[crux-commits] ports/contrib (3.5): ebtables: 2.0.10-4 -> 2.0.11

crux at crux.nu crux at crux.nu
Wed Jul 1 14:13:59 UTC 2020


commit 5c9a0b87311bfbad7fde7cbbc0dc92d4819eb606
Author: Tim Biermann <tbier at posteo.de>
Date:   Wed Jul 1 13:52:32 2020 +0000

    ebtables: 2.0.10-4 -> 2.0.11

diff --git a/ebtables/.footprint b/ebtables/.footprint
index e1c3ada98..b14b3da0b 100644
--- a/ebtables/.footprint
+++ b/ebtables/.footprint
@@ -2,33 +2,17 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/ethertypes
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libebt_802_3.so
--rwxr-xr-x	root/root	usr/lib/libebt_among.so
--rwxr-xr-x	root/root	usr/lib/libebt_arp.so
--rwxr-xr-x	root/root	usr/lib/libebt_arpreply.so
--rwxr-xr-x	root/root	usr/lib/libebt_ip.so
--rwxr-xr-x	root/root	usr/lib/libebt_ip6.so
--rwxr-xr-x	root/root	usr/lib/libebt_limit.so
--rwxr-xr-x	root/root	usr/lib/libebt_log.so
--rwxr-xr-x	root/root	usr/lib/libebt_mark.so
--rwxr-xr-x	root/root	usr/lib/libebt_mark_m.so
--rwxr-xr-x	root/root	usr/lib/libebt_nat.so
--rwxr-xr-x	root/root	usr/lib/libebt_nflog.so
--rwxr-xr-x	root/root	usr/lib/libebt_pkttype.so
--rwxr-xr-x	root/root	usr/lib/libebt_redirect.so
--rwxr-xr-x	root/root	usr/lib/libebt_standard.so
--rwxr-xr-x	root/root	usr/lib/libebt_stp.so
--rwxr-xr-x	root/root	usr/lib/libebt_ulog.so
--rwxr-xr-x	root/root	usr/lib/libebt_vlan.so
--rwxr-xr-x	root/root	usr/lib/libebtable_broute.so
--rwxr-xr-x	root/root	usr/lib/libebtable_filter.so
--rwxr-xr-x	root/root	usr/lib/libebtable_nat.so
--rwxr-xr-x	root/root	usr/lib/libebtc.so
+-rwxr-xr-x	root/root	usr/lib/libebtc.la
+lrwxrwxrwx	root/root	usr/lib/libebtc.so -> libebtc.so.0.0.0
+lrwxrwxrwx	root/root	usr/lib/libebtc.so.0 -> libebtc.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libebtc.so.0.0.0
 drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/ebtables
--rwxr-xr-x	root/root	usr/sbin/ebtables-restore
--rwxr-xr-x	root/root	usr/sbin/ebtables-save
+-rwxr-xr-x	root/root	usr/sbin/ebtables-legacy
+-rwxr-xr-x	root/root	usr/sbin/ebtables-legacy-restore
+-rwxr-xr-x	root/root	usr/sbin/ebtables-legacy-save
+-rwxr-xr-x	root/root	usr/sbin/ebtablesd
+-rwxr-xr-x	root/root	usr/sbin/ebtablesu
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man8/
--rw-r--r--	root/root	usr/share/man/man8/ebtables.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ebtables-legacy.8.gz
diff --git a/ebtables/.signature b/ebtables/.signature
index fa472d328..fe46ad385 100644
--- a/ebtables/.signature
+++ b/ebtables/.signature
@@ -1,5 +1,8 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/gkZMyBpKxhGV0wTGrTXzr+Uh18i/2VZQNvorj+avgaPpUp7IrTYnSN8dJemHzoyNIaRybNqU6Y3TwOKS87bwg=
-SHA256 (Pkgfile) = a41387a9334d3d74cf53cb4104f06d10c8b46e69559d2cd5412409d5b75e9e61
-SHA256 (.footprint) = 028cbc5b866cf8418ceb90ab66c8c5914ff0872c5b66fcd341c7225ca6b1fe45
-SHA256 (ebtables-v2.0.10-4.tar.gz) = dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d
+RWSagIOpLGJF3/zV1AJuck58ORuUegkXDuXew7XxbsAmxQDig95bDV/03Btn4b0+er3OSdLhXxjZ951HIbrvgr6lA3zHjb75Iwk=
+SHA256 (Pkgfile) = 1f2623c74d82e3677bc1a55917a109212fc2228043562c5f81d8ec21682e9a79
+SHA256 (.footprint) = c8de5015026a5419b9db034053323e98d0a388307ceff669989b82d44f3f9235
+SHA256 (ebtables-2.0.11.tar.gz) = b71f654784a726329f88b412ef7b96b4e5d786ed2bd28193ed7b4c0d677dfd2a
+SHA256 (ebtables-2.0.11-ebt-save.patch) = 27294013cd08ccda647cdf2bb3b54a87fb44f2b2bd7bc11cdece4a37e376f58e
+SHA256 (ebtables-2.0.11-makefile.patch) = c6ec7f21c421b8df28decb6e43a5e6cdb7202a7d628917aacaaa392e98995383
+SHA256 (ebtables-2.0.11-remove-stray-atsign.patch) = c9f03364d94d5191400381868ff5f6cb2112d3e3fbdd79d805de0bb8e7c820a9
diff --git a/ebtables/Pkgfile b/ebtables/Pkgfile
index 465b5e4c6..570226578 100644
--- a/ebtables/Pkgfile
+++ b/ebtables/Pkgfile
@@ -1,24 +1,30 @@
 # Description: A firewalling tool to transparently filter network traffic passing a bridge
