diff options
author | fjoe <fjoe@FreeBSD.org> | 2005-07-12 18:11:17 +0800 |
---|---|---|
committer | fjoe <fjoe@FreeBSD.org> | 2005-07-12 18:11:17 +0800 |
commit | 5d5984775c3b8074a17d21c7eb9fb16c0e47012b (patch) | |
tree | 7cc1aa608ec7d3120b39d0fbf30e784e2e669f61 /net/asterisk16 | |
parent | 13ee989560c6874b4258358847cef5684c218d99 (diff) | |
download | freebsd-ports-gnome-5d5984775c3b8074a17d21c7eb9fb16c0e47012b.tar.gz freebsd-ports-gnome-5d5984775c3b8074a17d21c7eb9fb16c0e47012b.tar.zst freebsd-ports-gnome-5d5984775c3b8074a17d21c7eb9fb16c0e47012b.zip |
Update to 1.0.9 and bristuff-0.2.0-RC8h.
Approved by: MAINTAINER
Diffstat (limited to 'net/asterisk16')
-rw-r--r-- | net/asterisk16/Makefile | 7 | ||||
-rw-r--r-- | net/asterisk16/distinfo | 8 | ||||
-rw-r--r-- | net/asterisk16/files/patch-Makefile | 12 | ||||
-rw-r--r-- | net/asterisk16/files/patch-res::Makefile | 19 | ||||
-rw-r--r-- | net/asterisk16/files/patch-rtp.c | 22 | ||||
-rw-r--r-- | net/asterisk16/pkg-plist | 8 |
6 files changed, 35 insertions, 41 deletions
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 4c0d18d05948..1ea4517f1202 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -6,13 +6,12 @@ # PORTNAME= asterisk -PORTVERSION= 1.0.7 -PORTREVISION= 8 +PORTVERSION= 1.0.9 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ -PATCHFILES= ${PORTNAME}-1.0.6-${BRIVER}.patch.gz +PATCHFILES= ${PORTNAME}-1.0.8-${BRIVER}.patch.gz PATCH_SITES= ${MASTER_SITE_LOCAL} PATCH_SITE_SUBDIR= fjoe PATCH_DIST_STRIP= -p1 @@ -27,7 +26,7 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 sparc64 -BRIVER= bristuff-0.2.0-RC7j +BRIVER= bristuff-0.2.0-RC8h GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/editline USE_GMAKE= yes diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo index 7824440e6c18..9ef6daa2ce76 100644 --- a/net/asterisk16/distinfo +++ b/net/asterisk16/distinfo @@ -1,4 +1,4 @@ -MD5 (asterisk-1.0.7.tar.gz) = 4cc3c1e4a1b12e0e4c748326ad153291 -SIZE (asterisk-1.0.7.tar.gz) = 9591705 -MD5 (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = cdffa574bb65250d93abf98fb11e29f9 -SIZE (asterisk-1.0.6-bristuff-0.2.0-RC7j.patch.gz) = 40762 +MD5 (asterisk-1.0.9.tar.gz) = 0d7f1c680ae53a739f26a069ef8b580a +SIZE (asterisk-1.0.9.tar.gz) = 9604582 +MD5 (asterisk-1.0.8-bristuff-0.2.0-RC8h.patch.gz) = 42172c5b04af9080f22b883296c34002 +SIZE (asterisk-1.0.8-bristuff-0.2.0-RC8h.patch.gz) = 56589 diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile index c509623ce46a..176c4ba74d4e 100644 --- a/net/asterisk16/files/patch-Makefile +++ b/net/asterisk16/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Apr 14 00:05:14 2005 -+++ Makefile Thu Apr 14 00:05:14 2005 +--- Makefile.orig Tue Jul 12 00:36:27 2005 ++++ Makefile Tue Jul 12 01:24:50 2005 @@ -45,6 +45,15 @@ PROC=$(shell uname -m) endif @@ -225,7 +225,7 @@ update: @if [ -d CVS ]; then \ -@@ -367,125 +372,90 @@ +@@ -367,127 +372,90 @@ fi bininstall: all @@ -325,6 +325,8 @@ - @echo " + a stable release, remember to delete +" - @echo " + everything from your asterisk modules +" - @echo " + directory (/usr/lib/asterisk/modules/) +" +- @echo " + and the asterisk header directory +" +- @echo " + (/usr/include/asterisk/) +" - @echo " + before doing a '$(MAKE) install'. +" - @echo " + +" - @echo " +-------------------------------------------+" @@ -403,7 +405,7 @@ :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \ -@@ -500,7 +470,7 @@ +@@ -502,7 +470,7 @@ @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi @@ -412,7 +414,7 @@ for x in images/*.gif; do \ install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ done -@@ -520,10 +490,10 @@ +@@ -522,10 +490,10 @@ __rpm: _version rm -rf /tmp/asterisk ; \ diff --git a/net/asterisk16/files/patch-res::Makefile b/net/asterisk16/files/patch-res::Makefile index 3377b4aa1c8e..2b920da8ea3f 100644 --- a/net/asterisk16/files/patch-res::Makefile +++ b/net/asterisk16/files/patch-res::Makefile @@ -1,9 +1,16 @@ - -$FreeBSD$ - ---- res/Makefile.orig -+++ res/Makefile -@@ -21,7 +21,10 @@ +--- res/Makefile.orig Tue Jul 12 01:28:04 2005 ++++ res/Makefile Tue Jul 12 01:58:11 2005 +@@ -13,15 +13,18 @@ + + MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \ + res_agi.so res_watchdog.so +-MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) +-MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) ++#MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) ++#MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) + MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi) + + CRYPTO_LIBS=-lssl -lcrypto CFLAGS+= CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") diff --git a/net/asterisk16/files/patch-rtp.c b/net/asterisk16/files/patch-rtp.c index 36c4bea2f7ea..c652add6a2f2 100644 --- a/net/asterisk16/files/patch-rtp.c +++ b/net/asterisk16/files/patch-rtp.c @@ -9,28 +9,6 @@ break; case TYPE_SILENCE: return 4; -@@ -351,9 +351,7 @@ - 0, (struct sockaddr *)&sin, &len); - - if (res < 0) { -- if (errno == EAGAIN) -- ast_log(LOG_NOTICE, "RTP: Received packet with bad UDP checksum\n"); -- else -+ if (errno != EAGAIN) - ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno)); - if (errno == EBADF) - CRASH; -@@ -431,9 +429,7 @@ - - rtpheader = (unsigned int *)(rtp->rawdata + AST_FRIENDLY_OFFSET); - if (res < 0) { -- if (errno == EAGAIN) -- ast_log(LOG_NOTICE, "RTP: Received packet with bad UDP checksum\n"); -- else -+ if (errno != EAGAIN) - ast_log(LOG_WARNING, "RTP Read error: %s\n", strerror(errno)); - if (errno == EBADF) - CRASH; @@ -862,8 +858,10 @@ /* Must be an even port number by RTP spec */ rtp->us.sin_port = htons(x); diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist index 7da453842b34..94f2ce3e15a3 100644 --- a/net/asterisk16/pkg-plist +++ b/net/asterisk16/pkg-plist @@ -121,6 +121,9 @@ etc/asterisk/voicemail.conf-dist @unexec if cmp -s %D/etc/asterisk/vpb.conf %D/etc/asterisk/vpb.conf-dist; then rm -f %D/etc/asterisk/vpb.conf; fi etc/asterisk/vpb.conf-dist @exec [ -f %B/vpb.conf ] || cp %B/%f %B/vpb.conf +@unexec if cmp -s %D/etc/asterisk/watchdog.conf %D/etc/asterisk/watchdog.conf-dist; then rm -f %D/etc/asterisk/watchdog.conf; fi +etc/asterisk/watchdog.conf-dist +@exec [ -f %B/watchdog.conf ] || cp %B/%f %B/watchdog.conf @unexec if cmp -s %D/etc/asterisk/zapata.conf %D/etc/asterisk/zapata.conf-dist; then rm -f %D/etc/asterisk/zapata.conf; fi etc/asterisk/zapata.conf-dist @exec [ -f %B/zapata.conf ] || cp %B/%f %B/zapata.conf @@ -176,6 +179,7 @@ include/asterisk/sched.h include/asterisk/srv.h include/asterisk/tdd.h include/asterisk/term.h +include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/ulaw.h include/asterisk/utils.h @@ -230,6 +234,7 @@ lib/asterisk/modules/app_setcallerid.so lib/asterisk/modules/app_setcdruserfield.so lib/asterisk/modules/app_setcidname.so lib/asterisk/modules/app_setcidnum.so +lib/asterisk/modules/app_settransfercapability.so lib/asterisk/modules/app_sms.so lib/asterisk/modules/app_softhangup.so lib/asterisk/modules/app_striplsd.so @@ -251,6 +256,7 @@ lib/asterisk/modules/app_zapateller.so %%WITH_ZAPTEL%%lib/asterisk/modules/app_zapscan.so lib/asterisk/modules/cdr_csv.so lib/asterisk/modules/cdr_manager.so +lib/asterisk/modules/cdr_odbc.so lib/asterisk/modules/chan_agent.so %%WITH_H323%%lib/asterisk/modules/chan_h323.so lib/asterisk/modules/chan_iax2.so @@ -298,6 +304,7 @@ lib/asterisk/modules/res_features.so lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so +lib/asterisk/modules/res_watchdog.so sbin/asterisk sbin/astgenkey sbin/astman @@ -411,6 +418,7 @@ sbin/safe_asterisk %%DATADIR%%/sounds/digits/h-9.gsm %%DATADIR%%/sounds/digits/hundred.gsm %%DATADIR%%/sounds/digits/million.gsm +%%DATADIR%%/sounds/digits/minus.gsm %%DATADIR%%/sounds/digits/mon-0.gsm %%DATADIR%%/sounds/digits/mon-1.gsm %%DATADIR%%/sounds/digits/mon-10.gsm |