Date: Wed, 20 Sep 2006 14:39:28 +0100 (BST) From: Thomas Sandford <freebsduser@paradisegreen.co.uk> To: FreeBSD-gnats-submit@freebsd.org Cc: freebsduser@paradisegreen.co.uk, freebsd-bugs@freebsd.org Subject: [PATCH] net/asterisk: update to 1.2.12 Message-ID: <200609201339.k8KDdSJl093493@mail.paradisegreen.co.uk>
next in thread | raw e-mail | index | archive | help
>Submitter-Id: current-users >Originator: Thomas Sandford >Organization: Paradise Green Technical Services >Confidential: no >Synopsis: [PATCH] net/asterisk: update to 1.2.12 >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.4-RELEASE i386 >Environment: System: FreeBSD almaz.paradisegreen.co.uk 5.4-RELEASE FreeBSD 5.4-RELEASE #0: Sun May 15 12:31:08 BST 2005 >Description: - Update to 1.2.12 Note: - 1.2.12.1 is available on the master site, but the codec negociation patch included in the port hs not yet been updated to that code level, and the 1.2.12 version of the patch does not compile when applied to the latest code (and the compile error is at the heart of the complicated patch and also the core of the .1 version bump. Removed file(s): - files/patch-asterisk.c Other changes: - Makefile has been reordered and tidied slightly to make portlint happy. - (this includes) removal of old commented out bristuff patches from Makefile Port maintainer (sobomax@FreeBSD.org) was cc'd on another attempt to submit this PR which got eaten by the spam trap. This version is cc'd to freebsd-bugs@ as suggested by the auto-reply to the previous attempt. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- asterisk-1.2.12.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/asterisk.orig/Makefile /usr/ports/net/asterisk/Makefile --- /usr/ports/net/asterisk.orig/Makefile Thu Aug 24 01:58:24 2006 +++ /usr/ports/net/asterisk/Makefile Wed Sep 20 11:47:53 2006 @@ -6,19 +6,13 @@ # PORTNAME= asterisk -PORTVERSION= 1.2.9.1 -PORTREVISION= 2 +PORTVERSION= 1.2.12 CATEGORIES= net MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases/ -PATCHFILES= asterisk129_codec_negotiation-20060615.diff.gz PATCH_SITES= http://unofficial.portaone.com/~bamby/public/ - -# ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff -# ${MASTER_SITE_LOCAL:S,$,:bristuff,} -#PATCH_SITE_SUBDIR= fjoe/:bristuff -#BRIVER= bristuff-0.3.0-PRE-1l +PATCHFILES= asterisk1212_codec_negotiation-20060912.diff.gz MAINTAINER= sobomax@FreeBSD.org COMMENT= An Open Source PBX and telephony toolkit diff -ruN --exclude=CVS /usr/ports/net/asterisk.orig/distinfo /usr/ports/net/asterisk/distinfo --- /usr/ports/net/asterisk.orig/distinfo Sat Jun 17 00:34:44 2006 +++ /usr/ports/net/asterisk/distinfo Wed Sep 20 00:38:41 2006 @@ -1,6 +1,6 @@ -MD5 (asterisk-1.2.9.1.tar.gz) = d98fc3dc5ee8df691ca2b0bd309bb251 -SHA256 (asterisk-1.2.9.1.tar.gz) = 6569080ee10a6dd9b554fc04a33641bc0964abc0502f797cdfefadafe2b6e71d -SIZE (asterisk-1.2.9.1.tar.gz) = 10568287 -MD5 (asterisk129_codec_negotiation-20060615.diff.gz) = 4f1b5dd22ba393a9bc2b384f98ff9c1d -SHA256 (asterisk129_codec_negotiation-20060615.diff.gz) = 8e031323d1fc55e81a5748d9474e4c7c2480328ef5785ff964aa6618f3e7ce1b -SIZE (asterisk129_codec_negotiation-20060615.diff.gz) = 32749 +MD5 (asterisk-1.2.12.tar.gz) = a81d180da203baa5170d9b1d4ac093f3 +SHA256 (asterisk-1.2.12.tar.gz) = 64c87c504dfc513afcf74c59361c6ea88026599fb153c42098347f7d769aa11a +SIZE (asterisk-1.2.12.tar.gz) = 10575163 +MD5 (asterisk1212_codec_negotiation-20060912.diff.gz) = 0daf2a5d4874ba621135c1b32360c7cf +SHA256 (asterisk1212_codec_negotiation-20060912.diff.gz) = fccd8e3091860cef5ba7fcb06e832710cdafb3cbd41d860ace15bfb5e3b1f652 +SIZE (asterisk1212_codec_negotiation-20060912.diff.gz) = 32810 diff -ruN --exclude=CVS /usr/ports/net/asterisk.orig/files/patch-Makefile /usr/ports/net/asterisk/files/patch-Makefile --- /usr/ports/net/asterisk.orig/files/patch-Makefile Thu Aug 24 01:58:24 2006 +++ /usr/ports/net/asterisk/files/patch-Makefile Tue Sep 19 22:36:24 2006 @@ -1,8 +1,5 @@ - -$FreeBSD: ports/net/asterisk/files/patch-Makefile,v 1.16 2006/08/24 00:58:24 sobomax Exp $ - ---- Makefile.orig -+++ Makefile +--- Makefile.orig Tue Sep 19 22:34:16 2006 ++++ Makefile Tue Sep 19 22:35:12 2006 @@ -19,8 +19,8 @@ # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be- # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/ @@ -14,7 +11,7 @@ # CROSS_ARCH=Linux # CROSS_PROC=arm # SUB_PROC=xscale # or maverick -@@ -46,14 +46,14 @@ +@@ -47,14 +47,14 @@ #K6OPT = -DK6OPT #Tell gcc to optimize the code @@ -32,7 +29,7 @@ #Set NOCRYPTO to yes if you do not want to have crypto support or #dependencies -@@ -85,7 +85,7 @@ +@@ -88,7 +88,7 @@ # Where to install asterisk after compiling # Default -> leave empty @@ -41,7 +38,7 @@ # Staging directory # Files are copied here temporarily during the install process -@@ -108,17 +108,17 @@ +@@ -111,17 +111,17 @@ BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE ifneq ($(OSARCH),SunOS) @@ -68,7 +65,7 @@ MODULES_DIR=$(ASTLIBDIR)/modules AGI_DIR=$(ASTVARLIBDIR)/agi-bin else -@@ -220,25 +220,25 @@ +@@ -226,25 +226,25 @@ endif INCLUDE+=-Iinclude -I../include @@ -100,7 +97,7 @@ else ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),) ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp -@@ -247,27 +247,24 @@ +@@ -253,27 +253,24 @@ ifeq ($(OSARCH),FreeBSD) BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk) @@ -142,16 +139,7 @@ endif # FreeBSD -@@ -283,7 +280,7 @@ - - ifeq ($(OSARCH),SunOS) - ASTCFLAGS+=-Wcast-align -DSOLARIS -- INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include -+ INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/include - endif - - ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) -@@ -298,7 +295,7 @@ +@@ -307,7 +304,7 @@ ifndef WITHOUT_ZAPTEL @@ -160,20 +148,7 @@ ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS endif -@@ -390,10 +387,10 @@ - endif - - ifeq ($(OSARCH),SunOS) -- LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - OBJS+=strcompat.o - ASTLINK= -- SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib -+ SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/ssl/lib - endif - - ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) -@@ -401,7 +398,7 @@ +@@ -414,7 +411,7 @@ endif # This is used when generating the doxygen documentation @@ -182,7 +157,7 @@ HAVEDOT=yes else HAVEDOT=no -@@ -420,7 +417,7 @@ +@@ -431,7 +428,7 @@ @echo " + $(MAKE) install +" @echo " +-------------------------------------------+" @@ -191,7 +166,7 @@ #ifneq ($(wildcard tags),) ctags: tags -@@ -439,13 +436,13 @@ +@@ -450,13 +447,13 @@ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure $(MAKE) -C editline libedit.a @@ -212,7 +187,7 @@ ifneq ($(wildcard .depend),) include .depend -@@ -469,10 +466,10 @@ +@@ -480,10 +477,10 @@ manpage: asterisk.8 @@ -227,7 +202,7 @@ asterisk.pdf: asterisk.sgml docbook2pdf asterisk.sgml -@@ -512,14 +509,14 @@ +@@ -523,14 +520,14 @@ cygwin_a: $(MAKE) -C cygwin all @@ -244,7 +219,7 @@ muted: muted.o $(CC) $(AUDIO_LIBS) -o muted muted.o -@@ -541,38 +538,38 @@ +@@ -552,38 +549,38 @@ datafiles: all if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi @@ -292,9 +267,9 @@ else \ echo "No description for $$x"; \ exit 1; \ -@@ -580,18 +577,18 @@ +@@ -591,18 +588,18 @@ done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \ + for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ - $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ + $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ @@ -316,7 +291,7 @@ update: @if [ -d .svn ]; then \ -@@ -620,47 +617,47 @@ +@@ -631,47 +628,47 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) bininstall: all @@ -348,7 +323,7 @@ + if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi + if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi + if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi - ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk + $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk - $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ - $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ + $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ @@ -396,7 +371,7 @@ else \ echo "You need to do cvs update -d not just cvs update" ; \ fi -@@ -690,46 +687,28 @@ +@@ -701,46 +698,28 @@ echo " WARNING WARNING WARNING" ;\ fi @@ -450,7 +425,7 @@ if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ if [ "$(OVERWRITE)" = "y" ]; then \ if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \ -@@ -742,7 +721,7 @@ +@@ -753,7 +732,7 @@ continue; \ fi ;\ fi ; \ @@ -459,7 +434,7 @@ done if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ( \ -@@ -802,25 +781,25 @@ +@@ -813,25 +792,25 @@ echo "; Default: strict"; \ echo ";"; \ echo ";translation_algorithm = strict"; \ @@ -491,7 +466,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 ; \ -@@ -834,9 +813,9 @@ +@@ -845,9 +824,9 @@ @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 ) @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 ) $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi @@ -503,7 +478,7 @@ done @echo " +--------- Asterisk Web Voicemail ----------+" @echo " + +" -@@ -863,10 +842,10 @@ +@@ -874,10 +853,10 @@ __rpm: include/asterisk/version.h spec rm -rf /tmp/asterisk ; \ diff -ruN --exclude=CVS /usr/ports/net/asterisk.orig/files/patch-asterisk.c /usr/ports/net/asterisk/files/patch-asterisk.c --- /usr/ports/net/asterisk.orig/files/patch-asterisk.c Tue Jun 20 19:57:24 2006 +++ /usr/ports/net/asterisk/files/patch-asterisk.c Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ - -$FreeBSD: ports/net/asterisk/files/patch-asterisk.c,v 1.2 2006/06/20 18:57:24 sobomax Exp $ - ---- asterisk.c.orig -+++ asterisk.c -@@ -1803,7 +1804,6 @@ - - if (option_exec && data) { /* hack to print output then exit if asterisk -rx is used */ - char tempchar; --#ifdef __Darwin__ - struct pollfd fds[0]; - fds[0].fd = ast_consock; - fds[0].events = POLLIN; -@@ -1811,9 +1811,6 @@ - while (poll(fds, 1, 100) > 0) { - ast_el_read_char(el, &tempchar); - } --#else -- while (!ast_el_read_char(el, &tempchar)); --#endif - return; - } - for(;;) { diff -ruN --exclude=CVS /usr/ports/net/asterisk.orig/pkg-plist /usr/ports/net/asterisk/pkg-plist --- /usr/ports/net/asterisk.orig/pkg-plist Sat Jun 17 00:34:44 2006 +++ /usr/ports/net/asterisk/pkg-plist Wed Sep 20 12:05:08 2006 @@ -532,6 +532,7 @@ %%DATADIR%%/sounds/dir-nomatch.gsm %%DATADIR%%/sounds/dir-nomore.gsm %%DATADIR%%/sounds/hello-world.gsm +%%DATADIR%%/sounds/hours.gsm %%DATADIR%%/sounds/invalid.gsm %%DATADIR%%/sounds/letters/a.gsm %%DATADIR%%/sounds/letters/at.gsm @@ -569,6 +570,7 @@ %%DATADIR%%/sounds/letters/y.gsm %%DATADIR%%/sounds/letters/z.gsm %%DATADIR%%/sounds/letters/zed.gsm +%%DATADIR%%/sounds/minutes.gsm %%DATADIR%%/sounds/pbx-invalid.gsm %%DATADIR%%/sounds/pbx-invalidpark.gsm %%DATADIR%%/sounds/pbx-transfer.gsm @@ -618,6 +620,7 @@ %%DATADIR%%/sounds/queue-thereare.gsm %%DATADIR%%/sounds/queue-youarenext.gsm %%DATADIR%%/sounds/screen-callee-options.gsm +%%DATADIR%%/sounds/seconds.gsm %%DATADIR%%/sounds/spy-agent.gsm %%DATADIR%%/sounds/spy-h323.gsm %%DATADIR%%/sounds/spy-iax.gsm --- asterisk-1.2.12.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609201339.k8KDdSJl093493>