From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/ebtables/ebtables-2.0.6/gcc34.patch | 16 ++++++ recipes/ebtables/ebtables-2.0.6/gcc4.patch | 67 ++++++++++++++++++++++ .../ebtables-2.0.6/installcreatedirs.patch | 25 ++++++++ .../ebtables/ebtables-2.0.6/installnonroot.patch | 55 ++++++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 recipes/ebtables/ebtables-2.0.6/gcc34.patch create mode 100644 recipes/ebtables/ebtables-2.0.6/gcc4.patch create mode 100644 recipes/ebtables/ebtables-2.0.6/installcreatedirs.patch create mode 100644 recipes/ebtables/ebtables-2.0.6/installnonroot.patch (limited to 'recipes/ebtables/ebtables-2.0.6') diff --git a/recipes/ebtables/ebtables-2.0.6/gcc34.patch b/recipes/ebtables/ebtables-2.0.6/gcc34.patch new file mode 100644 index 0000000000..c5d341e225 --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.6/gcc34.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ebtables-v2.0.6/ebtables.c~gcc34 2003-11-02 12:22:56.000000000 -0600 ++++ ebtables-v2.0.6/ebtables.c 2004-06-03 13:27:28.000000000 -0500 +@@ -1170,7 +1170,7 @@ + if (!t->compare(t->t, u_e->t)) + continue; + return i; +-letscontinue: ++letscontinue:; + } + return -1; + } diff --git a/recipes/ebtables/ebtables-2.0.6/gcc4.patch b/recipes/ebtables/ebtables-2.0.6/gcc4.patch new file mode 100644 index 0000000000..6b3688a3d9 --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.6/gcc4.patch @@ -0,0 +1,67 @@ +--- ebtables-v2.0.6/extensions/ebt_ip.c 2006/09/01 02:27:02 1.1 ++++ ebtables-v2.0.6/extensions/ebt_ip.c 2006/09/01 02:27:30 +@@ -313,7 +313,7 @@ + ipinfo->invflags |= EBT_IP_PROTO; + if (optind > argc) + print_error("Missing IP protocol argument"); +- (unsigned char) i = strtoul(argv[optind - 1], &end, 10); ++ i = strtoul(argv[optind - 1], &end, 10); + if (*end != '\0') { + struct protoent *pe; + +--- ebtables-v2.0.6/extensions/ebt_vlan.c 2006/09/01 02:27:38 1.1 ++++ ebtables-v2.0.6/extensions/ebt_vlan.c 2006/09/01 02:28:01 +@@ -141,7 +141,7 @@ + check_option(flags, OPT_VLAN_ID); + CHECK_INV_FLAG(EBT_VLAN_ID); + CHECK_IF_MISSING_VALUE; +- (unsigned short) local.id = ++ local.id = + strtoul(argv[optind - 1], &end, 10); + CHECK_RANGE(local.id > 4094 || *end != '\0'); + vlaninfo->id = local.id; +@@ -152,7 +152,7 @@ + check_option(flags, OPT_VLAN_PRIO); + CHECK_INV_FLAG(EBT_VLAN_PRIO); + CHECK_IF_MISSING_VALUE; +- (unsigned char) local.prio = ++ local.prio = + strtoul(argv[optind - 1], &end, 10); + CHECK_RANGE(local.prio >= 8 || *end != '\0'); + vlaninfo->prio = local.prio; +@@ -163,7 +163,7 @@ + check_option(flags, OPT_VLAN_ENCAP); + CHECK_INV_FLAG(EBT_VLAN_ENCAP); + CHECK_IF_MISSING_VALUE; +- (unsigned short) local.encap = ++ local.encap = + strtoul(argv[optind - 1], &end, 16); + if (*end != '\0') { + ethent = getethertypebyname(argv[optind - 1]); +--- ebtables-v2.0.6/extensions/ebt_limit.c 2006/09/01 02:28:09 1.1 ++++ ebtables-v2.0.6/extensions/ebt_limit.c 2006/09/01 02:30:21 +@@ -203,15 +203,15 @@ + + static struct ebt_u_match limit_match = + { +- .name EBT_LIMIT_MATCH, +- .size sizeof(struct ebt_limit_info), +- .help print_help, +- .init init, +- .parse parse, +- .final_check final_check, +- .print print, +- .compare compare, +- .extra_ops opts, ++ .name = EBT_LIMIT_MATCH, ++ .size = sizeof(struct ebt_limit_info), ++ .help = print_help, ++ .init = init, ++ .parse = parse, ++ .final_check = final_check, ++ .print = print, ++ .compare = compare, ++ .extra_ops = opts, + }; + + static void _init(void) __attribute((constructor)); diff --git a/recipes/ebtables/ebtables-2.0.6/installcreatedirs.patch b/recipes/ebtables/ebtables-2.0.6/installcreatedirs.patch new file mode 100644 index 0000000000..86bc4f0a44 --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.6/installcreatedirs.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ebtables-v2.0.6/Makefile~installcreatedirs 2004-06-03 13:34:17.000000000 -0500 ++++ ebtables-v2.0.6/Makefile 2004-06-03 13:35:21.000000000 -0500 +@@ -47,14 +47,17 @@ + + $(MANDIR)/man8/ebtables.8: ebtables.8 + mkdir -p $(@D) ++ install -d $(MANDIR)/man8 + install -m 0644 $(INSTALLOWN) $< $@ + + $(ETHERTYPESFILE): ethertypes + mkdir -p $(@D) ++ install -d $(ETHERTYPESPATH) + install -m 0644 $(INSTALLOWN) $< $@ + + .PHONY: exec + exec: ebtables ++ install -d $(BINPATH) + install -m 0755 $(INSTALLOWN) $< $(BINFILE) + + .PHONY: install diff --git a/recipes/ebtables/ebtables-2.0.6/installnonroot.patch b/recipes/ebtables/ebtables-2.0.6/installnonroot.patch new file mode 100644 index 0000000000..0211e62364 --- /dev/null +++ b/recipes/ebtables/ebtables-2.0.6/installnonroot.patch @@ -0,0 +1,55 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- ebtables-v2.0.6/Makefile~installnonroot 2003-11-02 12:22:56.000000000 -0600 ++++ ebtables-v2.0.6/Makefile 2004-06-03 13:34:17.000000000 -0500 +@@ -7,6 +7,7 @@ + MANDIR?=/usr/local/man + CFLAGS:=-Wall -Wunused + CC:=gcc ++INSTALLOWN=$(if $(filter 0,$(shell id -u)),-o root -g root) + + ifeq ($(shell uname -m),sparc64) + CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32 +@@ -46,15 +47,15 @@ + + $(MANDIR)/man8/ebtables.8: ebtables.8 + mkdir -p $(@D) +- install -m 0644 -o root -g root $< $@ ++ install -m 0644 $(INSTALLOWN) $< $@ + + $(ETHERTYPESFILE): ethertypes + mkdir -p $(@D) +- install -m 0644 -o root -g root $< $@ ++ install -m 0644 $(INSTALLOWN) $< $@ + + .PHONY: exec + exec: ebtables +- install -m 0755 -o root -g root $< $(BINFILE) ++ install -m 0755 $(INSTALLOWN) $< $(BINFILE) + + .PHONY: install + install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec +@@ -70,16 +71,16 @@ + .PHONY: release + release: + mkdir -p include/linux/netfilter_bridge +- install -m 0644 -o root -g root \ ++ install -m 0644 $(INSTALLOWN) \ + $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/ + # To keep possible compile error complaints about undefined ETH_P_8021Q + # off my back +- install -m 0644 -o root -g root \ ++ install -m 0644 $(INSTALLOWN) \ + $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/ +- install -m 0644 -o root -g root \ ++ install -m 0644 $(INSTALLOWN) \ + $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \ + include/linux/netfilter_bridge/ +- install -m 0644 -o root -g root \ ++ install -m 0644 $(INSTALLOWN) \ + include/ebtables.h include/linux/netfilter_bridge/ + make clean + touch * -- cgit v1.2.3