Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 8 Jun 2006 00:27:15 +0100 (BST)
From:      Thomas Sandford <freebsduser@paradisegreen.co.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        sobomax@FreeBSD.org
Subject:   ports/98678: [PATCH] net/asterisk: update to 1.2.9.1
Message-ID:  <200606072327.k57NRFHa099272@mail.paradisegreen.co.uk>
Resent-Message-ID: <200606080150.k581oHjT083609@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         98678
>Category:       ports
>Synopsis:       [PATCH] net/asterisk: update to 1.2.9.1
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 08 01:50:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Sandford
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
Paradise Green Technical Services
>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.9.1

Removed file(s):
- files/patch-codecs::gsm::Makefile
- files/patch-editline::configure
- files/patch-editline::makelist

Port maintainer (sobomax@FreeBSD.org) is cc'd.

I've marked this update as high priority as there is an outstanding security
advisory for Asterisk 1.2.7.1 which is the current port version.

Because of this I have (for now) omitted the codec negociation patch
as the patch author has not yet created a version of the patch against 1.2.9.1

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- asterisk-1.2.9.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/asterisk/Makefile /usr/ports/net/asterisk-tdgs/Makefile
--- /usr/ports/net/asterisk/Makefile	Tue May 23 03:47:04 2006
+++ /usr/ports/net/asterisk-tdgs/Makefile	Thu Jun  8 00:09:55 2006
@@ -6,18 +6,13 @@
 #
 
 PORTNAME=	asterisk
-PORTVERSION=	1.2.7.1
+PORTVERSION=	1.2.9.1
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
 
-PATCHFILES=	asterisk127_codec_negotiation-20060419.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=	asterisk127_codec_negotiation-20060505.diff.gz
+# PATCH_SITES=	http://unofficial.portaone.com/~bamby/public/
 
 MAINTAINER=	sobomax@FreeBSD.org
 COMMENT=	An Open Source PBX and telephony toolkit
diff -ruN --exclude=CVS /usr/ports/net/asterisk/distinfo /usr/ports/net/asterisk-tdgs/distinfo
--- /usr/ports/net/asterisk/distinfo	Wed Apr 26 12:31:03 2006
+++ /usr/ports/net/asterisk-tdgs/distinfo	Wed Jun  7 13:44:18 2006
@@ -1,6 +1,3 @@
-MD5 (asterisk-1.2.7.1.tar.gz) = 5c4b473eee2fbc2cb9e346f0564ef970
-SHA256 (asterisk-1.2.7.1.tar.gz) = c561ec886a779a59c78cbeffda457f2a07535ddceb371561c54adc6ee60d984a
-SIZE (asterisk-1.2.7.1.tar.gz) = 10554037
-MD5 (asterisk127_codec_negotiation-20060419.diff.gz) = c5838975a6bea1799da9cc021a2ce8f0
-SHA256 (asterisk127_codec_negotiation-20060419.diff.gz) = df16f36a87e6b539d038ac466504d317d61666eec94ffa96549921458d8c489c
-SIZE (asterisk127_codec_negotiation-20060419.diff.gz) = 32475
+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
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-Makefile /usr/ports/net/asterisk-tdgs/files/patch-Makefile
--- /usr/ports/net/asterisk/files/patch-Makefile	Wed Apr 26 12:31:03 2006
+++ /usr/ports/net/asterisk-tdgs/files/patch-Makefile	Wed Jun  7 14:32:39 2006
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-Makefile,v 1.14 2006/04/26 11:31:03 fjoe Exp $
-
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Sun Apr 30 15:27:56 2006
++++ Makefile	Wed Jun  7 14:26:19 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
-@@ -44,14 +44,14 @@
+@@ -46,14 +46,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
-@@ -83,7 +83,7 @@
+@@ -85,7 +85,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
-@@ -106,17 +106,17 @@
+@@ -108,17 +108,17 @@
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
  ifneq ($(OSARCH),SunOS)
@@ -68,7 +65,7 @@
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  else
-@@ -218,25 +218,25 @@
+@@ -220,25 +220,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
-@@ -245,27 +245,24 @@
+@@ -247,27 +247,24 @@
  
  ifeq ($(OSARCH),FreeBSD)
    BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
@@ -142,7 +139,7 @@
  
  endif # FreeBSD
  
-@@ -281,7 +278,7 @@
+@@ -283,7 +280,7 @@
  
  ifeq ($(OSARCH),SunOS)
    ASTCFLAGS+=-Wcast-align -DSOLARIS
@@ -151,7 +148,7 @@
  endif
  
  ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
-@@ -296,7 +293,7 @@
+@@ -298,7 +295,7 @@
  
  ifndef WITHOUT_ZAPTEL
  
