Applying changes from 20090516, fixing a buffer overflow bug.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 174 insertions, 4 deletions

diff --git a/net-misc/miniupnpd/ChangeLog b/net-misc/miniupnpd/ChangeLog
index b390b132090f..e5a70dd9a66e 100644
--- a/net-misc/miniupnpd/ChangeLog
+++ b/net-misc/miniupnpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/miniupnpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.8 2009/05/13 07:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/ChangeLog,v 1.9 2009/05/21 19:27:25 gurligebis Exp $
+
+*miniupnpd-1.3-r1 (21 May 2009)
+
+  21 May 2009; Bjarke Istrup Pedersen <gurligebis@gentoo.org>
+  -miniupnpd-1.3.ebuild, +miniupnpd-1.3-r1.ebuild,
+  +files/miniupnpd-20090516.diff:
+  Applying changes from 20090516, fixing a buffer overflow bug.
 
   13 May 2009; Samuli Suominen <ssuominen@gentoo.org> miniupnpd-1.3.ebuild:
   Keyword ~amd64, stop prestripping and use correct CC target.
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index da4da31910d2..b356651c1986 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX miniupnpd-1.3-Makefile_fix.diff 330 RMD160 cd41e8270a54d47efcb92cad729d7d6d7e6781bb SHA1 c0d9538e2c47421e9688b4f2d6a51941fe800999 SHA256 3c59afd314685be72d8a527c8979768e46d9cf3ebeb72064c8e26de91c71d9b5
 AUX miniupnpd-1.3-conf.d 41 RMD160 6ce4c17365bbb0b993613c9bd7392fa97545cd21 SHA1 7e1d95a80f62a01928ac49497127e98755ca7d08 SHA256 8c6dae8588e21208a2f0a17965548e0b0708ceeea1157e2506f745e28913f9b3
 AUX miniupnpd-1.3-init.d 621 RMD160 2834661061bd2d7c0d4ad26779dc02eb6985e8ee SHA1 c0826044b2868ce13beadc937d11972722e95cdf SHA256 b2e5908231ad494c3eb408aed54536c897729b9f5c973244206f03b7dc8b8288
 AUX miniupnpd-1.3-iptables_path.diff 2309 RMD160 e244817a4f7f4f7dc4abfaef44df017734f3c21a SHA1 23b92910e58238cf31ad77cb746f28bb36bcb608 SHA256 6fecac3acd2f773110a8f22db931d2b77dd75ec1894e15b33e0747f0aa66154c
+AUX miniupnpd-20090516.diff 5936 RMD160 4b82871350cf0fd709748cf8fb26688265d42257 SHA1 5fbb15c7463e64f2c49b6b32a60bb7e3c0d7fbf9 SHA256 bab23b1593fe4fd746101031d9a040304549efa541475508f03649a1f65ba1c5
 DIST miniupnpd-1.3.tar.gz 83464 RMD160 ae3dd9f7012adc47d65da73af19f989b0f3a9441 SHA1 f9de317b6cf69506a33ad771198802a5fabe2c5c SHA256 b4585c77ac5a7fb00a687772db95996dd2e8854db9d628c9bb85e5ecfd67f2ff