-# URL:         http://ebtables.sourceforge.net/
+# URL:         https://netfilter.org/index.html
 # Maintainer:  Thomas Penteker, tek at serverop dot de
 # Packager:    Mikhail Kolesnik, mike at openbunker dot org
 
 name=ebtables
-version=2.0.10-4
+version=2.0.11
 release=1
-source=(http://download.sourceforge.net/$name/$name-v$version.tar.gz)
+source=(http://distfiles.exherbo.org/distfiles/$name-$version.tar.gz
+  # https://gitweb.gentoo.org/repo/gentoo.git/tree/net-firewall/ebtables/files
+  ebtables-2.0.11-ebt-save.patch ebtables-2.0.11-makefile.patch
+  ebtables-2.0.11-remove-stray-atsign.patch)
 
 build() {
-	cd $name-v$version
+  cd $name-$version
+  patch -Np1 -i $SRC/ebtables-2.0.11-ebt-save.patch
+  patch -Np1 -i $SRC/ebtables-2.0.11-makefile.patch
+  patch -Np1 -i $SRC/ebtables-2.0.11-remove-stray-atsign.patch
 
-  sed -i -e 's|BINDIR:=.*|BINDIR:=/usr/sbin|g' \
-         -e 's|MANDIR:=.*|MANDIR:=/usr/share/man|g' \
-         -e 's|rc.d/init.d|rc.d|g' -e 's|-Werror||g' Makefile
+  ./autogen.sh
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc
 
-	mkdir -p $PKG/usr/sbin
+  mkdir -p $PKG/usr/sbin
 
-	make
-	make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-	rm -rf $PKG/etc/{rc.d,sysconfig}
+  rm -rf $PKG/etc/{rc.d,sysconfig}
 }
diff --git a/ebtables/ebtables-2.0.11-ebt-save.patch b/ebtables/ebtables-2.0.11-ebt-save.patch
new file mode 100644
index 000000000..7cfe128ba
--- /dev/null
+++ b/ebtables/ebtables-2.0.11-ebt-save.patch
@@ -0,0 +1,26 @@
+diff --git a/ebtables-save.in b/ebtables-save.in
+index 17924a2..c7a64c3 100644
+--- a/ebtables-save.in
++++ b/ebtables-save.in
+@@ -12,6 +12,7 @@ my $ebtables = "@sbindir@/ebtables";
+ my $cnt = "";
+ my $version = "1.0";
+ my $table_name;
++my @table_names;
+ 
+ # ========================================================
+ # Process filter table
+@@ -49,6 +50,13 @@ sub process_table {
+ }
+ # ========================================================
+ 
++if ($#ARGV + 1 == 0) {
++   @table_names =split("\n", `grep -E '^ebtable_' /proc/modules | cut -f1 -d' ' | sed s/ebtable_//`);
++}
++else {
++   @table_names = @ARGV;
++}
++# ========================================================
+ unless (-x $ebtables) { exit -1 };
+ print "# Generated by ebtables-save v$version (legacy) on " . `date`;
+ if (defined($ENV{'EBTABLES_SAVE_COUNTER'}) && $ENV{'EBTABLES_SAVE_COUNTER'} eq "yes") {
diff --git a/ebtables/ebtables-2.0.11-makefile.patch b/ebtables/ebtables-2.0.11-makefile.patch
new file mode 100644
index 000000000..dc9be9e7d
--- /dev/null
+++ b/ebtables/ebtables-2.0.11-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6181003..de01139 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -50,7 +50,7 @@ ebtables_legacy_LDADD = libebtc.la
+ ebtablesd_LDADD = libebtc.la
+ ebtables_legacy_restore_SOURCES = ebtables-restore.c
+ ebtables_legacy_restore_LDADD = libebtc.la
+-static_SOURCES = ebtables.c
++static_SOURCES = ebtables.c ebtables-standalone.c
+ static_LDFLAGS = -static
+ static_LDADD = libebtc.la
+ examples_ulog_test_ulog_SOURCES = examples/ulog/test_ulog.c getethertype.c
diff --git a/ebtables/ebtables-2.0.11-remove-stray-atsign.patch b/ebtables/ebtables-2.0.11-remove-stray-atsign.patch
new file mode 100644
index 000000000..88f1d7296
--- /dev/null
+++ b/ebtables/ebtables-2.0.11-remove-stray-atsign.patch
@@ -0,0 +1,32 @@
+From 7d00e58157bc61168a057cde91a6e5b54dca573b Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh at inai.de>
+Date: Mon, 2 Dec 2019 20:52:04 +0100
+Subject: build: remove stray @ sign in manpage
+
+Because the sed command was not matching the trailing @, it
+was left in the manpage, leading to
+
+NAME
+       ebtables-legacy (2.0.11@) - Ethernet bridge frame table administration (legacy)
+
+Signed-off-by: Jan Engelhardt <jengelh at inai.de>
+Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b879941..6181003 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -64,6 +64,6 @@ ebtables-legacy-save: ebtables-save.in ${top_builddir}/config.status
+ 	${AM_V_GEN}sed -e 's![@]sbindir@!${sbindir}!g' <$< >$@
+ 
+ ebtables-legacy.8: ebtables-legacy.8.in ${top_builddir}/config.status
+-	${AM_V_GEN}sed -e 's![@]PACKAGE_VERSION!${PACKAGE_VERSION}!g' \
++	${AM_V_GEN}sed -e 's![@]PACKAGE_VERSION@!${PACKAGE_VERSION}!g' \
+ 		-e 's![@]PACKAGE_DATE@!${PROGDATE}!g' \
+ 		-e 's![@]LOCKFILE@!${LOCKFILE}!g' <$< >$@
+-- 
+cgit v1.2.1
+


More information about the crux-commits mailing list