Browse Source

musl: fixed ebtables to compile

stable/0.6
Christian Wiese 11 years ago
parent
commit
5b24e78a23
  1. 43
      base/musl/pkg/ebtables/ebtables-ethernetdb.h-add-__THROW.patch
  2. 113
      base/musl/pkg/ebtables/ebtables-struct-ethhdr.patch
  3. 81
      base/musl/pkg/ebtables/ebtables-use-standard-int-types.patch

43
base/musl/pkg/ebtables/ebtables-ethernetdb.h-add-__THROW.patch

@ -0,0 +1,43 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/pkg/ebtables/ebtables-ethernetdb.h-add-__THROW.patch
# Copyright (C) 2014 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From f9f9c612d457280ba3f9a6f5642c0fb820974cc5 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 28 Apr 2014 00:15:16 +0200
Subject: ethernetdb.h: add __THROW
---
include/ethernetdb.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/ethernetdb.h b/include/ethernetdb.h
index 46d8bfd..faf7d0f 100644
--- a/include/ethernetdb.h
+++ b/include/ethernetdb.h
@@ -30,6 +30,10 @@
#define _PATH_ETHERTYPES "/etc/ethertypes"
#endif /* _PATH_ETHERTYPES */
+#ifndef __THROW
+#define __THROW
+#endif
+
struct ethertypeent {
char *e_name; /* Official ethernet type name. */
char **e_aliases; /* Alias list. */
--
1.7.2.3

113
base/musl/pkg/ebtables/ebtables-struct-ethhdr.patch

@ -0,0 +1,113 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/pkg/ebtables/ebtables-struct-ethhdr.patch
# Copyright (C) 2014 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From 94df0e94a42bf2c92c0fa62b9429e2e833eef952 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 28 Apr 2014 02:32:37 +0200
Subject: fix redefinition of struct ethhdr
Resort headers so <netinet/if_ether.h> gets before <linux/if_ether.h> to
avoid redefinition of struct ethhdr.
---
extensions/ebt_among.c | 5 +++--
extensions/ebt_arpreply.c | 3 ++-
extensions/ebt_nat.c | 3 ++-
useful_functions.c | 5 +++--
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
index f97d07e..b57b2ad 100644
--- a/extensions/ebt_among.c
+++ b/extensions/ebt_among.c
@@ -12,15 +12,16 @@
#include <getopt.h>
#include <ctype.h>
#include <unistd.h>
-#include "../include/ebtables_u.h"
#include <netinet/ether.h>
-#include "../include/ethernetdb.h"
#include <linux/if_ether.h>
#include <linux/netfilter_bridge/ebt_among.h>
#include <sys/mman.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include "../include/ebtables_u.h"
+#include "../include/ethernetdb.h"
+
#define AMONG_DST '1'
#define AMONG_SRC '2'
#define AMONG_DST_F '3'
diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
index c3757f3..a1b3503 100644
--- a/extensions/ebt_arpreply.c
+++ b/extensions/ebt_arpreply.c
@@ -11,10 +11,11 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include "../include/ebtables_u.h"
#include <netinet/ether.h>
#include <linux/netfilter_bridge/ebt_arpreply.h>
+#include "../include/ebtables_u.h"
+
static int mac_supplied;
#define REPLY_MAC '1'
diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
index e6afbf8..ae9c9bb 100644
--- a/extensions/ebt_nat.c
+++ b/extensions/ebt_nat.c
@@ -10,10 +10,11 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include "../include/ebtables_u.h"
#include <netinet/ether.h>
#include <linux/netfilter_bridge/ebt_nat.h>
+#include "../include/ebtables_u.h"
+
static int to_source_supplied, to_dest_supplied;
#define NAT_S '1'
diff --git a/useful_functions.c b/useful_functions.c
index d20b68e..b305ff5 100644
--- a/useful_functions.c
+++ b/useful_functions.c
@@ -22,8 +22,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "include/ebtables_u.h"
-#include "include/ethernetdb.h"
#include <stdio.h>
#include <netinet/ether.h>
#include <string.h>
@@ -34,6 +32,9 @@
#include <sys/socket.h>
#include <arpa/inet.h>
+#include "include/ebtables_u.h"
+#include "include/ethernetdb.h"
+
const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0};
const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0};
const unsigned char mac_type_multicast[ETH_ALEN] = {1,0,0,0,0,0};
--
1.7.2.3

81
base/musl/pkg/ebtables/ebtables-use-standard-int-types.patch

@ -0,0 +1,81 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../musl/pkg/ebtables/ebtables-use-standard-int-types.patch
# Copyright (C) 2014 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From b94ddfd6ea097db2ee8414556094ed37e8b20611 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 28 Apr 2014 00:09:25 +0200
Subject: changed to use standard int types
---
extensions/ebt_ip6.c | 4 ++--
extensions/ebt_limit.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
index 0465e77..a1fc1ae 100644
--- a/extensions/ebt_ip6.c
+++ b/extensions/ebt_ip6.c
@@ -53,8 +53,8 @@ static const struct option opts[] =
struct icmpv6_names {
const char *name;
- u_int8_t type;
- u_int8_t code_min, code_max;
+ uint8_t type;
+ uint8_t code_min, code_max;
};
static const struct icmpv6_names icmpv6_codes[] = {
diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
index ee40e5c..d189a09 100644
--- a/extensions/ebt_limit.c
+++ b/extensions/ebt_limit.c
@@ -59,11 +59,11 @@ static void print_help(void)
" default %u\n", EBT_LIMIT_BURST);
}
-static int parse_rate(const char *rate, u_int32_t *val)
+static int parse_rate(const char *rate, uint32_t *val)
{
const char *delim;
- u_int32_t r;
- u_int32_t mult = 1; /* Seconds by default. */
+ uint32_t r;
+ uint32_t mult = 1; /* Seconds by default. */
delim = strchr(rate, '/');
if (delim) {
@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry,
struct rates
{
const char *name;
- u_int32_t mult;
+ uint32_t mult;
};
static struct rates g_rates[] =
@@ -162,7 +162,7 @@ static struct rates g_rates[] =
{ "sec", EBT_LIMIT_SCALE }
};
-static void print_rate(u_int32_t period)
+static void print_rate(uint32_t period)
{
unsigned int i;
--
1.7.2.3
Loading…
Cancel
Save