-EBUILD miniupnpd-1.3.ebuild 1157 RMD160 0baa087f8db838ee2c0dd18028a7019c52d9d485 SHA1 122fd3d754ef32e29c93d23a9a9856736fb4a2ab SHA256 dcbcaeca8c2c731d90569ff5ea14a3fd921b14365642c8a28856e5a37fcb52ee
-MISC ChangeLog 2700 RMD160 f8a251b8b83d9631f3da8c3ece2b67eec553c0d0 SHA1 c4d91b68612d51a1e66d840c7673ae76b00bf9dd SHA256 fa2f143ffe1604a50d9cd04a1152838b7424fe11fe0d06e8915c2c4661442aba
+EBUILD miniupnpd-1.3-r1.ebuild 1204 RMD160 93dfdd4dbb8c5d18866d5c6467be7333acadfc36 SHA1 75d5ecbe1c174c290365fa1b6e169d1b9c01d9c5 SHA256 00e70a4fe52ba60381da375856fd9decedac99de6c16365a74ec48e10cfe1c29
+MISC ChangeLog 2946 RMD160 697cc892c18d981c0e8c23a15992d90f6f1e3ba8 SHA1 34de1fbda823df2170896dda006679545d60ce00 SHA256 da3170b272ea341a54bcb573a00ebf39eeda46109d0b7d9cadf52a1f116112d8
 MISC metadata.xml 401 RMD160 b4f2959a8b2aa1f97df19bbc675decd518ae1457 SHA1 aded6feda295e161854ba5c305bd0711d0f1ca13 SHA256 18377435ab021c2ab7967a14249da4a0c1c89a027b38e3ade7f73ae430448380
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoVqycACgkQsR7PQhRXYEnirACfYd7t8Km0m5NHWEw2dZc4SudG
+haEAn26P5cYXApoyO6GMnutykFzkZ7NR
+=Z0mE
+-----END PGP SIGNATURE-----
diff --git a/net-misc/miniupnpd/files/miniupnpd-20090516.diff b/net-misc/miniupnpd/files/miniupnpd-20090516.diff
new file mode 100644
index 000000000000..1abcfb5cb959
--- /dev/null
+++ b/net-misc/miniupnpd/files/miniupnpd-20090516.diff
@@ -0,0 +1,150 @@
+diff -Naurp old/miniupnpd-1.3/Changelog.txt new/miniupnpd-1.3/Changelog.txt
+--- old/miniupnpd-1.3/Changelog.txt	2009-04-17 20:08:04.000000000 +0000
++++ new/miniupnpd-1.3/Changelog.txt	2009-05-16 08:45:19.000000000 +0000
+@@ -1,5 +1,12 @@
+-$Id: Changelog.txt,v 1.169 2009/04/17 19:58:38 nanard Exp $
++$Id: Changelog.txt,v 1.171 2009/05/16 08:44:15 nanard Exp $
+ 
++2009/05/16:
++  Fixed a buffer overflow in ProcessSSDPRequest()
++
++2009/05/11:
++  improving genconfig.sh for NetBSD : detecting use of pf or ipf
++
++VERSION 1.3 :
+ 2009/04/17:
+   working support for iptables >= 1.4.3
+ 
+diff -Naurp old/miniupnpd-1.3/genconfig.sh new/miniupnpd-1.3/genconfig.sh
+--- old/miniupnpd-1.3/genconfig.sh	2008-10-01 12:49:26.000000000 +0000
++++ new/miniupnpd-1.3/genconfig.sh	2009-05-16 08:45:19.000000000 +0000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+-# $Id: genconfig.sh,v 1.29 2008/10/01 11:19:38 nanard Exp $
++# $Id: genconfig.sh,v 1.31 2009/05/12 08:27:31 nanard Exp $
+ # miniupnp daemon
+ # http://miniupnp.free.fr or http://miniupnp.tuxfamily.org/
+-# (c) 2006-2008 Thomas Bernard
++# (c) 2006-2009 Thomas Bernard
+ # This software is subject to the conditions detailed in the
+ # LICENCE file provided within the distribution
+ 
+@@ -32,7 +32,7 @@ ${RM} ${CONFIGFILE}
+ 
+ echo "/* MiniUPnP Project" >> ${CONFIGFILE}
+ echo " * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/" >> ${CONFIGFILE}
+-echo " * (c) 2006-2008 Thomas Bernard" >> ${CONFIGFILE}
++echo " * (c) 2006-2009 Thomas Bernard" >> ${CONFIGFILE}
+ echo " * generated by $0 on `date` */" >> ${CONFIGFILE}
+ echo "#ifndef $CONFIGMACRO" >> ${CONFIGFILE}
+ echo "#define $CONFIGMACRO" >> ${CONFIGFILE}
+@@ -95,14 +95,22 @@ case $OS_NAME in
+ 		OS_URL=http://www.pfsense.com/
+ 		;;
+ 	NetBSD)
+-		OS_URL=http://www.netbsd.org/
+-		if [ -f /usr/include/net/pfvar.h ] ; then
++		# source file with handy subroutines like checkyesno
++		. /etc/rc.subr
++		# source config file so we can probe vars
++		. /etc/rc.conf
++		if checkyesno pf; then
+ 			echo "#define USE_PF 1" >> ${CONFIGFILE}
+ 			FW=pf
+-		else
++		elif checkyesno ipfilter; then
+ 			echo "#define USE_IPF 1" >> ${CONFIGFILE}
+ 			FW=ipf
++		else
++			echo "Could not detect ipf nor pf, defaulting to pf."
++			echo "#define USE_PF 1" >> ${CONFIGFILE}
++			FW=pf
+ 		fi
++		OS_URL=http://www.netbsd.org/
+ 		;;
+ 	SunOS)
+ 		echo "#define USE_IPF 1" >> ${CONFIGFILE}
+diff -Naurp old/miniupnpd-1.3/INSTALL new/miniupnpd-1.3/INSTALL
+--- old/miniupnpd-1.3/INSTALL	2009-04-10 08:56:54.000000000 +0000
++++ new/miniupnpd-1.3/INSTALL	2009-05-16 08:45:19.000000000 +0000
+@@ -61,6 +61,8 @@ To Build and install :
+   > make -f Makefile.linux
+   If not using iptables from your system, 
+   > IPTABLESPATH=/path/to/iptables-1.4.1 make -f Makefile.linux
++  note : make sure you have iptables with static libraries compiled.
++  use "./configure --enable-static" before compiling iptables
+ - install as root using :
+   > make -f Makefile.linux install
+ - A miniupnpd script should be installed to /etc/init.d
+diff -Naurp old/miniupnpd-1.3/Makefile new/miniupnpd-1.3/Makefile
+--- old/miniupnpd-1.3/Makefile	2009-01-29 18:21:05.000000000 +0000
++++ new/miniupnpd-1.3/Makefile	2009-05-16 08:45:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile,v 1.49 2009/01/29 18:21:05 nanard Exp $
++# $Id: Makefile,v 1.50 2009/05/11 12:38:35 nanard Exp $
+ # MiniUPnP project
+ # http://miniupnp.free.fr/
+ # Author: Thomas Bernard
+@@ -30,6 +30,12 @@ FWNAME != . /etc/rc.subr; . /etc/rc.conf
+           echo "ipf"; else echo "pf"; fi
+ .endif
+ 
++.if $(OSNAME) == "NetBSD"
++FWNAME != . /etc/rc.subr; . /etc/rc.conf; \
++          if checkyesno ipfilter; then \
++          echo "ipf"; else echo "pf"; fi
++.endif
++
+ # Solaris specific CFLAGS
+ .if $(OSNAME) == "SunOS"
+ CFLAGS += -DSOLARIS2=`uname -r | cut -d. -f2`
+diff -Naurp old/miniupnpd-1.3/Makefile.linux new/miniupnpd-1.3/Makefile.linux
+--- old/miniupnpd-1.3/Makefile.linux	2009-04-17 20:08:04.000000000 +0000
++++ new/miniupnpd-1.3/Makefile.linux	2009-05-16 08:45:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-# $Id: Makefile.linux,v 1.45 2009/04/17 19:58:38 nanard Exp $
++# $Id: Makefile.linux,v 1.46 2009/04/25 23:16:38 nanard Exp $
+ # MiniUPnP project
+ # http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+ # Author : Thomas Bernard
+@@ -53,7 +53,8 @@ TEST := $(shell [ \( \( $(IPTABLESVERSIO
+ ifeq ($(TEST), 1)
+ CFLAGS := $(CFLAGS) -DIPTABLES_143
+ # the following sucks, but works
+-LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
++#LIBS = $(IPTABLESPATH)/libiptc/.libs/libip4tc.o
++LIBS = $(IPTABLESPATH)/libiptc/.libs/libiptc.a
+ else
+ LIBS = $(IPTABLESPATH)/libiptc/libiptc.a
+ endif
+diff -Naurp old/miniupnpd-1.3/minissdp.c new/miniupnpd-1.3/minissdp.c
+--- old/miniupnpd-1.3/minissdp.c	2008-11-24 09:48:07.000000000 +0000
++++ new/miniupnpd-1.3/minissdp.c	2009-05-16 08:45:19.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* $Id: minissdp.c,v 1.15 2008/11/24 09:48:00 nanard Exp $ */
++/* $Id: minissdp.c,v 1.16 2009/05/16 08:44:16 nanard Exp $ */
+ /* MiniUPnP project
+  * http://miniupnp.free.fr/ or http://miniupnp.tuxfamily.org/
+  * (c) 2006 Thomas Bernard
+@@ -331,10 +331,10 @@ ProcessSSDPRequest(int s, unsigned short
+ 		i = 0;
+ 		while(i < n)
+ 		{
+-			while(bufr[i] != '\r' || bufr[i+1] != '\n')
++			while((i < n - 1) && (bufr[i] != '\r' || bufr[i+1] != '\n'))
+ 				i++;
+ 			i += 2;
+-			if(strncasecmp(bufr+i, "st:", 3) == 0)
++			if((i < n - 3) && (strncasecmp(bufr+i, "st:", 3) == 0))
+ 			{
+ 				st = bufr+i+3;
+ 				st_len = 0;
+@@ -352,7 +352,7 @@ ProcessSSDPRequest(int s, unsigned short
+ 		/*syslog(LOG_INFO, "SSDP M-SEARCH packet received from %s:%d",
+ 	           inet_ntoa(sendername.sin_addr),
+ 	           ntohs(sendername.sin_port) );*/
+-		if(st)
++		if(st && (st_len > 0))
+ 		{
+ 			/* TODO : doesnt answer at once but wait for a random time */
+ 			syslog(LOG_INFO, "SSDP M-SEARCH from %s:%d ST: %.*s",
diff --git a/net-misc/miniupnpd/miniupnpd-1.3.ebuild b/net-misc/miniupnpd/miniupnpd-1.3-r1.ebuild
index b18eed6fb751..12e56a5f97d8 100644
--- a/net-misc/miniupnpd/miniupnpd-1.3.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.3.ebuild,v 1.2 2009/05/13 07:51:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/miniupnpd/miniupnpd-1.3-r1.ebuild,v 1.1 2009/05/21 19:27:25 gurligebis Exp $
 
 EAPI=2
 inherit eutils linux-info toolchain-funcs
@@ -19,6 +19,8 @@ RDEPEND=">=net-firewall/iptables-1.4.3
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-20090516.diff"
+
 	mv Makefile.linux Makefile
 	epatch "${FILESDIR}/${P}-iptables_path.diff"
 	epatch "${FILESDIR}/${P}-Makefile_fix.diff"