Hello community,
here is the log from the commit of package ebtables
checked in at Sat Oct 13 00:07:42 CEST 2007.
--------
--- ebtables/ebtables.changes 2007-08-09 16:27:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2007-10-12 16:14:02.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Oct 12 16:13:57 CEST 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)
+
+-------------------------------------------------------------------
Old:
----
ebtables-v2.0.6-gcc.diff
ebtables-v2.0.6-makefile.diff
ebtables-v2.0.6.tar.bz2
New:
----
ebtables-v2.0.8-2.tar.bz2
ebtables-v2.0.8-initscript.diff
ebtables-v2.0.8-makefile.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ebtables.spec ++++++
--- /var/tmp/diff_new_pack.H10257/_old 2007-10-13 00:07:08.000000000 +0200
+++ /var/tmp/diff_new_pack.H10257/_new 2007-10-13 00:07:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ebtables (Version v2.0.6)
+# spec file for package ebtables (Version v2.0.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,14 +13,14 @@
Name: ebtables
License: GPL v2 or later
Group: Productivity/Networking/Security
-Autoreqprov: on
-Version: v2.0.6
-Release: 68
+AutoReqProv: on
+Version: v2.0.8
+Release: 1
Summary: Ethernet Bridge Tables
-Source: %{name}-%{version}.tar.bz2
-Patch: %{name}-%{version}-makefile.diff
-Patch1: %{name}-%{version}-gcc.diff
-URL: http://ebtables.sourceforge.net/
+Source: %{name}-%{version}-2.tar.bz2
+Patch0: %{name}-%{version}-makefile.diff
+Patch1: %{name}-%{version}-initscript.diff
+Url: http://ebtables.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -39,24 +39,42 @@
Grzegorz Borowiak
%prep
-%setup
-%patch
+%setup -q -n %{name}-%{version}-2
+%patch0
%patch1
%build
rm -rf include/linux/
-make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
- BINPATH=%{_prefix}/sbin/ \
+make \
+ CFLAGS="$RPM_OPT_FLAGS" \
+ CXXFLAGS="$RPM_OPT_FLAGS" \
+ LIBDIR=%{_libdir} \
MANDIR=%{_mandir} \
- ETHERTYPESPATH=/etc
+ BINDIR=%{_sbindir} \
+ ETCDIR=%{_sysconfdir} \
+ INITDIR=%{_sysconfdir}/init.d \
+ SYSCONFIGDIR=%{_sysconfdir}
%install
-install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/sbin
-install -d -m 755 $RPM_BUILD_ROOT/etc
-make BINPATH=$RPM_BUILD_ROOT%{_prefix}/sbin/ \
- MANDIR=$RPM_BUILD_ROOT%{_mandir} \
- ETHERTYPESPATH=$RPM_BUILD_ROOT/etc \
+install -d -m 755 $RPM_BUILD_ROOT%{_sbindir}
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+make \
+ DESTDIR=$RPM_BUILD_ROOT \
+ LIBDIR=%{_libdir} \
+ MANDIR=%{_mandir} \
+ BINDIR=%{_sbindir} \
+ ETCDIR=%{_sysconfdir} \
+ INITDIR=%{_sysconfdir}/init.d \
+ SYSCONFIGDIR=%{_sysconfdir} \
install
+ln -sf %{_sysconfdir}/init.d/ebtables $RPM_BUILD_ROOT%{_sbindir}/rcebtables
+
+%preun
+%stop_on_removal ebtables
+
+%postun
+%restart_on_update ebtables
+%insserv_cleanup
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,10 +82,24 @@
%files
%defattr(-,root,root)
%doc %{_mandir}/man8/ebtables.8*
-%{_prefix}/sbin/ebtables
-%config(noreplace) /etc/ethertypes
-
+%config(noreplace) %{_sysconfdir}/ebtables-config
+%config(noreplace) %{_sysconfdir}/ethertypes
+%{_sysconfdir}/init.d/ebtables
+%{_libdir}/*
+%{_sbindir}/ebtables
+%{_sbindir}/ebtables-restore
+%{_sbindir}/ebtables-save
+%{_sbindir}/rcebtables
%changelog
+* 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
++++++ ebtables-v2.0.8-initscript.diff ++++++
--- ebtables.sysv
+++ ebtables.sysv
@@ -11,6 +11,14 @@
#
# config: __SYSCONFIG__/ebtables (text)
# __SYSCONFIG__/ebtables.<table> (binary)
+### BEGIN INIT INFO
+# Provides: eptables
+# Required-Start: $remote_fs
+# Required-Stop:
+# Short-Description: Ethernet Bridge filter tables
+# Description: Ethernet Bridge filter tables
+### END INIT INFO
+
source /etc/init.d/functions
source /etc/sysconfig/network
++++++ ebtables-v2.0.6-makefile.diff -> ebtables-v2.0.8-makefile.diff ++++++
--- ebtables/ebtables-v2.0.6-makefile.diff 2004-06-18 16:00:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/ebtables/ebtables-v2.0.8-makefile.diff 2007-09-25 13:42:35.000000000 +0200
@@ -1,21 +1,62 @@
--- Makefile
+++ Makefile
-@@ -46,15 +46,15 @@
+@@ -154,28 +154,28 @@
+ .PHONY: scripts
+ scripts: ebtables-save ebtables.sysv ebtables-config
+ cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
+- install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
++ install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
+ cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
+- install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
++ install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
+ cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
+- install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
++ install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
+ rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
$(MANDIR)/man8/ebtables.8: ebtables.8
- mkdir -p $(@D)
-- install -m 0644 -o root -g root $< $@
-+ install -m 0644 $< $@
+ mkdir -p $(DESTDIR)$(@D)
+ sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
+- install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
++ install -m 0644 ebtables.8_ $(DESTDIR)$@
+ rm -f ebtables.8_
$(ETHERTYPESFILE): ethertypes
- mkdir -p $(@D)
-- install -m 0644 -o root -g root $< $@
-+ install -m 0644 $< $@
+ mkdir -p $(DESTDIR)$(@D)
+- install -m 0644 -o root -g root $< $(DESTDIR)$@
++ install -m 0644 $< $(DESTDIR)$@
.PHONY: exec
- exec: ebtables
-- install -m 0755 -o root -g root $< $(BINFILE)
-+ install -m 0755 $< $(BINFILE)
+ exec: ebtables ebtables-restore
+ mkdir -p $(DESTDIR)$(BINDIR)
+- install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
+- install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
++ install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
++ install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
.PHONY: install
- install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec
+ install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
+@@ -199,18 +199,18 @@
+ rm -f extensions/ebt_inat.c
+ rm -rf $(CVSDIRS)
+ mkdir -p include/linux/netfilter_bridge
+- install -m 0644 -o root -g root \
++ install -m 0644 \
+ $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
+ # To keep possible compile error complaints about undefined ETH_P_8021Q
+ # off my back
+- install -m 0644 -o root -g root \
++ install -m 0644 \
+ $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
+- install -m 0644 -o root -g root \
++ install -m 0644 \
+ $(KERNEL_INCLUDES)/linux/types.h include/linux/
+- install -m 0644 -o root -g root \
++ install -m 0644 \
+ $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
+ include/linux/netfilter_bridge/
+- install -m 0644 -o root -g root \
++ install -m 0644 \
+ include/ebtables.h include/linux/netfilter_bridge/
+ make clean
+ touch *
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org