Accepting request 482495 from home:kstreitova:branches:security:netfilter
- cleanup with spec-cleaner
- get rid of %{name} macros in the patch names
- remove sysvinit support
OBS-URL: https://build.opensuse.org/request/show/482495
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=43
This commit is contained in:
Git OBS Bridge
parent
8b3624a4e2
commit
9e67edcc73
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 23 15:14:46 UTC 2017 - kstreitova@suse.com
|
||||
|
||||
- cleanup with spec-cleaner
|
||||
- get rid of %{name} macros in the patch names
|
||||
- remove sysvinit support
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 6 10:43:55 UTC 2016 - p.drouand@gmail.com
|
||||
|
||||
|
||||
@ -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 @@ 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
|
||||
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 kstreitova@suse.com -- audit patch for CC certification
|
||||
Patch2: ebtables-v2.0.10-4-audit.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
@ -37,16 +37,11 @@ Patch3: 0001-fix-compilation-warning.patch
|
||||
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 @@ make \
|
||||
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}.filter
|
||||
%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat
|
||||
%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/*.so
|
||||
%{_sbindir}/ebtables
|
||||
|
||||
Loading…
Reference in New Issue
Block a user