From root@hilbert.suse.de Fri Apr 27 14:09:05 2018
From: root@hilbert.suse.de
To: commit@lists.opensuse.org
Subject: commit openscap for openSUSE:Factory
Date: Fri, 27 Apr 2018 16:09:05 +0200
Message-ID: <20180427140905.BD9E19B88A@hilbert.suse.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6294546427955220175=="

--===============6294546427955220175==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello community,

here is the log from the commit of package openscap for openSUSE:Factory chec=
ked in at 2018-04-27 16:08:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openscap (Old)
 and      /work/SRC/openSUSE:Factory/.openscap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openscap"

Fri Apr 27 16:08:52 2018 rev:56 rq:601561 version:1.2.16

Changes:
--------
--- /work/SRC/openSUSE:Factory/openscap/openscap.changes	2018-03-07 10:35:17.=
353154897 +0100
+++ /work/SRC/openSUSE:Factory/.openscap.new/openscap.changes	2018-04-27 16:0=
9:04.962818068 +0200
@@ -1,0 +2,6 @@
+Thu Apr 26 12:56:42 UTC 2018 - meissner(a)suse.com
+
+- openscap-new-suse.patch: handle SLE15 and openSUSE Leap 42.3 and 15.0
+  (bsc#1091040)
+
+-------------------------------------------------------------------

New:
----
  openscap-new-suse.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openscap.spec ++++++
--- /var/tmp/diff_new_pack.j2ZPz7/_old	2018-04-27 16:09:05.626793715 +0200
+++ /var/tmp/diff_new_pack.j2ZPz7/_new	2018-04-27 16:09:05.630793568 +0200
@@ -36,6 +36,7 @@
 Source4:        scap-yast2sec-oval.xml
 Source5:        oscap-scan.service
 Source6:        oscap-scan.sh
+Patch0:         openscap-new-suse.patch
 Url:            http://www.open-scap.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  doxygen
@@ -174,6 +175,7 @@
=20
 %prep
 %setup -q
+%patch0 -p1
=20
 %build
=20

++++++ openscap-new-suse.patch ++++++
Index: openscap-1.2.16/cpe/openscap-cpe-dict.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- openscap-1.2.16.orig/cpe/openscap-cpe-dict.xml
+++ openscap-1.2.16/cpe/openscap-cpe-dict.xml
@@ -133,6 +133,14 @@
             <title xml:lang=3D"en-us">SUSE Linux Enterprise Desktop 12</titl=
e>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:12</check>
       </cpe-item>
+      <cpe-item name=3D"cpe:/o:suse:sles:15">
+            <title xml:lang=3D"en-us">SUSE Linux Enterprise Server 15</title>
+            <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.sles:def:15</check>
+      </cpe-item>
+      <cpe-item name=3D"cpe:/o:suse:sled:15">
+            <title xml:lang=3D"en-us">SUSE Linux Enterprise Desktop 15</titl=
e>
+            <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.sled:def:15</check>
+      </cpe-item>
       <cpe-item name=3D"cpe:/o:opensuse:opensuse:11.4">
             <title xml:lang=3D"en-us">openSUSE 11.4</title>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:114</=
check>
@@ -145,14 +153,22 @@
             <title xml:lang=3D"en-us">openSUSE 13.2</title>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:132</=
check>
       </cpe-item>
-      <cpe-item name=3D"cpe:/o:novell:leap:42.1">
+      <cpe-item name=3D"cpe:/o:opensuse:leap:42.1">
             <title xml:lang=3D"en-us">openSUSE 42.1</title>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:421</=
check>
       </cpe-item>
-      <cpe-item name=3D"cpe:/o:novell:leap:42.2">
+      <cpe-item name=3D"cpe:/o:opensuse:leap:42.2">
             <title xml:lang=3D"en-us">openSUSE 42.2</title>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:422</=
check>
       </cpe-item>
+      <cpe-item name=3D"cpe:/o:opensuse:leap:42.3">
+            <title xml:lang=3D"en-us">openSUSE Leap 42.3</title>
+            <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:423</=
check>
+      </cpe-item>
+      <cpe-item name=3D"cpe:/o:opensuse:leap:15.0">
+            <title xml:lang=3D"en-us">openSUSE Leap 15.0</title>
+            <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:150</=
check>
+      </cpe-item>
       <cpe-item name=3D"cpe:/o:opensuse:opensuse">
             <title xml:lang=3D"en-us">openSUSE All Versions</title>
             <check system=3D"http://oval.mitre.org/XMLSchema/oval-definition=
s-5" href=3D"openscap-cpe-oval.xml">oval:org.open-scap.cpe.opensuse:def:1</ch=
eck>
Index: openscap-1.2.16/cpe/openscap-cpe-oval.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- openscap-1.2.16.orig/cpe/openscap-cpe-oval.xml
+++ openscap-1.2.16/cpe/openscap-cpe-oval.xml
@@ -449,6 +449,34 @@
                   </criteria>
             </definition>
=20
+            <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.sle=
s:def:15" version=3D"1">
+                  <metadata>
+                        <title>SUSE Linux Enterprise Server 15</title>
+                        <affected family=3D"unix">
+                            <platform>SUSE Linux Enterprise Server 15</platf=
orm>
+                        </affected>
+                        <reference ref_id=3D"cpe:/o:suse:sles:15" source=3D"=
CPE"/>
+                        <description>The operating system installed on the s=
ystem is SUSE Linux Enterprise Server 15</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment=3D"SLES 15 is installed" test_ref=
=3D"oval:org.open-scap.cpe.sles:tst:15"/>
+                  </criteria>
+            </definition>
+
+            <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.sle=
d:def:15" version=3D"1">
+                  <metadata>
+                        <title>SUSE Linux Enterprise Desktop 15</title>
+                        <affected family=3D"unix">
+                            <platform>SUSE Linux Enterprise Desktop 15</plat=
form>
+                        </affected>
+                        <reference ref_id=3D"cpe:/o:suse:sled:15" source=3D"=
CPE"/>
+                        <description>The operating system installed on the s=
ystem is SUSE Linux Enterprise Desktop 15</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment=3D"SLED 15 is installed" test_ref=
=3D"oval:org.open-scap.cpe.sled:tst:15"/>
+                  </criteria>
+            </definition>
+
             <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.ope=
nsuse:def:1" version=3D"1">
                   <metadata>
                         <title>openSUSE All Versions</title>
@@ -519,17 +547,43 @@
             </definition>
             <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.ope=
nsuse:def:422" version=3D"1">
                   <metadata>
-                        <title>openSUSE 42.2</title>
+                        <title>openSUSE Leap 42.2</title>
                         <affected family=3D"unix">
-                            <platform>openSUSE 42.2</platform>
+                            <platform>openSUSE Leap 42.2</platform>
                         </affected>
                         <reference ref_id=3D"cpe:/o:novell:leap:42.2" source=
=3D"CPE"/>
-                        <description>The operating system installed on the s=
ystem is openSUSE 42.2</description>
+                        <description>The operating system installed on the s=
ystem is openSUSE Leap 42.2</description>
                   </metadata>
                   <criteria>
                         <criterion comment=3D"openSUSE 42.2 is installed" te=
st_ref=3D"oval:org.open-scap.cpe.opensuse:tst:422"/>
                   </criteria>
             </definition>
+            <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.ope=
nsuse:def:423" version=3D"1">
+                  <metadata>
+                        <title>openSUSE Leap 42.3</title>
+                        <affected family=3D"unix">
+                            <platform>openSUSE Leap 42.3</platform>
+                        </affected>
+                        <reference ref_id=3D"cpe:/o:novell:leap:42.3" source=
=3D"CPE"/>
+                        <description>The operating system installed on the s=
ystem is openSUSE Leap 42.3</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment=3D"openSUSE 42.3 is installed" te=
st_ref=3D"oval:org.open-scap.cpe.opensuse:tst:423"/>
+                  </criteria>
+            </definition>
+            <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.ope=
nsuse:def:150" version=3D"1">
+                  <metadata>
+                        <title>openSUSE Leap 15.0</title>
+                        <affected family=3D"unix">
+                            <platform>openSUSE Leap 15.0</platform>
+                        </affected>
+                        <reference ref_id=3D"cpe:/o:novell:leap:15.0" source=
=3D"CPE"/>
+                        <description>The operating system installed on the s=
ystem is openSUSE Leap 15.0</description>
+                  </metadata>
+                  <criteria>
+                        <criterion comment=3D"openSUSE 42.3 is installed" te=
st_ref=3D"oval:org.open-scap.cpe.opensuse:tst:423"/>
+                  </criteria>
+            </definition>
             <definition class=3D"inventory" id=3D"oval:org.open-scap.cpe.wrl=
inux:def:1" version=3D"1" >
                   <metadata>
                         <title>Wind River Linux</title>
@@ -715,6 +769,11 @@
                   <object object_ref=3D"oval:org.open-scap.cpe.sles-release:=
obj:1"/>
                   <state state_ref=3D"oval:org.open-scap.cpe.sles:ste:12"/>
             </rpminfo_test>
+            <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.sles:tst:15" version=3D"1" check=3D"at least one" comment=
=3D"sles-release is version 15"
+                  xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
+                  <object object_ref=3D"oval:org.open-scap.cpe.sles-release:=
obj:1"/>
+                  <state state_ref=3D"oval:org.open-scap.cpe.sles:ste:15"/>
+            </rpminfo_test>
             <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.sled:tst:10" version=3D"1" check=3D"at least one" comment=
=3D"sled-release is version 10"
                   xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
                   <object object_ref=3D"oval:org.open-scap.cpe.sled-release:=
obj:1"/>
@@ -730,6 +789,11 @@
                   <object object_ref=3D"oval:org.open-scap.cpe.sled-release:=
obj:1"/>
                   <state state_ref=3D"oval:org.open-scap.cpe.sled:ste:12"/>
             </rpminfo_test>
+            <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.sled:tst:15" version=3D"1" check=3D"at least one" comment=
=3D"sled-release is version 15"
+                  xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
+                  <object object_ref=3D"oval:org.open-scap.cpe.sled-release:=
obj:1"/>
+                  <state state_ref=3D"oval:org.open-scap.cpe.sled:ste:15"/>
+            </rpminfo_test>
             <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.opensuse:tst:1" version=3D"1" check=3D"at least one" comme=
nt=3D"openSUSE-release is version 11.4"
                   xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
                   <object object_ref=3D"oval:org.open-scap.cpe.openSUSE-rele=
ase:obj:1"/>
@@ -760,6 +824,16 @@
                   <object object_ref=3D"oval:org.open-scap.cpe.openSUSE-rele=
ase:obj:1"/>
                   <state state_ref=3D"oval:org.open-scap.cpe.opensuse:ste:42=
2"/>
             </rpminfo_test>
+            <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.opensuse:tst:423" version=3D"2" check=3D"at least one" com=
ment=3D"openSUSE-release is version 42.2"
+                  xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
+                  <object object_ref=3D"oval:org.open-scap.cpe.openSUSE-rele=
ase:obj:1"/>
+                  <state state_ref=3D"oval:org.open-scap.cpe.opensuse:ste:42=
3"/>
+            </rpminfo_test>
+            <rpminfo_test check_existence=3D"at_least_one_exists" id=3D"oval=
:org.open-scap.cpe.opensuse:tst:150" version=3D"2" check=3D"at least one" com=
ment=3D"openSUSE-release is version 42.2"
+                  xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#linux">
+                  <object object_ref=3D"oval:org.open-scap.cpe.openSUSE-rele=
ase:obj:1"/>
+                  <state state_ref=3D"oval:org.open-scap.cpe.opensuse:ste:15=
0"/>
+            </rpminfo_test>
             <family_test check_existence=3D"at_least_one_exists" id=3D"oval:=
org.open-scap.cpe.wrlinux:tst:1" version=3D"1" check=3D"only one"
                   comment=3D"Installed operating system is part of the Unix =
family."
                   xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-=
5#independent">
@@ -955,6 +1029,9 @@
             <rpminfo_state id=3D"oval:org.open-scap.cpe.sles:ste:12" version=
=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <version operation=3D"pattern match">^12($|[^\d])</version>
             </rpminfo_state>
+            <rpminfo_state id=3D"oval:org.open-scap.cpe.sles:ste:15" version=
=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+                  <version operation=3D"pattern match">^15($|[^\d])</version>
+            </rpminfo_state>
             <rpminfo_state id=3D"oval:org.open-scap.cpe.sled:ste:10" version=
=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <version operation=3D"pattern match">^10($|[^\d])</version>
             </rpminfo_state>
@@ -964,6 +1041,9 @@
             <rpminfo_state id=3D"oval:org.open-scap.cpe.sled:ste:12" version=
=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <version operation=3D"pattern match">^12($|[^\d])</version>
             </rpminfo_state>
+            <rpminfo_state id=3D"oval:org.open-scap.cpe.sled:ste:15" version=
=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
+                  <version operation=3D"pattern match">^15($|[^\d])</version>
+            </rpminfo_state>
             <rpminfo_state id=3D"oval:org.open-scap.cpe.opensuse:ste:2" vers=
ion=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux">
                   <name operation=3D"pattern match">^openSUSE-release</name>
             </rpminfo_state>
@@ -982,6 +1062,12 @@
             <rpminfo_state id=3D"oval:org.open-scap.cpe.opensuse:ste:422" ve=
rsion=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux=
">
                   <version operation=3D"pattern match">^42.2$</version>
             </rpminfo_state>
+            <rpminfo_state id=3D"oval:org.open-scap.cpe.opensuse:ste:423" ve=
rsion=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux=
">
+                  <version operation=3D"pattern match">^42.3$</version>
+            </rpminfo_state>
+            <rpminfo_state id=3D"oval:org.open-scap.cpe.opensuse:ste:150" ve=
rsion=3D"1" xmlns=3D"http://oval.mitre.org/XMLSchema/oval-definitions-5#linux=
">
+                  <version operation=3D"pattern match">^15.0$</version>
+            </rpminfo_state>
             <textfilecontent54_state
                             id=3D"oval:org.open-scap.cpe.wrlinux-release:ste=
:8"
                             comment=3D"Check the /etc/wrlinux-release file f=
or VERSION 8 specification."

--===============6294546427955220175==--