[Oval-commits] r119 - in branches/debian/debian: . examples patches

Pavel Vinogradov blaze-guest at alioth.debian.org
Wed Aug 8 19:14:14 UTC 2007


Author: blaze-guest
Date: 2007-08-08 19:14:14 +0000 (Wed, 08 Aug 2007)
New Revision: 119

Added:
   branches/debian/debian/examples/dsa1325_example.xml
   branches/debian/debian/examples/package_example.xml
   branches/debian/debian/examples/release_example.xml
   branches/debian/debian/patches/debian.ovaldi.1.patch
Removed:
   branches/debian/debian/examples/debian_dsa1325_example.xml
   branches/debian/debian/examples/debian_package_example.xml
   branches/debian/debian/examples/debian_release_example.xml
Modified:
   branches/debian/debian/control
   branches/debian/debian/patches/series
Log:
Update debian package

Modified: branches/debian/debian/control
===================================================================
--- branches/debian/debian/control	2007-08-08 18:41:50 UTC (rev 118)
+++ branches/debian/debian/control	2007-08-08 19:14:14 UTC (rev 119)
@@ -1,4 +1,4 @@
-Source: oval
+Source: ovaldi
 Section: admin
 Priority: optional
 Maintainer: Pavel Vinogradov <Pavel.Vinogradov at nixdev.net>

