Fix overflow, bug #337520 by flameeyes and fix by Kevin McCarthy.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 39 insertions, 16 deletions

diff --git a/net-misc/selfdhcp/ChangeLog b/net-misc/selfdhcp/ChangeLog
index 3286a01740c4..efb6575d42e3 100644
--- a/net-misc/selfdhcp/ChangeLog
+++ b/net-misc/selfdhcp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/selfdhcp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/ChangeLog,v 1.7 2007/02/22 02:45:17 peper Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/ChangeLog,v 1.8 2012/03/03 15:44:30 pacho Exp $
+
+*selfdhcp-0.2a-r1 (03 Mar 2012)
+
+  03 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/selfdhcp-0.2a-buffer-overflow.patch, +selfdhcp-0.2a-r1.ebuild,
+  -selfdhcp-0.2a.ebuild:
+  Fix overflow, bug #337520 by flameeyes and fix by Kevin McCarthy.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/net-misc/selfdhcp/Manifest b/net-misc/selfdhcp/Manifest
index 7f087db68918..553c0b71e6ca 100644
--- a/net-misc/selfdhcp/Manifest
+++ b/net-misc/selfdhcp/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX selfdhcp-0.2a-buffer-overflow.patch 576 RMD160 aedb0e66a0ee87da3221fdf340a906adc31cc044 SHA1 5825dbaa926e9c2e7baa5e1d19847eb058cc745d SHA256 6c05dec7fb57efeea0cfe3fe7eb7605dd9914fa3dc23fb9065875e7e4eaa613d
 DIST selfdhcp-0.2a.tar.bz2 162803 RMD160 d33d79332519c79771fbc7e76933ba1075bf96d4 SHA1 c1759b96f6dd50aa071d7a8b32ac010f94d876b6 SHA256 b60d37b288eee05dcaf6b14b1bba184726ec2e3af6dddfdad78f0627878ec8b6
-EBUILD selfdhcp-0.2a.ebuild 696 RMD160 7a0af388c0d001ac940a18d56109021c8cef443a SHA1 88bf46ba2210739d0688655ccff4e73788b13c6b SHA256 4a63a842b72cd5a6e2f3cee577a95ba1751047a0b7d08045c9a6c3398707d5ef
-MISC ChangeLog 1133 RMD160 e1dba4d27b508809ceef8cf694b160348978d41f SHA1 f3a49cada44107c237ef245901df21a5f447f42f SHA256 3594cdd45e99783009420394066b2d19d1b21457ef8438257f7c7ddf23dd76b4
+EBUILD selfdhcp-0.2a-r1.ebuild 767 RMD160 1dbfac72f484778e0630b7304acefc2394b8b419 SHA1 c83f611b093bafe60d13615d929d939cc0655e6c SHA256 3c63bc4ec2d2eca4b9622821016bc51b6fb6fcda89ce19805e1be3b574d50696
+MISC ChangeLog 1378 RMD160 48c2657cd3957885b7557674619d9cde7b0a35e1 SHA1 d262a202cf24450af6062891df18f9ade363f9e7 SHA256 34a2c302f4cadc341809920c5b557e6a85945ac061b3bcaaa6ce7a0557766fea
 MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59rSYACgkQfXuS5UK5QB0ASwQAkY815EgOXc9heWshLEenMMVy
-6TCe9UJx1PjPIJ02HTSdo1Umzk3aO7eoMjgfNNht5Z/Vqb9Md3yxvvPBBrs1vFwB
-M9Iil6oORO9xRr6u/SJlyqUQ4k8OCcY9qYKKmPqdIP7TUzAKDXxmOt7QyRco/Bi3
-scXI0kdLhpzbaPUIgvA=
-=eYmW
+iEYEARECAAYFAk9SPGQACgkQCaWpQKGI+9RQPwCdEoCyOkfLfGtJwDPt3HFu20RY
+dCwAnRZb55LFuDkvkPx1RtpCxvmVHBpK
+=nC6X
 -----END PGP SIGNATURE-----
diff --git a/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
new file mode 100644
index 000000000000..6f99f7dea895
--- /dev/null
+++ b/net-misc/selfdhcp/files/selfdhcp-0.2a-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- selfdhcp-0.2a.orig/src/selfdhcp_profiles.c	2004-08-02 18:10:36.000000000 -0400
++++ selfdhcp-0.2a/src/selfdhcp_profiles.c	2011-01-29 11:54:29.132199679 -0500
+@@ -345,7 +345,7 @@
+ 	{
+ 	  key = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
+ 	  err_msg (DBG_PROG, "xml element \"%s\"", (char *) key);
+-	  strncpy (netconf_buff.domainname, (char *) key, 49);
++	  strncpy (netconf_buff.domainname, (char *) key, sizeof(netconf_buff.domainname)-1);
+ 	  netconf_buff.what_is_set &= NETADDR;
+ 	  err_msg (DBG_INFO, "read domain name \"%s\"",
+ 		   netconf_buff.domainname);
diff --git a/net-misc/selfdhcp/selfdhcp-0.2a.ebuild b/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild
index 7e6a58d3d717..781d8e71e058 100644
--- a/net-misc/selfdhcp/selfdhcp-0.2a.ebuild
+++ b/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/selfdhcp-0.2a.ebuild,v 1.5 2010/10/28 11:08:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/selfdhcp/selfdhcp-0.2a-r1.ebuild,v 1.1 2012/03/03 15:44:30 pacho Exp $
+
+EAPI=4
+inherit eutils
 
 DESCRIPTION="a small stealth network autoconfigure software."
 HOMEPAGE="http://selfdhcp.sourceforge.net"
@@ -16,12 +19,15 @@ DEPEND="dev-libs/popt
 	>=net-libs/libnet-1.0.2
 	net-libs/libpcap"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-buffer-overflow.patch"
+}
+
+src_configure() {
 	econf --sysconfdir=/etc --sbindir=/sbin
-	emake || die
 }
 
 src_install() {
-	einstall sbindir="${D}"/sbin || die
+	einstall sbindir="${D}"/sbin
 	dodoc AUTHORS ChangeLog README TODO
 }