From fb6543d0b5bc1804c10c751cc37ec8723d299c62 Mon Sep 17 00:00:00 2001 From: David Rothenberg Date: Mon, 13 Apr 2015 11:38:35 -0400 Subject: [PATCH] Removing use of DebianRPMEVRStringType entity type Changing to inline declaration of evr_string and debian_evr_string entity datatypes. Updated Schematron message prefix to align with intrinsic message level parsing from some tools. --- schemas/linux-definitions-schema.xsd | 20 ++++++++++++++++--- .../linux-system-characteristics-schema.xsd | 20 ++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/schemas/linux-definitions-schema.xsd b/schemas/linux-definitions-schema.xsd index 5a4531a..bd7bec4 100644 --- a/schemas/linux-definitions-schema.xsd +++ b/schemas/linux-definitions-schema.xsd @@ -8,7 +8,7 @@ Linux Definition 5.11.1:1.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. @@ -164,17 +164,31 @@ - + This represents the epoch, upstream_version, and debian_revision fields, for a Debian package, as a single version string. It has the form "EPOCH:UPSTREAM_VERSION-DEBIAN_REVISION". Note that a null epoch (or '(none)' as returned by dpkg) is equivalent to '0' and would hence have the form 0:UPSTREAM_VERSION-DEBIAN_REVISION. - WARNING: There are differences in the algorithms for how the version strings of Debian and RPM packages are compared. As a result, a new debian_evr_string datatype was added to the OVAL Language and should be used, for this entity, instead of the evr_string datatype. + Warning: There are differences in the algorithms for how the version strings of Debian and RPM packages are compared. As a result, a new debian_evr_string datatype was added to the OVAL Language and should be used, for this entity, instead of the evr_string datatype. + + + + + + + + + + + + + + diff --git a/schemas/linux-system-characteristics-schema.xsd b/schemas/linux-system-characteristics-schema.xsd index c95cc90..b793a10 100644 --- a/schemas/linux-system-characteristics-schema.xsd +++ b/schemas/linux-system-characteristics-schema.xsd @@ -8,7 +8,7 @@ Linux System Characteristics 5.11.1:1.1 - 3/30/2015 09:00:00 AM + 4/13/2015 09:00:00 AM Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. @@ -93,17 +93,31 @@ - + This type represents the epoch, upstream_version, and debian_revision fields, for a Debian package, as a single version string. It has the form "EPOCH:UPSTREAM_VERSION-DEBIAN_REVISION". Note that a null epoch (or '(none)' as returned by dpkg) is equivalent to '0' and would hence have the form 0:UPSTREAM_VERSION-DEBIAN_REVISION. - WARNING: There are differences in the algorithms for how the version strings of Debian and RPM packages are compared. As a result, a new debian_evr_string datatype was added to the OVAL Language and should be used, for this entity, instead of the evr_string datatype. + Warning: There are differences in the algorithms for how the version strings of Debian and RPM packages are compared. As a result, a new debian_evr_string datatype was added to the OVAL Language and should be used, for this entity, instead of the evr_string datatype. + + + + + + + + + + + + + +