Hello community, here is the log from the commit of package ebtables for openSUSE:Factory checked in at Tue Jun 14 12:09:20 CEST 2011.
-------- --- ebtables/ebtables.changes 2011-05-31 14:57:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-06-06 13:54:03.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Jun 6 11:18:31 UTC 2011 - pu...@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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ebtables-v2.0.9-1.tar.bz2 New: ---- ebtables-v2.0.9-2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebtables.spec ++++++ --- /var/tmp/diff_new_pack.DPpTON/_old 2011-06-14 12:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.DPpTON/_new 2011-06-14 12:08:05.000000000 +0200 @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: ebtables -License: GPLv2+ -Group: Productivity/Networking/Security -Version: v2.0.9 -Release: 11 +Version: v2.0.9.2 +Release: 1 +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 @@ can be used together with the other Linux filtering tools, like iptables. There are no incompatibility issues. - - -Authors: --------- - Bart De Schuymer <bdsch...@pandora.be> - Nick Fedchik <n...@fedchik.org.ua> - Grzegorz Borowiak <gr...@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 @@ 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" \ + CFLAGS="%{optflags}" \ + CXXFLAGS="%{optflags}" \ LIBDIR=%{_libdir}/%{name} \ MANDIR=%{_mandir} \ BINDIR=%{_sbindir} \ @@ -73,10 +64,10 @@ %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 $RPM_BUILD_ROOT%{_sysconfdir}/init.d +install -d -m 755 %{buildroot}%{_sbindir} +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 @@ 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 @@ %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 ++++++ ebtables-v2.0.8-makefile.diff ++++++ --- /var/tmp/diff_new_pack.DPpTON/_old 2011-06-14 12:08:05.000000000 +0200 +++ /var/tmp/diff_new_pack.DPpTON/_new 2011-06-14 12:08:05.000000000 +0200 @@ -2,24 +2,6 @@ =================================================================== --- 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 -> ebtables-v2.0.9-2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/ChangeLog new/ebtables-v2.0.9-2/ChangeLog --- old/ebtables-v2.0.9-1/ChangeLog 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/ChangeLog 2010-02-03 22:17:45.000000000 +0100 @@ -1,3 +1,11 @@ +20100203 + Changelog for v2.0.9-2 + * fix unwanted zeroing of counters in the last user-defined chain + (reported by Jon Lewis) + * 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 20090621 Changelog for v2.0.9 vs v2.0.8-2 * added ip6 module for filtering IPv6 traffic (Kuo-Lang Tseng, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/INSTALL new/ebtables-v2.0.9-2/INSTALL --- old/ebtables-v2.0.9-1/INSTALL 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/INSTALL 2010-02-03 22:17:45.000000000 +0100 @@ -45,7 +45,7 @@ packets seen by the ebtables ulog watcher. Compile with: -%make test_ulog.c KERNEL_INCLUDES=/usr/src/linux/include +%make test_ulog KERNEL_INCLUDES=/usr/src/linux/include Usage: %examples/ulog/test_ulog NETLINK_GROUP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/Makefile new/ebtables-v2.0.9-2/Makefile --- old/ebtables-v2.0.9-1/Makefile 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/Makefile 2010-02-03 22:17:45.000000000 +0100 @@ -1,7 +1,7 @@ # ebtables Makefile PROGNAME:=ebtables -PROGRELEASE:=1 +PROGRELEASE:=2 PROGVERSION_:=2.0.9 PROGVERSION:=$(PROGVERSION_)-$(PROGRELEASE) PROGDATE:=June\ 2009 @@ -85,7 +85,7 @@ .PHONY: libebtc libebtc: $(OBJECTS2) - $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2) + $(CC) -shared -Wl,-soname,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) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/communication.c new/ebtables-v2.0.9-2/communication.c --- old/ebtables-v2.0.9-1/communication.c 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/communication.c 2010-02-03 22:17:45.000000000 +0100 @@ -189,8 +189,8 @@ int size; int fd; - /* Start from an empty file with right priviliges */ - if (!(fd = creat(filename, 0600))) { + /* Start from an empty file with the correct priviliges */ + if ((fd = creat(filename, 0600)) == -1) { ebt_print_error("Couldn't create file %s", filename); return; } @@ -303,8 +303,9 @@ new = newcounters; while (cc != u_repl->cc) { if (!next || next == entries->entries) { - while (chainnr < u_repl->num_chains && (!(entries = u_repl->chains[chainnr++]) || - (next = entries->entries->next) == entries->entries)); + while (chainnr < u_repl->num_chains && (!(entries = u_repl->chains[chainnr]) || + (next = entries->entries->next) == entries->entries)) + chainnr++; if (chainnr == u_repl->num_chains) break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/ebtables.8 new/ebtables-v2.0.9-2/ebtables.8 --- old/ebtables-v2.0.9-1/ebtables.8 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/ebtables.8 2010-02-03 22:17:46.000000000 +0100 @@ -24,7 +24,7 @@ .\" .\" .SH NAME -ebtables (v2.0.9-1) \- Ethernet bridge frame table administration +ebtables (v2.0.9-2) \- Ethernet bridge frame table administration .SH SYNOPSIS .BR "ebtables " [ -t " table ] " - [ ACDI "] chain rule specification [match extensions] [watcher extensions] target" .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/ebtables.spec new/ebtables-v2.0.9-2/ebtables.spec --- old/ebtables-v2.0.9-1/ebtables.spec 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/ebtables.spec 2010-02-03 22:17:46.000000000 +0100 @@ -6,7 +6,7 @@ Summary: Ethernet Bridge frame table administration tool Name: ebtables Version: 2.0.9 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base URL: http://ebtables.sourceforge.net/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/include/linux/if_ether.h new/ebtables-v2.0.9-2/include/linux/if_ether.h --- old/ebtables-v2.0.9-1/include/linux/if_ether.h 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/include/linux/if_ether.h 2010-02-03 22:17:45.000000000 +0100 @@ -78,7 +78,9 @@ #define ETH_P_PAE 0x888E /* Port Access Entity (IEEE 802.1X) */ #define ETH_P_AOE 0x88A2 /* ATA over Ethernet */ #define ETH_P_TIPC 0x88CA /* TIPC */ +#define ETH_P_1588 0x88F7 /* IEEE 1588 Timesync */ #define ETH_P_FCOE 0x8906 /* Fibre Channel over Ethernet */ +#define ETH_P_FIP 0x8914 /* FCoE Initialization Protocol */ #define ETH_P_EDSA 0xDADA /* Ethertype DSA [ NOT AN OFFICIALLY REGISTERED ID ] */ /* @@ -106,6 +108,7 @@ #define ETH_P_DSA 0x001B /* Distributed Switch Arch. */ #define ETH_P_TRAILER 0x001C /* Trailer switch tagging */ #define ETH_P_PHONET 0x00F5 /* Nokia Phonet frames */ +#define ETH_P_IEEE802154 0x00F6 /* IEEE802.15.4 frame */ /* * This is an Ethernet frame header. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/include/linux/netfilter_bridge.h new/ebtables-v2.0.9-2/include/linux/netfilter_bridge.h --- old/ebtables-v2.0.9-1/include/linux/netfilter_bridge.h 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/include/linux/netfilter_bridge.h 2010-02-03 22:17:45.000000000 +0100 @@ -1,9 +1,14 @@ #ifndef __LINUX_BRIDGE_NETFILTER_H #define __LINUX_BRIDGE_NETFILTER_H -/* bridge-specific defines for netfilter. +/* bridge-specific defines for netfilter. */ +#include <linux/netfilter.h> +#include <linux/if_ether.h> +#include <linux/if_vlan.h> +#include <linux/if_pppox.h> + /* Bridge Hooks */ /* After promisc drops, checksum checks. */ #define NF_BR_PRE_ROUTING 0 @@ -20,10 +25,6 @@ #define NF_BR_NUMHOOKS 6 #ifdef __KERNEL__ -#include <linux/netfilter.h> -#include <linux/if_ether.h> -#include <linux/if_vlan.h> -#include <linux/if_pppox.h> enum nf_br_hook_priorities { NF_BR_PRI_FIRST = INT_MIN, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebtables-v2.0.9-1/include/linux/types.h new/ebtables-v2.0.9-2/include/linux/types.h --- old/ebtables-v2.0.9-1/include/linux/types.h 2009-06-21 15:13:25.000000000 +0200 +++ new/ebtables-v2.0.9-2/include/linux/types.h 2010-02-03 22:17:45.000000000 +0100 @@ -131,7 +131,7 @@ * * blkcnt_t is the type of the inode's block count. */ -#ifdef CONFIG_LBD +#ifdef CONFIG_LBDAF typedef u64 sector_t; typedef u64 blkcnt_t; #else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
