Add flag patch from bug #169320

Package-Manager: portage-2.1.2.7

5 files changed, 96 insertions, 6 deletions

diff --git a/net-analyzer/gnu-netcat/ChangeLog b/net-analyzer/gnu-netcat/ChangeLog
index 081bd77d6c09..178fb895e032 100644
--- a/net-analyzer/gnu-netcat/ChangeLog
+++ b/net-analyzer/gnu-netcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/gnu-netcat
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.13 2006/10/09 19:24:44 drizzt Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.14 2007/05/22 19:36:40 jokey Exp $
+
+*gnu-netcat-0.7.1-r1 (22 May 2007)
+
+  22 May 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/gnu-netcat-flagcount.patch, +gnu-netcat-0.7.1-r1.ebuild:
+  Add flag patch from bug #169320
 
   09 Oct 2006; Timothy Redaelli <drizzt@gentoo.org> gnu-netcat-0.7.1.ebuild:
   Added ~x86-fbsd keyword.
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
index e34b44c7a1d0..1586899653e7 100644
--- a/net-analyzer/gnu-netcat/Manifest
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gnu-netcat-flagcount.patch 582 RMD160 d3129895f6f18610fa86d8a51089f7b2d0fab035 SHA1 a7a4fc46a13a11853da48e97a922956e960efc0e SHA256 9fd0ef40815a42515ae68f41479a2f475fdd1b4126b33b0ea5b64f1b6882a21e
+MD5 927450dd03beeee190149a31285901d1 files/gnu-netcat-flagcount.patch 582
+RMD160 d3129895f6f18610fa86d8a51089f7b2d0fab035 files/gnu-netcat-flagcount.patch 582
+SHA256 9fd0ef40815a42515ae68f41479a2f475fdd1b4126b33b0ea5b64f1b6882a21e files/gnu-netcat-flagcount.patch 582
 DIST netcat-0.7.1.tar.bz2 325687 RMD160 fd5343b11849ea8b12f7c0b02b6fe3c093475ec0 SHA1 b761d70fe9e3e8b3fe33a329b9bc31300dc04d11 SHA256 b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
+EBUILD gnu-netcat-0.7.1-r1.ebuild 936 RMD160 144080137e34ac0b4c80ec46a4a7fc0330ea69e7 SHA1 d08fbd157bc0d58d5ac14bed7dd46a969219f0bd SHA256 bc7da7cad8a4c3da0d3d9f2e0a6e6a858265399e3e6db8183eeaa72971652706
+MD5 2c0c8500689d1c72aab20a8f8833f2f4 gnu-netcat-0.7.1-r1.ebuild 936
+RMD160 144080137e34ac0b4c80ec46a4a7fc0330ea69e7 gnu-netcat-0.7.1-r1.ebuild 936
+SHA256 bc7da7cad8a4c3da0d3d9f2e0a6e6a858265399e3e6db8183eeaa72971652706 gnu-netcat-0.7.1-r1.ebuild 936
 EBUILD gnu-netcat-0.7.1.ebuild 786 RMD160 42319aab518a0ffb12fdb124f608a0c8f60b5e0b SHA1 017476908426262446b55693c516f0147b76f133 SHA256 4b6477b3e849730074bbe1682cc0b7f3e666fcb8333d27d3bae153d41d504019
 MD5 b1af5a2bfd4264f82ea69b3485a05a50 gnu-netcat-0.7.1.ebuild 786
 RMD160 42319aab518a0ffb12fdb124f608a0c8f60b5e0b gnu-netcat-0.7.1.ebuild 786
 SHA256 4b6477b3e849730074bbe1682cc0b7f3e666fcb8333d27d3bae153d41d504019 gnu-netcat-0.7.1.ebuild 786
