From e68db1f763c8a207cbf92500536f9f7d0cfc02f98478cc1927336d985aae6721 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 2 Dec 2014 12:46:26 +0000 Subject: [PATCH] - openscap-1.1.0-fix-bashisms.patch: upstreamed OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=118 --- openscap-1.1.0-fix-bashisms.patch | 12 ------------ openscap.changes | 1 + openscap.spec | 2 -- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 openscap-1.1.0-fix-bashisms.patch diff --git a/openscap-1.1.0-fix-bashisms.patch b/openscap-1.1.0-fix-bashisms.patch deleted file mode 100644 index 178fd6a..0000000 --- a/openscap-1.1.0-fix-bashisms.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Ndur openscap-1.1.0/docs/oscap-scan.cron openscap-1.1.0-fix-bashisms/docs/oscap-scan.cron ---- openscap-1.1.0/docs/oscap-scan.cron 2011-08-17 15:55:37.000000000 +0300 -+++ openscap-1.1.0-fix-bashisms/docs/oscap-scan.cron 2014-11-29 03:09:36.518411860 +0200 -@@ -7,7 +7,7 @@ - - #OPTIONS="oval eval --report /var/log/oscap-scan.html.log --results /var/log/oscap-scan.xml.log /usr/share/openscap/scap-fedora14-oval.xml" - PROG="/usr/bin/oscap" --if [ x"$OPTIONS" == "x" ] -+if [ -z "$OPTIONS" ] - then - logger "OpenSCAP security scan: NOT CONFIGURED. (Cron job)" - exit 0 diff --git a/openscap.changes b/openscap.changes index 0d7f465..9f41ab6 100644 --- a/openscap.changes +++ b/openscap.changes @@ -24,6 +24,7 @@ Tue Dec 2 12:44:35 UTC 2014 - meissner@suse.com - dozens of small fixes - dozens of memory leaks (whole test suite is now leak free) - updated gnulib +- openscap-1.1.0-fix-bashisms.patch: upstreamed ------------------------------------------------------------------- Mon Dec 1 12:38:45 UTC 2014 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index 7581365..2ec44b6 100644 --- a/openscap.spec +++ b/openscap.spec @@ -32,7 +32,6 @@ Source2: sysconfig.oscap-scan Source3: scap-yast2sec-xccdf.xml Source4: scap-yast2sec-oval.xml Patch0: fix-missing-include.dif -Patch1: openscap-1.1.0-fix-bashisms.patch Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -142,7 +141,6 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build