From 22d259e0ed85408067427e099339eec346e16cc1 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Sun, 22 Jul 2007 10:40:35 +0000 Subject: o Update to 1.4.8, which fixes some security issues. PR: 114720, 114712 o Enable zaptel channel and friends on AMD64. PR: 112624 o Improve startup script. PR: 107222 --- net/asterisk10/Makefile | 15 +++--- net/asterisk10/distinfo | 6 +-- net/asterisk10/files/asterisk.sh.in | 8 +++ net/asterisk10/files/patch-Makefile | 18 +++---- net/asterisk10/files/patch-configure | 93 +++++++++++++++++++++++++------- net/asterisk10/files/patch-main::utils.c | 14 ----- net/asterisk10/pkg-plist | 8 +-- 7 files changed, 106 insertions(+), 56 deletions(-) delete mode 100644 net/asterisk10/files/patch-main::utils.c (limited to 'net/asterisk10') diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index f1f830f08814..7b2a359eefa2 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -6,8 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.4.4 -PORTREVISION= 2 +PORTVERSION= 1.4.8 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ @@ -25,8 +24,9 @@ ONLY_FOR_ARCHS= i386 sparc64 amd64 GNU_CONFIGURE= yes CONFIGURE_ARGS= --mandir=${LOCALBASE}/man -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_BISON= yes USE_RC_SUBR= asterisk.sh @@ -50,7 +50,7 @@ OPTIONS= OGGVORBIS "Enable Ogg Vorbis support" on \ .include -.if ${ARCH} == "i386" +.if ${ARCH} == "i386" || ${ARCH} == "amd64" OPTIONS+= ZAPTEL "Enable Zaptel support" on .else WITHOUT_ZAPTEL= yes @@ -61,7 +61,7 @@ PLIST_SUB+= WITH_H323="@comment " CONFIGURE_ARGS+= --without-h323 .else PLIST_SUB+= WITH_H323="" -CONFIGURE_ARGS+= --with-h323 +CONFIGURE_ARGS+= --with-h323=${LOCALBASE} LIB_DEPENDS+= pt_r.1:${PORTSDIR}/devel/pwlib \ h323_r.1:${PORTSDIR}/net/openh323 .endif @@ -86,8 +86,9 @@ PLIST_SUB+= WITH_ODBC="@comment " CONFIGURE_ARGS+= --without-odbc .else PLIST_SUB+= WITH_ODBC="" -CONFIGURE_ARGS+= --with-odbc -LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC +CONFIGURE_ARGS+= --with-odbc --with-ltdl +LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ + ltdl.4:${PORTSDIR}/devel/libltdl15 .endif .if defined(WITHOUT_FREETDS) diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo index 9a855ab04449..fe6532ba67ba 100644 --- a/net/asterisk10/distinfo +++ b/net/asterisk10/distinfo @@ -1,3 +1,3 @@ -MD5 (asterisk-1.4.4.tar.gz) = 90f6a2ea5113ad26de393517576a1ede -SHA256 (asterisk-1.4.4.tar.gz) = 82a28d8f511703de5fc6231123f15a7c2fbda54ff9c0a686e405f74d1c03aca7 -SIZE (asterisk-1.4.4.tar.gz) = 17081631 +MD5 (asterisk-1.4.8.tar.gz) = 7263ff56ad93cbb5efb971a536ee6a51 +SHA256 (asterisk-1.4.8.tar.gz) = 3eabdf2c52d366abe7dd1e303b982fa7aad12945b1ac32ee97dc4b652041a43f +SIZE (asterisk-1.4.8.tar.gz) = 11171190 diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in index 4489cb50be04..e05d58ed6ee8 100644 --- a/net/asterisk10/files/asterisk.sh.in +++ b/net/asterisk10/files/asterisk.sh.in @@ -11,6 +11,14 @@ . %%RC_SUBR%% +stop_precmd=asterisk_shutdown +sig_stop=KILL +asterisk_shutdown () { + %%PREFIX%%/sbin/asterisk -qrx 'stop now' + sleep 1 + return 0 +} + name=asterisk rcvar=`set_rcvar` diff --git a/net/asterisk10/files/patch-Makefile b/net/asterisk10/files/patch-Makefile index f145cb58e89b..0a6c7bc4b3a8 100644 --- a/net/asterisk10/files/patch-Makefile +++ b/net/asterisk10/files/patch-Makefile @@ -3,7 +3,7 @@ $FreeBSD$ --- Makefile.orig +++ Makefile -@@ -207,7 +207,7 @@ +@@ -210,7 +210,7 @@ ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -12,7 +12,7 @@ $FreeBSD$ ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) endif -@@ -371,15 +371,15 @@ +@@ -375,15 +375,15 @@ # Should static HTTP be installed during make samples or even with its own target ala # webvoicemail? There are portions here that *could* be customized but might also be # improved a lot. I'll put it here for now. @@ -33,7 +33,7 @@ $FreeBSD$ $(MAKE) -C sounds install update: -@@ -400,45 +400,45 @@ +@@ -404,45 +404,45 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) bininstall: _all @@ -67,7 +67,7 @@ $FreeBSD$ + $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ + $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ - cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ + cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ fi - $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) @@ -109,7 +109,7 @@ $FreeBSD$ fi $(SUBDIRS_INSTALL): -@@ -465,7 +465,7 @@ +@@ -469,7 +469,7 @@ echo " WARNING WARNING WARNING" ;\ fi @@ -118,7 +118,7 @@ $FreeBSD$ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi -@@ -495,31 +495,23 @@ +@@ -499,31 +499,23 @@ upgrade: bininstall adsi: @@ -158,7 +158,7 @@ $FreeBSD$ ( \ echo "[directories]" ; \ echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -540,20 +532,23 @@ +@@ -544,20 +536,23 @@ echo ";astctlowner = root" ; \ echo ";astctlgroup = apache" ; \ echo ";astctl = asterisk.ctl" ; \ @@ -186,7 +186,7 @@ $FreeBSD$ done @echo " +--------- Asterisk Web Voicemail ----------+" @echo " + +" -@@ -580,10 +575,10 @@ +@@ -584,10 +579,10 @@ __rpm: include/asterisk/version.h include/asterisk/buildopts.h spec rm -rf /tmp/asterisk ; \ @@ -199,7 +199,7 @@ $FreeBSD$ cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec -@@ -594,19 +589,19 @@ +@@ -598,19 +593,19 @@ config: @if [ "${OSARCH}" = "linux-gnu" ]; then \ if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \ diff --git a/net/asterisk10/files/patch-configure b/net/asterisk10/files/patch-configure index 9a62851600a8..21df7182f365 100644 --- a/net/asterisk10/files/patch-configure +++ b/net/asterisk10/files/patch-configure @@ -3,25 +3,80 @@ $FreeBSD$ --- configure.orig +++ configure -@@ -23776,7 +23776,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lodbc ${pbxlibdir} -lltdl $LIBS" -+LIBS="-lodbc ${pbxlibdir} $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23855,7 +23855,7 @@ - - - if test "${AST_UNIXODBC_FOUND}" = "yes"; then -- UNIXODBC_LIB="-lodbc -lltdl" -+ UNIXODBC_LIB="-lodbc" - UNIXODBC_HEADER_FOUND="1" - if test "x${UNIXODBC_DIR}" != "x"; then - UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}" -@@ -28065,7 +28065,7 @@ +@@ -3926,8 +3926,6 @@ + case "${host_os}" in + freebsd*) + ac_default_prefix=/usr/local +- CPPFLAGS=-I/usr/local/include +- LDFLAGS=-L/usr/local/lib + ;; + *) + ac_default_prefix=/usr +@@ -26066,6 +26064,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include + #include <${OPENH323DIR}/include/h323.h> + _ACEOF + rm -f conftest.$ac_objext +@@ -26106,6 +26105,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include <${OPENH323DIR}/include/h323.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -26202,6 +26202,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include + #include <${HOME}/openh323/include/h323.h> + _ACEOF + rm -f conftest.$ac_objext +@@ -26242,6 +26243,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include <${HOME}/openh323/include/h323.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -26336,6 +26338,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include + #include + _ACEOF + rm -f conftest.$ac_objext +@@ -26376,6 +26379,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -26475,6 +26479,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default ++#include + #include + _ACEOF + rm -f conftest.$ac_objext +@@ -26515,6 +26520,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ ++#include + #include + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" +@@ -26700,7 +26706,7 @@ fi diff --git a/net/asterisk10/files/patch-main::utils.c b/net/asterisk10/files/patch-main::utils.c deleted file mode 100644 index 4c465aeb9875..000000000000 --- a/net/asterisk10/files/patch-main::utils.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- main/utils.c -+++ main/utils.c -@@ -58,7 +58,7 @@ - static char base64[64]; - static char b2a[256]; - --#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) -+#if (defined(__FreeBSD__) && __FreeBSD_version < 601103) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) - - /* duh? ERANGE value copied from web... */ - #define ERANGE 34 diff --git a/net/asterisk10/pkg-plist b/net/asterisk10/pkg-plist index 9fc1bf7e3501..43ac54d37b72 100644 --- a/net/asterisk10/pkg-plist +++ b/net/asterisk10/pkg-plist @@ -74,6 +74,8 @@ etc/asterisk/phone.conf-dist etc/asterisk/privacy.conf-dist @unexec if cmp -s %D/etc/asterisk/queues.conf %D/etc/asterisk/queues.conf-dist; then rm -f %D/etc/asterisk/queues.conf; fi etc/asterisk/queues.conf-dist +@unexec if cmp -s %D/etc/asterisk/res_pgsql.conf %D/etc/asterisk/res_pgsql.conf-dist; then rm -f %D/etc/asterisk/res_pgsql.conf; fi +etc/asterisk/res_pgsql.conf-dist @unexec if cmp -s %D/etc/asterisk/res_odbc.conf %D/etc/asterisk/res_odbc.conf-dist; then rm -f %D/etc/asterisk/res_odbc.conf; fi etc/asterisk/res_odbc.conf-dist @unexec if cmp -s %D/etc/asterisk/rpt.conf %D/etc/asterisk/rpt.conf-dist; then rm -f %D/etc/asterisk/rpt.conf; fi @@ -280,7 +282,6 @@ lib/asterisk/modules/cdr_manager.so %%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so %%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so lib/asterisk/modules/chan_agent.so -lib/asterisk/modules/chan_features.so %%WITH_JABBER%%lib/asterisk/modules/chan_gtalk.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so @@ -378,8 +379,8 @@ share/asterisk/moh/LICENSE-asterisk-moh-freeplay-wav share/asterisk/moh/fpm-calm-river.wav share/asterisk/moh/fpm-sunshine.wav share/asterisk/moh/fpm-world-mix.wav -share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.6 -share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.6 +share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.7 +share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.7 share/asterisk/sounds/agent-alreadyon.gsm share/asterisk/sounds/agent-incorrect.gsm share/asterisk/sounds/agent-loggedoff.gsm @@ -749,7 +750,6 @@ share/asterisk/sounds/vm-undeleted.gsm share/asterisk/sounds/vm-unknown-caller.gsm share/asterisk/sounds/vm-whichbox.gsm share/asterisk/sounds/vm-youhave.gsm -share/asterisk/sounds/x share/asterisk/static-http/ajamdemo.html share/asterisk/static-http/astman.css share/asterisk/static-http/astman.js -- cgit v1.2.3