[oe-commits] org.oe.dev ebtables 2.0.6: Patch to enable compiling with gcc 4.x. Tested with gcc
lenehan commit
openembedded-commits at lists.openembedded.org
Fri Sep 1 02:39:41 UTC 2006
ebtables 2.0.6: Patch to enable compiling with gcc 4.x. Tested with gcc
4.1.1 and 3.4.4.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: fc647af540160490aa9f2a626b2daaf15edfe350
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fc647af540160490aa9f2a626b2daaf15edfe350
Files:
1
packages/ebtables/ebtables-2.0.6/gcc4.patch
packages/ebtables/ebtables_2.0.6.bb
Diffs:
#
# mt diff -r4d0f56c57b45f8033dff27b76aa83f14d1292945 -rfc647af540160490aa9f2a626b2daaf15edfe350
#
#
#
# add_file "packages/ebtables/ebtables-2.0.6/gcc4.patch"
# content [5d984b0eaaa1599ca19d480fbb6fd557a8f8596a]
#
# patch "packages/ebtables/ebtables_2.0.6.bb"
# from [a515758c64777196c35269aef7c1a6ac2a504d7b]
# to [c4d8aaec166d5bfc1f23e03986f54f43e610ca6b]
#
============================================================
--- packages/ebtables/ebtables-2.0.6/gcc4.patch 5d984b0eaaa1599ca19d480fbb6fd557a8f8596a
+++ packages/ebtables/ebtables-2.0.6/gcc4.patch 5d984b0eaaa1599ca19d480fbb6fd557a8f8596a
@@ -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));
============================================================
--- packages/ebtables/ebtables_2.0.6.bb a515758c64777196c35269aef7c1a6ac2a504d7b
+++ packages/ebtables/ebtables_2.0.6.bb c4d8aaec166d5bfc1f23e03986f54f43e610ca6b
@@ -1,12 +1,13 @@ SECTION = "console/network"
DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
PRIORITY = "optional"
MAINTAINER = "Ned Ludd <solar at gentoo.org>"
LICENSE = "GPL"
SECTION = "console/network"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
file://gcc34.patch;patch=1 \
+ file://gcc4.patch;patch=1 \
file://installnonroot.patch;patch=1 \
file://installcreatedirs.patch;patch=1"
S = "${WORKDIR}/ebtables-v${PV}"
More information about the Openembedded-commits
mailing list