Deleted: branches/debian/debian/examples/debian_dsa1325_example.xml
===================================================================
--- branches/debian/debian/examples/debian_dsa1325_example.xml	2007-08-08 18:41:50 UTC (rev 118)
+++ branches/debian/debian/examples/debian_dsa1325_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -1,252 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-  <generator>
-    <oval:product_name>Debian</oval:product_name>
-    <oval:schema_version>5.3</oval:schema_version>
-    <oval:timestamp>2007-08-08T22:49:20.188-04:00</oval:timestamp>
-  </generator>
-  <definitions>
-    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
-      <metadata>
-        <title>several vulnerabilities</title>
-        <affected family='unix'>
-          <platform>Debian GNU/Linux 4.0</platform>
-          <platform>Debian GNU/Linux 3.1</platform>
-          <product>evolution</product>
-        </affected>
-        <reference source='CVE' ref_url='http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1002' ref_id='CVE-2007-1002'/>
-        <reference source='CVE' ref_url='http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3257' ref_id='CVE-2007-3257'/>
-        <description>What information can i put there?</description>
-        <debian>
-          <date>2007-06-29</date>
-          <moreinfo>
-Several remote vulnerabilities have been discovered in Evolution, a
-groupware suite with mail client and organizer. The Common Vulnerabilities
-and Exposures project identifies the following problems:
-Ulf Härnhammar discovered that a format string vulnerability in
-    the handling of shared calendars may allow the execution of arbitrary
-    code.
-It was discovered that the IMAP code in the Evolution Data Server
-    performs insufficient sanitising of a value later used an array index,
-    which can lead to the execution of arbitrary code.</moreinfo>
-        </debian>
-      </metadata>
-      <criteria comment='Platform section' operator='OR'>
-        <criteria comment='Release section' operator='AND'>
-          <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
-          <criteria comment='Architecture section' operator='OR'>
-            <criteria comment='Architecture independet section' operator='AND'>
-              <criterion comment='all architecture' test_ref='oval:org.debian.oval:tst:2'/>
-              <criterion comment='evolution-common DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:3'/>
-            </criteria>
-            <criteria comment='Architecture depended section' operator='AND'>
-              <criteria comment='Supported architectures section' operator='OR'>
-                <criterion comment='s390 architecture' test_ref='oval:org.debian.oval:tst:4'/>
-                <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:5'/>
-                <criterion comment='sparc architecture' test_ref='oval:org.debian.oval:tst:6'/>
-                <criterion comment='arm architecture' test_ref='oval:org.debian.oval:tst:7'/>
-                <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:8'/>
-                <criterion comment='ia64 architecture' test_ref='oval:org.debian.oval:tst:9'/>
-                <criterion comment='alpha architecture' test_ref='oval:org.debian.oval:tst:10'/>
-                <criterion comment='powerpc architecture' test_ref='oval:org.debian.oval:tst:11'/>
-                <criterion comment='mipsel architecture' test_ref='oval:org.debian.oval:tst:12'/>
-                <criterion comment='hppa architecture' test_ref='oval:org.debian.oval:tst:13'/>
-              </criteria>
-              <criteria comment='Packages section' operator='OR'>
-                <criterion comment='evolution-dbg DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:14'/>
-                <criterion comment='evolution DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:15'/>
-                <criterion comment='evolution-dev DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:16'/>
-                <criterion comment='evolution-plugins DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:17'/>
-                <criterion comment='evolution-plugins-experimental DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:18'/>
-              </criteria>
-            </criteria>
-          </criteria>
-        </criteria>
-        <criteria comment='Release section' operator='AND'>
-          <criterion comment='Debian 3.1 is installed' test_ref='oval:org.debian.oval:tst:19'/>
-          <criteria comment='Architecture section' operator='OR'>
-            <criteria comment='Architecture depended section' operator='AND'>
-              <criteria comment='Supported architectures section' operator='OR'>
-                <criterion comment='s390 architecture' test_ref='oval:org.debian.oval:tst:4'/>
-                <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:5'/>
-                <criterion comment='sparc architecture' test_ref='oval:org.debian.oval:tst:6'/>
-                <criterion comment='m68k architecture' test_ref='oval:org.debian.oval:tst:20'/>
-                <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:8'/>
-                <criterion comment='ia64 architecture' test_ref='oval:org.debian.oval:tst:9'/>
-                <criterion comment='alpha architecture' test_ref='oval:org.debian.oval:tst:10'/>
-                <criterion comment='mipsel architecture' test_ref='oval:org.debian.oval:tst:12'/>
-                <criterion comment='arm architecture' test_ref='oval:org.debian.oval:tst:7'/>
-              </criteria>
-              <criteria comment='Packages section' operator='OR'>
-                <criterion comment='evolution DPKG is earlier than 2.0.4-2sarge2' test_ref='oval:org.debian.oval:tst:21'/>
-                <criterion comment='evolution-dev DPKG is earlier than 2.0.4-2sarge2' test_ref='oval:org.debian.oval:tst:22'/>
-              </criteria>
-            </criteria>
-          </criteria>
-        </criteria>
-      </criteria>
-    </definition>
-  </definitions>
-  <tests>
-    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:1'/>
-      <state state_ref='oval:org.debian.oval:ste:1'/>
-    </textfilecontent_test>
-    <uname_test comment='Installed architecture is all' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:2' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-    </uname_test>
-    <dpkginfo_test comment='evolution-common is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:3' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:3'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <uname_test comment='Installed architecture is s390' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:4' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:3'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is amd64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:5' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:4'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is sparc' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:6' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:5'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is arm' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:7' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:6'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is i386' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:8' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:7'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is ia64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:9' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:8'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is alpha' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:10' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:9'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is powerpc' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:11' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:10'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is mipsel' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:12' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:11'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is hppa' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:13' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:12'/>
-    </uname_test>
-    <dpkginfo_test comment='evolution-dbg is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:14' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:4'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <dpkginfo_test comment='evolution is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:15' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:5'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <dpkginfo_test comment='evolution-dev is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:16' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:6'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <dpkginfo_test comment='evolution-plugins is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:17' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:7'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <dpkginfo_test comment='evolution-plugins-experimental is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:18' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:8'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </dpkginfo_test>
-    <textfilecontent_test comment='Debian GNU/Linux 3.1 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:19' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:1'/>
-      <state state_ref='oval:org.debian.oval:ste:13'/>
-    </textfilecontent_test>
-    <uname_test comment='Installed architecture is m68k' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:20' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:14'/>
-    </uname_test>
-    <dpkginfo_test comment='evolution is earlier than 2.0.4-2sarge2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:21' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:5'/>
-      <state state_ref='oval:org.debian.oval:ste:15'/>
-    </dpkginfo_test>
-    <dpkginfo_test comment='evolution-dev is earlier than 2.0.4-2sarge2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:22' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:6'/>
-      <state state_ref='oval:org.debian.oval:ste:15'/>
-    </dpkginfo_test>
-  </tests>
-  <objects>
-    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <path>/etc</path>
-      <filename>debian_version</filename>
-      <line operation='pattern match'>\d\.\d</line>
-    </textfilecontent_object>
-    <uname_object version='1' id='oval:org.debian.oval:obj:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'/>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution-common</name>
-    </dpkginfo_object>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:4' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution-dbg</name>
-    </dpkginfo_object>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:5' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution</name>
-    </dpkginfo_object>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:6' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution-dev</name>
-    </dpkginfo_object>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:7' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution-plugins</name>
-    </dpkginfo_object>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:8' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>evolution-plugins-experimental</name>
-    </dpkginfo_object>
-  </objects>
-  <states>
-    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <line operation='equals'>4.0</line>
-    </textfilecontent_state>
-    <dpkginfo_state version='1' id='oval:org.debian.oval:ste:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <evr datatype='evr_string' operation='less than'>0:2.6.3-6etch1</evr>
-    </dpkginfo_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>s390x</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:4' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>x86-64</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:5' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>sparc</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:6' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>arm</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:7' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>i686</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:8' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>ia64</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:9' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>alpha</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:10' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>ppc</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:11' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>mipsel</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:12' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>hppa</processor_type>
-    </uname_state>
-    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:13' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <line operation='equals'>3.1</line>
-    </textfilecontent_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:14' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>m68k</processor_type>
-    </uname_state>
-    <dpkginfo_state version='1' id='oval:org.debian.oval:ste:15' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <evr datatype='evr_string' operation='less than'>0:2.0.4-2sarge2</evr>
-    </dpkginfo_state>
-  </states>
-</oval_definitions>

