diff --git a/openscap-1.1.0-fix-bashisms.patch b/openscap-1.1.0-fix-bashisms.patch new file mode 100644 index 0000000..178fd6a --- /dev/null +++ b/openscap-1.1.0-fix-bashisms.patch @@ -0,0 +1,12 @@ +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 6851777..ffa1825 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 29 01:11:00 UTC 2014 - Led + +- fix bashism in oscap-scan.cron script +- add patches: + * openscap-1.1.0-fix-bashisms.patch + ------------------------------------------------------------------- Wed Sep 3 12:09:10 UTC 2014 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index fce4c53..58899d6 100644 --- a/openscap.spec +++ b/openscap.spec @@ -32,6 +32,7 @@ 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 @@ -141,6 +142,7 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build