summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Leverton <nick@leverton.org>2010-07-20 06:58:01 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-07-20 06:59:36 (GMT)
commit6c387f2e691293df096349af0f08c071d6f21a65 (patch)
tree779964ca0945db0d20f84092739a414a769ebfdb
parentc9ff3273eb94078ad342d0a3e08e1757bced2afa (diff)
downloadbuildroot-6c387f2e691293df096349af0f08c071d6f21a65.tar.gz
buildroot-6c387f2e691293df096349af0f08c071d6f21a65.tar.bz2
netcat: fix logic for archs with unsigned chars
Closes #2245 Signed-off-by: Nick Leverton <nick@leverton.org> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES5
-rw-r--r--package/netcat/netcat-0.7.1-signed-bit-counting.patch30
2 files changed, 33 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 59b4a6f..1386a77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,8 +21,8 @@
iptables, libart, libcgi, libfuse, libgpg-error, libidn,
liblockfile, libpng, links, linux-fusion, lmbench, lrzsz,
make, module-init-tools, mysql_client, nbd, ncurses, neon,
- netperf, ntfsprogs, openssl, php, qt, quagga, sqlite, sdl,
- sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
+ netcat, netperf, ntfsprogs, openssl, php, qt, quagga, sqlite,
+ sdl, sdl_mixer, sdl_sound, sdl_ttf, squashfs, tn5250, tremor,
usbutils, xkeyboard-config, xserver_xorg-server, xvkbd
Removed packages: modutils, portage, rxvt
@@ -70,6 +70,7 @@
#2191: linux-fusion build fail
#2221: Qt does not compile (dependencies not taken into account?)
#2233: Atmel atstk target skeletons have /etc/mtab as a file, not ...
+ #2245: Netcat does not work due to incorrect assumptions about signed..
2010.05, Released May 30th, 2010:
diff --git a/package/netcat/netcat-0.7.1-signed-bit-counting.patch b/package/netcat/netcat-0.7.1-signed-bit-counting.patch
new file mode 100644
index 0000000..e29da31
--- /dev/null
+++ b/package/netcat/netcat-0.7.1-signed-bit-counting.patch
@@ -0,0 +1,30 @@
+# Fix the endian-specific bit-counting code so that it works.
+# SF:1068324 "netcat_flag_count() fix"
+# http://sourceforge.net/tracker/?func=detail&aid=1205729&group_id=52204&atid=466046
+# SF:1205729 "doen't work on arm linux platform":
+# http://sourceforge.net/tracker/?func=detail&aid=1068324&group_id=52204&atid=466046
+
+Index: netcat-0.7.1/src/flagset.c
+===================================================================
+--- netcat-0.7.1.orig/src/flagset.c 2010-07-19 13:51:46.000000000 +0100
++++ netcat-0.7.1/src/flagset.c 2010-07-19 13:52:27.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;
+ }
+ }
+