Deleted: branches/debian/debian/examples/debian_package_example.xml
===================================================================
--- branches/debian/debian/examples/debian_package_example.xml	2007-08-08 18:41:50 UTC (rev 118)
+++ branches/debian/debian/examples/debian_package_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -1,69 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-  <generator>
-    <oval:product_name>Debian</oval:product_name>
-    <oval:schema_version>5.3</oval:schema_version>
-    <oval:timestamp>2007-08-08T22:23:18.188-04:00</oval:timestamp>
-  </generator>
-  <definitions>
-    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
-      <metadata>
-        <title>Grub package installed on i386 or amd64 architecture</title>
-        <affected family='unix'>
-          <platform>Debian GNU/Linux 4.0</platform>
-          <product>grub</product>
-        </affected>
-        <description>Check if grub package installed on Debian 4.0 (etch) on i386 or amd64 arch</description>
-      </metadata>
-      <criteria comment='Release section' operator='AND'>
-        <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
-        <criteria comment='Architecture depended section' operator='AND'>
-          <criteria comment='Supported architectures section' operator='OR'>
-            <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:2'/>
-            <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:3'/>
-          </criteria>
-          <criterion comment='grub DPKG is installed' test_ref='oval:org.debian.oval:tst:4'/>
-        </criteria>
-      </criteria>
-    </definition>
-  </definitions>
-  <tests>
-    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:1'/>
-      <state state_ref='oval:org.debian.oval:ste:1'/>
-    </textfilecontent_test>
-    <uname_test comment='Installed architecture is amd64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:2' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:2'/>
-    </uname_test>
-    <uname_test comment='Installed architecture is i386' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:3' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:2'/>
-      <state state_ref='oval:org.debian.oval:ste:3'/>
-    </uname_test>
-    <dpkginfo_test comment='grub package installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:4' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:3'/>
-    </dpkginfo_test>
-  </tests>
-  <objects>
-    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <path>/etc</path>
-      <filename>debian_version</filename>
-      <line operation='pattern match'>\d\.\d</line>
-    </textfilecontent_object>
-    <uname_object version='1' id='oval:org.debian.oval:obj:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'/>
-    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-      <name>grub</name>
-    </dpkginfo_object>
-  </objects>
-  <states>
-    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <line operation='equals'>4.0</line>
-    </textfilecontent_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>x86-64</processor_type>
-    </uname_state>
-    <uname_state version='1' id='oval:org.debian.oval:ste:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
-      <processor_type operation='equals'>i686</processor_type>
-    </uname_state>
-  </states>
-</oval_definitions>

