Fix buffer overflow, bug 329039. Thanks to Joseph Yasi for the patch.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 59 insertions, 2 deletions

diff --git a/net-libs/openslp/ChangeLog b/net-libs/openslp/ChangeLog
index 2d8d2c0dab1f..aae445e34517 100644
--- a/net-libs/openslp/ChangeLog
+++ b/net-libs/openslp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/openslp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.47 2010/12/02 01:15:14 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/ChangeLog,v 1.48 2012/01/24 22:27:18 dilfridge Exp $
+
+*openslp-1.2.1-r2 (24 Jan 2012)
+
+  24 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +openslp-1.2.1-r2.ebuild, +files/openslp-1.2.1-fixoverflow.patch:
+  Fix buffer overflow, bug 329039. Thanks to Joseph Yasi for the patch.
 
   02 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   openslp-1.2.1-r1.ebuild:
diff --git a/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
new file mode 100644
index 000000000000..c02d8407fb3b
--- /dev/null
+++ b/net-libs/openslp/files/openslp-1.2.1-fixoverflow.patch
@@ -0,0 +1,11 @@
+--- a/openslp-1.2.1/slpd/slpd_socket.c	2010-09-11 16:31:47.325871093 -0500
++++ b/openslp-1.2.1/slpd/slpd_socket.c	2010-09-11 16:31:55.706851189 -0500
+@@ -183,7 +183,7 @@
+     memcpy(&mreq.imr_multiaddr, maddr, sizeof(struct in_addr));
+ 
+     /* drop for the specified interface */
+-    memcpy(&mreq.imr_interface,addr,sizeof(addr));
++    memcpy(&mreq.imr_interface,addr,sizeof(struct in_addr));
+ 
+     return setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (char*)&mreq,sizeof(mreq));               
+ }
diff --git a/net-libs/openslp/openslp-1.2.1-r2.ebuild b/net-libs/openslp/openslp-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..a875e89c3275
--- /dev/null
+++ b/net-libs/openslp/openslp-1.2.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openslp/openslp-1.2.1-r2.ebuild,v 1.1 2012/01/24 22:27:18 dilfridge Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="An open-source implementation of Service Location Protocol"
+HOMEPAGE="http://www.openslp.org/"
+SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-fbsd.patch
+	epatch "${FILESDIR}"/${P}-fixoverflow.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf || die
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS FAQ ChangeLog NEWS README* THANKS
+	rm -rf "${D}"/usr/doc
+	dohtml -r .
+	newinitd "${FILESDIR}"/slpd-init slpd
+}