[packages/ebtables] - merged old changes from legacy branch: cleanups, adjust init script to -legacy names

[qboosh]

commit 0d3180f10df14942d88c628aa522958dc4b76e69
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 30 19:31:15 2020 +0100

    - merged old changes from legacy branch: cleanups, adjust init script to -legacy names

 ebtables.init | 14 +++++++-------
 ebtables.spec | 15 ++++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/ebtables.spec b/ebtables.spec
index 8ce5998..bde887e 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -10,9 +10,8 @@ Source0:	https://ftp.netfilter.org/pub/ebtables/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
 Source2:	%{name}-config
 URL:		https://ebtables.netfilter.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	libtool
+# <linux/netfilter/xt_AUDIT.h>
+BuildRequires:	linux-libc-headers >= 6:3.0
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -42,6 +41,7 @@ standardowych jąder Linuksa w wersjach 2.5.x i nowszych.
 %configure \
 	--disable-silent-rules \
 	LOCKFILE=/var/lib/ebtables/lock
+
 %{__make}
 
 %install
@@ -52,13 +52,15 @@ install -d $RPM_BUILD_ROOT{/etc/sysconfig,/etc/rc.d/init.d}
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ebtables
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ebtables-config
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ebtables-config
 
 # create compatibility symlinks (upstream renamed to ebtables-legacy)
 ln -sf ebtables-legacy $RPM_BUILD_ROOT%{_sbindir}/ebtables
 ln -sf ebtables-legacy-restore $RPM_BUILD_ROOT%{_sbindir}/ebtables-restore
 ln -sf ebtables-legacy-save $RPM_BUILD_ROOT%{_sbindir}/ebtables-save
 
+# headers are not installed
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libebtc.so
 # remove libtool archives and deprecated binaries
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libebtc.la
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/ebtables{d,u}
@@ -87,7 +89,6 @@ fi
 %{_sbindir}/ebtables
 %{_sbindir}/ebtables-restore
 %{_sbindir}/ebtables-save
-%attr(755,root,root) %{_libdir}/libebtc.so.0.*.*
-%{_libdir}/libebtc.so.0
-%{_libdir}/libebtc.so
+%{_libdir}/libebtc.so.*.*.*
+%ghost %{_libdir}/libebtc.so.0
 %{_mandir}/man8/ebtables-legacy.8*
diff --git a/ebtables.init b/ebtables.init
index 03fabac..1339c81 100755
--- a/ebtables.init
+++ b/ebtables.init
@@ -34,10 +34,10 @@ start() {
 		show "Starting Ethernet bridge filtering (ebtables)"
 		if is_yes "$EBTABLES_BINARY_FORMAT"; then
 			for table in $(ls /etc/sysconfig/ebtables.* 2>/dev/null | sed -e 's/.*ebtables\.//' -e '/save/d' ); do
-				/usr/sbin/ebtables -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-commit || RETVAL=1
+				/usr/sbin/ebtables-legacy -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-commit || RETVAL=1
 			done
 		else
-			/usr/sbin/ebtables-restore < /etc/sysconfig/ebtables || RETVAL=1
+			/usr/sbin/ebtables-legacy-restore < /etc/sysconfig/ebtables || RETVAL=1
 		fi
 
 		if [ $RETVAL -eq 0 ]; then
@@ -52,7 +52,7 @@ start() {
 stop() {
 	show "Stopping Ethernet bridge filtering (ebtables)"
 	for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
-		/usr/sbin/ebtables -t $table --init-table || RETVAL=1
+		/usr/sbin/ebtables-legacy -t $table --init-table || RETVAL=1
 	done
 
 	if [ $RETVAL -eq 0 ]; then
@@ -75,7 +75,7 @@ save() {
 			chmod 0600 /etc/sysconfig/ebtables
 			mv -f /etc/sysconfig/ebtables /etc/sysconfig/ebtables.save
 		fi
-		/usr/sbin/ebtables-save > /etc/sysconfig/ebtables || RETVAL=1
+		/usr/sbin/ebtables-legacy-save > /etc/sysconfig/ebtables || RETVAL=1
 	fi
 	if is_yes "$EBTABLES_BINARY_FORMAT"; then
 		rm -f /etc/sysconfig/ebtables.*.save
@@ -84,9 +84,9 @@ save() {
 			mv -f $oldtable $oldtable.save
 		done
 		for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
-			/usr/sbin/ebtables -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-save || RETVAL=1
+			/usr/sbin/ebtables-legacy -t $table --atomic-file /etc/sysconfig/ebtables.$table --atomic-save || RETVAL=1
 			if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
-				/usr/sbin/ebtables -t $table --atomic-file /etc/sysconfig/ebtables.$table -Z || RETVAL=1
+				/usr/sbin/ebtables-legacy -t $table --atomic-file /etc/sysconfig/ebtables.$table -Z || RETVAL=1
 			fi
 		done
 	fi
@@ -119,7 +119,7 @@ case "$1" in
 	;;
   status)
 	for table in $(grep '^ebtable_' /proc/modules | sed -e 's/ebtable_\([^ ]*\).*/\1/'); do
-		/usr/sbin/ebtables -t $table --list
+		/usr/sbin/ebtables-legacy -t $table --list
 	done
 	;;
   *)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ebtables.git/commitdiff/0d3180f10df14942d88c628aa522958dc4b76e69