Accepting request 29024 from network:utilities

Copy from network:utilities/ebtables based on submit request 29024 from user coolo OBS-URL: https://build.opensuse.org/request/show/29024 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ebtables?expand=0&rev=8
2010-01-12 14:48:48 +00:00 · 2010-01-12 14:48:48 +00:00 · 27e8fac5ca
commit 27e8fac5ca
parent 6d761cb455
6 changed files with 154 additions and 62 deletions
--- a/ebtables-v2.0.8-2.tar.bz2
+++ b/ebtables-v2.0.8-2.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a1789a8c96009d1e8931bfcec884525fa20721dd55cc52ed658a3d597f39116
-size 80196
--- a/ebtables-v2.0.8-initscript.diff
+++ b/ebtables-v2.0.8-initscript.diff
@ -1,30 +1,114 @@
--- Makefile
-+++ Makefile
-@@ -85,7 +85,7 @@
- 
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
-	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
-+	$(LD) -shared -Wl,-soname -Wl,libebtc.so -o libebtc.so -lc $(OBJECTS2)
- 
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
- 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
--- ebtables.sysv
+Index: ebtables.sysv
+===================================================================
+--- ebtables.sysv.orig
 +++ ebtables.sysv
-@@ -11,6 +11,16 @@
+@@ -11,12 +11,15 @@
 #
 # config: __SYSCONFIG__/ebtables         (text)
 #         __SYSCONFIG__/ebtables.<table> (binary)
-+### BEGIN INIT INFO 
+-
+-source /etc/init.d/functions
+-source /etc/sysconfig/network
+-
+-# Check that networking is up.
+-[ ${NETWORKING} = "no" ] && exit 0
+### BEGIN INIT INFO
 +# Provides:          eptables
 +# Required-Start:    $remote_fs $network
 +# Required-Stop:     $remote_fs $network
 +# Short-Description: Ethernet Bridge filter tables
 +# Description:       Ethernet Bridge filter tables
 +# Default-Start:     2 3 5
-+# Default-Stop:      0 1 6 
+# Default-Stop:      0 1 6
 +### END INIT INFO
-+
 
- source /etc/init.d/functions
- source /etc/sysconfig/network
+ [ -x __EXEC_PATH__/ebtables ] || exit 1
+ [ -x __EXEC_PATH__/ebtables-save ] || exit 1
+@@ -35,8 +38,8 @@ EBTABLES_SAVE_ON_STOP="no"
+ EBTABLES_SAVE_ON_RESTART="no"
+ EBTABLES_SAVE_COUNTER="no"
+ 
+-config=__SYSCONFIG__/$prog-config
+-[ -f "$config" ] && . "$config"
+. /etc/rc.status
+rc_reset
+ 
+ start() {
+ 	echo -n $"Starting $desc ($prog): "
+@@ -49,10 +52,10 @@ start() {
+ 	fi
+ 
+ 	if [ $RETVAL -eq 0 ]; then
+-		success "$prog startup"
+		rc_running
+ 		rm -f /var/lock/subsys/$prog
+ 	else
+-		failure "$prog startup"
+		rc_failed 3
+ 	fi
+ 	echo
+ }
+@@ -70,10 +73,10 @@ stop() {
+ 	fi
+ 
+ 	if [ $RETVAL -eq 0 ]; then
+-		success "$prog shutdown"
+		rc_done
+ 		rm -f /var/lock/subsys/$prog
+ 	else
+-		failure "$prog shutdown"
+		rc_failed 3
+ 	fi
+ 	echo
+ }
+@@ -107,9 +110,9 @@ save() {
+ 	fi
+ 
+ 	if [ $RETVAL -eq 0 ]; then
+-		success "$prog saved"
+		rc_done
+ 	else
+-		failure "$prog saved"
+		rc_failed 3
+ 	fi
+ 	echo
+ }
+@@ -117,29 +120,34 @@ save() {
+ case "$1" in
+   start)
+ 	start
+	rc_status -v
+ 	;;
+   stop)
+ 	[ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
+ 	stop
+	rc_status -v
+ 	;;
+   restart|reload)
+ 	[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
+ 	restart
+	rc_status -v
+ 	;;
+   condrestart)
+ 	[ -e /var/lock/subsys/$prog ] && restart
+-	RETVAL=$?
+	rc_status
+ 	;;
+   save)
+ 	save
+	rc_status
+ 	;;
+   status)
+ 	__EXEC_PATH__/ebtables-save
+-	RETVAL=$?
+	rc_status -v
+ 	;;
+   *)
+ 	echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
+-	RETVAL=1
+	exit 1
+	;;
+ esac
+ 
+-exit $RETVAL
+rc_exit
--- a/ebtables-v2.0.8-makefile.diff
+++ b/ebtables-v2.0.8-makefile.diff
@ -1,6 +1,8 @@
--- Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig
 +++ Makefile
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ DESTDIR:=
 CFLAGS:=-Wall -Wunused
 CFLAGS_SH_LIB:=-fPIC
 CC:=gcc
@ -9,7 +11,16 @@
 
 ifeq ($(shell uname -m),sparc64)
 CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -154,28 +154,28 @@
