Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at Wed Jun 1 09:32:41 CEST 2011.
--------
--- ebtables/ebtables.changes 2010-03-18 08:10:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-05-31
14:57:59.000000000 +0200
@@ -1,0 +2,8 @@
+Tue May 31 12:34:34 UTC 2011 - lnus...@suse.de
+
+- cleanup up initscript
+ * don't use /var/lock/subsys
+ * read /etc/sysconfig/ebtables for setting and restore state from
+ /etc/ebtables where the script actually saved the state to.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ebtables.spec ++++++
--- /var/tmp/diff_new_pack.nmb0Hg/_old 2011-06-01 09:32:10.000000000 +0200
+++ /var/tmp/diff_new_pack.nmb0Hg/_new 2011-06-01 09:32:10.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ebtables (Version v2.0.9)
+# spec file for package ebtables
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -22,7 +22,7 @@
License: GPLv2+
Group: Productivity/Networking/Security
Version: v2.0.9
-Release: 3
+Release: 11
Summary: Ethernet Bridge Tables
Source: %{name}-%{version}-1.tar.bz2
Patch0: %{name}-v2.0.8-makefile.diff
@@ -85,9 +85,10 @@
SYSCONFIGDIR=%{_sysconfdir} \
install
ln -sf %{_sysconfdir}/init.d/ebtables $RPM_BUILD_ROOT%{_sbindir}/rcebtables
+# not used
+rm -f $RPM_BUILD_ROOT/etc/ebtables-config
%post
-/sbin/ldconfig
%fillup_and_insserv ebtables
%preun
@@ -96,7 +97,6 @@
%postun
%restart_on_update ebtables
%insserv_cleanup
-/sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
@@ -104,7 +104,6 @@
%files
%defattr(-,root,root)
%doc %{_mandir}/man8/ebtables.8*
-%config(noreplace) %{_sysconfdir}/ebtables-config
%config(noreplace) %{_sysconfdir}/ethertypes
%{_sysconfdir}/init.d/ebtables
%dir %{_libdir}/%{name}
++++++ ebtables-v2.0.8-initscript.diff ++++++
--- /var/tmp/diff_new_pack.nmb0Hg/_old 2011-06-01 09:32:10.000000000 +0200
+++ /var/tmp/diff_new_pack.nmb0Hg/_new 2011-06-01 09:32:10.000000000 +0200
@@ -13,7 +13,7 @@
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+### BEGIN INIT INFO
-+# Provides: eptables
++# Provides: ebtables
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs $network
+# Short-Description: Ethernet Bridge filter tables
@@ -24,56 +24,82 @@
[ -x __EXEC_PATH__/ebtables ] || exit 1
[ -x __EXEC_PATH__/ebtables-save ] || exit 1
-@@ -35,8 +38,8 @@ EBTABLES_SAVE_ON_STOP="no"
+@@ -30,12 +33,15 @@ umask 0077
+ #default configuration
+ EBTABLES_TEXT_FORMAT="yes"
+ EBTABLES_BINARY_FORMAT="yes"
+-EBTABLES_MODULES_UNLOAD="yes"
++EBTABLES_MODULES_UNLOAD="no"
+ 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
++
++config=/etc/sysconfig/ebtables
+ [ -f "$config" ] && . "$config"
start() {
- echo -n $"Starting $desc ($prog): "
-@@ -49,10 +52,10 @@ start() {
+@@ -45,16 +51,15 @@ start() {
+ __EXEC_PATH__/ebtables -t $table --atomic-file
__SYSCONFIG__/ebtables.$table --atomic-commit || RETVAL=1
+ done
+ else
+- __EXEC_PATH__/ebtables-restore < /etc/sysconfig/ebtables ||
RETVAL=1
++ __EXEC_PATH__/ebtables-restore < __SYSCONFIG__/ebtables ||
RETVAL=1
fi
if [ $RETVAL -eq 0 ]; then
- success "$prog startup"
-+ rc_status -v
- rm -f /var/lock/subsys/$prog
+- rm -f /var/lock/subsys/$prog
++ touch /var/run/rcebtables
++ rc_failed 0
else
- failure "$prog startup"
+ rc_failed 3
fi
- echo
+- echo
}
-@@ -70,10 +73,10 @@ stop() {
+
+ stop() {
+@@ -70,17 +75,18 @@ stop() {
fi
if [ $RETVAL -eq 0 ]; then
- success "$prog shutdown"
-+ rc_status -v
- rm -f /var/lock/subsys/$prog
+- rm -f /var/lock/subsys/$prog
++ rm -f /var/run/rcebtables
++ rc_failed 0
else
- failure "$prog shutdown"
+ rc_failed 3
fi
- echo
+- echo
+ }
+
+ restart() {
+ stop
++ rc_status -v
+ start
++ rc_status -v
}
-@@ -107,9 +110,9 @@ save() {
+
+ save() {
+@@ -106,40 +112,42 @@ save() {
+ done
fi
- if [ $RETVAL -eq 0 ]; then
+- if [ $RETVAL -eq 0 ]; then
- success "$prog saved"
-+ rc_status -v
- else
+- else
- failure "$prog saved"
++ if [ $RETVAL -ne 0 ]; then
+ rc_failed 3
fi
- echo
+- echo
}
-@@ -117,29 +120,34 @@ save() {
+
case "$1" in
start)
start
@@ -87,16 +113,18 @@
restart|reload)
[ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
restart
-+ rc_status -v
;;
- condrestart)
- [ -e /var/lock/subsys/$prog ] && restart
+- condrestart)
+- [ -e /var/lock/subsys/$prog ] && restart
- RETVAL=$?
-+ rc_status
++ try-restart|condrestart)
++ if [ -e /var/run/rcebtables ]; then
++ restart
++ fi
;;
save)
save
-+ rc_status
++ rc_status -v
;;
status)
__EXEC_PATH__/ebtables-save
@@ -104,8 +132,9 @@
+ rc_status -v
;;
*)
- echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
+- echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
- RETVAL=1
++ echo $"Usage $0 {start|stop|restart|try-restart|save|status}"
+ exit 1
+ ;;
esac
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