Deleted: branches/debian/debian/examples/debian_release_example.xml
===================================================================
--- branches/debian/debian/examples/debian_release_example.xml	2007-08-08 18:41:50 UTC (rev 118)
+++ branches/debian/debian/examples/debian_release_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -1,40 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
-  <generator>
-    <oval:product_name>Debian</oval:product_name>
-    <oval:schema_version>5.3</oval:schema_version>
-    <oval:timestamp>2007-08-08T22:18:08.188-04:00</oval:timestamp>
-  </generator>
-  <definitions>
-    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
-      <metadata>
-        <title>Debian release example definition</title>
-        <affected family='unix'>
-          <platform>Debian GNU/Linux 4.0</platform>
-        </affected>
-        <description>Test instalation of Debian 4.0 (etch) release</description>
-      </metadata>
-      <criteria comment='Release section' operator='AND'>
-        <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
-      </criteria>
-    </definition>
-  </definitions>
-  <tests>
-    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
-      <object object_ref='oval:org.debian.oval:obj:1'/>
-      <state state_ref='oval:org.debian.oval:ste:1'/>
-    </textfilecontent_test>
-  </tests>
-  <objects>
-    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <path>/etc</path>
-      <filename>debian_version</filename>
-      <line operation='pattern match'>\d\.\d</line>
-    </textfilecontent_object>
-  </objects>
-  <states>
-    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
-      <line operation='equals'>4.0</line>
-    </textfilecontent_state>
-  </states>
-</oval_definitions>

