commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2020-09-04 10:55:25
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new.3399 (New)
Package is "ebtables"
Fri Sep 4 10:55:25 2020 rev:47 rq:831487 version:2.0.11
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2020-05-09
19:48:53.292391431 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new.3399/ebtables.changes
2020-09-04 10:56:04.474525723 +0200
@@ -1,0 +2,13 @@
+Wed Sep 2 14:23:48 UTC 2020 - Dominique Leuenberger
+
+- Have the source .service file hold a placeholder for LIBEXECDIR,
+ which we replace during build/install phase, allowing the package
+ to be used no matter what value %{_libexecdir} has.
+
+---
+Tue Sep 1 12:11:49 UTC 2020 - Kristyna Streitova
+
+- replace /usr/lib with /usr/libexec in .service files to follow
+ %_libexecdir macro changes
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.XDYSiK/_old 2020-09-04 10:56:09.810528582 +0200
+++ /var/tmp/diff_new_pack.XDYSiK/_new 2020-09-04 10:56:09.810528582 +0200
@@ -87,6 +87,7 @@
mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_unitdir}
install -p %_sourcedir/ebtables.service %{buildroot}%{_unitdir}/
+sed -i "s|@LIBEXECDIR@|%{_libexecdir}|g" %{buildroot}%{_unitdir}/*.service
chmod -x %{buildroot}%{_unitdir}/*.service
mkdir -p %{buildroot}%{_libexecdir}
install -m0755 %_sourcedir/ebtables.systemd
%{buildroot}%{_libexecdir}/%{name}-helper
@@ -129,7 +130,8 @@
%files
%defattr(-,root,root)
-%doc COPYING ChangeLog
+%license COPYING
+%doc ChangeLog
%{_mandir}/man8/ebtables*.8*
%{_libexecdir}/%{name}-helper
%{_unitdir}/%{name}.service
++ ebtables.service ++
--- /var/tmp/diff_new_pack.XDYSiK/_old 2020-09-04 10:56:09.874528616 +0200
+++ /var/tmp/diff_new_pack.XDYSiK/_new 2020-09-04 10:56:09.874528616 +0200
@@ -4,8 +4,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/lib/ebtables-helper start
-ExecStop=/usr/lib/ebtables-helper stop
+ExecStart=@LIBEXECDIR@/ebtables-helper start
+ExecStop=@LIBEXECDIR@/ebtables-helper stop
[Install]
WantedBy=multi-user.target
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2020-05-09 19:48:48
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new.2738 (New)
Package is "ebtables"
Sat May 9 19:48:48 2020 rev:46 rq:802233 version:2.0.11
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2020-01-18
12:16:58.643101784 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new.2738/ebtables.changes
2020-05-09 19:48:53.292391431 +0200
@@ -1,0 +2,11 @@
+Tue May 5 10:15:21 UTC 2020 - Thorsten Kukuk
+
+- Revert last /bin/bash -> /bin/sh change
+
+---
+Wed Apr 29 14:05:24 UTC 2020 - Thorsten Kukuk
+
+- Use /bin/sh for ebtables.systemd
+- Don't hard require systemd, we don't need that in a container
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.EmnJ3d/_old 2020-05-09 19:48:54.700394453 +0200
+++ /var/tmp/diff_new_pack.EmnJ3d/_new 2020-05-09 19:48:54.704394462 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,7 +43,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): update-alternatives
Requires(postun): update-alternatives
-%{?systemd_requires}
+%{?systemd_ordering}
%description
A firewalling tool to transparently filter network traffic passing a
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2020-01-18 12:15:12
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new.26092 (New)
Package is "ebtables"
Sat Jan 18 12:15:12 2020 rev:45 rq:764571 version:2.0.11
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2019-12-18
14:46:24.757886315 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new.26092/ebtables.changes
2020-01-18 12:16:58.643101784 +0100
@@ -1,0 +2,7 @@
+Fri Jan 10 14:26:56 UTC 2020 - Kristyna Streitova
+
+- rename /usr/lib/ebtables helper file to /usr/lib/ebtables-helper
+ otherwise it conflicts with /usr/lib/ebtables library directory
+ on 32-bit systems [bsc#1159769]
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.CfHOi2/_old 2020-01-18 12:16:59.407102194 +0100
+++ /var/tmp/diff_new_pack.CfHOi2/_new 2020-01-18 12:16:59.407102194 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -89,7 +89,7 @@
install -p %_sourcedir/ebtables.service %{buildroot}%{_unitdir}/
chmod -x %{buildroot}%{_unitdir}/*.service
mkdir -p %{buildroot}%{_libexecdir}
-install -m0755 %_sourcedir/ebtables.systemd %{buildroot}%{_libexecdir}/ebtables
+install -m0755 %_sourcedir/ebtables.systemd
%{buildroot}%{_libexecdir}/%{name}-helper
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.filter
touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.nat
@@ -131,7 +131,7 @@
%defattr(-,root,root)
%doc COPYING ChangeLog
%{_mandir}/man8/ebtables*.8*
-%{_libexecdir}/%{name}
+%{_libexecdir}/%{name}-helper
%{_unitdir}/%{name}.service
%ghost %{_sysconfdir}/alternatives/ebtables
%ghost %{_sysconfdir}/alternatives/ebtables-restore
++ ebtables.service ++
--- /var/tmp/diff_new_pack.CfHOi2/_old 2020-01-18 12:16:59.447102215 +0100
+++ /var/tmp/diff_new_pack.CfHOi2/_new 2020-01-18 12:16:59.447102215 +0100
@@ -4,8 +4,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/lib/ebtables start
-ExecStop=/usr/lib/ebtables stop
+ExecStart=/usr/lib/ebtables-helper start
+ExecStop=/usr/lib/ebtables-helper stop
[Install]
WantedBy=multi-user.target
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2019-12-18 14:43:15
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new.4691 (New)
Package is "ebtables"
Wed Dec 18 14:43:15 2019 rev:44 rq:756069 version:2.0.11
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2019-07-17
14:22:39.380199943 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new.4691/ebtables.changes
2019-12-18 14:46:24.757886315 +0100
@@ -1,0 +2,26 @@
+Tue Dec 10 14:12:00 UTC 2019 - Kristyna Streitova
+
+- add ebtables.keyring as a Source
+
+---
+Mon Dec 2 19:26:41 UTC 2019 - Jan Engelhardt
+
+- Update to release 2.0.11
+ * Add --noflush command line support for ebtables-restore
+ * Do not print IPv6 mask if it is all ones
+ * Allow RETURN target rules in user defined chains
+ * ebt_ip: add support for matching ICMP type and code
+ * ebt_ip: add support for matching IGMP type
+ * extensions: Add string filter to ebtables
+ * Print IPv6 prefixes in CIDR notation
+ * extensions: Add AUDIT target
+ * Fix incorrect IPv6 prefix formatting
+- Drop ebtables-v2.0.8-makefile.diff (no longer needed)
+- Drop ebtables-v2.0.8-initscript.diff, include-linux-if.patch
+ (not applicable)
+- Drop ebtables-v2.0.10-4-audit.patch,
+ 0001-fix-compilation-warning.patch,
+ 0001-Use-flock-for-concurrent-option.patch,
+ 0002-Fix-locking-if-LOCKDIR-does-not-exist.patch (merged)
+
+---
Old:
0001-Use-flock-for-concurrent-option.patch
0001-fix-compilation-warning.patch
0002-Fix-locking-if-LOCKDIR-does-not-exist.patch
ebtables-v2.0.10-4-audit.patch
ebtables-v2.0.10-4.tar.xz
ebtables-v2.0.8-initscript.diff
ebtables-v2.0.8-makefile.diff
include-linux-if.patch
New:
ebtables-2.0.11.tar.gz
ebtables-2.0.11.tar.gz.sig
ebtables.keyring
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.kIclk2/_old 2019-12-18 14:46:25.625886712 +0100
+++ /var/tmp/diff_new_pack.kIclk2/_new 2019-12-18 14:46:25.629886714 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,27 +22,18 @@
%endif
Name: ebtables
-Version:2.0.10.4
+Version:2.0.11
Release:0
Summary:Ethernet Bridge Tables
License:GPL-2.0-or-later
Group: Productivity/Networking/Security
-Url:http://ebtables.sf.net/
+URL:http://ebtables.sf.net/
#Git-Clone:git://git.netfilter.org/ebtables
-Source: ebtables-v2.0.10-4.tar.xz
-Source1:ebtables.service
-Source2:ebtables.systemd
-Patch0: ebtables-v2.0.8-makefile.diff
-Patch1: ebtables-v2.0.8-initscript.diff
-# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
-Patch2: ebtables-v2.0.10-4-audit.patch
-# PATCH-FIX-UPSTREAM
-Patch3: 0001-fix-compilation-warning.patch
-# PATCH-FIX-SUSE-ONLY
-Patch4: include-linux-if.patch
-# PATCH-FIX-UPSTREAM boo#1126094
-Patch5: 0001-Use-flock-for-concurrent-option.patch
-Patch6: 0002-Fix-locking-if-LOCKDIR-does-not-exist.patch
+Source0:http://ftp.netfilter.org/pub/ebtables/ebtables-%version.tar.gz
+Source1:
http://ftp.netfilter.org/pub/ebtables/ebtables-%version.tar.gz.sig
+Source2:ebtables.keyring
+Source3:ebtables.service
+Source4:ebtables.systemd
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
BuildRequires: systemd-rpm-macros
@@ -61,14 +52,17 @@
can be used together with the other Linux filtering tools, like
iptables. There are no incompatibility issues.
+%package -n libebtc0
+Summary:Library for the ebtables low-level ruleset generation and
parsing
+Group: System/Libraries
+
+%description -n libebtc0
+libebtc ("ebtables cache") is used to retrieve from the kernel, parse,
+construct, and load rulesets into the kernel.
+
%prep
-%setup -q -n %{name}-v2.0.10-4
-%patch -P 0 -P 1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%autosetup -p1
+
# 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}
@@ -82,48 +76,33 @@
%build
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNE
commit ebtables for openSUSE:Factory
Hello community, here is the log from the commit of package ebtables for openSUSE:Factory checked in at 2019-07-17 14:22:38 Comparing /work/SRC/openSUSE:Factory/ebtables (Old) and /work/SRC/openSUSE:Factory/.ebtables.new.1887 (New) Package is "ebtables" Wed Jul 17 14:22:38 2019 rev:43 rq:715400 version:2.0.10.4 Changes: --- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2019-03-04 09:16:20.844644469 +0100 +++ /work/SRC/openSUSE:Factory/.ebtables.new.1887/ebtables.changes 2019-07-17 14:22:39.380199943 +0200 @@ -1,0 +2,5 @@ +Wed Jul 10 11:30:50 UTC 2019 - Kristyna Streitova + +- fix path (/sbin -> /usr/sbin) in ebtables.systemd [bsc#1140898] + +--- Other differences: -- ++ ebtables.systemd ++ --- /var/tmp/diff_new_pack.St7XbY/_old 2019-07-17 14:22:40.456197012 +0200 +++ /var/tmp/diff_new_pack.St7XbY/_new 2019-07-17 14:22:40.456197012 +0200 @@ -6,7 +6,7 @@ # Initialize $TYPE tables echo -n $" $TYPE tables: " if [ -r /etc/sysconfig/ebtables.$TYPE ]; then -/sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1 +/usr/sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE --atomic-commit > /dev/null || RETVAL=1 else echo -n "not configured" fi @@ -36,12 +36,12 @@ initialize ;; stop) -/sbin/ebtables -t filter --init-table || RETVAL=1 -/sbin/ebtables -t nat --init-table || RETVAL=1 -/sbin/ebtables -t broute --init-table || RETVAL=1 +/usr/sbin/ebtables -t filter --init-table || RETVAL=1 +/usr/sbin/ebtables -t nat --init-table || RETVAL=1 +/usr/sbin/ebtables -t broute --init-table || RETVAL=1 for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut -f1 -d' ') ebtables; do - /sbin/rmmod $mod || RETVAL=1 + /usr/sbin/rmmod $mod || RETVAL=1 done if [ $RETVAL -eq 0 ]; then @@ -54,9 +54,9 @@ ;; save) echo -n $"Saving Ethernet bridge filtering (ebtables): " -/sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1 -/sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1 -/sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1 +/usr/sbin/ebtables -t filter --atomic-file /etc/sysconfig/ebtables.filter --atomic-save || RETVAL=1 +/usr/sbin/ebtables -t nat --atomic-file /etc/sysconfig/ebtables.nat --atomic-save || RETVAL=1 +/usr/sbin/ebtables -t broute --atomic-file /etc/sysconfig/ebtables.broute --atomic-save || RETVAL=1 if [ $RETVAL -eq 0 ]; then echo -n $"[ OK ]" echo -ne "\r"
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2019-03-04 09:16:13
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new.28833 (New)
Package is "ebtables"
Mon Mar 4 09:16:13 2019 rev:42 rq:680740 version:2.0.10.4
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2018-09-18
11:42:30.707968538 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new.28833/ebtables.changes
2019-03-04 09:16:20.844644469 +0100
@@ -1,0 +2,8 @@
+Fri Feb 22 14:04:30 UTC 2019 - Michał Rostecki
+
+- Add upstream patches which improve handling stale locks.
+ (boo#1126094)
+ * 0001-Use-flock-for-concurrent-option.patch
+ * 0002-Fix-locking-if-LOCKDIR-does-not-exist.patch
+
+---
New:
0001-Use-flock-for-concurrent-option.patch
0002-Fix-locking-if-LOCKDIR-does-not-exist.patch
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.kJ4Eva/_old 2019-03-04 09:16:21.760644304 +0100
+++ /var/tmp/diff_new_pack.kJ4Eva/_new 2019-03-04 09:16:21.760644304 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -40,6 +40,9 @@
Patch3: 0001-fix-compilation-warning.patch
# PATCH-FIX-SUSE-ONLY
Patch4: include-linux-if.patch
+# PATCH-FIX-UPSTREAM boo#1126094
+Patch5: 0001-Use-flock-for-concurrent-option.patch
+Patch6: 0002-Fix-locking-if-LOCKDIR-does-not-exist.patch
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
BuildRequires: systemd-rpm-macros
@@ -64,6 +67,8 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# 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}
++ 0001-Use-flock-for-concurrent-option.patch ++
>From f401e3ec8358069f2407ae39ecb8b7ba1a6fbcc6 Mon Sep 17 00:00:00 2001
From: Phil Sutter
Date: Fri, 6 Oct 2017 12:48:50 +0200
Subject: [PATCH 1/2] Use flock() for --concurrent option
The previous locking mechanism was not atomic, hence it was possible
that a killed ebtables process would leave the lock file in place which
in turn made future ebtables processes wait indefinitely for the lock to
become free.
Fix this by using flock(). This also simplifies code quite a bit because
there is no need for a custom signal handler or an __exit routine
anymore.
Signed-off-by: Phil Sutter
Signed-off-by: Pablo Neira Ayuso
---
ebtables.c | 8
libebtc.c | 49 +
2 files changed, 5 insertions(+), 52 deletions(-)
diff --git a/ebtables.c b/ebtables.c
index 62f1ba8..f7dfccf 100644
--- a/ebtables.c
+++ b/ebtables.c
@@ -528,12 +528,6 @@ void ebt_early_init_once()
ebt_iterate_targets(merge_target);
}
-/* signal handler, installed when the option --concurrent is specified. */
-static void sighandler(int signum)
-{
- exit(-1);
-}
-
/* We use exec_style instead of #ifdef's because ebtables.so is a shared
object. */
int do_command(int argc, char *argv[], int exec_style,
struct ebt_u_replace *replace_)
@@ -1047,8 +1041,6 @@ big_iface_length:
strcpy(replace->filename, optarg);
break;
case 13 : /* concurrent */
- signal(SIGINT, sighandler);
- signal(SIGTERM, sighandler);
use_lockfd = 1;
break;
case 1 :
diff --git a/libebtc.c b/libebtc.c
index 17ba8f2..76dd9d7 100644
--- a/libebtc.c
+++ b/libebtc.c
@@ -31,6 +31,7 @@
#include "include/ethernetdb.h"
#include
#include
+#include
#include
#include
#include
@@ -137,58 +138,18 @@ void ebt_list_extensions()
#define LOCKDIR "/var/lib/ebtables"
#define LOCKFILE LOCKDIR"/lock"
#endif
-static int lockfd = -1, locked;
int use_lockfd;
/* Returns 0 on success, -1 when the file is locked by another process
* or -2 on any other error. */
static int lock_file()
{
- int try = 0;
- int ret = 0;
- sigset_t sigset;
-
-tr
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2018-09-18 11:42:29
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Tue Sep 18 11:42:29 2018 rev:41 rq:634279 version:2.0.10.4
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2018-03-20
21:55:16.068683006 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2018-09-18
11:42:30.707968538 +0200
@@ -1,0 +2,6 @@
+Fri Aug 24 10:20:05 UTC 2018 - jeng...@inai.de
+
+- Move ebtables to ebtables-legacy and use update-alternatives to
+ offer a selection mechanism.
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.IYcXyf/_old 2018-09-18 11:42:31.335967881 +0200
+++ /var/tmp/diff_new_pack.IYcXyf/_new 2018-09-18 11:42:31.343967872 +0200
@@ -25,7 +25,7 @@
Version:2.0.10.4
Release:0
Summary:Ethernet Bridge Tables
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Productivity/Networking/Security
Url:http://ebtables.sf.net/
#Git-Clone:git://git.netfilter.org/ebtables
@@ -47,6 +47,8 @@
Requires: netcfg >= 11.6
Requires(pre): %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
%{?systemd_requires}
%description
@@ -111,11 +113,21 @@
rm -rf %{buildroot}%{_initrddir}
# not used
rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
+mv "%{buildroot}/%{_sbindir}/ebtables"
"%{buildroot}/%{_sbindir}/ebtables-legacy"
+mv "%{buildroot}/%{_sbindir}/ebtables-restore"
"%{buildroot}/%{_sbindir}/ebtables-legacy-restore"
+mv "%{buildroot}/%{_sbindir}/ebtables-save"
"%{buildroot}/%{_sbindir}/ebtables-legacy-save"
+for i in ebtables ebtables-restore ebtables-save; do
+ ln -fsv "/etc/alternatives/$i" "%{buildroot}/%{_sbindir}/$i"
+done
%pre
%service_add_pre %{name}.service
%post
+update-alternatives --force \
+ --install "%{_sbindir}/ebtables" ebtables "%{_sbindir}/ebtables-legacy"
1 \
+ --slave "%{_sbindir}/ebtables-restore" ebtables-restore
"%{_sbindir}/ebtables-legacy-restore" \
+ --slave "%{_sbindir}/ebtables-save" ebtables-save
"%{_sbindir}/ebtables-legacy-save"
%service_add_post %{name}.service
%fillup_only
@@ -123,6 +135,9 @@
%service_del_preun %{name}.service
%postun
+if test "$1" = 0; then
+ update-alternatives --remove ebtables "%{_sbindir}/ebtables-legacy"
+fi
%service_del_postun %{name}.service
%files
@@ -131,6 +146,9 @@
%{_mandir}/man8/ebtables.8*
%{_libexecdir}/%{name}
%{_unitdir}/%{name}.service
+%ghost %{_sysconfdir}/alternatives/ebtables
+%ghost %{_sysconfdir}/alternatives/ebtables-restore
+%ghost %{_sysconfdir}/alternatives/ebtables-save
%ghost %{_fillupdir}/sysconfig.%{name}.filter
%ghost %{_fillupdir}/sysconfig.%{name}.nat
%ghost %{_fillupdir}/sysconfig.%{name}.broute
@@ -138,9 +156,7 @@
%exclude %{_sysconfdir}/ethertypes
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
-%{_sbindir}/ebtables
-%{_sbindir}/ebtables-restore
-%{_sbindir}/ebtables-save
+%{_sbindir}/ebtables*
%{_sbindir}/rcebtables
%changelog
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2018-03-20 21:55:15
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Tue Mar 20 21:55:15 2018 rev:40 rq:587926 version:2.0.10.4
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2017-11-30
12:41:42.369957518 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2018-03-20
21:55:16.068683006 +0100
@@ -1,0 +2,16 @@
+Thu Mar 15 13:30:35 UTC 2018 - kstreit...@suse.com
+
+- fix ExecStart/ExecStop path in ebtables.service [bnc#1085228]
+
+---
+Mon Mar 12 10:08:51 UTC 2018 - matthias.gerst...@suse.com
+
+- Fix ethertypes ownership, should be %exclude, not %ghost.
+
+---
+Thu Feb 22 16:22:33 UTC 2018 - matthias.gerst...@suse.com
+
+- Resolve conflict with iptables-nft and obtain ethertypes from new netcfg
+ minor version. FATE#320520
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.4kbAl2/_old 2018-03-20 21:55:17.180642966 +0100
+++ /var/tmp/diff_new_pack.4kbAl2/_new 2018-03-20 21:55:17.180642966 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -44,6 +44,7 @@
BuildRequires: sed
BuildRequires: systemd-rpm-macros
BuildRequires: xz
+Requires: netcfg >= 11.6
Requires(pre): %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
@@ -128,12 +129,13 @@
%defattr(-,root,root)
%doc COPYING ChangeLog
%{_mandir}/man8/ebtables.8*
-%config(noreplace) %{_sysconfdir}/ethertypes
%{_libexecdir}/%{name}
%{_unitdir}/%{name}.service
%ghost %{_fillupdir}/sysconfig.%{name}.filter
%ghost %{_fillupdir}/sysconfig.%{name}.nat
%ghost %{_fillupdir}/sysconfig.%{name}.broute
+# is provided by the netcfg package
+%exclude %{_sysconfdir}/ethertypes
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
%{_sbindir}/ebtables
++ ebtables.service ++
--- /var/tmp/diff_new_pack.4kbAl2/_old 2018-03-20 21:55:17.240640806 +0100
+++ /var/tmp/diff_new_pack.4kbAl2/_new 2018-03-20 21:55:17.240640806 +0100
@@ -4,8 +4,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=/usr/libexec/ebtables start
-ExecStop=/usr/libexec/ebtables stop
+ExecStart=/usr/lib/ebtables start
+ExecStop=/usr/lib/ebtables stop
[Install]
WantedBy=multi-user.target
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2017-11-30 12:41:41
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Thu Nov 30 12:41:41 2017 rev:39 rq:545296 version:2.0.10.4
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2017-04-17
10:20:49.516829998 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2017-11-30
12:41:42.369957518 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:37:47 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new
+ %_fillupdir macro (boo#1069468)
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.zkPOXr/_old 2017-11-30 12:41:43.061932359 +0100
+++ /var/tmp/diff_new_pack.zkPOXr/_new 2017-11-30 12:41:43.061932359 +0100
@@ -16,6 +16,11 @@
#
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: ebtables
Version:2.0.10.4
Release:0
@@ -92,16 +97,16 @@
INITDIR="%{_sysconfdir}/init.d" \
SYSCONFIGDIR="%{_sysconfdir}" \
install
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}%{_unitdir}
install -p %{SOURCE1} %{buildroot}%{_unitdir}/
chmod -x %{buildroot}%{_unitdir}/*.service
mkdir -p %{buildroot}%{_libexecdir}
install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
-touch
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter
-touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat
-touch
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute
+touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.filter
+touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.nat
+touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.broute
rm -rf %{buildroot}%{_initrddir}
# not used
rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
@@ -126,9 +131,9 @@
%config(noreplace) %{_sysconfdir}/ethertypes
%{_libexecdir}/%{name}
%{_unitdir}/%{name}.service
-%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter
-%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat
-%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute
+%ghost %{_fillupdir}/sysconfig.%{name}.filter
+%ghost %{_fillupdir}/sysconfig.%{name}.nat
+%ghost %{_fillupdir}/sysconfig.%{name}.broute
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
%{_sbindir}/ebtables
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2017-04-17 10:20:48
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Mon Apr 17 10:20:48 2017 rev:38 rq:483896 version:2.0.10.4
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2016-06-07
23:47:14.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2017-04-17
10:20:49.516829998 +0200
@@ -1,0 +2,7 @@
+Thu Mar 23 15:14:46 UTC 2017 - kstreit...@suse.com
+
+- cleanup with spec-cleaner
+- get rid of %{name} macros in the patch names
+- remove sysvinit support
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.LUTP2R/_old 2017-04-17 10:20:50.272722946 +0200
+++ /var/tmp/diff_new_pack.LUTP2R/_new 2017-04-17 10:20:50.276722379 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,11 +24,11 @@
Group: Productivity/Networking/Security
Url:http://ebtables.sf.net/
#Git-Clone:git://git.netfilter.org/ebtables
-Source: %{name}-v2.0.10-4.tar.xz
-Source1:%{name}.service
-Source2:%{name}.systemd
-Patch0: %{name}-v2.0.8-makefile.diff
-Patch1: %{name}-v2.0.8-initscript.diff
+Source: ebtables-v2.0.10-4.tar.xz
+Source1:ebtables.service
+Source2:ebtables.systemd
+Patch0: ebtables-v2.0.8-makefile.diff
+Patch1: ebtables-v2.0.8-initscript.diff
# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
Patch2: ebtables-v2.0.10-4-audit.patch
# PATCH-FIX-UPSTREAM
@@ -37,16 +37,11 @@
Patch4: include-linux-if.patch
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
-BuildRequires: xz
-%if 0%{?suse_version} > 1210
BuildRequires: systemd-rpm-macros
+BuildRequires: xz
Requires(pre): %fillup_prereq
-%{?systemd_requires}
-%else
-BuildRequires: sysvinit
-Requires(pre): %insserv_prereq
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
%description
A firewalling tool to transparently filter network traffic passing a
@@ -97,66 +92,43 @@
INITDIR="%{_sysconfdir}/init.d" \
SYSCONFIGDIR="%{_sysconfdir}" \
install
-%if 0%{?suse_version} > 1210
-mkdir -p %{buildroot}/var/adm/fillup-templates
+mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
mkdir -p %{buildroot}%{_unitdir}
install -p %{SOURCE1} %{buildroot}%{_unitdir}/
chmod -x %{buildroot}%{_unitdir}/*.service
mkdir -p %{buildroot}%{_libexecdir}
install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
-touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.filter
-touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.nat
-touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.broute
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
+touch
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter
+touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat
+touch
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute
rm -rf %{buildroot}%{_initrddir}
-%else
-ln -sf "%{_initddir}/ebtables" "%{buildroot}/%{_sbindir}/rcebtables"
-%endif
# not used
rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
-%if 0%{?suse_version} > 1210
%pre
%service_add_pre %{name}.service
-%endif
%post
-%if 0%{?suse_version} > 1210
%service_add_post %{name}.service
%fillup_only
-%else
-%fillup_and_insserv ebtables
-%endif
%preun
-%if 0%{?suse_version} > 1210
%service_del_preun %{name}.service
-%else
-%stop_on_removal ebtables
-%endif
%postun
-%if 0%{?suse_version} > 1210
%service_del_postun %{name}.service
-%else
-%restart_on_update ebtables
-%insserv_cleanup
-%endif
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
%{_mandir}/man8/ebtables.8*
%config(noreplace) %{_sysconfdir}/ethertypes
-%if 0%{?suse_version} > 1210
%{_libexecdir}/%{name}
%{_unitdir}/%{name}.service
-%ghost /var/adm/fillup-templates/sysconfig.%{name}.filter
-%ghost /var/adm/fillup-templates/sysconfig.%{name}.nat
-%ghost /var/adm/fillup-templates/sysconfig.%{name}.broute
-%else
-%{_initddir}/ebtables
-%endif
+%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.fi
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2016-06-07 23:47:14
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2016-05-10
09:27:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2016-06-07
23:47:14.0 +0200
@@ -1,0 +2,9 @@
+Fri May 6 10:43:55 UTC 2016 - p.drou...@gmail.com
+
+- Add systemd support for openSUSE > 12.10
+- Do not depend on fillup when building with sysvinit support; the
+ package doesn't provide any sysconfig file
+- Change Requires(post) tag for Requires(pre); sysvinit must be
+ available before the package installation, according to the policy
+
+---
New:
ebtables.service
ebtables.systemd
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.li4eK4/_old 2016-06-07 23:47:15.0 +0200
+++ /var/tmp/diff_new_pack.li4eK4/_new 2016-06-07 23:47:15.0 +0200
@@ -25,6 +25,8 @@
Url:http://ebtables.sf.net/
#Git-Clone:git://git.netfilter.org/ebtables
Source: %{name}-v2.0.10-4.tar.xz
+Source1:%{name}.service
+Source2:%{name}.systemd
Patch0: %{name}-v2.0.8-makefile.diff
Patch1: %{name}-v2.0.8-initscript.diff
# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
@@ -36,7 +38,14 @@
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
BuildRequires: xz
-Requires(post): %insserv_prereq %fillup_prereq
+%if 0%{?suse_version} > 1210
+BuildRequires: systemd-rpm-macros
+Requires(pre): %fillup_prereq
+%{?systemd_requires}
+%else
+BuildRequires: sysvinit
+Requires(pre): %insserv_prereq
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -88,26 +97,66 @@
INITDIR="%{_sysconfdir}/init.d" \
SYSCONFIGDIR="%{_sysconfdir}" \
install
+%if 0%{?suse_version} > 1210
+mkdir -p %{buildroot}/var/adm/fillup-templates
+mkdir -p %{buildroot}%{_unitdir}
+install -p %{SOURCE1} %{buildroot}%{_unitdir}/
+chmod -x %{buildroot}%{_unitdir}/*.service
+mkdir -p %{buildroot}%{_libexecdir}
+install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
+touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.filter
+touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.nat
+touch %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}.broute
+rm -rf %{buildroot}%{_initrddir}
+%else
ln -sf "%{_initddir}/ebtables" "%{buildroot}/%{_sbindir}/rcebtables"
+%endif
# not used
rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
+%if 0%{?suse_version} > 1210
+%pre
+%service_add_pre %{name}.service
+%endif
+
%post
+%if 0%{?suse_version} > 1210
+%service_add_post %{name}.service
+%fillup_only
+%else
%fillup_and_insserv ebtables
+%endif
%preun
+%if 0%{?suse_version} > 1210
+%service_del_preun %{name}.service
+%else
%stop_on_removal ebtables
+%endif
%postun
+%if 0%{?suse_version} > 1210
+%service_del_postun %{name}.service
+%else
%restart_on_update ebtables
%insserv_cleanup
+%endif
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
%{_mandir}/man8/ebtables.8*
%config(noreplace) %{_sysconfdir}/ethertypes
+%if 0%{?suse_version} > 1210
+%{_libexecdir}/%{name}
+%{_unitdir}/%{name}.service
+%ghost /var/adm/fillup-templates/sysconfig.%{name}.filter
+%ghost /var/adm/fillup-templates/sysconfig.%{name}.nat
+%ghost /var/adm/fillup-templates/sysconfig.%{name}.broute
+%else
%{_initddir}/ebtables
+%endif
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/*.so
%{_sbindir}/ebtables
++ ebtables.service ++
[Unit]
Description=Ethernet Bridge Filtering tables
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/usr/libexec/ebtables start
ExecStop=/usr/libexec/ebtables stop
[Install]
WantedBy=multi-user.target
++ ebtables.systemd ++
#!/bin/bash
RETVAL=0
initialize() {
# Initialize $TYPE tables
echo -n $" $TYPE tables: "
if [ -r /etc/sysconfig/ebtables.$TYPE ]; then
/sbin/ebtables -t $TYPE --atomic-file /etc/sysconfig/ebtables.$TYPE
--atomic-commit > /dev/null || RETVAL=1
else
echo -n "not configured"
fi
if [ $RETVAL -eq 0 ]; then
echo -n $"[ OK ]"
echo -ne "\r"
else
echo -n $"[FAILED]"
echo -ne "\r"
fi
}
case $1 in
start)
# Initialize filter tables
TYPE=filter
initialize
# Initialize NAT tables
echo
TYPE=nat
initialize
# Initialize broute tables
echo
TYPE=broute
initialize
;;
stop)
/sbin/ebtables -t filte
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2016-05-10 09:27:14
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2015-08-31
22:59:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2016-05-10
09:27:15.0 +0200
@@ -1,0 +2,8 @@
+Tue Apr 26 12:13:47 UTC 2016 - kstreit...@suse.com
+
+- add "Requires(post): %insserv_prereq %fillup_prereq" to fix
+ problem with missing sed during the installation [bnc#976919]
+- remove non-break space from specfile
+- use spec-cleaner to clean the specfile
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.59lrZZ/_old 2016-05-10 09:27:16.0 +0200
+++ /var/tmp/diff_new_pack.59lrZZ/_new 2016-05-10 09:27:16.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,21 +23,21 @@
License:GPL-2.0+
Group: Productivity/Networking/Security
Url:http://ebtables.sf.net/
-
#Git-Clone:git://git.netfilter.org/ebtables
-Source: %name-v2.0.10-4.tar.xz
-Patch0: %name-v2.0.8-makefile.diff
-Patch1: %name-v2.0.8-initscript.diff
-# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
+Source: %{name}-v2.0.10-4.tar.xz
+Patch0: %{name}-v2.0.8-makefile.diff
+Patch1: %{name}-v2.0.8-initscript.diff
+# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
Patch2: ebtables-v2.0.10-4-audit.patch
# PATCH-FIX-UPSTREAM
Patch3: 0001-fix-compilation-warning.patch
# PATCH-FIX-SUSE-ONLY
Patch4: include-linux-if.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
BuildRequires: xz
+Requires(post): %insserv_prereq %fillup_prereq
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A firewalling tool to transparently filter network traffic passing a
@@ -47,8 +47,8 @@
iptables. There are no incompatibility issues.
%prep
-%setup -q -n %name-v2.0.10-4
-%patch -P 0 -P 1 -p0
+%setup -q -n %{name}-v2.0.10-4
+%patch -P 0 -P 1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -66,31 +66,31 @@
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNEEDED=0
make \
-CFLAGS="%optflags" \
-CXXFLAGS="%optflags" \
-LIBDIR="%_libdir/%name" \
-MANDIR="%_mandir" \
-BINDIR="%_sbindir" \
-ETCDIR="%_sysconfdir" \
-INITDIR="%_sysconfdir/init.d" \
-SYSCONFIGDIR="%_sysconfdir"
+CFLAGS="%{optflags}" \
+CXXFLAGS="%{optflags}" \
+LIBDIR="%{_libdir}/%{name}" \
+MANDIR="%{_mandir}" \
+BINDIR="%{_sbindir}" \
+ETCDIR="%{_sysconfdir}" \
+INITDIR="%{_sysconfdir}/init.d" \
+SYSCONFIGDIR="%{_sysconfdir}"
%install
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNEEDED=0
-mkdir -p "%buildroot/%_sysconfdir/init.d"
+mkdir -p "%{buildroot}/%{_sysconfdir}/init.d"
make \
-DESTDIR="%buildroot" \
-LIBDIR="%_libdir/%name" \
-MANDIR="%_mandir" \
-BINDIR="%_sbindir" \
-ETCDIR="%_sysconfdir" \
-INITDIR="%_sysconfdir/init.d" \
-SYSCONFIGDIR="%_sysconfdir" \
+DESTDIR=%{buildroot} \
+LIBDIR="%{_libdir}/%{name}" \
+MANDIR="%{_mandir}" \
+BINDIR="%{_sbindir}" \
+ETCDIR="%{_sysconfdir}" \
+INITDIR="%{_sysconfdir}/init.d" \
+SYSCONFIGDIR="%{_sysconfdir}" \
install
-ln -sf "%_initddir/ebtables" "%buildroot/%_sbindir/rcebtables"
+ln -sf "%{_initddir}/ebtables" "%{buildroot}/%{_sbindir}/rcebtables"
# not used
-rm -f "%buildroot/%_sysconfdir/ebtables-config"
+rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config"
%post
%fillup_and_insserv ebtables
@@ -105,14 +105,14 @@
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
-%doc %_mandir/man8/ebtables.8*
-%config(noreplace) %_sysconfdir/ethertypes
-%_initddir/ebtables
-%dir %_libdir/%name
-%_libdir/%name/*.so
-%_sbindir/ebtables
-%_sbindir/ebtables-restore
-%_sbindir/ebtables-save
-%_sbindir/rcebtables
+%{_mandir}/man8/ebtables.8*
+%config(noreplace) %{_sysconfdir}/ethertypes
+%{_initddir}/ebtables
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/*.so
+%{_sbindir}/ebtables
+%{_sbin
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2015-08-31 22:59:33
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2015-06-23
12:00:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2015-08-31
22:59:34.0 +0200
@@ -1,0 +2,6 @@
+Sat Aug 29 15:07:16 UTC 2015 - bwiedem...@suse.com
+
+- fix compilation
+ add include-linux-if.patch 0001-fix-compilation-warning.patch
+
+---
New:
0001-fix-compilation-warning.patch
include-linux-if.patch
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.A92uIX/_old 2015-08-31 22:59:35.0 +0200
+++ /var/tmp/diff_new_pack.A92uIX/_new 2015-08-31 22:59:35.0 +0200
@@ -30,6 +30,10 @@
Patch1: %name-v2.0.8-initscript.diff
# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
Patch2: ebtables-v2.0.10-4-audit.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0001-fix-compilation-warning.patch
+# PATCH-FIX-SUSE-ONLY
+Patch4: include-linux-if.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
@@ -46,10 +50,8 @@
%setup -q -n %name-v2.0.10-4
%patch -P 0 -P 1 -p0
%patch2 -p1
-
-%build
-# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
-export SUSE_ASNEEDED=0
+%patch3 -p1
+%patch4 -p1
# 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}
@@ -59,6 +61,10 @@
mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h}
mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
mv include/linux/netfilter_bridge/ebt_ulog.{h.save,h}
+
+%build
+# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
+export SUSE_ASNEEDED=0
make \
CFLAGS="%optflags" \
CXXFLAGS="%optflags" \
++ 0001-fix-compilation-warning.patch ++
>From 146f762e1b4be613fad4b045c67974c000742647 Mon Sep 17 00:00:00 2001
From: Petri Gynther
Date: Sun, 24 Feb 2013 10:56:59 +0100
Subject: [PATCH 1/9] fix compilation warning
---
communication.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/communication.c b/communication.c
index 62ed667..ba058c0 100644
--- a/communication.c
+++ b/communication.c
@@ -282,7 +282,7 @@ static int store_counters_in_file(char *filename, struct
ebt_u_replace *repl)
}
close_file:
fclose(file);
- return 0;
+ return ret;
}
/* Gets executed after ebt_deliver_table. Delivers the counters to the kernel
--
2.1.4
++ include-linux-if.patch ++
diff --git a/include/ebtables_u.h b/include/ebtables_u.h
index 35a5bcc..f120eb8 100644
--- a/include/ebtables_u.h
+++ b/include/ebtables_u.h
@@ -24,6 +24,7 @@
#ifndef EBTABLES_U_H
#define EBTABLES_U_H
#include
+#include
#include
#include
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2015-06-23 12:00:00
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2014-11-24
11:13:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2015-06-23
12:00:02.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 16 11:19:33 UTC 2015 - kstreit...@suse.com
+
+- add ebtables-v2.0.10-4-audit.patch needed for CC certification
+ [bnc#934680]
+
+---
New:
ebtables-v2.0.10-4-audit.patch
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.46sKdm/_old 2015-06-23 12:00:02.0 +0200
+++ /var/tmp/diff_new_pack.46sKdm/_new 2015-06-23 12:00:02.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@
Source: %name-v2.0.10-4.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
+# PATCH-FIX-UPSTREAM bnc#934680 kstreit...@suse.com -- audit patch for CC
certification
+Patch2: ebtables-v2.0.10-4-audit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
@@ -43,6 +45,7 @@
%prep
%setup -q -n %name-v2.0.10-4
%patch -P 0 -P 1 -p0
+%patch2 -p1
%build
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
++ ebtables-v2.0.10-4-audit.patch ++
--- ebtables2.orig/extensions/ebt_AUDIT.c 1970-01-01 01:00:00.0
+0100
+++ ebtables2.orig/extensions/ebt_AUDIT.c 2011-01-07 10:53:46.680329228
+0100
@@ -0,0 +1,110 @@
+
+#include
+#include
+#include
+#include
+#include "../include/ebtables_u.h"
+#include
+
+#define AUDIT_TYPE '1'
+static struct option opts[] =
+{
+ { "audit-type" , required_argument, 0, AUDIT_TYPE },
+ { 0 }
+};
+
+static void print_help()
+{
+ printf(
+ "AUDIT target options:\n"
+ " --audit-type TYPE : Set action type to record.\n");
+}
+
+static void init(struct ebt_entry_target *target)
+{
+ struct xt_AUDIT_info *info = (struct xt_AUDIT_info *) target->data;
+
+ info->type = 0;
+}
+
+static int parse(int c, char **argv, int argc,
+ const struct ebt_u_entry *entry, unsigned int *flags,
+ struct ebt_entry_target **target)
+{
+ struct xt_AUDIT_info *info = (struct xt_AUDIT_info *) (*target)->data;
+
+ switch (c) {
+ case AUDIT_TYPE:
+ ebt_check_option2(flags, AUDIT_TYPE);
+
+ if (!strcasecmp(optarg, "accept"))
+ info->type = XT_AUDIT_TYPE_ACCEPT;
+ else if (!strcasecmp(optarg, "drop"))
+ info->type = XT_AUDIT_TYPE_DROP;
+ else if (!strcasecmp(optarg, "reject"))
+ info->type = XT_AUDIT_TYPE_REJECT;
+ else
+ ebt_print_error2("Bad action type value `%s'", optarg);
+
+ break;
+default:
+ return 0;
+ }
+ return 1;
+}
+
+static void final_check(const struct ebt_u_entry *entry,
+ const struct ebt_entry_match *match, const char *name,
+ unsigned int hookmask, unsigned int time)
+{
+}
+
+static void print(const struct ebt_u_entry *entry,
+ const struct ebt_entry_target *target)
+{
+ const struct xt_AUDIT_info *info =
+ (const struct xt_AUDIT_info *) target->data;
+
+ printf("--audit-type ");
+
+ switch(info->type) {
+ case XT_AUDIT_TYPE_ACCEPT:
+ printf("accept");
+ break;
+ case XT_AUDIT_TYPE_DROP:
+ printf("drop");
+ break;
+ case XT_AUDIT_TYPE_REJECT:
+ printf("reject");
+ break;
+ }
+}
+
+static int compare(const struct ebt_entry_target *t1,
+ const struct ebt_entry_target *t2)
+{
+ const struct xt_AUDIT_info *info1 =
+ (const struct xt_AUDIT_info *) t1->data;
+ const struct xt_AUDIT_info *info2 =
+ (const struct xt_AUDIT_info *) t2->data;
+
+ return info1->type == info2->type;
+}
+
+static struct ebt_u_target AUDIT_target =
+{
+ .name = "AUDIT",
+ .size = sizeof(struct xt_AUDIT_info),
+ .help = print_hel
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2014-11-24 11:13:27
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2014-10-01
11:23:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2014-11-24
11:13:41.0 +0100
@@ -1,0 +2,6 @@
+Thu Nov 13 18:52:25 UTC 2014 - dims...@opensuse.org
+
+- Also save include/linux/netfilter_bridge/ebt_ulog.h, as it no
+ longer exists in the mainline kernel.
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.CnJEHF/_old 2014-11-24 11:13:41.0 +0100
+++ /var/tmp/diff_new_pack.CnJEHF/_new 2014-11-24 11:13:41.0 +0100
@@ -50,10 +50,12 @@
# 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}
+mv include/linux/netfilter_bridge/ebt_ulog.{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}
+mv include/linux/netfilter_bridge/ebt_ulog.{h.save,h}
make \
CFLAGS="%optflags" \
CXXFLAGS="%optflags" \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2014-10-01 11:23:17
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2014-03-20
07:04:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2014-10-01
11:23:35.0 +0200
@@ -1,0 +2,6 @@
+Tue Sep 23 15:28:21 UTC 2014 - jeng...@inai.de
+
+- Remove support for old distros from specfile
+ (prjconf can do substitutions instead)
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.1TPyHD/_old 2014-10-01 11:23:37.0 +0200
+++ /var/tmp/diff_new_pack.1TPyHD/_new 2014-10-01 11:23:37.0 +0200
@@ -24,21 +24,14 @@
Group: Productivity/Networking/Security
Url:http://ebtables.sf.net/
+#Git-Clone:git://git.netfilter.org/ebtables
Source: %name-v2.0.10-4.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: linux-glibc-devel >= 2.6.20
BuildRequires: sed
BuildRequires: xz
-%if 0%{?suse_version} >= 1140
-BuildRequires: linux-glibc-devel >= 2.6.20
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-BuildRequires: linux-kernel-headers >= 2.6.20
-%endif
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-BuildRequires: kernel-headers >= 2.6.20
-%endif
%description
A firewalling tool to transparently filter network traffic passing a
@@ -48,14 +41,8 @@
iptables. There are no incompatibility issues.
%prep
-%if 0%{?__xz:1}
%setup -q -n %name-v2.0.10-4
-%else
-tar -xf "%{S:0}" --use=xz;
-%setup -DTqn %name-v2.0.10-4
-%endif
-%patch0
-%patch1
+%patch -P 0 -P 1 -p0
%build
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
@@ -70,30 +57,29 @@
make \
CFLAGS="%optflags" \
CXXFLAGS="%optflags" \
-LIBDIR=%_libdir/%name \
-MANDIR=%_mandir \
-BINDIR=%_sbindir \
-ETCDIR=%_sysconfdir \
-INITDIR=%_sysconfdir/init.d \
-SYSCONFIGDIR=%_sysconfdir
+LIBDIR="%_libdir/%name" \
+MANDIR="%_mandir" \
+BINDIR="%_sbindir" \
+ETCDIR="%_sysconfdir" \
+INITDIR="%_sysconfdir/init.d" \
+SYSCONFIGDIR="%_sysconfdir"
%install
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNEEDED=0
-install -d -m 755 %buildroot%_sbindir
-install -d -m 755 %buildroot%_sysconfdir/init.d
+mkdir -p "%buildroot/%_sysconfdir/init.d"
make \
-DESTDIR=%buildroot \
-LIBDIR=%_libdir/%name \
-MANDIR=%_mandir \
-BINDIR=%_sbindir \
-ETCDIR=%_sysconfdir \
-INITDIR=%_sysconfdir/init.d \
-SYSCONFIGDIR=%_sysconfdir \
+DESTDIR="%buildroot" \
+LIBDIR="%_libdir/%name" \
+MANDIR="%_mandir" \
+BINDIR="%_sbindir" \
+ETCDIR="%_sysconfdir" \
+INITDIR="%_sysconfdir/init.d" \
+SYSCONFIGDIR="%_sysconfdir" \
install
-ln -sf %_sysconfdir/init.d/ebtables %buildroot%_sbindir/rcebtables
+ln -sf "%_initddir/ebtables" "%buildroot/%_sbindir/rcebtables"
# not used
-rm -f %buildroot%_sysconfdir/ebtables-config
+rm -f "%buildroot/%_sysconfdir/ebtables-config"
%post
%fillup_and_insserv ebtables
@@ -110,7 +96,7 @@
%doc COPYING ChangeLog
%doc %_mandir/man8/ebtables.8*
%config(noreplace) %_sysconfdir/ethertypes
-%_sysconfdir/init.d/ebtables
+%_initddir/ebtables
%dir %_libdir/%name
%_libdir/%name/*.so
%_sbindir/ebtables
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2014-03-20 07:04:55
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2012-12-19
20:29:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2014-03-20
07:04:56.0 +0100
@@ -1,0 +2,5 @@
+Fri Feb 28 08:42:42 UTC 2014 - vci...@suse.com
+
+- add missing BuildRequires: sed (bnc#865848)
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.Qu1aK6/_old 2014-03-20 07:04:56.0 +0100
+++ /var/tmp/diff_new_pack.Qu1aK6/_new 2014-03-20 07:04:56.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -28,6 +28,7 @@
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: sed
BuildRequires: xz
%if 0%{?suse_version} >= 1140
BuildRequires: linux-glibc-devel >= 2.6.20
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2012-12-19 20:29:09
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables", Maintainer is "vci...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2011-12-21
09:59:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2012-12-19
20:29:10.0 +0100
@@ -1,0 +2,5 @@
+Wed Dec 19 10:08:54 UTC 2012 - jeng...@inai.de
+
+- Have build succeed on non-SUSE
+
+---
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.X33Ysz/_old 2012-12-19 20:29:10.0 +0100
+++ /var/tmp/diff_new_pack.X33Ysz/_new 2012-12-19 20:29:10.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ebtables
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -16,21 +16,27 @@
#
-
Name: ebtables
Version:2.0.10.4
-Release:1
-License:GPL-2.0+
+Release:0
Summary:Ethernet Bridge Tables
-URL:http://ebtables.sf.net/
+License:GPL-2.0+
Group: Productivity/Networking/Security
+Url:http://ebtables.sf.net/
+
Source: %name-v2.0.10-4.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: xz
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: kernel-headers
+%if 0%{?suse_version} >= 1140
+BuildRequires: linux-glibc-devel >= 2.6.20
+%endif
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110
+BuildRequires: linux-kernel-headers >= 2.6.20
+%endif
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+BuildRequires: kernel-headers >= 2.6.20
%endif
%description
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2011-12-21 09:59:58
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables", Maintainer is "pu...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2011-12-15
16:06:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2011-12-21
09:59:59.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec 15 21:44:32 UTC 2011 - jeng...@medozas.de
+
+- Update to new upstream release 2.0.10.4
+* previous counter bug was still present and has been addressed now
+
+---
Old:
ebtables-v2.0.10-3.tar.xz
New:
ebtables-v2.0.10-4.tar.xz
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.6NNOPo/_old 2011-12-21 10:00:00.0 +0100
+++ /var/tmp/diff_new_pack.6NNOPo/_new 2011-12-21 10:00:00.0 +0100
@@ -18,13 +18,13 @@
Name: ebtables
-Version:2.0.10.3
+Version:2.0.10.4
Release:1
License:GPL-2.0+
Summary:Ethernet Bridge Tables
URL:http://ebtables.sf.net/
Group: Productivity/Networking/Security
-Source: %name-v2.0.10-3.tar.xz
+Source: %name-v2.0.10-4.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,10 +42,10 @@
%prep
%if 0%{?__xz:1}
-%setup -q -n %name-v2.0.10-3
+%setup -q -n %name-v2.0.10-4
%else
tar -xf "%{S:0}" --use=xz;
-%setup -DTqn %name-v2.0.10-3
+%setup -DTqn %name-v2.0.10-4
%endif
%patch0
%patch1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at 2011-12-15 16:06:06
Comparing /work/SRC/openSUSE:Factory/ebtables (Old)
and /work/SRC/openSUSE:Factory/.ebtables.new (New)
Package is "ebtables", Maintainer is "pu...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes2011-09-23
01:55:58.0 +0200
+++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2011-12-15
16:06:08.0 +0100
@@ -1,0 +2,6 @@
+Sun Dec 4 16:27:22 UTC 2011 - jeng...@medozas.de
+
+- Update to new upstream release 2.0.10.3
+* fix a counter setting bug
+
+---
Old:
ebtables-v2.0.10-2.tar.xz
New:
ebtables-v2.0.10-3.tar.xz
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.qkGVV2/_old 2011-12-15 16:06:10.0 +0100
+++ /var/tmp/diff_new_pack.qkGVV2/_new 2011-12-15 16:06:10.0 +0100
@@ -18,13 +18,13 @@
Name: ebtables
-Version:2.0.10.2
+Version:2.0.10.3
Release:1
-License:GPLv2
+License:GPL-2.0+
Summary:Ethernet Bridge Tables
-Url:http://ebtables.sf.net/
+URL:http://ebtables.sf.net/
Group: Productivity/Networking/Security
-Source: %name-v2.0.10-2.tar.xz
+Source: %name-v2.0.10-3.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -42,10 +42,10 @@
%prep
%if 0%{?__xz:1}
-%setup -q -n %name-v2.0.10-2
+%setup -q -n %name-v2.0.10-3
%else
tar -xf "%{S:0}" --use=xz;
-%setup -DTqn %name-v2.0.10-2
+%setup -DTqn %name-v2.0.10-3
%endif
%patch0
%patch1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at Fri Aug 12 10:23:26 CEST 2011.
--- ebtables/ebtables.changes 2011-07-11 01:07:57.0 +0200
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-08-12
01:51:41.0 +0200
@@ -1,0 +2,7 @@
+Thu Aug 11 23:23:35 UTC 2011 - jeng...@medozas.de
+
+- Update to new upstream release 2.0.10.2
+* minor compilation fixes: respect LDFLAGS in Makefiles
+- Remove obsolete ebtables-typepuns.diff patch (fixed upstream)
+
+---
calling whatdependson for head-i586
Old:
ebtables-typepuns.diff
ebtables-v2.0.10-1.tar.xz
New:
ebtables-v2.0.10-2.tar.xz
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.zNtnwG/_old 2011-08-12 10:22:16.0 +0200
+++ /var/tmp/diff_new_pack.zNtnwG/_new 2011-08-12 10:22:16.0 +0200
@@ -18,18 +18,20 @@
Name: ebtables
-Version:2.0.10.1
+Version:2.0.10.2
Release:1
License:GPLv2
Summary:Ethernet Bridge Tables
Url:http://ebtables.sf.net/
Group: Productivity/Networking/Security
-Source: %name-v2.0.10-1.tar.xz
+Source: %name-v2.0.10-2.tar.xz
Patch0: %name-v2.0.8-makefile.diff
Patch1: %name-v2.0.8-initscript.diff
-Patch2: ebtables-typepuns.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: xz
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: kernel-headers
+%endif
%description
A firewalling tool to transparently filter network traffic passing a
@@ -39,10 +41,14 @@
iptables. There are no incompatibility issues.
%prep
-%setup -q -n %name-v2.0.10-1
+%if 0%{?__xz:1}
+%setup -q -n %name-v2.0.10-2
+%else
+tar -xf "%{S:0}" --use=xz;
+%setup -DTqn %name-v2.0.10-2
+%endif
%patch0
%patch1
-%patch -P 2 -p1
%build
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ebtables for openSUSE:Factory
Hello community,
here is the log from the commit of package ebtables for openSUSE:Factory
checked in at Wed Jul 20 09:15:29 CEST 2011.
--- ebtables/ebtables.changes 2011-06-06 13:54:03.0 +0200
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-07-11
01:07:57.0 +0200
@@ -1,0 +2,14 @@
+Sun Jul 10 23:03:57 UTC 2011 - jeng...@medozas.de
+
+- update to 2.0.10.1
+* fix --among-dst-file, which translated to --among-src
+* Makefile: respect LDFLAGS during ebtables build
+* Makefile: create directories to avoid build failure when DESTDIR
+ is supplied
+* incorporate fixes for possible issues found by Coverity analysis
+* extend ebt_ip6 to allow matching on ipv6-icmp types/codes
+* add --concurrent option, which enables using a file lock to
+ support concurrent scripts updating the ebtables kernel tables
+- run spec-beautifier over specfile
+
+---
calling whatdependson for head-i586
Old:
ebtables-v2.0.9-2.tar.bz2
New:
ebtables-typepuns.diff
ebtables-v2.0.10-1.tar.xz
Other differences:
--
++ ebtables.spec ++
--- /var/tmp/diff_new_pack.opWEFy/_old 2011-07-20 09:13:26.0 +0200
+++ /var/tmp/diff_new_pack.opWEFy/_new 2011-07-20 09:13:26.0 +0200
@@ -18,16 +18,18 @@
Name: ebtables
-Version:v2.0.9.2
+Version:2.0.10.1
Release:1
License:GPLv2
Summary:Ethernet Bridge Tables
-Url:http://ebtables.sourceforge.net/
+Url:http://ebtables.sf.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
+Source: %name-v2.0.10-1.tar.xz
+Patch0: %name-v2.0.8-makefile.diff
+Patch1: %name-v2.0.8-initscript.diff
+Patch2: ebtables-typepuns.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: xz
%description
A firewalling tool to transparently filter network traffic passing a
@@ -37,9 +39,10 @@
iptables. There are no incompatibility issues.
%prep
-%setup -q -n %{name}-v2.0.9-2
+%setup -q -n %name-v2.0.10-1
%patch0
%patch1
+%patch -P 2 -p1
%build
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
@@ -52,32 +55,32 @@
mv include/linux/netfilter_bridge/ebt_ip6.{h.save,h}
mv include/linux/netfilter_bridge/ebt_nflog.{h.save,h}
make \
-CFLAGS="%{optflags}" \
-CXXFLAGS="%{optflags}" \
-LIBDIR=%{_libdir}/%{name} \
-MANDIR=%{_mandir} \
-BINDIR=%{_sbindir} \
-ETCDIR=%{_sysconfdir} \
-INITDIR=%{_sysconfdir}/init.d \
-SYSCONFIGDIR=%{_sysconfdir}
+CFLAGS="%optflags" \
+CXXFLAGS="%optflags" \
+LIBDIR=%_libdir/%name \
+MANDIR=%_mandir \
+BINDIR=%_sbindir \
+ETCDIR=%_sysconfdir \
+INITDIR=%_sysconfdir/init.d \
+SYSCONFIGDIR=%_sysconfdir
%install
# The way ebtables is built requires ASNEEDED=0 forever [bnc#567267]
export SUSE_ASNEEDED=0
-install -d -m 755 %{buildroot}%{_sbindir}
-install -d -m 755 %{buildroot}%{_sysconfdir}/init.d
+install -d -m 755 %buildroot%_sbindir
+install -d -m 755 %buildroot%_sysconfdir/init.d
make \
-DESTDIR=%{buildroot} \
-LIBDIR=%{_libdir}/%{name} \
-MANDIR=%{_mandir} \
-BINDIR=%{_sbindir} \
-ETCDIR=%{_sysconfdir} \
-INITDIR=%{_sysconfdir}/init.d \
-SYSCONFIGDIR=%{_sysconfdir} \
+DESTDIR=%buildroot \
+LIBDIR=%_libdir/%name \
+MANDIR=%_mandir \
+BINDIR=%_sbindir \
+ETCDIR=%_sysconfdir \
+INITDIR=%_sysconfdir/init.d \
+SYSCONFIGDIR=%_sysconfdir \
install
-ln -sf %{_sysconfdir}/init.d/ebtables %{buildroot}%{_sbindir}/rcebtables
+ln -sf %_sysconfdir/init.d/ebtables %buildroot%_sbindir/rcebtables
# not used
-rm -f %{buildroot}%{_sysconfdir}/ebtables-config
+rm -f %buildroot%_sysconfdir/ebtables-config
%post
%fillup_and_insserv ebtables
@@ -89,20 +92,17 @@
%restart_on_update ebtables
%insserv_cleanup
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root)
%doc COPYING ChangeLog
-%doc %{_mandir}/man8/ebtables.8*
-%config(noreplace) %{_sysconfdir}/ethertypes
-%{_sysconfdir}/init.d/ebtables
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*.so
-%{_sbindir}/ebtables
-%{_sbindir}/ebtables-restore
-%{_sbindir}/ebtables-save
-%{_sbindir}/rcebtables
+%doc %_mandir/man8/ebtables.8*
+%config(noreplace) %_sysconfdir/ethertypes
+%_sysconfdir/init.d/ebtables
+%dir %_libdir/%name
+%_libdir/%name/*.so
+%_sbindir/ebtables
+%_sbindir/ebtables-restore
+%_sbindir/ebtables-save
+%_sbindir/rcebtables
%changelog
++ ebtables-typepuns.diff ++
From: Jan Engelhardt
Date: 2011-07-11 01:11 +0200
libebt_among: fix undefined behavior on dereference of typepunned ptr
extensions/ebt_among.c: In function ‘create_wormhash’:
extensions/ebt_among.c:250:4: warning: dereferenci
commit ebtables for openSUSE:Factory
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.0 +0200
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-06-06
13:54:03.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.DPpTON/_new 2011-06-14 12:08:05.0 +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
-Nick Fedchik
-Grzegorz Borowiak
-
%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.0 +0200
+++ /var/tmp/diff_new_pack.DPpTON/_new 2011-06-14 12:08:05.0 +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
commit ebtables for openSUSE:Factory
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.0 +0100
+++ /mounts/work_src_done/STABLE/ebtables/ebtables.changes 2011-05-31
14:57:59.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.nmb0Hg/_new 2011-06-01 09:32:10.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.nmb0Hg/_new 2011-06-01 09:32:10.0 +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 ]; th
