1 |
commit: f84e89097180151ab71875c1ccdc7904d4ff3e6e |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 18:41:13 2022 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 18:41:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=f84e8909 |
7 |
|
8 |
glsa.rnc, metadata.rnc, repositories.rnc: Update from DTDs |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
glsa.rnc | 44 +++++++++++++++++++++----------------------- |
13 |
metadata.rnc | 1 - |
14 |
repositories.rnc | 4 +--- |
15 |
3 files changed, 22 insertions(+), 27 deletions(-) |
16 |
|
17 |
diff --git a/glsa.rnc b/glsa.rnc |
18 |
index 2711a6a..b2fbdf4 100644 |
19 |
--- a/glsa.rnc |
20 |
+++ b/glsa.rnc |
21 |
@@ -1,5 +1,3 @@ |
22 |
-# $Header: /var/cvsroot/gentoo/xml/htdocs/dtd/glsa.dtd,v 1.17 2008/04/04 17:04:39 neysx Exp $ |
23 |
- |
24 |
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" |
25 |
|
26 |
glsa = |
27 |
@@ -24,8 +22,8 @@ glsa = |
28 |
} |
29 |
attlist.glsa &= attribute id { text } |
30 |
# Element: title |
31 |
-# Description: Provides a 4-5 word description about the advisory |
32 |
-# Example: <title>Buffer overflow vulnerability found in openssl-0.9.5</title> |
33 |
+# Description: Provides a 4-5 word description about the advisory |
34 |
+# Example: <title>Buffer overflow vulnerability found in openssl-0.9.5</title> |
35 |
title = element title { attlist.title, text } |
36 |
attlist.title &= empty |
37 |
# Element: synopsis |
38 |
@@ -41,11 +39,11 @@ attlist.synopsis &= empty |
39 |
# Description: Defines what type of security announcement this is. |
40 |
# |
41 |
# Valid types are: |
42 |
-# - ebuild A Portage-provided ebuild has a security |
43 |
+# - ebuild A Portage-provided ebuild has a security |
44 |
# issue |
45 |
# - informational This GLSA is purely informational, no Gentoo |
46 |
# system is affected |
47 |
-# - infrastructure The security issue involves the Gentoo |
48 |
+# - infrastructure The security issue involves the Gentoo |
49 |
# infrastructure |
50 |
# |
51 |
# The text contains one keyword that defines the issue. |
52 |
@@ -90,25 +88,25 @@ attlist.access &= empty |
53 |
# |
54 |
# If product@type = 'ebuild', the child elements are 'package' |
55 |
# If product@type = 'portage', the child elements are 'package' |
56 |
-# If product@type = 'infrastructure', the child elements are |
57 |
+# If product@type = 'infrastructure', the child elements are |
58 |
# 'service' |
59 |
# |
60 |
affected = element affected { attlist.affected, (package* | service*) } |
61 |
attlist.affected &= empty |
62 |
# Element: package |
63 |
-# Description: Provide all necessary information regarded the affected |
64 |
-# packages. It also contains information about the affected |
65 |
+# Description: Provide all necessary information regarded the affected |
66 |
+# packages. It also contains information about the affected |
67 |
# architectures, if automatic updates can be done and the update |
68 |
# |
69 |
# The "update" attribute contains the path to the non-vulnerable |
70 |
# version of the package |
71 |
# |
72 |
-# The "auto" attribute contains either "yes" or "no" and tells |
73 |
-# Portage that the package can be updated automatically (to be |
74 |
+# The "auto" attribute contains either "yes" or "no" and tells |
75 |
+# Portage that the package can be updated automatically (to be |
76 |
# implemented) without further user interaction |
77 |
# |
78 |
# The "arch" attribute contains either the architecture (as used |
79 |
-# by ACCEPT_KEYWORDS) or the "*" value (in case all |
80 |
+# by ACCEPT_KEYWORDS) or the "*" value (in case all |
81 |
# architectures are affected) |
82 |
# |
83 |
# Occurrence: The package element can occur 0, 1 or more times |
84 |
@@ -131,11 +129,11 @@ attlist.vulnerable &= |
85 |
}, |
86 |
[ a:defaultValue = "*" ] attribute slot { text }? |
87 |
# Element: unaffected |
88 |
-# Description: Version of the fixed (or unaffected) package. In case the |
89 |
+# Description: Version of the fixed (or unaffected) package. In case the |
90 |
# package is superseded by another package, you need to |
91 |
# define that package using the "name" attribute. |
92 |
# |
93 |
-# The r* range information is revision-specific. For instance, |
94 |
+# The r* range information is revision-specific. For instance, |
95 |
# rge foo-1.2.3-r4 == >=foo-1.2.3-r4 && <foo-1.2.4 |
96 |
# |
97 |
# Example: |
98 |
@@ -150,7 +148,7 @@ attlist.unaffected &= |
99 |
# Element: service |
100 |
# Description: Provide information about the Gentoo services that are |
101 |
# affected by the security advisory. Portage must be able |
102 |
-# to parse this information to make decisions (for instance, |
103 |
+# to parse this information to make decisions (for instance, |
104 |
# ignore an rsync server or a certain distfiles mirror). |
105 |
# |
106 |
# The type attribute can be one of "rsync", "web", "mirror". |
107 |
@@ -196,7 +194,7 @@ code = element code { attlist.code, text } |
108 |
attlist.code &= empty |
109 |
# Element: background |
110 |
# Description: Provides a background of the affected package(s)/service(s) |
111 |
-# The background element contains only "<p>"s in which the text |
112 |
+# The background element contains only "<p>"s in which the text |
113 |
# is placed |
114 |
# |
115 |
background = element background { attlist.background, (p | ul | ol)* } |
116 |
@@ -208,18 +206,18 @@ description = |
117 |
element description { attlist.description, (p | ul | ol | code)* } |
118 |
attlist.description &= empty |
119 |
# Element: impact |
120 |
-# Description: Provides information about the impact that the security issue |
121 |
+# Description: Provides information about the impact that the security issue |
122 |
# can have |
123 |
# |
124 |
# The "impact" element contains only "<p>"s. |
125 |
# |
126 |
-# The type element gives a short term, such as |
127 |
+# The type element gives a short term, such as |
128 |
# "Denial of Service", "Buffer Overflow", ... |
129 |
# |
130 |
impact = element impact { attlist.impact, (p | ul | ol)* } |
131 |
attlist.impact &= attribute type { text } |
132 |
# Element: workaround |
133 |
-# Description: Provides information about how the security issue can be |
134 |
+# Description: Provides information about how the security issue can be |
135 |
# (temporarily) resolved through a work-around |
136 |
# |
137 |
# The "workaround" element contains only "<p>"s and "<code>"s. |
138 |
@@ -227,7 +225,7 @@ workaround = |
139 |
element workaround { attlist.workaround, (p | code | ul | ol)* } |
140 |
attlist.workaround &= empty |
141 |
# Element: resolution |
142 |
-# Description: Provides information about how the security issue can be |
143 |
+# Description: Provides information about how the security issue can be |
144 |
# resolved. |
145 |
# |
146 |
# The "resolution" element contains only "<p>"s and "<code>"s. |
147 |
@@ -249,7 +247,7 @@ attlist.ul &= empty |
148 |
ol = element ol { attlist.ol, li* } |
149 |
attlist.ol &= empty |
150 |
# Element: li |
151 |
-# Description: Element of a listing |
152 |
+# Description: Element of a listing |
153 |
# |
154 |
# Example: <ul> |
155 |
# <li>This is element one</li> |
156 |
@@ -272,7 +270,7 @@ attlist.i &= empty |
157 |
# Element: br |
158 |
# Description: hard line break |
159 |
# |
160 |
-# Example: And then: <br/> |
161 |
+# Example: And then: <br/> |
162 |
# KABLAM! |
163 |
br = element br { attlist.br, text } |
164 |
attlist.br &= empty |
165 |
@@ -287,7 +285,7 @@ attlist.license &= empty |
166 |
# |
167 |
# Example: <metadata tag="approved">Level 1</metadata> |
168 |
# |
169 |
-# On request of plasmaroo, metadata can contain all elements again. |
170 |
+# On request of plasmaroo, metadata can contain all elements again. |
171 |
metadata = element metadata { attlist.metadata, (text | metadata)* } |
172 |
attlist.metadata &= |
173 |
attribute tag { text }, |
174 |
|
175 |
diff --git a/metadata.rnc b/metadata.rnc |
176 |
index 8deae47..f815278 100644 |
177 |
--- a/metadata.rnc |
178 |
+++ b/metadata.rnc |
179 |
@@ -98,7 +98,6 @@ attlist.remote-id &= |
180 |
| "gentoo" |
181 |
| "github" |
182 |
| "gitlab" |
183 |
- | "gitorious" |
184 |
| "google-code" |
185 |
| "heptapod" |
186 |
| "launchpad" |
187 |
|
188 |
diff --git a/repositories.rnc b/repositories.rnc |
189 |
index 265a371..8c2d469 100644 |
190 |
--- a/repositories.rnc |
191 |
+++ b/repositories.rnc |
192 |
@@ -1,9 +1,7 @@ |
193 |
-# $Header |
194 |
- |
195 |
# Used by [gentoo]/xml/htdocs/proj/en/overlays/repositories.xml |
196 |
|
197 |
# The source copy and history of this file is available from |
198 |
-# http://git.overlays.gentoo.org/gitweb/?p=proj/repositories-xml-format.git |
199 |
+# https://gitweb.gentoo.org/proj/repositories-xml-format.git/ |
200 |
|
201 |
# Gentoo repositories.xml DTD 1.0 |
202 |
# |