Trim down 1.4 branch by culling vulnerable ebuild for security bug #352059. Adding 1.4.39.1 which fixes a stack buffer overflow in SIP URI encoding. Patchset repackaged but otherwise unchanged.

(Portage version: 2.1.9.31/cvs/Linux x86_64)

7 files changed, 21 insertions, 126 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index e1a260058682..f903beed2240 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.284 2011/01/19 13:19:44 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.285 2011/01/19 13:55:24 chainsaw Exp $
+
+*asterisk-1.4.39.1 (19 Jan 2011)
+
+  19 Jan 2011; Tony Vroon <chainsaw@gentoo.org>
+  -files/1.4.0/asterisk-1.4.0-uclibc.patch,
+  -files/1.4.0/asterisk-1.4.0-var_rundir.patch,
+  -files/1.4.0/asterisk-1.4.33-gsm-pic.patch,
+  -files/1.4.0/asterisk-1.4.33-inband-indications.patch,
+  -asterisk-1.4.37.ebuild, -files/1.4.0/asterisk-1.4.37-imap-libs.patch,
+  +asterisk-1.4.39.1.ebuild:
+  Trim down 1.4 branch by culling vulnerable ebuild for security bug #352059.
+  Adding 1.4.39.1 which fixes a stack buffer overflow in SIP URI encoding.
+  Patchset repackaged but otherwise unchanged.
 
 *asterisk-1.6.2.16.1 (19 Jan 2011)
 
diff --git a/net-misc/asterisk/asterisk-1.4.37.ebuild b/net-misc/asterisk/asterisk-1.4.39.1.ebuild
index 3a1bfbbb1291..1916e325d9cd 100644
--- a/net-misc/asterisk/asterisk-1.4.37.ebuild
+++ b/net-misc/asterisk/asterisk-1.4.39.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.4.37.ebuild,v 1.1 2010/12/01 17:54:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.4.39.1.ebuild,v 1.1 2011/01/19 13:55:24 chainsaw Exp $
 
 EAPI=3
 inherit autotools base eutils flag-o-matic linux-info multilib
@@ -9,13 +9,17 @@ MY_P="${PN}-${PV/_/-}"
 
 DESCRIPTION="Asterisk: A Modular Open Source PBX System"
 HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-ast14-patchset-0.1.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="alsa +caps dahdi debug doc freetds imap jabber keepsrc misdn newt +samples odbc oss postgres radius snmp speex ssl sqlite static vanilla vorbis"
 
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/ast14-patchset" )
+
 RDEPEND="sys-libs/ncurses
 	dev-libs/popt
 	sys-libs/zlib
