diff --git a/fix-missing-include.dif b/fix-missing-include.dif index 48188a3..6c77627 100644 --- a/fix-missing-include.dif +++ b/fix-missing-include.dif @@ -1,7 +1,7 @@ -Index: openscap-1.2.6/src/OVAL/probes/unix/linux/rpminfo.c +Index: openscap-1.2.7/src/OVAL/probes/unix/linux/rpminfo.c =================================================================== ---- openscap-1.2.6.orig/src/OVAL/probes/unix/linux/rpminfo.c -+++ openscap-1.2.6/src/OVAL/probes/unix/linux/rpminfo.c +--- openscap-1.2.7.orig/src/OVAL/probes/unix/linux/rpminfo.c ++++ openscap-1.2.7/src/OVAL/probes/unix/linux/rpminfo.c @@ -66,6 +66,7 @@ #include #include @@ -10,15 +10,3 @@ Index: openscap-1.2.6/src/OVAL/probes/unix/linux/rpminfo.c #ifndef HAVE_HEADERFORMAT # define HAVE_LIBRPM44 1 /* hack */ -Index: openscap-1.2.6/src/common/oscap_acquire.c -=================================================================== ---- openscap-1.2.6.orig/src/common/oscap_acquire.c -+++ openscap-1.2.6/src/common/oscap_acquire.c -@@ -36,6 +36,7 @@ - #include - - #include "oscap_acquire.h" -+#include "oscap_buffer.h" - #include "common/_error.h" - #include "oscap_string.h" - diff --git a/openscap-1.2.6.tar.gz b/openscap-1.2.6.tar.gz deleted file mode 100644 index 77676c2..0000000 --- a/openscap-1.2.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95f2345e041e9ba838ad8065b68ce0ec4b0971d7afc72d601489236bbfc0c652 -size 15601491 diff --git a/openscap-1.2.6.tar.gz.sha1sum b/openscap-1.2.6.tar.gz.sha1sum deleted file mode 100644 index fa059a3..0000000 --- a/openscap-1.2.6.tar.gz.sha1sum +++ /dev/null @@ -1 +0,0 @@ -1a2582cb9a75309316fa2e86169529a2b9eaa060 openscap-1.2.6.tar.gz diff --git a/openscap-1.2.7.tar.gz b/openscap-1.2.7.tar.gz new file mode 100644 index 0000000..a6ac889 --- /dev/null +++ b/openscap-1.2.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41c266f4316546b227c5da447568ee64d856cb85a9104893038e66bc9b956d58 +size 15685221 diff --git a/openscap-1.2.7.tar.gz.sha1sum b/openscap-1.2.7.tar.gz.sha1sum new file mode 100644 index 0000000..918d20e --- /dev/null +++ b/openscap-1.2.7.tar.gz.sha1sum @@ -0,0 +1 @@ +88be9e23c5fb34d7a4e2252c959af87dc986fa89 openscap-1.2.7.tar.gz diff --git a/openscap-new-inventory.patch b/openscap-new-inventory.patch deleted file mode 100644 index 1f9b0c6..0000000 --- a/openscap-new-inventory.patch +++ /dev/null @@ -1,372 +0,0 @@ -Index: openscap-1.2.6/cpe/openscap-cpe-dict.xml -=================================================================== ---- openscap-1.2.6.orig/cpe/openscap-cpe-dict.xml -+++ openscap-1.2.6/cpe/openscap-cpe-dict.xml -@@ -77,7 +77,50 @@ - Fedora 24 - oval:org.open-scap.cpe.fedora:def:24 - -- -+ -+ SUSE Linux Enterprise all versions -+ oval:org.open-scap.cpe.sle:def:1 -+ -+ -+ SUSE Linux Enterprise Server 10 -+ oval:org.open-scap.cpe.sles:def:10 -+ -+ -+ SUSE Linux Enterprise Desktop 10 -+ oval:org.open-scap.cpe.sled:def:10 -+ -+ -+ SUSE Linux Enterprise Server 11 -+ oval:org.open-scap.cpe.sles:def:11 -+ -+ -+ SUSE Linux Enterprise Desktop 11 -+ oval:org.open-scap.cpe.sled:def:11 -+ -+ -+ SUSE Linux Enterprise Server 12 -+ oval:org.open-scap.cpe.sles:def:12 -+ -+ -+ SUSE Linux Enterprise Desktop 12 -+ oval:org.open-scap.cpe.sled:def:12 -+ -+ -+ openSUSE 11.4 -+ oval:org.open-scap.cpe.opensuse:def:114 -+ -+ -+ openSUSE 13.1 -+ oval:org.open-scap.cpe.opensuse:def:131 -+ -+ -+ openSUSE 13.2 -+ oval:org.open-scap.cpe.opensuse:def:132 -+ -+ -+ openSUSE All Versions -+ oval:org.open-scap.cpe.opensuse:def:1 -+ - - - Red Hat Enterprise Linux Optional Productivity Applications -Index: openscap-1.2.6/cpe/openscap-cpe-oval.xml -=================================================================== ---- openscap-1.2.6.orig/cpe/openscap-cpe-oval.xml -+++ openscap-1.2.6/cpe/openscap-cpe-oval.xml -@@ -278,6 +278,175 @@ - - - -+ -+ -+ -+ SUSE Linux Enterprise All Platforms -+ -+ SUSE Linux Enterprise All Platforms -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Server 10 -+ -+ SUSE Linux Enterprise Server 10 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Server 10 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Desktop 10 -+ -+ SUSE Linux Enterprise Desktop 10 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Desktop 10 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Server 11 -+ -+ SUSE Linux Enterprise Server 11 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Server 11 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Desktop 11 -+ -+ SUSE Linux Enterprise Desktop 11 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Desktop 11 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Server 12 -+ -+ SUSE Linux Enterprise Server 12 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Server 12 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ SUSE Linux Enterprise Desktop 12 -+ -+ SUSE Linux Enterprise Desktop 12 -+ -+ -+ The operating system installed on the system is SUSE Linux Enterprise Desktop 12 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ openSUSE All Versions -+ -+ openSUSE -+ -+ -+ The operating system installed on the system is openSUSE -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ openSUSE 11.4 -+ -+ openSUSE 11.4 -+ -+ -+ The operating system installed on the system is openSUSE 11.4 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ openSUSE 13.1 -+ -+ openSUSE 13.1 -+ -+ -+ The operating system installed on the system is openSUSE 13.1 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ openSUSE 13.2 -+ -+ openSUSE 13.2 -+ -+ -+ The operating system installed on the system is openSUSE 13.2 -+ -+ -+ -+ -+ -+ -+ - - - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -400,6 +640,15 @@ - /etc/redhat-release - - -+ -+ sles-release -+ -+ -+ sled-release -+ -+ -+ openSUSE-release -+ - - - -@@ -470,5 +719,41 @@ - - ^24$ - -+ -+ ^sles-release -+ -+ -+ ^sled-release -+ -+ -+ ^10($|[^\d]) -+ -+ -+ ^11($|[^\d]) -+ -+ -+ ^12($|[^\d]) -+ -+ -+ ^10($|[^\d]) -+ -+ -+ ^11($|[^\d]) -+ -+ -+ ^12($|[^\d]) -+ -+ -+ ^openSUSE-release -+ -+ -+ ^11.4$ -+ -+ -+ ^13.1$ -+ -+ -+ ^13.2$ -+ - - diff --git a/openscap.changes b/openscap.changes index 30d9f7c..ba7dfcf 100644 --- a/openscap.changes +++ b/openscap.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Dec 3 13:06:14 UTC 2015 - meissner@suse.com + +- openscap 1.2.7 release + - New features + - OVAL 5.11.1 fully supported + - oscap-vm - tool for offline scanning of virtual machines + - verbose mode + - added SLED, SLES and OpenSUSE CPE names + - show profile description in HTML report and guide + - group rules by PCI DSS identifier in HTML report + - preliminary support for Ansible Playbooks within xccdf:fix + - added "How to contribute" and "Versioning" documents + - Maintenance + - using bziped RHSA documents in oscap-docker + - fixed errors of sysctl probe + - fixed skip-valid option (issue #203) + - fixed segmentation faults in SCE content reporting (issue #231) + - fixed tracebacks of scap-as-rpm + - fixed invalid memory reads in rpmverifyfile probe (issue #212) + - updated README and user manual + - many small bugfixes and new tests +- openscap-new-inventory.patch: upstreamed +- fix-missing-include.dif: refreshed, 1 hunk upstream + ------------------------------------------------------------------- Fri Oct 9 09:35:46 UTC 2015 - meissner@suse.com diff --git a/openscap.spec b/openscap.spec index cbb4dbc..bce61ea 100644 --- a/openscap.spec +++ b/openscap.spec @@ -20,7 +20,7 @@ %define with_bindings 0 Name: openscap -Version: 1.2.6 +Version: 1.2.7 Release: 1.0 Source: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz Source5: https://fedorahosted.org/releases/o/p/openscap/%name-%version.tar.gz.sha1sum @@ -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-new-inventory.patch Url: http://www.open-scap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libacl-devel @@ -149,7 +148,6 @@ commonly used and require additional dependencies. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build