Copied: branches/debian/debian/examples/dsa1325_example.xml (from rev 116, branches/debian/debian/examples/debian_dsa1325_example.xml)
===================================================================
--- branches/debian/debian/examples/dsa1325_example.xml	                        (rev 0)
+++ branches/debian/debian/examples/dsa1325_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -0,0 +1,252 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+  <generator>
+    <oval:product_name>Debian</oval:product_name>
+    <oval:schema_version>5.3</oval:schema_version>
+    <oval:timestamp>2007-08-08T22:49:20.188-04:00</oval:timestamp>
+  </generator>
+  <definitions>
+    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
+      <metadata>
+        <title>several vulnerabilities</title>
+        <affected family='unix'>
+          <platform>Debian GNU/Linux 4.0</platform>
+          <platform>Debian GNU/Linux 3.1</platform>
+          <product>evolution</product>
+        </affected>
+        <reference source='CVE' ref_url='http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-1002' ref_id='CVE-2007-1002'/>
+        <reference source='CVE' ref_url='http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-3257' ref_id='CVE-2007-3257'/>
+        <description>What information can i put there?</description>
+        <debian>
+          <date>2007-06-29</date>
+          <moreinfo>
+Several remote vulnerabilities have been discovered in Evolution, a
+groupware suite with mail client and organizer. The Common Vulnerabilities
+and Exposures project identifies the following problems:
+Ulf Härnhammar discovered that a format string vulnerability in
+    the handling of shared calendars may allow the execution of arbitrary
+    code.
+It was discovered that the IMAP code in the Evolution Data Server
+    performs insufficient sanitising of a value later used an array index,
+    which can lead to the execution of arbitrary code.</moreinfo>
+        </debian>
+      </metadata>
+      <criteria comment='Platform section' operator='OR'>
+        <criteria comment='Release section' operator='AND'>
+          <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
+          <criteria comment='Architecture section' operator='OR'>
+            <criteria comment='Architecture independet section' operator='AND'>
+              <criterion comment='all architecture' test_ref='oval:org.debian.oval:tst:2'/>
+              <criterion comment='evolution-common DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:3'/>
+            </criteria>
+            <criteria comment='Architecture depended section' operator='AND'>
+              <criteria comment='Supported architectures section' operator='OR'>
+                <criterion comment='s390 architecture' test_ref='oval:org.debian.oval:tst:4'/>
+                <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:5'/>
+                <criterion comment='sparc architecture' test_ref='oval:org.debian.oval:tst:6'/>
+                <criterion comment='arm architecture' test_ref='oval:org.debian.oval:tst:7'/>
+                <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:8'/>
+                <criterion comment='ia64 architecture' test_ref='oval:org.debian.oval:tst:9'/>
+                <criterion comment='alpha architecture' test_ref='oval:org.debian.oval:tst:10'/>
+                <criterion comment='powerpc architecture' test_ref='oval:org.debian.oval:tst:11'/>
+                <criterion comment='mipsel architecture' test_ref='oval:org.debian.oval:tst:12'/>
+                <criterion comment='hppa architecture' test_ref='oval:org.debian.oval:tst:13'/>
+              </criteria>
+              <criteria comment='Packages section' operator='OR'>
+                <criterion comment='evolution-dbg DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:14'/>
+                <criterion comment='evolution DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:15'/>
+                <criterion comment='evolution-dev DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:16'/>
+                <criterion comment='evolution-plugins DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:17'/>
+                <criterion comment='evolution-plugins-experimental DPKG is earlier than 2.6.3-6etch1' test_ref='oval:org.debian.oval:tst:18'/>
+              </criteria>
+            </criteria>
+          </criteria>
+        </criteria>
+        <criteria comment='Release section' operator='AND'>
+          <criterion comment='Debian 3.1 is installed' test_ref='oval:org.debian.oval:tst:19'/>
+          <criteria comment='Architecture section' operator='OR'>
+            <criteria comment='Architecture depended section' operator='AND'>
+              <criteria comment='Supported architectures section' operator='OR'>
+                <criterion comment='s390 architecture' test_ref='oval:org.debian.oval:tst:4'/>
+                <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:5'/>
+                <criterion comment='sparc architecture' test_ref='oval:org.debian.oval:tst:6'/>
+                <criterion comment='m68k architecture' test_ref='oval:org.debian.oval:tst:20'/>
+                <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:8'/>
+                <criterion comment='ia64 architecture' test_ref='oval:org.debian.oval:tst:9'/>
+                <criterion comment='alpha architecture' test_ref='oval:org.debian.oval:tst:10'/>
+                <criterion comment='mipsel architecture' test_ref='oval:org.debian.oval:tst:12'/>
+                <criterion comment='arm architecture' test_ref='oval:org.debian.oval:tst:7'/>
+              </criteria>
+              <criteria comment='Packages section' operator='OR'>
+                <criterion comment='evolution DPKG is earlier than 2.0.4-2sarge2' test_ref='oval:org.debian.oval:tst:21'/>
+                <criterion comment='evolution-dev DPKG is earlier than 2.0.4-2sarge2' test_ref='oval:org.debian.oval:tst:22'/>
+              </criteria>
+            </criteria>
+          </criteria>
+        </criteria>
+      </criteria>
+    </definition>
+  </definitions>
+  <tests>
+    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:1'/>
+      <state state_ref='oval:org.debian.oval:ste:1'/>
+    </textfilecontent_test>
+    <uname_test comment='Installed architecture is all' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:2' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+    </uname_test>
+    <dpkginfo_test comment='evolution-common is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:3' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:3'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <uname_test comment='Installed architecture is s390' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:4' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:3'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is amd64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:5' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:4'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is sparc' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:6' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:5'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is arm' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:7' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:6'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is i386' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:8' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:7'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is ia64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:9' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:8'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is alpha' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:10' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:9'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is powerpc' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:11' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:10'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is mipsel' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:12' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:11'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is hppa' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:13' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:12'/>
+    </uname_test>
+    <dpkginfo_test comment='evolution-dbg is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:14' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:4'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <dpkginfo_test comment='evolution is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:15' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:5'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <dpkginfo_test comment='evolution-dev is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:16' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:6'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <dpkginfo_test comment='evolution-plugins is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:17' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:7'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <dpkginfo_test comment='evolution-plugins-experimental is earlier than 2.6.3-6etch1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:18' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:8'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </dpkginfo_test>
+    <textfilecontent_test comment='Debian GNU/Linux 3.1 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:19' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:1'/>
+      <state state_ref='oval:org.debian.oval:ste:13'/>
+    </textfilecontent_test>
+    <uname_test comment='Installed architecture is m68k' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:20' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:14'/>
+    </uname_test>
+    <dpkginfo_test comment='evolution is earlier than 2.0.4-2sarge2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:21' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:5'/>
+      <state state_ref='oval:org.debian.oval:ste:15'/>
+    </dpkginfo_test>
+    <dpkginfo_test comment='evolution-dev is earlier than 2.0.4-2sarge2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:22' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:6'/>
+      <state state_ref='oval:org.debian.oval:ste:15'/>
+    </dpkginfo_test>
+  </tests>
+  <objects>
+    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <path>/etc</path>
+      <filename>debian_version</filename>
+      <line operation='pattern match'>\d\.\d</line>
+    </textfilecontent_object>
+    <uname_object version='1' id='oval:org.debian.oval:obj:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'/>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution-common</name>
+    </dpkginfo_object>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:4' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution-dbg</name>
+    </dpkginfo_object>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:5' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution</name>
+    </dpkginfo_object>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:6' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution-dev</name>
+    </dpkginfo_object>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:7' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution-plugins</name>
+    </dpkginfo_object>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:8' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>evolution-plugins-experimental</name>
+    </dpkginfo_object>
+  </objects>
+  <states>
+    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <line operation='equals'>4.0</line>
+    </textfilecontent_state>
+    <dpkginfo_state version='1' id='oval:org.debian.oval:ste:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <evr datatype='evr_string' operation='less than'>0:2.6.3-6etch1</evr>
+    </dpkginfo_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>s390x</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:4' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>x86-64</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:5' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>sparc</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:6' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>arm</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:7' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>i686</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:8' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>ia64</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:9' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>alpha</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:10' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>ppc</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:11' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>mipsel</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:12' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>hppa</processor_type>
+    </uname_state>
+    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:13' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <line operation='equals'>3.1</line>
+    </textfilecontent_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:14' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>m68k</processor_type>
+    </uname_state>
+    <dpkginfo_state version='1' id='oval:org.debian.oval:ste:15' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <evr datatype='evr_string' operation='less than'>0:2.0.4-2sarge2</evr>
+    </dpkginfo_state>
+  </states>
+</oval_definitions>

