diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile index b16f2ae8fc8..c7220b40fc4 100644 --- a/telephony/asterisk/Makefile +++ b/telephony/asterisk/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.13 2006/10/19 21:19:07 jolan Exp $ +# $OpenBSD: Makefile,v 1.14 2006/12/22 22:16:10 jolan Exp $ COMMENT= "open source PBX" -DISTNAME= asterisk-1.2.13 +DISTNAME= asterisk-1.2.14 CATEGORIES= telephony MASTER_SITES= http://ftp.digium.com/pub/asterisk/releases/ diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo index ec21507cd4e..831789e8b62 100644 --- a/telephony/asterisk/distinfo +++ b/telephony/asterisk/distinfo @@ -1,4 +1,4 @@ -MD5 (asterisk-1.2.13.tar.gz) = ad8fbe2198568f55c254045ecb3b7926 -RMD160 (asterisk-1.2.13.tar.gz) = 7cf9e00a0697b16891b463345c64a615c30015a3 -SHA1 (asterisk-1.2.13.tar.gz) = d2ec77e08f512a3fa11fd8639a7fe629a46ed242 -SIZE (asterisk-1.2.13.tar.gz) = 10584113 +MD5 (asterisk-1.2.14.tar.gz) = 2ce03466b99e0b9471e6c791ed14a5f2 +RMD160 (asterisk-1.2.14.tar.gz) = c07410e57086ebc34c78fd6794fa5395c3f5a174 +SHA1 (asterisk-1.2.14.tar.gz) = 1e88a30bcd3d78c1cdee44b80e0162516102ea86 +SIZE (asterisk-1.2.14.tar.gz) = 10595184 diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile index adaa1a8820b..dc012234f3f 100644 --- a/telephony/asterisk/patches/patch-Makefile +++ b/telephony/asterisk/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.8 2006/09/24 21:09:26 jolan Exp $ ---- Makefile.orig Wed Sep 6 15:09:10 2006 -+++ Makefile Tue Sep 19 14:26:50 2006 +$OpenBSD: patch-Makefile,v 1.9 2006/12/22 22:16:10 jolan Exp $ +--- Makefile.orig Mon Dec 11 21:55:43 2006 ++++ Makefile Sat Dec 16 22:04:36 2006 @@ -19,8 +19,8 @@ OPTIONS= # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ @@ -119,7 +119,7 @@ $OpenBSD: patch-Makefile,v 1.8 2006/09/24 21:09:26 jolan Exp $ all: cleantest depend asterisk subdirs -@@ -705,6 +738,7 @@ install: all datafiles bininstall instal +@@ -714,6 +747,7 @@ install: all datafiles bininstall instal @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi @@ -127,7 +127,7 @@ $OpenBSD: patch-Makefile,v 1.8 2006/09/24 21:09:26 jolan Exp $ @echo " +---- Asterisk Installation Complete -------+" @echo " + +" @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -@@ -726,6 +760,7 @@ install: all datafiles bininstall instal +@@ -735,6 +769,7 @@ install: all datafiles bininstall instal @echo " + **Note** This requires that you have +" @echo " + doxygen installed on your local system +" @echo " +-------------------------------------------+" diff --git a/telephony/asterisk/patches/patch-asterisk_c b/telephony/asterisk/patches/patch-asterisk_c index fd928425b37..f4c84ef771a 100644 --- a/telephony/asterisk/patches/patch-asterisk_c +++ b/telephony/asterisk/patches/patch-asterisk_c @@ -1,13 +1,13 @@ -$OpenBSD: patch-asterisk_c,v 1.5 2006/09/24 21:09:26 jolan Exp $ ---- asterisk.c.orig Mon Aug 21 17:34:26 2006 -+++ asterisk.c Tue Sep 19 14:26:50 2006 +$OpenBSD: patch-asterisk_c,v 1.6 2006/12/22 22:16:10 jolan Exp $ +--- asterisk.c.orig Fri Oct 27 18:36:07 2006 ++++ asterisk.c Sat Dec 16 22:06:01 2006 @@ -448,7 +448,7 @@ int ast_safe_system(const char *s) /* Close file descriptors and launch system command */ for (x = STDERR_FILENO + 1; x < 4096; x++) close(x); - execl("/bin/sh", "/bin/sh", "-c", s, NULL); + execl("/bin/sh", "/bin/sh", "-c", s, (void*)NULL); - exit(1); + _exit(1); } else if (pid > 0) { for(;;) { @@ -2010,7 +2010,7 @@ int main(int argc, char *argv[]) diff --git a/telephony/asterisk/patches/patch-cdr_Makefile b/telephony/asterisk/patches/patch-cdr_Makefile index 8b2154709fa..b1e33a27149 100644 --- a/telephony/asterisk/patches/patch-cdr_Makefile +++ b/telephony/asterisk/patches/patch-cdr_Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-cdr_Makefile,v 1.4 2006/09/24 21:09:26 jolan Exp $ ---- cdr/Makefile.orig Sun Apr 30 09:27:56 2006 -+++ cdr/Makefile Tue Sep 19 14:26:50 2006 +$OpenBSD: patch-cdr_Makefile,v 1.5 2006/12/22 22:16:10 jolan Exp $ +--- cdr/Makefile.orig Thu Nov 16 20:29:28 2006 ++++ cdr/Makefile Sat Dec 16 22:09:39 2006 @@ -30,21 +30,26 @@ endif #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. #So we go lowest common available by gcc and go a step down, still a step up from @@ -26,26 +26,14 @@ $OpenBSD: patch-cdr_Makefile,v 1.4 2006/09/24 21:09:26 jolan Exp $ # +ifneq (${OSARCH},OpenBSD) ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) - ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 -@@ -57,13 +62,16 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET - endif - MODS+=cdr_tds.so + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) + CFLAGS += -DFREETDS_0_64 +@@ -103,12 +108,15 @@ endif + ifneq ($(wilcard $(CROSS_COMPILE_TARGET)/usr/lib/libpq.so),) + MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib endif +endif - # - # PGSQL stuff... Autoconf anyone?? - # -+ifneq (${OSARCH},OpenBSD) - ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) - MODS+=cdr_pgsql.so - endif -+endif - - MLFLAGS= - -@@ -103,8 +111,10 @@ endif # # SQLite stuff... # diff --git a/telephony/asterisk/pkg/PLIST b/telephony/asterisk/pkg/PLIST index 4f6957bdfbd..d6e158d15be 100644 --- a/telephony/asterisk/pkg/PLIST +++ b/telephony/asterisk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2006/10/18 00:18:36 jolan Exp $ +@comment $OpenBSD: PLIST,v 1.8 2006/12/22 22:16:10 jolan Exp $ @newgroup _asterisk:545 @newuser _asterisk:545:_asterisk:daemon:asterisk user:/nonexistent:/sbin/nologin include/asterisk/ @@ -345,6 +345,17 @@ share/asterisk/sounds/queue-thereare.gsm share/asterisk/sounds/queue-youarenext.gsm share/asterisk/sounds/screen-callee-options.gsm share/asterisk/sounds/seconds.gsm +share/asterisk/sounds/silence/ +share/asterisk/sounds/silence/1.gsm +share/asterisk/sounds/silence/10.gsm +share/asterisk/sounds/silence/2.gsm +share/asterisk/sounds/silence/3.gsm +share/asterisk/sounds/silence/4.gsm +share/asterisk/sounds/silence/5.gsm +share/asterisk/sounds/silence/6.gsm +share/asterisk/sounds/silence/7.gsm +share/asterisk/sounds/silence/8.gsm +share/asterisk/sounds/silence/9.gsm share/asterisk/sounds/spy-agent.gsm share/asterisk/sounds/spy-h323.gsm share/asterisk/sounds/spy-iax.gsm