@@ -48,14 +52,6 @@ PDEPEND="net-misc/asterisk-core-sounds
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/1.4.0/${PN}-1.4.0-var_rundir.patch"
-	"${FILESDIR}/1.4.0/${PN}-1.4.33-gsm-pic.patch"
-	"${FILESDIR}/1.4.0/${PN}-1.4.0-uclibc.patch"
-	"${FILESDIR}/1.4.0/${PN}-1.4.33-inband-indications.patch"
-	"${FILESDIR}/1.4.0/${P}-imap-libs.patch"
-)
-
 pkg_setup() {
 	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
 	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
diff --git a/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch b/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch
deleted file mode 100644
index 476fcf90c198..000000000000
--- a/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.old	2007-01-05 10:12:48 +0000
-+++ Makefile	2007-01-05 10:21:52 +0000
-@@ -216,6 +216,10 @@
-   ASTCFLAGS+=-pthread
- endif
- 
-+ifeq ($(OSARCH),linux-uclibc)
-+  AST_LIBS+=-lpthread -ldl
-+endif
-+
- ifeq ($(OSARCH),SunOS)
-   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
- endif
diff --git a/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch b/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch
deleted file mode 100644
index 367dc7163f54..000000000000
--- a/net-misc/asterisk/files/1.4.0/asterisk-1.4.0-var_rundir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.0/Makefile.orig	2006-12-24 03:07:19.000000000 +0000
-+++ asterisk-1.4.0/Makefile	2006-12-24 03:07:57.000000000 +0000
-@@ -109,7 +109,7 @@
-   ASTSBINDIR=$(sbindir)
-   ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-   ASTLOGDIR=$(localstatedir)/log/asterisk
--  ASTVARRUNDIR=$(localstatedir)/run
-+  ASTVARRUNDIR=$(localstatedir)/run/asterisk
-   ASTMANDIR=$(mandir)
- ifeq ($(OSARCH),FreeBSD)
-   ASTVARLIBDIR=$(prefix)/share/asterisk
diff --git a/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch b/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch
deleted file mode 100644
index 208eb125d7b0..000000000000
--- a/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-gsm-pic.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- asterisk-1.4.33.orig/codecs/gsm/Makefile	2010-03-16 20:47:15.000000000 +0000
-+++ asterisk-1.4.33/codecs/gsm/Makefile	2010-06-20 18:21:56.576515592 +0100
-@@ -37,30 +37,6 @@
- ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
- ######### probably require gcc. 
- 
--ifeq (,$(findstring $(shell uname -s),Darwin SunOS))
--  ifeq (,$(findstring $(PROC),x86_64 amd64 ultrasparc sparc64 arm armv5b armeb hppa2.0 ppc powerpc ppc64 ia64 s390 bfin mipsel mips))
--    ifeq (,$(findstring $(shell uname -m),ppc ppc64 alpha armv4l s390))
--      OPTIMIZE+=-march=$(PROC)
--    endif
--  endif
--else
--  ifneq (,$(findstring $(OSARCH),Darwin))
--    ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
--      # Snow Leopard reports i386, even though it's really x86_64
--      OPTIMIZE+=-mtune=native
--    endif
--  endif
--endif
--
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#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
--#the default as we now have a better instruction set to work with. - Belgarath
--ifeq ($(PROC),ultrasparc)
--OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
--endif
--
- PG =
- #PG = -g -pg
- ######### Profiling flags.  If you don't know what that means, leave it blank.
-@@ -217,10 +193,12 @@
- ifeq ($(OSARCH),linux-gnu)
- ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
- ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
-+ifneq ($(K6OPT),)
- GSM_SOURCES+= $(SRC)/k6opt.s
- endif
- endif
- endif
-+endif
- 
- TOAST_SOURCES = $(SRC)/toast.c 		\
- 		$(SRC)/toast_lin.c	\
-@@ -269,10 +247,12 @@
- ifeq ($(OSARCH),linux-gnu)
- ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
- ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
-+ifneq ($(K6OPT),)
- GSM_OBJECTS+= $(SRC)/k6opt.o
- endif
- endif
- endif
-+endif
- 
- TOAST_OBJECTS =	$(SRC)/toast.o 		\
- 		$(SRC)/toast_lin.o	\
diff --git a/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch b/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch
deleted file mode 100644
index 60b3ead00cce..000000000000
--- a/net-misc/asterisk/files/1.4.0/asterisk-1.4.33-inband-indications.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- asterisk-1.4.33.orig/main/channel.c	2010-05-24 20:37:55.000000000 +0100
-+++ asterisk-1.4.33/main/channel.c	2010-06-23 15:06:44.949805705 +0100
-@@ -1767,6 +1767,8 @@ int ast_activate_generator(struct ast_ch
- 			chan->generator->release(chan, chan->generatordata);
- 		chan->generatordata = NULL;
- 	}
-+
-+	ast_prod(chan);
- 	if (gen->alloc && !(chan->generatordata = gen->alloc(chan, params))) {
- 		res = -1;
- 	}
-@@ -1776,8 +1778,6 @@ int ast_activate_generator(struct ast_ch
- 	}
- 	ast_channel_unlock(chan);
- 
--	ast_prod(chan);
--
- 	return res;
- }
- 
diff --git a/net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch b/net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch
deleted file mode 100644
index ede088579b41..000000000000
--- a/net-misc/asterisk/files/1.4.0/asterisk-1.4.37-imap-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- asterisk-1.4.37.orig/configure.ac	2010-09-10 01:13:45.000000000 +0100
-+++ asterisk-1.4.37/configure.ac	2010-11-27 14:37:29.379718734 +0000
-@@ -1032,7 +1032,7 @@
- 		CPPFLAGS="${saved_cppflags}"
- 		LIBS="${saved_libs}"
- 		imap_ldflags=""
--		imap_libs="-lc-client"
-+		imap_libs="-lc-client ${IMAP_LIBS}"
- 		imap_include="-DUSE_SYSTEM_IMAP" #Try the imap directory first
- 		CPPFLAGS="${CPPFLAGS} ${imap_include}"
- 		LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`