@@ -160,7 +157,16 @@
    ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
  endif
  
-@@ -388,10 +385,10 @@
+@@ -308,7 +305,7 @@
+ 
+ ifneq ($(wildcard .version),)
+   ASTERISKVERSION:=$(shell cat .version)
+-  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
++  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%d%02d%02d", $$1, $$2, $$3}' .version)
+   RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
+ else
+   RPMVERSION=unknown
+@@ -390,10 +387,10 @@
  endif
  
  ifeq ($(OSARCH),SunOS)
@@ -173,7 +179,7 @@
  endif
  
  ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-@@ -399,7 +396,7 @@
+@@ -401,7 +398,7 @@
  endif
  
  # This is used when generating the doxygen documentation
@@ -182,7 +188,7 @@
    HAVEDOT=yes
  else
    HAVEDOT=no
-@@ -418,7 +415,7 @@
+@@ -420,7 +417,7 @@
  	@echo " +               $(MAKE) install                +"  
  	@echo " +-------------------------------------------+"  
  
@@ -191,8 +197,8 @@
  
  #ifneq ($(wildcard tags),)
  ctags: tags
-@@ -437,13 +434,13 @@
- 	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+@@ -439,13 +436,13 @@
+ 	cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
  	$(MAKE) -C editline libedit.a
  
 -db1-ast/libdb1.a: FORCE
@@ -212,7 +218,7 @@
  
  ifneq ($(wildcard .depend),)
    include .depend
-@@ -470,10 +467,10 @@
+@@ -469,10 +466,10 @@
  
  manpage: asterisk.8
  
@@ -227,7 +233,7 @@
  
  asterisk.pdf: asterisk.sgml
  	docbook2pdf asterisk.sgml
-@@ -510,14 +507,14 @@
+@@ -512,14 +509,14 @@
  cygwin_a:
  	$(MAKE) -C cygwin all
  
