Revision bump to fix NULL dereferencing thanks to Israel G. Lugo (bug #190248).

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.25-gentoo-r7-JeR i686

4 files changed, 63 insertions, 13 deletions

diff --git a/dev-libs/libmix/ChangeLog b/dev-libs/libmix/ChangeLog
index ba7174bf6d21..65597ec0bc53 100644
--- a/dev-libs/libmix/ChangeLog
+++ b/dev-libs/libmix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libmix
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.8 2008/08/06 09:55:05 ulm Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/ChangeLog,v 1.9 2009/01/08 19:11:40 jer Exp $
+
+*libmix-2.05-r1 (08 Jan 2009)
+
+  08 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  +files/libmix-2.05-fix-pattern.patch, +libmix-2.05-r1.ebuild:
+  Revision bump to fix NULL dereferencing thanks to Israel G. Lugo (bug
+  #190248).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/dev-libs/libmix/Manifest b/dev-libs/libmix/Manifest
index 925003406c56..b995189bfe72 100644
--- a/dev-libs/libmix/Manifest
+++ b/dev-libs/libmix/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libmix-2.05-fix-pattern.patch 415 RMD160 36e580101f9b0c072ee95c83945e3a0b976048c6 SHA1 128873f9a7a708ea4e245887ebae997972390079 SHA256 7924d3e439ef17d374a1bb6846e8074f416af64a9e35277bfee2e37ab6f4aab9
 DIST libmix-205.tgz 79860 RMD160 7b08dbd54979480c3b9e6664a43d7a6d02c3fb85 SHA1 554bb0a7c77e8ebf2f56769c22a304ea46537d7c SHA256 7d2ca949652137c20fdf1cb87482f92bdbeef403cd832a8597e747d8651137c6
+EBUILD libmix-2.05-r1.ebuild 1006 RMD160 719394db9ceafc180e7e022c4914b0b746a848b4 SHA1 ffdd55fc950f5e0f50abfca836787f0ffd09a5b3 SHA256 d5e0bce6ecff2df6feda45f9d75f2057cb7d5ea0ec18e3734935f6fff0dc8ad2
 EBUILD libmix-2.05.ebuild 944 RMD160 e8ebb57496beee154e43901189d7638ea5393b9c SHA1 055adfd489f605fdab5b37abc68c0bf3e401509b SHA256 47d479f00b6552daafe600b581268f8e4c344723a8fad6559d5a0433a5415de2
-MISC ChangeLog 914 RMD160 378ee7d97705143fb950de60c8c9d73a51234754 SHA1 7ee7cf8b2e44cb26d57ee072c9f543bbaf971fdb SHA256 ea80e1e43734a1273bb2890de452b75a6e82a140c225c9852d558452d59f0ba0
+MISC ChangeLog 1141 RMD160 49c8972d2d6096e37723a6ac15b970452d800e9f SHA1 35f8565226dffaebfb195a29cc835a70d8939200 SHA256 55d25e92fb25c52d3b253333cbe72fe2765aeee25ceef64ffb6d29344b7ca380
 MISC metadata.xml 358 RMD160 45e29ac813927bbc65c4869d2864e7b0d8293076 SHA1 752dc3105aed16670a3e664e91fdba03fd8c5c96 SHA256 13d1892a652676ec081ddb747a5307ae1d9c1c7c8246aecc38d9b58a74ad86ee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiZdQoACgkQOeoy/oIi7uzmrQCfRB7Ep7mJa+KwPTZ5A+VC8U+D
-/+0AoMHzV9MZtR7VYBcE11A3rAK9EvAQ
-=fixl
------END PGP SIGNATURE-----
diff --git a/dev-libs/libmix/files/libmix-2.05-fix-pattern.patch b/dev-libs/libmix/files/libmix-2.05-fix-pattern.patch
new file mode 100644
index 000000000000..58d978e96df6
--- /dev/null
+++ b/dev-libs/libmix/files/libmix-2.05-fix-pattern.patch
@@ -0,0 +1,12 @@
+diff -durp libmix-v2.05/misc/misc.c libmix-v2.05-fix-pattern/misc/misc.c
+--- libmix-v2.05/misc/misc.c	2002-05-19 09:51:23.000000000 +0100
++++ libmix-v2.05-fix-pattern/misc/misc.c	2007-08-25 22:48:14.000000000 +0100
+@@ -209,7 +209,7 @@ pattern(char *data, char **list)
+ {
+   int i = 0;
+ 
+-  while (strcmp(list[i++], NULL) != 0)
++  while (list[i++] != NULL)
+     if (strstr(data, list[i]) != NULL)
+       return 1;
+ 
diff --git a/dev-libs/libmix/libmix-2.05-r1.ebuild b/dev-libs/libmix/libmix-2.05-r1.ebuild
new file mode 100644
index 000000000000..9cbbc126e202
--- /dev/null
+++ b/dev-libs/libmix/libmix-2.05-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r1.ebuild,v 1.1 2009/01/08 19:11:40 jer Exp $
+
+inherit multilib eutils
+
+DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
+HOMEPAGE="http://mixter.void.ru/"
+SRC_URI="http://mixter.void.ru/${P/.}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="no-net2"
+
+DEPEND="!no-net2? ( virtual/libpcap net-libs/libnet )"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i "s:-O3 -funroll-loops:${CFLAGS} -fPIC:" configure
+	epatch "${FILESDIR}"/${P}-fix-pattern.patch
+}
+
+src_compile() {
+	econf $(use_with no-net2) || die
+	emake || die
+}
+
+src_install() {
+	make \
+		INSTALL_INCLUDES_IN="${D}"/usr/include \
+		INSTALL_LIBRARY_IN="${D}"/usr/$(get_libdir) \
+		INSTALL_MANPAGE_IN="${D}"/usr/share/man \
+		install || die
+	dodoc CHANGES
+}