-MISC ChangeLog 1513 RMD160 f854b5bcd1598a3835a3b4797e3d032d8affe8eb SHA1 db166f130194bd667bb459d405ba68718380ebbc SHA256 8c33d8ba209bd6afe0785c956b0fb2cf791b9e735322c36e62996f1f9a1fe2b0
-MD5 aee478aeaf281bf0e509cc7bac33dd71 ChangeLog 1513
-RMD160 f854b5bcd1598a3835a3b4797e3d032d8affe8eb ChangeLog 1513
-SHA256 8c33d8ba209bd6afe0785c956b0fb2cf791b9e735322c36e62996f1f9a1fe2b0 ChangeLog 1513
+MISC ChangeLog 1698 RMD160 3957115bfd356c481a807310a5d0aad30f65b022 SHA1 fce8071b7c6b08ec9adfb5e0ba10f9a0140e6481 SHA256 2643c5c07875ac10ab14cfa8aad7b09e11bdd2e0950213e4bc234bd52f71e4b3
+MD5 05535dc7a6946e8b3ed6caf1a8e6c812 ChangeLog 1698
+RMD160 3957115bfd356c481a807310a5d0aad30f65b022 ChangeLog 1698
+SHA256 2643c5c07875ac10ab14cfa8aad7b09e11bdd2e0950213e4bc234bd52f71e4b3 ChangeLog 1698
 MISC metadata.xml 227 RMD160 9df39213f17a663a862c0cea4de042a2684fc9c8 SHA1 802652e7a5d529bdc20ea6f6acf5526a89f5165f SHA256 d91bb529a0025f5eb41c7c8385d58ef58848fa368e786238b48cc9e7176c4867
 MD5 41fd70e4bb6db4ef064f15731b5aa78a metadata.xml 227
 RMD160 9df39213f17a663a862c0cea4de042a2684fc9c8 metadata.xml 227
@@ -14,3 +25,13 @@ SHA256 d91bb529a0025f5eb41c7c8385d58ef58848fa368e786238b48cc9e7176c4867 metadata
 MD5 70dd19543c95264281b15b18b4d4173f files/digest-gnu-netcat-0.7.1 241
 RMD160 1c7a184a7bd445176d6fe2c51157eb9e4135b788 files/digest-gnu-netcat-0.7.1 241
 SHA256 0b0347e0b5e8a1434858cc20d7ec887a9734ff4414fd0d92fc991c0272a4d424 files/digest-gnu-netcat-0.7.1 241
+MD5 70dd19543c95264281b15b18b4d4173f files/digest-gnu-netcat-0.7.1-r1 241
+RMD160 1c7a184a7bd445176d6fe2c51157eb9e4135b788 files/digest-gnu-netcat-0.7.1-r1 241
+SHA256 0b0347e0b5e8a1434858cc20d7ec887a9734ff4414fd0d92fc991c0272a4d424 files/digest-gnu-netcat-0.7.1-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGU0ZZz974XjDVpbkRAtLWAKCbEL6jVitF8DuDI4dVvC5Qle/LDgCfYCX/
+LVsfoIZcLcQU5POkRl2BWDI=
+=oQet
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/gnu-netcat/files/digest-gnu-netcat-0.7.1-r1 b/net-analyzer/gnu-netcat/files/digest-gnu-netcat-0.7.1-r1
new file mode 100644
index 000000000000..0c3cab207645
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/digest-gnu-netcat-0.7.1-r1
@@ -0,0 +1,3 @@
+MD5 0a29eff1736ddb5effd0b1ec1f6fe0ef netcat-0.7.1.tar.bz2 325687
+RMD160 fd5343b11849ea8b12f7c0b02b6fe3c093475ec0 netcat-0.7.1.tar.bz2 325687
+SHA256 b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb netcat-0.7.1.tar.bz2 325687
diff --git a/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
new file mode 100644
index 000000000000..df029a6f15d6
--- /dev/null
+++ b/net-analyzer/gnu-netcat/files/gnu-netcat-flagcount.patch
@@ -0,0 +1,22 @@
+--- bad/netcat-0.7.1/src/flagset.c	2003-12-10 17:18:07.000000000 +0100
++++ good/netcat-0.7.1/src/flagset.c	2007-03-04 17:38:10.000000000 +0100
+@@ -134,7 +134,7 @@
+ 
+ int netcat_flag_count(void)
+ {
+-  register char c;
++  register unsigned char c;
+   register int i;
+   int ret = 0;
+ 
+@@ -154,8 +154,8 @@
+ 	Assumed that the bit number 1 is the sign, and that we will shift the
+ 	bit 1 (or the bit that takes its place later) until the the most right,
+ 	WHY it has to keep the wrong sign? */
+-      ret -= (c >> 7);
+-      c <<= 1;
++      ret += (c & 1);
++      c >>= 1;
+     }
+   }
+ 
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..fac976cc6dbd
--- /dev/null
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r1.ebuild,v 1.1 2007/05/22 19:36:40 jokey Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="the GNU network swiss army knife"
+HOMEPAGE="http://netcat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls debug"
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/netcat-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-flagcount.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "emake install failed"
+	rm "${D}"/usr/bin/nc
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}