+@@ -85,7 +85,7 @@ ebtables-standalone.o: ebtables-standalo
+ 
+ .PHONY: libebtc
+ libebtc: $(OBJECTS2)
+-	$(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
+	$(LD) -shared -Wl,-soname -Wl,libebtc.so -o libebtc.so -lc $(OBJECTS2)
+ 
+ ebtables: $(OBJECTS) ebtables-standalone.o libebtc
+ 	$(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
+@@ -154,28 +154,28 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
 .PHONY: scripts
 scripts: ebtables-save ebtables.sysv ebtables-config
 	cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
@ -45,7 +56,7 @@
 
 .PHONY: install
 install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
-@@ -199,18 +199,18 @@
+@@ -199,18 +199,18 @@ release:
 	rm -f extensions/ebt_inat.c
 	rm -rf $(CVSDIRS)
 	mkdir -p include/linux/netfilter_bridge
--- a/ebtables-v2.0.9-1.tar.bz2
+++ b/ebtables-v2.0.9-1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcedab0d88ea6ea5915eb1938f4b24aba964afd7f1e8aebb5766fa076a89777b
+size 82835
--- a/ebtables.changes
+++ b/ebtables.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jan  6 13:52:39 CET 2010 - prusnak@suse.cz
+
+- update to 2.0.9-1
+  * added ip6 module for filtering IPv6 traffic
+  * added --log-ip6 option for logging IPv6 traffic
+  * added nflog watcher for logging packets to userspace
+  * bugfix in ebtables.sysv
+  * bugfix for among match on x86-64
+- fix scriptlets in spec
+- fix init script
+
 -------------------------------------------------------------------
 Sat Aug 30 21:21:06 CEST 2008 - cthiel@suse.de

@ -6,7 +18,7 @@ Sat Aug 30 21:21:06 CEST 2008 - cthiel@suse.de
 -------------------------------------------------------------------
 Wed Oct 24 18:55:52 CEST 2007 - ro@suse.de

- fix build (use gcc not ld directly) 
+- fix build (use gcc not ld directly)

 -------------------------------------------------------------------
 Wed Oct 17 16:17:18 CEST 2007 - prusnak@suse.cz
--- a/ebtables.spec
+++ b/ebtables.spec
@ -1,7 +1,7 @@
 #
-# spec file for package ebtables (Version v2.0.8)
+# spec file for package ebtables (Version v2.0.9)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -19,15 +19,14 @@


 Name:           ebtables
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Networking/Security
-AutoReqProv:    on
-Version:        v2.0.8
-Release:        56
+Version:        v2.0.9
+Release:        1
 Summary:        Ethernet Bridge Tables
-Source:         %{name}-%{version}-2.tar.bz2
-Patch0:         %{name}-%{version}-makefile.diff
-Patch1:         %{name}-%{version}-initscript.diff
+Source:         %{name}-%{version}-1.tar.bz2
+Patch0:         %{name}-v2.0.8-makefile.diff
+Patch1:         %{name}-v2.0.8-initscript.diff
 Url:            http://ebtables.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

@ -47,12 +46,18 @@ Authors:
    Grzegorz Borowiak <grzes@gnu.univ.gda.pl>

 %prep
-%setup -q -n %{name}-%{version}-2
+%setup -q -n %{name}-%{version}-1
 %patch0
 %patch1

 %build
-rm -rf include/linux/
+# delete all kernel headers, but keep ebt_ip6.h and ebt_nflog.h
+mv include/linux/netfilter_bridge/ebt_ip6.{h,h.save}
+mv include/linux/netfilter_bridge/ebt_nflog.{h,h.save}
+rm -f include/linux/*.h
+rm -f include/linux/netfilter_bridge/*.h
+mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h}
+mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
 make \
    CFLAGS="$RPM_OPT_FLAGS" \
    CXXFLAGS="$RPM_OPT_FLAGS" \
@ -77,12 +82,17 @@ make \
    install
 ln -sf %{_sysconfdir}/init.d/ebtables $RPM_BUILD_ROOT%{_sbindir}/rcebtables

+%post
+/sbin/ldconfig
+%fillup_and_insserv ebtables
+
 %preun
 %stop_on_removal ebtables

 %postun
 %restart_on_update ebtables
 %insserv_cleanup
+/sbin/ldconfig

 %clean
 rm -rf $RPM_BUILD_ROOT
@ -100,28 +110,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/rcebtables

 %changelog
-* Sat Aug 30 2008 cthiel@suse.de
- fix init script
-* Wed Oct 24 2007 ro@suse.de
- fix build (use gcc not ld directly)
-* Wed Oct 17 2007 prusnak@suse.cz
- fixed specfile not to include debug files in normal package
-* Fri Oct 12 2007 prusnak@suse.cz
- update to 2.0.8-2
-  * add sysconfig support (ebtables-save, ebtables-restore, etc)
-  * add ulog watcher
-  * use shared libraries (making the code easily usable by third parties)
-  * improve speed
-  * bugfixes, dccp and sctp support
- dropped obsolete patches:
-  * gcc.diff (included in update)
-* Thu Aug 09 2007 olh@suse.de
- remove private include/linux/ files
-* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Wed Jun 29 2005 meissner@suse.de
- use RPM_OPT_FLAGS.
-* Thu Apr 21 2005 postadal@suse.cz
- fixed for gcc 4.0
-* Fri Jun 18 2004 postadal@suse.cz
- new package v2.0.6