update to v2.0.9-2

OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=6

ebtables-v2.0.8-makefile.diff

@@ -2,24 +2,6 @@ Index: Makefile
 ===================================================================
 --- Makefile.orig
 +++ Makefile
-@@ -18,7 +18,7 @@ DESTDIR:=
- CFLAGS:=-Wall -Wunused
- CFLAGS_SH_LIB:=-fPIC
- CC:=gcc
--LD:=ld
-+LD:=gcc
- 
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
-@@ -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

ebtables-v2.0.9-1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcedab0d88ea6ea5915eb1938f4b24aba964afd7f1e8aebb5766fa076a89777b
-size 82835

ebtables-v2.0.9-2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10afe46cf12bb97dde83bd6dbf4c183b184d7183283f5897ed9178dd246c9b36
+size 83116

ebtables.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Jun  6 11:18:31 UTC 2011 - puzel@novell.com
+
+- update to 2.0.9-2 
+  * fix unwanted zeroing of counters in the last user-defined chain
+  * fix hidden symbol compilation error when using ld directly
+  * fix return value checking of creat to give a correct error
+    message if the atomic file couldn't be created
+  * correct info in INSTALL about compilation of ulog
+- use spec-cleaner
+- update ebtables-v2.0.8-makefile.diff
+- license is GPLv2, not GPLv2+
+- package COPYING and ChangeLog files
+
 -------------------------------------------------------------------
 Tue May 31 12:34:34 UTC 2011 - lnussel@suse.de
 

ebtables.spec

@@ -15,19 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           ebtables
-License:        GPLv2+
+Version:        v2.0.9.2
-Group:          Productivity/Networking/Security
-Version:        v2.0.9
 Release:        11
+License:        GPLv2
 Summary:        Ethernet Bridge Tables
-Source:         %{name}-%{version}-1.tar.bz2
+Url:            http://ebtables.sourceforge.net/
+Group:          Productivity/Networking/Security
+Source:         %{name}-v2.0.9-2.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
 
 %description
@@ -37,16 +36,8 @@ and some basic filtering on higher network layers. The ebtables tool
 can be used together with the other Linux filtering tools, like
 iptables. There are no incompatibility issues.
 
-
-
-Authors:
---------
-    Bart De Schuymer <bdschuym@pandora.be>
-    Nick Fedchik <nick@fedchik.org.ua>
-    Grzegorz Borowiak <grzes@gnu.univ.gda.pl>
-
 %prep
-%setup -q -n %{name}-%{version}-1
+%setup -q -n %{name}-v2.0.9-2
 %patch0
 %patch1
 
@@ -61,8 +52,8 @@ 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" \
+    CFLAGS="%{optflags}" \
-    CXXFLAGS="$RPM_OPT_FLAGS" \
+    CXXFLAGS="%{optflags}" \
     LIBDIR=%{_libdir}/%{name} \
     MANDIR=%{_mandir} \
     BINDIR=%{_sbindir} \
@@ -73,10 +64,10 @@ make \
 %install
 # The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
 export SUSE_ASNEEDED=0
-install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
+install -d -m 755 %{buildroot}%{_sbindir}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
 make \
-    DESTDIR=$RPM_BUILD_ROOT \
+    DESTDIR=%{buildroot} \
     LIBDIR=%{_libdir}/%{name} \
     MANDIR=%{_mandir} \
     BINDIR=%{_sbindir} \
@@ -84,9 +75,9 @@ make \
     INITDIR=%{_sysconfdir}/init.d \
     SYSCONFIGDIR=%{_sysconfdir} \
     install
-ln -sf %{_sysconfdir}/init.d/ebtables $RPM_BUILD_ROOT%{_sbindir}/rcebtables
+ln -sf %{_sysconfdir}/init.d/ebtables %{buildroot}%{_sbindir}/rcebtables
 # not used
-rm -f $RPM_BUILD_ROOT/etc/ebtables-config
+rm -f %{buildroot}%{_sysconfdir}/ebtables-config
 
 %post
 %fillup_and_insserv ebtables
@@ -99,10 +90,11 @@ rm -f $RPM_BUILD_ROOT/etc/ebtables-config
 %insserv_cleanup
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
+%doc COPYING ChangeLog
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_sysconfdir}/init.d/ebtables