summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Danks <ray.danks@se-eng.com>2012-06-21 15:27:59 -0600
committerRaymond Danks <ray.danks@se-eng.com>2012-06-21 15:27:59 -0600
commit20ba217312d37166d86d9562bcf5a7df9a9da05f (patch)
tree913aead4c341868dcad1c4c45d7fbbc2ba3f6939
parent5323ad54237bd038add09256018465d61d71bfd2 (diff)
downloadmeta-virtualization-20ba217312d37166d86d9562bcf5a7df9a9da05f.tar.gz
ebtables: Pulled in from openembedded. Dependency for libvirt.
Signed-off-by: Raymond Danks <ray.danks@se-eng.com>
Diffstat
-rw-r--r--recipes-extended/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch50
-rw-r--r--recipes-extended/ebtables/ebtables-2.0.9-2/04compensate-for-missing-aligned-u64.patch16
-rwxr-xr-xrecipes-extended/ebtables/ebtables-2.0.9-2/ebtables.init186
-rw-r--r--recipes-extended/ebtables/ebtables-2.0.9-2/installcreatedirs.patch25
-rw-r--r--recipes-extended/ebtables/ebtables-2.0.9-2/installnonroot.patch45
-rw-r--r--recipes-extended/ebtables/ebtables_2.0.9-2.bb53
6 files changed, 375 insertions, 0 deletions
diff --git a/recipes-extended/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch b/recipes-extended/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch
new file mode 100644
index 00000000..c260403e
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables-2.0.9-2/01debian_defaultconfig.patch
@@ -0,0 +1,50 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2## debian_defaultconfig.dpatch by <hesso@pool.math.tu-berlin.de>
3##
4## DP: Debian enhancements to the ebtables "sysconfig" default settings.
5
6@DPATCH@
7
8--- ebtables-2.0.8.1.orig/ebtables-config
9+++ ebtables-2.0.8.1/ebtables-config
10@@ -1,17 +1,3 @@
11-# Save (and possibly restore) in text format.
12-# Value: yes|no, default: yes
13-# Save the firewall rules in text format to __SYSCONFIG__/ebtables
14-# If EBTABLES_BINARY_FORMAT="no" then restoring the firewall rules
15-# is done using this text format.
16-EBTABLES_TEXT_FORMAT="yes"
17-
18-# Save (and restore) in binary format.
19-# Value: yes|no, default: yes
20-# Save (and restore) the firewall rules in binary format to (and from)
21-# __SYSCONFIG__/ebtables.<chain>. Enabling this option will make
22-# firewall initialisation a lot faster.
23-EBTABLES_BINARY_FORMAT="yes"
24-
25 # Unload modules on restart and stop
26 # Value: yes|no, default: yes
27 # This option has to be 'yes' to get to a sane state for a firewall
28@@ -19,6 +5,12 @@
29 # modules.
30 EBTABLES_MODULES_UNLOAD="yes"
31
32+# Load firewall rules on system startup.
33+# Value: yes|no, default: no
34+# Restores the ebtables rulesets from the last saved state when the
35+# system boots up.
36+EBTABLES_LOAD_ON_START="no"
37+
38 # Save current firewall rules on stop.
39 # Value: yes|no, default: no
40 # Saves all firewall rules if firewall gets stopped
41@@ -35,3 +27,9 @@
42 # Save rule counters when saving a kernel table to a file. If the
43 # rule counters were saved, they will be restored when restoring the table.
44 EBTABLES_SAVE_COUNTER="no"
45+
46+# Backup suffix for ruleset save files.
47+# Value: <string>, default: "~"
48+# Keep one backup level of saved rules.
49+# Set this variable to the empty string to disable backups.
50+EBTABLES_BACKUP_SUFFIX="~"
diff --git a/recipes-extended/ebtables/ebtables-2.0.9-2/04compensate-for-missing-aligned-u64.patch b/recipes-extended/ebtables/ebtables-2.0.9-2/04compensate-for-missing-aligned-u64.patch
new file mode 100644
index 00000000..aae7f4b6
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables-2.0.9-2/04compensate-for-missing-aligned-u64.patch
@@ -0,0 +1,16 @@
1http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661449
2
3--- ebtables-2.0.9.2.orig/extensions/ebt_pkttype.c 2010-02-03 21:17:45.000000000 +0000
4+++ ebtables-2.0.9.2/extensions/ebt_pkttype.c 2012-03-03 15:22:57.000000000 +0000
5@@ -12,6 +12,11 @@
6 #include <getopt.h>
7 #include <netdb.h>
8 #include "../include/ebtables_u.h"
9+/* BEGIN: Workaround */
10+#ifndef __aligned_u64
11+#define __aligned_u64 __u64 __attribute__((aligned(8)))
12+#endif
13+/* END: Workaround */
14 #include <linux/if_packet.h>
15 #include <linux/netfilter_bridge/ebt_pkttype.h>
16
diff --git a/recipes-extended/ebtables/ebtables-2.0.9-2/ebtables.init b/recipes-extended/ebtables/ebtables-2.0.9-2/ebtables.init
new file mode 100755
index 00000000..0044e982
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables-2.0.9-2/ebtables.init
@@ -0,0 +1,186 @@
1#!/bin/sh
2#
3# init script for the Ethernet Bridge filter tables
4#
5# Written by Dag Wieers <dag@wieers.com>
6# Modified by Rok Papez <rok.papez@arnes.si>
7# Bart De Schuymer <bdschuym@pandora.be>
8# Adapted to Debian by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
9# Adapted to OpenEmbedded by Roman I Khimov <khimov@altell.ru>
10#
11# chkconfig: - 15 85
12# description: Ethernet Bridge filtering tables
13#
14### BEGIN INIT INFO
15# Provides: ebtables
16# Required-Start:
17# Required-Stop:
18# Should-Start: $local_fs
19# Should-Stop: $local_fs
20# Default-Start: S
21# Default-Stop: 0 6
22# Short-Description: ebtables ruleset management
23# Description: Saves and restores the state of the ebtables rulesets.
24### END INIT INFO
25
26[ -x /sbin/ebtables ] || exit 1
27
28EBTABLES_DUMPFILE_STEM=/etc/ebtables/dump
29
30RETVAL=0
31prog="ebtables"
32desc="Ethernet bridge filtering"
33umask 0077
34
35#default configuration
36EBTABLES_MODULES_UNLOAD="yes"
37EBTABLES_LOAD_ON_START="no"
38EBTABLES_SAVE_ON_STOP="no"
39EBTABLES_SAVE_ON_RESTART="no"
40EBTABLES_SAVE_COUNTER="no"
41EBTABLES_BACKUP_SUFFIX="~"
42
43config=/etc/default/$prog
44[ -f "$config" ] && . "$config"
45
46function get_supported_tables() {
47 EBTABLES_SUPPORTED_TABLES=
48 /sbin/ebtables -t filter -L 2>&1 1>/dev/null | grep -q permission
49 if [ $? -eq 0 ]; then
50 echo "Error: insufficient privileges to access the ebtables rulesets."
51 exit 1
52 fi
53 for table in filter nat broute; do
54 /sbin/ebtables -t $table -L &> /dev/null
55 if [ $? -eq 0 ]; then
56 EBTABLES_SUPPORTED_TABLES="${EBTABLES_SUPPORTED_TABLES} $table"
57 fi
58 done
59}
60
61function load() {
62 RETVAL=0
63 get_supported_tables
64 echo -n "Restoring ebtables rulesets: "
65 for table in $EBTABLES_SUPPORTED_TABLES; do
66 echo -n "$table "
67 if [ -s ${EBTABLES_DUMPFILE_STEM}.$table ]; then
68 /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-commit
69 RET=$?
70 if [ $RET -ne 0 ]; then
71 echo -n "(failed) "
72 RETVAL=$RET
73 fi
74 else
75 echo -n "(no saved state) "
76 fi
77 done
78 if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
79 echo -n "no kernel support. "
80 else
81 echo -n "done. "
82 fi
83 if [ $RETVAL -eq 0 ]; then
84 echo "ok"
85 else
86 echo "fail"
87 fi
88}
89
90function clear() {
91 RETVAL=0
92 get_supported_tables
93 echo -n "Clearing ebtables rulesets: "
94 for table in $EBTABLES_SUPPORTED_TABLES; do
95 echo -n "$table "
96 /sbin/ebtables -t $table --init-table
97 done
98
99 if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
100 for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -d' ' -f1) ebtables; do
101 rmmod $mod 2> /dev/null
102 done
103 fi
104 if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
105 echo -n "no kernel support. "
106 else
107 echo -n "done. "
108 fi
109 if [ $RETVAL -eq 0 ]; then
110 echo "ok"
111 else
112 echo "fail"
113 fi
114}
115
116function save() {
117 RETVAL=0
118 get_supported_tables
119 echo -n "Saving ebtables rulesets: "
120 for table in $EBTABLES_SUPPORTED_TABLES; do
121 echo -n "$table "
122 [ -n "$EBTABLES_BACKUP_SUFFIX" ] && [ -s ${EBTABLES_DUMPFILE_STEM}.$table ] && \
123 mv ${EBTABLES_DUMPFILE_STEM}.$table ${EBTABLES_DUMPFILE_STEM}.$table$EBTABLES_BACKUP_SUFFIX
124 /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table --atomic-save
125 RET=$?
126 if [ $RET -ne 0 ]; then
127 echo -n "(failed) "
128 RETVAL=$RET
129 else
130 if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
131 /sbin/ebtables -t $table --atomic-file ${EBTABLES_DUMPFILE_STEM}.$table -Z
132 fi
133 fi
134 done
135 if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
136 echo -n "no kernel support. "
137 else
138 echo -n "done. "
139 fi
140 if [ $RETVAL -eq 0 ]; then
141 echo "ok"
142 else
143 echo "fail"
144 fi
145}
146
147case "$1" in
148 start)
149 [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
150 ;;
151 stop)
152 [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
153 clear
154 ;;
155 restart|reload|force-reload)
156 [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
157 clear
158 [ "$EBTABLES_LOAD_ON_START" = "yes" ] && load
159 ;;
160 load)
161 load
162 ;;
163 save)
164 save
165 ;;
166 status)
167 get_supported_tables
168 if [ -z "$EBTABLES_SUPPORTED_TABLES" ]; then
169 echo "No kernel support for ebtables."
170 RETVAL=1
171 else
172 echo -n "Ebtables support available, number of installed rules: "
173 for table in $EBTABLES_SUPPORTED_TABLES; do
174 COUNT=$(( $(/sbin/ebtables -t $table -L | sed -e "/^Bridge chain/! d" -e "s/^.*entries: //" -e "s/,.*$/ +/") 0 ))
175 echo -n "$table($COUNT) "
176 done
177 echo ok
178 RETVAL=0
179 fi
180 ;;
181 *)
182 echo "Usage: $0 {start|stop|restart|reload|force-reload|load|save|status}" >&2
183 RETVAL=1
184esac
185
186exit $RETVAL
diff --git a/recipes-extended/ebtables/ebtables-2.0.9-2/installcreatedirs.patch b/recipes-extended/ebtables/ebtables-2.0.9-2/installcreatedirs.patch
new file mode 100644
index 00000000..86bc4f0a
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables-2.0.9-2/installcreatedirs.patch
@@ -0,0 +1,25 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6--- ebtables-v2.0.6/Makefile~installcreatedirs 2004-06-03 13:34:17.000000000 -0500
7+++ ebtables-v2.0.6/Makefile 2004-06-03 13:35:21.000000000 -0500
8@@ -47,14 +47,17 @@
9
10 $(MANDIR)/man8/ebtables.8: ebtables.8
11 mkdir -p $(@D)
12+ install -d $(MANDIR)/man8
13 install -m 0644 $(INSTALLOWN) $< $@
14
15 $(ETHERTYPESFILE): ethertypes
16 mkdir -p $(@D)
17+ install -d $(ETHERTYPESPATH)
18 install -m 0644 $(INSTALLOWN) $< $@
19
20 .PHONY: exec
21 exec: ebtables
22+ install -d $(BINPATH)
23 install -m 0755 $(INSTALLOWN) $< $(BINFILE)
24
25 .PHONY: install
diff --git a/recipes-extended/ebtables/ebtables-2.0.9-2/installnonroot.patch b/recipes-extended/ebtables/ebtables-2.0.9-2/installnonroot.patch
new file mode 100644
index 00000000..4d42cc09
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables-2.0.9-2/installnonroot.patch
@@ -0,0 +1,45 @@
1
2#
3# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
4#
5
6Index: ebtables-v2.0.9-2/Makefile
7===================================================================
8--- ebtables-v2.0.9-2.orig/Makefile 2010-02-04 00:17:45.000000000 +0300
9+++ ebtables-v2.0.9-2/Makefile 2010-05-24 16:15:35.000000000 +0400
10@@ -154,28 +154,28 @@
11 .PHONY: scripts
12 scripts: ebtables-save ebtables.sysv ebtables-config
13 cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
14- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
15+ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
16 cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
17- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
18+ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
19 cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
20- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
21+ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
22 rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
23
24 $(MANDIR)/man8/ebtables.8: ebtables.8
25 mkdir -p $(DESTDIR)$(@D)
26 sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
27- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
28+ install -m 0644 ebtables.8_ $(DESTDIR)$@
29 rm -f ebtables.8_
30
31 $(ETHERTYPESFILE): ethertypes
32 mkdir -p $(DESTDIR)$(@D)
33- install -m 0644 -o root -g root $< $(DESTDIR)$@
34+ install -m 0644 $< $(DESTDIR)$@
35
36 .PHONY: exec
37 exec: ebtables ebtables-restore
38 mkdir -p $(DESTDIR)$(BINDIR)
39- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
40- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
41+ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
42+ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
43
44 .PHONY: install
45 install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
diff --git a/recipes-extended/ebtables/ebtables_2.0.9-2.bb b/recipes-extended/ebtables/ebtables_2.0.9-2.bb
new file mode 100644
index 00000000..2a3a9e1b
--- /dev/null
+++ b/recipes-extended/ebtables/ebtables_2.0.9-2.bb
@@ -0,0 +1,53 @@
1DESCRIPTION = "Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
2PRIORITY = "optional"
3LICENSE = "GPL"
4SECTION = "console/network"
5PR = "r0"
6LIC_FILES_CHKSUM = "file://COPYING;md5=53b4a999993871a28ab1488fdbd2e73e"
7
8TARGET_CC_ARCH += "${LDFLAGS}"
9
10SRC_URI = " \
11 ${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
12 file://installnonroot.patch \
13 file://01debian_defaultconfig.patch \
14 file://04compensate-for-missing-aligned-u64.patch \
15 file://ebtables.init \
16 "
17
18SRC_URI[md5sum] = "b880429a6424186728eb57ae80ef878a"
19SRC_URI[sha256sum] = "98855f644d43c615a8e663197978e49c95642f46f2bbf8e6f3213af87f8ad6a3"
20
21S = "${WORKDIR}/ebtables-v${PV}"
22
23EXTRA_OEMAKE = " \
24 BINDIR=${base_sbindir} \
25 MANDIR=${mandir} \
26 ETHERTYPESPATH=${sysconfdir} \
27 INITDIR=${sysconfdir}/init.d \
28 SYSCONFIGDIR=${sysconfdir}/default \
29 LIBDIR=${base_libdir}/ebtables \
30 'CC=${CC}' \
31 'CFLAGS=${CFLAGS}' \
32 'LD=${LD}' \
33 "
34
35do_install () {
36 install -d ${D}${sysconfdir}/init.d
37 install -d ${D}${sysconfdir}/default
38 install -d ${D}${sysconfdir}/ebtables
39 install -d ${D}/sbin
40 oe_runmake DESTDIR='${D}' install
41 install -m 0755 ${WORKDIR}/ebtables.init ${D}/${sysconfdir}/init.d/ebtables
42 mv ${D}${sysconfdir}/default/ebtables-config ${D}${sysconfdir}/default/ebtables
43}
44
45CONFFILES_${PN} += "${sysconfdir}/default/ebtables"
46
47inherit update-rc.d
48
49INITSCRIPT_NAME = "ebtables"
50INITSCRIPT_PARAMS = "start 41 S . stop 41 6 ."
51
52FILES_${PN}-dbg += "${base_libdir}/ebtables/.debug"
53FILES_${PN} += "${base_libdir}/ebtables/*.so"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-27 00:24:40 +0000