Accepting request 391721 from home:kstreitova:branches:security:netfilter

- 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

OBS-URL: https://build.opensuse.org/request/show/391721
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=39
This commit is contained in:
Kristyna Streitova 2016-05-06 08:56:44 +00:00 committed by Git OBS Bridge
parent 1852e18332
commit ae8fc77414
2 changed files with 45 additions and 37 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Apr 26 12:13:47 UTC 2016 - kstreitova@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
-------------------------------------------------------------------
Sat Aug 29 15:07:16 UTC 2015 - bwiedemann@suse.com

View File

@ -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 @@ Summary: Ethernet Bridge Tables
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 kstreitova@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 kstreitova@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 @@ can be used together with the other Linux filtering tools, like
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 @@ mv include/linux/netfilter_bridge/ebt_ulog.{h.save,h}
# 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 @@ rm -f "%buildroot/%_sysconfdir/ebtables-config"
%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
%{_sbindir}/ebtables-restore
%{_sbindir}/ebtables-save
%{_sbindir}/rcebtables
%changelog