Copied: branches/debian/debian/examples/package_example.xml (from rev 116, branches/debian/debian/examples/debian_package_example.xml)
===================================================================
--- branches/debian/debian/examples/package_example.xml	                        (rev 0)
+++ branches/debian/debian/examples/package_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+  <generator>
+    <oval:product_name>Debian</oval:product_name>
+    <oval:schema_version>5.3</oval:schema_version>
+    <oval:timestamp>2007-08-08T22:23:18.188-04:00</oval:timestamp>
+  </generator>
+  <definitions>
+    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
+      <metadata>
+        <title>Grub package installed on i386 or amd64 architecture</title>
+        <affected family='unix'>
+          <platform>Debian GNU/Linux 4.0</platform>
+          <product>grub</product>
+        </affected>
+        <description>Check if grub package installed on Debian 4.0 (etch) on i386 or amd64 arch</description>
+      </metadata>
+      <criteria comment='Release section' operator='AND'>
+        <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
+        <criteria comment='Architecture depended section' operator='AND'>
+          <criteria comment='Supported architectures section' operator='OR'>
+            <criterion comment='amd64 architecture' test_ref='oval:org.debian.oval:tst:2'/>
+            <criterion comment='i386 architecture' test_ref='oval:org.debian.oval:tst:3'/>
+          </criteria>
+          <criterion comment='grub DPKG is installed' test_ref='oval:org.debian.oval:tst:4'/>
+        </criteria>
+      </criteria>
+    </definition>
+  </definitions>
+  <tests>
+    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:1'/>
+      <state state_ref='oval:org.debian.oval:ste:1'/>
+    </textfilecontent_test>
+    <uname_test comment='Installed architecture is amd64' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:2' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:2'/>
+    </uname_test>
+    <uname_test comment='Installed architecture is i386' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' id='oval:org.debian.oval:tst:3' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:2'/>
+      <state state_ref='oval:org.debian.oval:ste:3'/>
+    </uname_test>
+    <dpkginfo_test comment='grub package installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux' id='oval:org.debian.oval:tst:4' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:3'/>
+    </dpkginfo_test>
+  </tests>
+  <objects>
+    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <path>/etc</path>
+      <filename>debian_version</filename>
+      <line operation='pattern match'>\d\.\d</line>
+    </textfilecontent_object>
+    <uname_object version='1' id='oval:org.debian.oval:obj:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'/>
+    <dpkginfo_object version='1' id='oval:org.debian.oval:obj:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+      <name>grub</name>
+    </dpkginfo_object>
+  </objects>
+  <states>
+    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <line operation='equals'>4.0</line>
+    </textfilecontent_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:2' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>x86-64</processor_type>
+    </uname_state>
+    <uname_state version='1' id='oval:org.debian.oval:ste:3' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix'>
+      <processor_type operation='equals'>i686</processor_type>
+    </uname_state>
+  </states>
+</oval_definitions>

