SHA256
1
0
forked from pool/openscap

Accepting request 263389 from home:Ledest:bashisms

fix bashism in oscap-scan.cron script

OBS-URL: https://build.opensuse.org/request/show/263389
OBS-URL: https://build.opensuse.org/package/show/security/openscap?expand=0&rev=115
This commit is contained in:
Marcus Meissner 2014-12-01 12:33:36 +00:00 committed by Git OBS Bridge
parent 68ca51a38a
commit c36700dc75
3 changed files with 21 additions and 0 deletions

View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 29 01:11:00 UTC 2014 - Led <ledest@gmail.com>
- 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

View File

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