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

- 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]

OBS-URL: https://build.opensuse.org/request/show/762870
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=65
This commit is contained in:
Kristyna Streitova 2020-01-15 09:23:27 +00:00 committed by Git OBS Bridge
parent bc913036dd
commit 0a66a9820d
3 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 10 14:26:56 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
- 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]
-------------------------------------------------------------------
Tue Dec 10 14:12:00 UTC 2019 - Kristyna Streitova <kstreitova@suse.com>

View File

@ -4,8 +4,8 @@ Description=Ethernet Bridge Filtering tables
[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

View File

@ -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 @@ mkdir -p %{buildroot}%{_unitdir}
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 @@ fi
%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