Copied: branches/debian/debian/examples/release_example.xml (from rev 116, branches/debian/debian/examples/debian_release_example.xml)
===================================================================
--- branches/debian/debian/examples/release_example.xml	                        (rev 0)
+++ branches/debian/debian/examples/release_example.xml	2007-08-08 19:14:14 UTC (rev 119)
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<oval_definitions xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:unix-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#unix' xmlns:ind-def ='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' xmlns:oval='http://oval.mitre.org/XMLSchema/oval-common-5' xmlns:oval-def='http://oval.mitre.org/XMLSchema/oval-definitions-5' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent independent-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#linux linux-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5#unix unix-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-definitions-5 oval-definitions-schema.xsd http://oval.mitre.org/XMLSchema/oval-common-5 oval-common-schema.xsd' xmlns:linux-def='http://oval.mitre.org/XMLSchema/oval-definitions-5#linux'>
+  <generator>
+    <oval:product_name>Debian</oval:product_name>
+    <oval:schema_version>5.3</oval:schema_version>
+    <oval:timestamp>2007-08-08T22:18:08.188-04:00</oval:timestamp>
+  </generator>
+  <definitions>
+    <definition version='1' id='oval:org.debian:def:1325' class='vulnerability'>
+      <metadata>
+        <title>Debian release example definition</title>
+        <affected family='unix'>
+          <platform>Debian GNU/Linux 4.0</platform>
+        </affected>
+        <description>Test instalation of Debian 4.0 (etch) release</description>
+      </metadata>
+      <criteria comment='Release section' operator='AND'>
+        <criterion comment='Debian 4.0 is installed' test_ref='oval:org.debian.oval:tst:1'/>
+      </criteria>
+    </definition>
+  </definitions>
+  <tests>
+    <textfilecontent_test comment='Debian GNU/Linux 4.0 is installed' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent' id='oval:org.debian.oval:tst:1' version='1' check='all' check_existence='at_least_one_exists'>
+      <object object_ref='oval:org.debian.oval:obj:1'/>
+      <state state_ref='oval:org.debian.oval:ste:1'/>
+    </textfilecontent_test>
+  </tests>
+  <objects>
+    <textfilecontent_object version='1' id='oval:org.debian.oval:obj:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <path>/etc</path>
+      <filename>debian_version</filename>
+      <line operation='pattern match'>\d\.\d</line>
+    </textfilecontent_object>
+  </objects>
+  <states>
+    <textfilecontent_state version='1' id='oval:org.debian.oval:ste:1' xmlns='http://oval.mitre.org/XMLSchema/oval-definitions-5#independent'>
+      <line operation='equals'>4.0</line>
+    </textfilecontent_state>
+  </states>
+</oval_definitions>

Added: branches/debian/debian/patches/debian.ovaldi.1.patch
===================================================================
--- branches/debian/debian/patches/debian.ovaldi.1.patch	                        (rev 0)
+++ branches/debian/debian/patches/debian.ovaldi.1.patch	2007-08-08 19:14:14 UTC (rev 119)
@@ -0,0 +1,24 @@
+Index: ovaldi.1
+===================================================================
+--- ovaldi.1	(revision 113)
++++ ovaldi.1	(working copy)
+@@ -92,13 +92,15 @@
+ available from the OVAL Web site.
+ .SH EXAMPLES
+ .TP
+-Run the interpreter against the Linux definitions file, without verifying MD5 checksum:
++Run the interpreter against the Debian example definition file, without verifying MD5 checksum:
+ .B ovaldi
+-\-o linux.definitions.xml
++\-o /usr/share/doc/ovaldi/examples/package_example.xml
+ \-m
+ .SH FILES
+ .TP
+-/usr/share/ovaldi/*.xsd
++/usr/share/ovaldi/xml/*.xsd
+ The schema files for the OVAL language.
+-.SH AUTHOR
++.SH AUTHORS
+ Man page written by Brendan Jonathan Baker (bakerj at mitre.org)
++.br
++Man page adapted to Debian by Pavel Vinogradov (Pavel.Vinogradov at nixdev.net)

Modified: branches/debian/debian/patches/series
===================================================================
--- branches/debian/debian/patches/series	2007-08-08 18:41:50 UTC (rev 118)
+++ branches/debian/debian/patches/series	2007-08-08 19:14:14 UTC (rev 119)
@@ -1,3 +1,4 @@
 oval.misc.patch
 oval.textfilecontent.patch
-oval.dpkg.patch
\ No newline at end of file
+oval.dpkg.patch
+debian.ovaldi.1.patch
\ No newline at end of file




More information about the Oval-commits mailing list