@@ -244,7 +250,7 @@
  
  muted: muted.o
  	$(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -539,38 +536,38 @@
+@@ -541,38 +538,38 @@
  
  datafiles: all
  	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -292,7 +298,7 @@
  		else \
  			echo "No description for $$x"; \
  			exit 1; \
-@@ -578,18 +575,18 @@
+@@ -580,18 +577,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 \
  		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
@@ -316,7 +322,7 @@
  
  update: 
  	@if [ -d .svn ]; then \
-@@ -618,73 +615,51 @@
+@@ -620,47 +617,47 @@
  OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
  
  bininstall: all
@@ -357,7 +363,6 @@
  		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
  		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
  	fi
- 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
 -	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
 -	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 +	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
@@ -397,41 +402,16 @@
  	else \
  		echo "You need to do cvs update -d not just cvs update" ; \
  	fi 
--	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
--	@echo " +---- Asterisk Installation Complete -------+"  
--	@echo " +                                           +"
--	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
--	@echo " +                                           +"
--	@echo " + Asterisk has successfully been installed. +"  
--	@echo " + If you would like to install the sample   +"  
--	@echo " + configuration files (overwriting any      +"
--	@echo " + existing config files), run:              +"  
--	@echo " +                                           +"
--	@echo " +               $(MAKE) samples                +"
--	@echo " +                                           +"
--	@echo " +-----------------  or ---------------------+"
--	@echo " +                                           +"
--	@echo " + You can go ahead and install the asterisk +"
--	@echo " + program documentation now or later run:   +"
--	@echo " +                                           +"
--	@echo " +              $(MAKE) progdocs                +"
--	@echo " +                                           +"
--	@echo " + **Note** This requires that you have      +"
--	@echo " + doxygen installed on your local system    +"
--	@echo " +-------------------------------------------+"
- 	@$(MAKE) -s oldmodcheck
- 
- NEWMODS=$(notdir $(wildcard */*.so))
-@@ -710,7 +685,7 @@
+@@ -690,7 +687,7 @@
  		echo " WARNING WARNING WARNING" ;\
  	fi
  
--install: all datafiles bininstall
-+install: all datafiles bininstall samples
+-install: all datafiles bininstall install-subdirs
++install: all datafiles bininstall install-subdirs samples
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
  	fi
-@@ -718,16 +693,19 @@
+@@ -720,16 +717,19 @@
  upgrade: all bininstall
  
  adsi:
@@ -454,7 +434,7 @@
  		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -740,7 +718,7 @@
+@@ -742,7 +742,7 @@
  				continue; \
  			fi ;\
  		fi ; \
@@ -463,10 +443,10 @@
  	done
  	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
  		( \
-@@ -800,25 +778,25 @@
- 		echo "; Default: strict"; \
- 		echo ";"; \
- 		echo ";translation_algorithm = strict"; \
+@@ -761,25 +761,25 @@
+ 		echo ";astctlowner = root" ; \
+ 		echo ";astctlgroup = apache" ; \
+ 		echo ";astctl = asterisk.ctl" ; \
 -		) > $(DESTDIR)$(ASTCONFPATH) ; \
 +		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
  	else \
@@ -495,7 +475,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 ; \
-@@ -832,7 +810,7 @@
+@@ -793,7 +793,7 @@
  	@[ -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
@@ -504,7 +484,7 @@
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
  	done
-@@ -861,10 +839,10 @@
+@@ -822,10 +822,10 @@
  
  __rpm: include/asterisk/version.h spec
  	rm -rf /tmp/asterisk ; \
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-apps::Makefile /usr/ports/net/asterisk-tdgs/files/patch-apps::Makefile
--- /usr/ports/net/asterisk/files/patch-apps::Makefile	Wed Apr 26 12:31:03 2006
+++ /usr/ports/net/asterisk-tdgs/files/patch-apps::Makefile	Tue Jun  6 18:45:14 2006
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-apps::Makefile,v 1.7 2006/04/26 11:31:03 fjoe Exp $
-
---- apps/Makefile.orig
-+++ apps/Makefile
+--- apps/Makefile.orig	Sun Apr 30 14:38:22 2006
++++ apps/Makefile	Tue Jun  6 18:32:03 2006
 @@ -45,25 +45,27 @@
  #APPS+=app_rpt.so
  
@@ -40,7 +37,7 @@
  
  ifeq (${OSARCH},CYGWIN)
  CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
-@@ -95,24 +97,32 @@
+@@ -95,18 +97,26 @@
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -ltonezone
  
  install: all
@@ -70,10 +67,3 @@
  
  app_sql_odbc.so: app_sql_odbc.o
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
- 
- look:	look.c
--	$(CC) -pipe -O6 -g look.c -o look -lncurses
-+	$(CC) look.c -o look -lncurses
- 
- ifeq (SunOS,$(shell uname))
- app_chanspy.so: app_chanspy.o
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-apps::app_rxfax.c /usr/ports/net/asterisk-tdgs/files/patch-apps::app_rxfax.c
--- /usr/ports/net/asterisk/files/patch-apps::app_rxfax.c	Tue Jan 17 22:27:45 2006
+++ /usr/ports/net/asterisk-tdgs/files/patch-apps::app_rxfax.c	Wed Jun  7 14:30:15 2006
@@ -102,7 +102,7 @@
 +                      "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
 +                      chan->name,
 +                      chan->exten,
-+#if ASTERISK_VERSION_NUM <= 010010
++#if ASTERISK_VERSION_NUM <= 10010
 +                      chan->callerid,
 +#else
 +                      (chan->cid.cid_num)  ?  chan->cid.cid_num  :  "",
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-channels::chan_sip.c /usr/ports/net/asterisk-tdgs/files/patch-channels::chan_sip.c
--- /usr/ports/net/asterisk/files/patch-channels::chan_sip.c	Fri Jan 27 00:15:33 2006
+++ /usr/ports/net/asterisk-tdgs/files/patch-channels::chan_sip.c	Tue Jun  6 19:08:34 2006
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-channels::chan_sip.c,v 1.5 2006/01/27 00:15:33 sobomax Exp $
-
---- channels/chan_sip.c.orig	Tue Jan 24 16:25:53 2006
-+++ channels/chan_sip.c	Tue Jan 24 16:30:44 2006
-@@ -337,7 +337,7 @@ static char global_vmexten[AST_MAX_EXTEN
+--- channels/chan_sip.c.orig	Thu May 25 18:18:01 2006
++++ channels/chan_sip.c	Tue Jun  6 18:52:39 2006
+@@ -339,7 +339,7 @@
  
  static char default_language[MAX_LANGUAGE] = "";
  
@@ -12,7 +9,7 @@
  static char default_callerid[AST_MAX_EXTENSION] = DEFAULT_CALLERID;
  
  static char default_fromdomain[AST_MAX_EXTENSION] = "";
-@@ -475,6 +475,7 @@ struct sip_invite_param {
+@@ -481,6 +481,7 @@
  
  struct sip_route {
  	struct sip_route *next;
@@ -20,7 +17,7 @@
  	char hop[0];
  };
  
-@@ -6015,6 +6016,7 @@ static void build_route(struct sip_pvt *
+@@ -6105,6 +6106,7 @@
  			/* Make a struct route */
  			thishop = malloc(sizeof(*thishop) + len);
  			if (thishop) {
@@ -28,7 +25,7 @@
  				ast_copy_string(thishop->hop, rr, len);
  				ast_log(LOG_DEBUG, "build_route: Record-Route hop: <%s>\n", thishop->hop);
  				/* Link in */
-@@ -6040,31 +6042,41 @@ static void build_route(struct sip_pvt *
+@@ -6130,31 +6132,41 @@
  
  	/* Only append the contact if we are dealing with a strict router */
  	if (!head || (!ast_strlen_zero(head->hop) && strstr(head->hop,";lr") == NULL) ) {
@@ -94,7 +91,7 @@
  			}
  		}
  	}
-@@ -10352,7 +10364,11 @@ static int handle_request_invite(struct 
+@@ -10511,7 +10523,11 @@
  		gotdest = get_destination(p, NULL);
  
  		get_rdnis(p, NULL);
@@ -107,7 +104,7 @@
  		build_contact(p);
  
  		if (gotdest) {
-@@ -10380,7 +10396,6 @@ static int handle_request_invite(struct 
+@@ -10539,7 +10555,6 @@
  			c = sip_new(p, AST_STATE_DOWN, ast_strlen_zero(p->username) ? NULL : p->username );
  			*recount = 1;
  			/* Save Record-Route for any later requests we make on this dialogue */
@@ -115,11 +112,10 @@
  			if (c) {
  				/* Pre-lock the call */
  				ast_mutex_lock(&c->lock);
-@@ -10466,7 +10481,12 @@ static int handle_request_invite(struct 
+@@ -10625,6 +10640,12 @@
  			transmit_response(p, "180 Ringing", req);
  			break;
  		case AST_STATE_UP:
--                        /* Here we have reINVITE request - try to renegotiate codecs with */
 +			/* Assuming this to be reinvite, process new SDP portion */
 +			if (!ast_strlen_zero(get_header(req, "Content-Type"))) {
 +				process_sdp(p, req);
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-codecs::gsm::Makefile /usr/ports/net/asterisk-tdgs/files/patch-codecs::gsm::Makefile
--- /usr/ports/net/asterisk/files/patch-codecs::gsm::Makefile	Fri Jan 27 00:15:33 2006
+++ /usr/ports/net/asterisk-tdgs/files/patch-codecs::gsm::Makefile	Thu Jan  1 01:00:00 1970
@@ -1,16 +0,0 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-codecs::gsm::Makefile,v 1.6 2006/01/27 00:15:33 sobomax Exp $
-
---- codecs/gsm/Makefile.orig
-+++ codecs/gsm/Makefile
-@@ -49,7 +49,9 @@
- ifneq (${PROC},arm)
- ifneq (${PROC},ppc)
- ifneq (${PROC},ppc64)
--OPTIMIZE+=-march=$(PROC)
-+ifneq (${PROC},amd64)
-+#OPTIMIZE+=-march=$(PROC)
-+endif
- endif
- endif
- endif
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-editline::configure /usr/ports/net/asterisk-tdgs/files/patch-editline::configure
--- /usr/ports/net/asterisk/files/patch-editline::configure	Fri Apr 30 06:21:08 2004
+++ /usr/ports/net/asterisk-tdgs/files/patch-editline::configure	Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-editline::configure,v 1.3 2004/04/30 05:21:08 sobomax Exp $
-
---- editline/configure.orig	Sun Apr 27 21:13:11 2003
-+++ editline/configure	Fri Jan 30 01:47:34 2004
-@@ -1906,7 +1906,7 @@
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
- else
--  CFLAGS="$CFLAGS -O"
-+  CFLAGS="$CFLAGS"
- fi
- 
- 
diff -ruN --exclude=CVS /usr/ports/net/asterisk/files/patch-editline::makelist /usr/ports/net/asterisk-tdgs/files/patch-editline::makelist
--- /usr/ports/net/asterisk/files/patch-editline::makelist	Sat Jun 18 19:38:33 2005
+++ /usr/ports/net/asterisk-tdgs/files/patch-editline::makelist	Thu Jan  1 01:00:00 1970
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/net/asterisk/files/patch-editline::makelist,v 1.1 2005/06/18 18:38:33 sobomax Exp $
-
---- editline/makelist
-+++ editline/makelist
-@@ -145,7 +145,7 @@
- #
- -fh)
-     cat $FILES | $AWK '/el_action_t/ { print $3 }' | \
--    sort | tr '[a-z]' '[A-Z]' | $AWK '
-+    sort | tr '[:lower:]' '[:upper:]' | $AWK '
- 	BEGIN {
- 	    printf("/* Automatically generated file, do not edit */\n");
- 	    printf("#ifndef _h_fcns_c\n#define _h_fcns_c\n");
--- asterisk-1.2.9.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606072327.k57NRFHa099272>