diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /zcip | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'zcip')
-rw-r--r-- | zcip/zcip-4/char-signed-idiocy.patch | 16 | ||||
-rw-r--r-- | zcip/zcip-4/compile.patch | 125 | ||||
-rw-r--r-- | zcip/zcip-4/linux-types.patch | 15 |
3 files changed, 156 insertions, 0 deletions
diff --git a/zcip/zcip-4/char-signed-idiocy.patch b/zcip/zcip-4/char-signed-idiocy.patch index e69de29bb2..109efc2349 100644 --- a/zcip/zcip-4/char-signed-idiocy.patch +++ b/zcip/zcip-4/char-signed-idiocy.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- zcip-4/zcip.c~char-signed-idiocy ++++ zcip-4/zcip.c +@@ -1243,7 +1243,7 @@ + + int main(int argc, char *argv[]) { + int r, rand_seed = 0; +- char c; ++ int c; + char ebuf[LIBNET_ERRBUF_SIZE]; + + struct option longopts[] = { diff --git a/zcip/zcip-4/compile.patch b/zcip/zcip-4/compile.patch index e69de29bb2..a8cfa32cd8 100644 --- a/zcip/zcip-4/compile.patch +++ b/zcip/zcip-4/compile.patch @@ -0,0 +1,125 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- zcip-4/Makefile~compile ++++ zcip-4/Makefile +@@ -5,21 +5,17 @@ + CPPFLAGS=`libnet-config --cflags` `libnet-config --defines` + CFLAGS=-O2 -Wall -W -I/usr/local/contrib/include -I/usr/local/include/pcap + LDFLAGS=-L/usr/local/contrib/lib -L/usr/local/lib -static +- +- ++LIBS=-lpcap `libnet-config --libs` + OBJS=zcip.o + +- +- +- + all: zcip make-arp + + + make-arp: make-arp.o +- $(CC) make-arp.o $(LDFLAGS) -o make-arp -lpcap `libnet-config --libs` ++ $(CC) make-arp.o $(LDFLAGS) -o make-arp $(LIBS) + + zcip: $(OBJS) +- $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o zcip -lpcap `libnet-config --libs` ++ $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o zcip $(LIBS) + + + clean: +--- zcip-4/zcip.c~compile ++++ zcip-4/zcip.c +@@ -1204,14 +1204,14 @@ + } + + void version(void) { +- printf("zcip release " RELEASE " +-Copyright (C) 2001-2002 Various authors +-zcip comes with NO WARRANTY, +-to the extent permitted by law. +-You may redistribute copies of zcip +-under the terms of the 3-clause BSD license. +-For more information about these matters, +-see the file named Copyright. ++ printf("zcip release " RELEASE "\n\ ++Copyright (C) 2001-2002 Various authors\n\ ++zcip comes with NO WARRANTY,\n\ ++to the extent permitted by law.\n\ ++You may redistribute copies of zcip\n\ ++under the terms of the 3-clause BSD license.\n\ ++For more information about these matters,\n\ ++see the file named Copyright.\n\ + "); + + exit (0); +@@ -1219,19 +1219,19 @@ + + + void usage(int exit_code) { +- printf("usage: zcip [OPTIONS] +-Zeroconf IPv4 Link-Local Address Configuration +-OPTIONS: +- -h, --help Print this help, and exit. +- -i, --interface IFNAME Use interface IFNAME. +- If not provided it uses 'eth0'. +- -r, --randseed Seeds RNG with random # rather than MAC address. +- -s, --syslog Output to syslog instead of stdout. +- -v, --version Print the version information, and exit. +- +-This program does the ad-hoc link-local IPv4 auto-configuration trick, as +-described in the IETF Internet Draft 'Dynamic Configuration of IPv4 +-Link-Local Addresses'. ++ printf("usage: zcip [OPTIONS]\n\ ++Zeroconf IPv4 Link-Local Address Configuration\n\ ++OPTIONS:\n\ ++ -h, --help Print this help, and exit.\n\ ++ -i, --interface IFNAME Use interface IFNAME.\n\ ++ If not provided it uses 'eth0'.\n\ ++ -r, --randseed Seeds RNG with random # rather than MAC address.\n\ ++ -s, --syslog Output to syslog instead of stdout.\n\ ++ -v, --version Print the version information, and exit.\n\ ++\n\ ++This program does the ad-hoc link-local IPv4 auto-configuration trick, as\n\ ++described in the IETF Internet Draft 'Dynamic Configuration of IPv4\n\ ++Link-Local Addresses'.\n\ + "); + + exit (exit_code); +--- zcip-4/make-arp.c~compile ++++ zcip-4/make-arp.c +@@ -106,19 +106,19 @@ + + + void usage(int exit_code) { +- printf(" +-make-arp -- sends arbitrary ARP Requests +- +-usage: make-arp [OPTIONS] [sea=SOURCE-EA] [sip=SOURCE-IP] tea=TARGET-EA tip=TARGET-IP +- +-OPTIONS: +- +- -h Print this help. +- +- +-Only ARP Requests for now. In the Ethernet header, the source EA is +-mine and the target EA is the broadcast address FF:FF:FF:FF:FF:FF. +- ++ printf("\n\ ++make-arp -- sends arbitrary ARP Requests\n\ ++\n\ ++usage: make-arp [OPTIONS] [sea=SOURCE-EA] [sip=SOURCE-IP] tea=TARGET-EA tip=TARGET-IP\n\ ++\n\ ++OPTIONS:\n\ ++\n\ ++ -h Print this help.\n\ ++\n\ ++\n\ ++Only ARP Requests for now. In the Ethernet header, the source EA is\n\ ++mine and the target EA is the broadcast address FF:FF:FF:FF:FF:FF.\n\ ++\n\ + "); + + exit (exit_code); diff --git a/zcip/zcip-4/linux-types.patch b/zcip/zcip-4/linux-types.patch index e69de29bb2..5ca388cafc 100644 --- a/zcip/zcip-4/linux-types.patch +++ b/zcip/zcip-4/linux-types.patch @@ -0,0 +1,15 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- zcip-4/zcip.c~linux-types ++++ zcip-4/zcip.c +@@ -163,6 +163,7 @@ + #endif + + #ifdef CHECK_KERNEL_SOCKETFILTERS ++#include <linux/types.h> + #include <linux/filter.h> + + // |