From f15a367785095ae3a586278f38985bfe5d212a4ab4a45fd4027c3f68429bca02 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 30 Apr 2020 13:10:10 +0000 Subject: [PATCH 1/2] Accepting request 798948 from home:kukuk:branches:security:netfilter - Use /bin/sh for ebtables.systemd - Don't hard require systemd, we don't need that in a container OBS-URL: https://build.opensuse.org/request/show/798948 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=67 --- ebtables.changes | 6 ++++++ ebtables.spec | 4 ++-- ebtables.systemd | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ebtables.changes b/ebtables.changes index 4285a47..208e381 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Fri Jan 10 14:26:56 UTC 2020 - Kristyna Streitova diff --git a/ebtables.spec b/ebtables.spec index 2396c26..f56f7eb 100644 --- a/ebtables.spec +++ b/ebtables.spec @@ -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 @@ Requires(pre): %fillup_prereq 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 diff --git a/ebtables.systemd b/ebtables.systemd index 8de6aca..4e6e43b 100644 --- a/ebtables.systemd +++ b/ebtables.systemd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh RETVAL=0 From 93e43f3f67d1741cc1a199a2e9b73b554e56058ae73b3cf0f2d64809cc262ff0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 9 May 2020 12:50:45 +0000 Subject: [PATCH 2/2] Accepting request 801531 from home:kukuk:container - Revert last /bin/bash -> /bin/sh change OBS-URL: https://build.opensuse.org/request/show/801531 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ebtables?expand=0&rev=68 --- ebtables.changes | 5 +++++ ebtables.systemd | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ebtables.changes b/ebtables.changes index 208e381..1054438 100644 --- a/ebtables.changes +++ b/ebtables.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/ebtables.systemd b/ebtables.systemd index 4e6e43b..8de6aca 100644 --- a/ebtables.systemd +++ b/ebtables.systemd @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash RETVAL=0