From eca93209e8ce670b974a3bccad138fe361690a29 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Nov 2026 12:07:05 -0500 Subject: [PATCH 1/6] PackageMetadataXmlCheck: accept proxied="maintainer-and-proxy" GLEP 67 v1.2 adds proxied="maintainer-and-proxy" for a developer who maintains a package and also serves as a proxy for its proxied maintainers. The proxy maintainer checks raised a KeyError on it. Count such a maintainer as a proxy. The testdata gentoo repo gets a metadata.xsd that accepts it, taken from data/xml-schema.git commit 0b779b433d5cbb76343a192833f3c96b8a974fa0. Signed-off-by: Matt Turner --- src/pkgcheck/checks/metadata_xml.py | 7 +- .../ProxyWithoutProxied/expected.json | 1 + .../ProxyWithoutProxied/fix.patch | 12 + .../ProxyWithoutProxied4-0.ebuild | 7 + .../ProxyWithoutProxied4/metadata.xml | 7 + .../gentoo/metadata/xml-schema/metadata.xsd | 374 ++++++++++++++++++ 6 files changed, 407 insertions(+), 1 deletion(-) create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/ProxyWithoutProxied4-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml create mode 100644 testdata/repos/gentoo/metadata/xml-schema/metadata.xsd diff --git a/src/pkgcheck/checks/metadata_xml.py b/src/pkgcheck/checks/metadata_xml.py index b1689850b..e867470cd 100644 --- a/src/pkgcheck/checks/metadata_xml.py +++ b/src/pkgcheck/checks/metadata_xml.py @@ -515,7 +515,12 @@ def _check_maintainers(self, pkg, loc, doc): # determine proxy maintainer status proxied, devs, proxies = [], [], [] - proxy_map = {"yes": proxied, "no": devs, "proxy": proxies} + proxy_map = { + "yes": proxied, + "no": devs, + "proxy": proxies, + "maintainer-and-proxy": proxies, + } for m in pkg.maintainers: proxy_map[self._maintainer_proxied_key(m)].append(m) diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/expected.json index 66a0775be..dabe8b8b1 100644 --- a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/expected.json +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/expected.json @@ -1,3 +1,4 @@ {"__class__": "ProxyWithoutProxied", "category": "PackageMetadataXmlCheck", "package": "ProxyWithoutProxied", "filename": "metadata.xml"} {"__class__": "ProxyWithoutProxied", "category": "PackageMetadataXmlCheck", "package": "ProxyWithoutProxied2", "filename": "metadata.xml"} {"__class__": "ProxyWithoutProxied", "category": "PackageMetadataXmlCheck", "package": "ProxyWithoutProxied3", "filename": "metadata.xml"} +{"__class__": "ProxyWithoutProxied", "category": "PackageMetadataXmlCheck", "package": "ProxyWithoutProxied4", "filename": "metadata.xml"} diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/fix.patch index 21ca79d7e..5d5fad9ea 100644 --- a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/fix.patch +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/fix.patch @@ -34,3 +34,15 @@ diff -Naur gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied3/metadata.xml fixe - frobnor@gentoo.org - +diff -Naur gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml fixed/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml +--- gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml 2026-11-07 12:00:00.000000000 -0500 ++++ fixed/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml 2026-11-07 12:00:00.000000000 -0500 +@@ -1,7 +1,7 @@ + + + +- ++ + barnor@gentoo.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/ProxyWithoutProxied4-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/ProxyWithoutProxied4-0.ebuild new file mode 100644 index 000000000..97354a11d --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/ProxyWithoutProxied4-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a maintainer-and-proxy in metadata.xml without proxied non-dev" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml new file mode 100644 index 000000000..c3d04b2b0 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied4/metadata.xml @@ -0,0 +1,7 @@ + + + + + barnor@gentoo.org + + diff --git a/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd b/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd new file mode 100644 index 000000000..423dd2839 --- /dev/null +++ b/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5f2aeec17e64c085c43dd642c10599003f753b84 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Nov 2026 12:07:05 -0500 Subject: [PATCH 2/6] PackageMetadataXmlCheck: check proxied attributes against e-mail addresses A maintainer without a gentoo.org address cannot push changes directly, so should be listed with proxied="yes". Without the attribute, GLEP 67 assumes proxied="no", saying that they can. Add UnmarkedProxiedMaintainer for those without it or with proxied="no". A gentoo.org address may also lack commit access, so proxied="yes" is not flagged there. A proxy pushes changes for proxied maintainers, which needs commit access. Add NonGentooProxy for proxied="proxy" or proxied="maintainer-and-proxy" without a gentoo.org address, and give the proxy in the MaintainerWithoutProxy fix one. Signed-off-by: Matt Turner --- src/pkgcheck/checks/metadata_xml.py | 58 +++++++++++++++++++ .../MaintainerWithoutProxy/fix.patch | 2 +- .../NonGentooProxy/expected.json | 2 + .../NonGentooProxy/fix.patch | 22 +++++++ .../UnmarkedProxiedMaintainer/expected.json | 3 + .../UnmarkedProxiedMaintainer/fix.patch | 36 ++++++++++++ .../NonGentooProxy/NonGentooProxy-0.ebuild | 7 +++ .../NonGentooProxy/metadata.xml | 10 ++++ .../NonGentooProxy2/NonGentooProxy2-0.ebuild | 7 +++ .../NonGentooProxy2/metadata.xml | 10 ++++ .../UnmarkedProxiedMaintainer-0.ebuild | 7 +++ .../UnmarkedProxiedMaintainer/metadata.xml | 10 ++++ .../UnmarkedProxiedMaintainer2-0.ebuild | 7 +++ .../UnmarkedProxiedMaintainer2/metadata.xml | 10 ++++ 14 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/expected.json create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/fix.patch create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/expected.json create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/fix.patch create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/NonGentooProxy-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/NonGentooProxy2-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/UnmarkedProxiedMaintainer-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/UnmarkedProxiedMaintainer2-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml diff --git a/src/pkgcheck/checks/metadata_xml.py b/src/pkgcheck/checks/metadata_xml.py index e867470cd..2e5938f7e 100644 --- a/src/pkgcheck/checks/metadata_xml.py +++ b/src/pkgcheck/checks/metadata_xml.py @@ -141,6 +141,46 @@ def desc(self): return f"{self.filename}: proxy with no proxied maintainer" +class UnmarkedProxiedMaintainer(results.PackageResult, results.Warning): + """Package has a non-@gentoo.org maintainer not marked as proxied. + + A maintainer without a @gentoo.org e-mail address cannot push changes + directly, so should be listed with ``proxied="yes"``. Without the + attribute, GLEP 67 assumes ``proxied="no"``, which says they can. + """ + + def __init__(self, filename, maintainers, **kwargs): + super().__init__(**kwargs) + self.filename = filename + self.maintainers = tuple(maintainers) + + @property + def desc(self): + s = pluralism(self.maintainers) + maintainers = ", ".join(self.maintainers) + return f'{self.filename}: maintainer{s} without proxied="yes": {maintainers}' + + +class NonGentooProxy(results.PackageResult, results.Warning): + """Package lists a proxy without a @gentoo.org e-mail address. + + A proxy pushes changes for proxied maintainers, which needs commit + access. A maintainer without a @gentoo.org e-mail address is most + likely not a Gentoo developer or project, so cannot serve as one. + """ + + def __init__(self, filename, maintainers, **kwargs): + super().__init__(**kwargs) + self.filename = filename + self.maintainers = tuple(maintainers) + + @property + def desc(self): + ies = pluralism(self.maintainers, singular="y", plural="ies") + maintainers = ", ".join(self.maintainers) + return f"{self.filename}: non-@gentoo.org prox{ies}: {maintainers}" + + class NonexistentProjectMaintainer(results.PackageResult, results.Warning): """Package specifying nonexistent project as a maintainer.""" @@ -443,6 +483,8 @@ class PackageMetadataXmlCheck(_XmlBaseCheck): MaintainerNeeded, MaintainerWithoutProxy, ProxyWithoutProxied, + UnmarkedProxiedMaintainer, + NonGentooProxy, RedundantLongDescription, NonexistentProjectMaintainer, WrongMaintainerType, @@ -530,6 +572,22 @@ def _check_maintainers(self, pkg, loc, doc): yield MaintainerWithoutProxy(os.path.basename(loc), maintainers, pkg=pkg) elif not proxied and proxies: yield ProxyWithoutProxied(os.path.basename(loc), pkg=pkg) + + # check the proxied attributes against the e-mail addresses + unmarked, non_gentoo_proxies = [], [] + for m in pkg.maintainers: + if m.email.endswith("@gentoo.org"): + continue + if m.proxied in ("proxy", "maintainer-and-proxy"): + non_gentoo_proxies.append(str(m)) + elif m.proxied != "yes": + unmarked.append(str(m)) + if unmarked: + yield UnmarkedProxiedMaintainer( + os.path.basename(loc), sorted(unmarked), pkg=pkg + ) + if non_gentoo_proxies: + yield NonGentooProxy(os.path.basename(loc), sorted(non_gentoo_proxies), pkg=pkg) elif not maintainer_needed: # check for missing maintainer-needed comment yield MaintainerNeeded(os.path.basename(loc), maintainer_needed, pkg=pkg) diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch index 4d61f64f8..12d73396b 100644 --- a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch @@ -17,6 +17,6 @@ diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/metadata.xml f gentoo-dev@gentoo.org + -+ committing-dev@email.alt ++ committing-dev@gentoo.org + diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/expected.json new file mode 100644 index 000000000..d0baf155f --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/expected.json @@ -0,0 +1,2 @@ +{"__class__": "NonGentooProxy", "category": "PackageMetadataXmlCheck", "package": "NonGentooProxy", "filename": "metadata.xml", "maintainers": ["proxy@example.org"]} +{"__class__": "NonGentooProxy", "category": "PackageMetadataXmlCheck", "package": "NonGentooProxy2", "filename": "metadata.xml", "maintainers": ["proxy@example.org"]} diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/fix.patch new file mode 100644 index 000000000..a78ca0d63 --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/fix.patch @@ -0,0 +1,22 @@ +diff -Naur gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml fixed/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml +--- gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml 2026-11-04 23:40:14.883722217 -0500 ++++ fixed/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml 2026-11-04 23:40:14.883829032 -0500 +@@ -5,6 +5,6 @@ + proxied@example.com + + +- proxy@example.org ++ proxy@gentoo.org + + +diff -Naur gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml fixed/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml +--- gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml 2026-11-04 23:40:14.883722217 -0500 ++++ fixed/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml 2026-11-04 23:40:14.883829032 -0500 +@@ -5,6 +5,6 @@ + proxied@example.com + + +- proxy@example.org ++ proxy@gentoo.org + + diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/expected.json new file mode 100644 index 000000000..80f7af7ca --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/expected.json @@ -0,0 +1,3 @@ +{"__class__": "UnmarkedProxiedMaintainer", "category": "PackageMetadataXmlCheck", "package": "MaintainerWithoutProxy", "filename": "metadata.xml", "maintainers": ["non-gentoo-dev@email.com"]} +{"__class__": "UnmarkedProxiedMaintainer", "category": "PackageMetadataXmlCheck", "package": "UnmarkedProxiedMaintainer", "filename": "metadata.xml", "maintainers": ["proxied@example.com"]} +{"__class__": "UnmarkedProxiedMaintainer", "category": "PackageMetadataXmlCheck", "package": "UnmarkedProxiedMaintainer2", "filename": "metadata.xml", "maintainers": ["proxied@example.com"]} diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/fix.patch new file mode 100644 index 000000000..ace4a6724 --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/fix.patch @@ -0,0 +1,36 @@ +diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/metadata.xml fixed/PackageMetadataXmlCheck/MaintainerWithoutProxy/metadata.xml +--- gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/metadata.xml 2026-11-04 23:40:14.878720665 -0500 ++++ fixed/PackageMetadataXmlCheck/MaintainerWithoutProxy/metadata.xml 2026-11-04 23:40:14.878904179 -0500 +@@ -1,7 +1,7 @@ + + + +- ++ + non-gentoo-dev@email.com + + +diff -Naur gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml fixed/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml +--- gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml 2026-11-04 23:40:14.878670874 -0500 ++++ fixed/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml 2026-11-04 23:40:14.878928393 -0500 +@@ -1,7 +1,7 @@ + + + +- ++ + proxied@example.com + + +diff -Naur gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml fixed/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml +--- gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml 2026-11-04 23:40:14.878593833 -0500 ++++ fixed/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml 2026-11-04 23:40:14.878962847 -0500 +@@ -1,7 +1,7 @@ + + + +- ++ + proxied@example.com + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/NonGentooProxy-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/NonGentooProxy-0.ebuild new file mode 100644 index 000000000..8ebcb638d --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/NonGentooProxy-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a proxy without a gentoo.org address in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml new file mode 100644 index 000000000..45b224e53 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + proxy@example.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/NonGentooProxy2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/NonGentooProxy2-0.ebuild new file mode 100644 index 000000000..0d6f11918 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/NonGentooProxy2-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a maintainer-and-proxy without a gentoo.org address in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml new file mode 100644 index 000000000..b5f3ddf63 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/NonGentooProxy2/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + proxy@example.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/UnmarkedProxiedMaintainer-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/UnmarkedProxiedMaintainer-0.ebuild new file mode 100644 index 000000000..f1b39402c --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/UnmarkedProxiedMaintainer-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a non-gentoo.org maintainer without a proxied attribute in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml new file mode 100644 index 000000000..f59442f12 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + proxy-maint@gentoo.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/UnmarkedProxiedMaintainer2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/UnmarkedProxiedMaintainer2-0.ebuild new file mode 100644 index 000000000..83c292510 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/UnmarkedProxiedMaintainer2-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a non-gentoo.org maintainer with proxied="no" in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml new file mode 100644 index 000000000..c0c0d657f --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxiedMaintainer2/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + gentoo-dev@gentoo.org + + From e3505af48e54247c4fa5e633a962affedeafaa7a Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Nov 2026 12:07:06 -0500 Subject: [PATCH 3/6] PackageMetadataXmlCheck: flag proxy-maint not marked as a proxy proxy-maint@gentoo.org serves only as a proxy for proxied maintainers, which GLEP 67 expresses as proxied="proxy". Without the attribute, proxied="no" is assumed. Add UnmarkedProxyMaint for proxy-maint listed without it. Signed-off-by: Matt Turner --- src/pkgcheck/checks/metadata_xml.py | 23 ++++++++++++ .../UnmarkedProxyMaint/expected.json | 3 ++ .../UnmarkedProxyMaint/fix.patch | 36 +++++++++++++++++++ .../UnmarkedProxyMaint-0.ebuild | 7 ++++ .../UnmarkedProxyMaint/metadata.xml | 10 ++++++ .../UnmarkedProxyMaint2-0.ebuild | 7 ++++ .../UnmarkedProxyMaint2/metadata.xml | 13 +++++++ 7 files changed, 99 insertions(+) create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/expected.json create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/fix.patch create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/UnmarkedProxyMaint-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/UnmarkedProxyMaint2-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml diff --git a/src/pkgcheck/checks/metadata_xml.py b/src/pkgcheck/checks/metadata_xml.py index 2e5938f7e..7ca01455b 100644 --- a/src/pkgcheck/checks/metadata_xml.py +++ b/src/pkgcheck/checks/metadata_xml.py @@ -161,6 +161,23 @@ def desc(self): return f'{self.filename}: maintainer{s} without proxied="yes": {maintainers}' +class UnmarkedProxyMaint(results.PackageResult, results.Warning): + """Package lists proxy-maint@gentoo.org without ``proxied="proxy"``. + + The Proxy Maintainers project serves only as a proxy for proxied + maintainers, which GLEP 67 expresses as ``proxied="proxy"``. Without + the attribute, ``proxied="no"`` is assumed. + """ + + def __init__(self, filename, **kwargs): + super().__init__(**kwargs) + self.filename = filename + + @property + def desc(self): + return f'{self.filename}: proxy-maint@gentoo.org without proxied="proxy"' + + class NonGentooProxy(results.PackageResult, results.Warning): """Package lists a proxy without a @gentoo.org e-mail address. @@ -484,6 +501,7 @@ class PackageMetadataXmlCheck(_XmlBaseCheck): MaintainerWithoutProxy, ProxyWithoutProxied, UnmarkedProxiedMaintainer, + UnmarkedProxyMaint, NonGentooProxy, RedundantLongDescription, NonexistentProjectMaintainer, @@ -575,8 +593,11 @@ def _check_maintainers(self, pkg, loc, doc): # check the proxied attributes against the e-mail addresses unmarked, non_gentoo_proxies = [], [] + unmarked_proxy_maint = False for m in pkg.maintainers: if m.email.endswith("@gentoo.org"): + if m.email == "proxy-maint@gentoo.org" and m.proxied != "proxy": + unmarked_proxy_maint = True continue if m.proxied in ("proxy", "maintainer-and-proxy"): non_gentoo_proxies.append(str(m)) @@ -586,6 +607,8 @@ def _check_maintainers(self, pkg, loc, doc): yield UnmarkedProxiedMaintainer( os.path.basename(loc), sorted(unmarked), pkg=pkg ) + if unmarked_proxy_maint: + yield UnmarkedProxyMaint(os.path.basename(loc), pkg=pkg) if non_gentoo_proxies: yield NonGentooProxy(os.path.basename(loc), sorted(non_gentoo_proxies), pkg=pkg) elif not maintainer_needed: diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/expected.json new file mode 100644 index 000000000..3b95aaba0 --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/expected.json @@ -0,0 +1,3 @@ +{"__class__": "UnmarkedProxyMaint", "category": "PackageMetadataXmlCheck", "package": "ProxyWithoutProxied", "filename": "metadata.xml"} +{"__class__": "UnmarkedProxyMaint", "category": "PackageMetadataXmlCheck", "package": "UnmarkedProxyMaint", "filename": "metadata.xml"} +{"__class__": "UnmarkedProxyMaint", "category": "PackageMetadataXmlCheck", "package": "UnmarkedProxyMaint2", "filename": "metadata.xml"} diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/fix.patch new file mode 100644 index 000000000..6b6d7ce63 --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/fix.patch @@ -0,0 +1,36 @@ +diff -Naur gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/metadata.xml fixed/PackageMetadataXmlCheck/ProxyWithoutProxied/metadata.xml +--- gentoo/PackageMetadataXmlCheck/ProxyWithoutProxied/metadata.xml 2026-11-04 23:40:14.881122652 -0500 ++++ fixed/PackageMetadataXmlCheck/ProxyWithoutProxied/metadata.xml 2026-11-04 23:40:14.881839371 -0500 +@@ -1,7 +1,7 @@ + + + +- ++ + proxy-maint@gentoo.org + + +diff -Naur gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml fixed/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml +--- gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml 2026-11-04 23:40:14.881372429 -0500 ++++ fixed/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml 2026-11-04 23:40:14.881904541 -0500 +@@ -4,7 +4,7 @@ + + proxied@example.com + +- ++ + proxy-maint@gentoo.org + + +diff -Naur gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml fixed/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml +--- gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml 2026-11-04 23:40:14.881255522 -0500 ++++ fixed/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml 2026-11-04 23:40:14.881966081 -0500 +@@ -4,7 +4,7 @@ + + proxied@example.com + +- ++ + proxy-maint@gentoo.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/UnmarkedProxyMaint-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/UnmarkedProxyMaint-0.ebuild new file mode 100644 index 000000000..c1039043e --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/UnmarkedProxyMaint-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a proxy-maint without a proxied attribute in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml new file mode 100644 index 000000000..72059e3dd --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + proxy-maint@gentoo.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/UnmarkedProxyMaint2-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/UnmarkedProxyMaint2-0.ebuild new file mode 100644 index 000000000..9b78f015e --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/UnmarkedProxyMaint2-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a proxy-maint with proxied="no" in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml new file mode 100644 index 000000000..bb1c4e1fc --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/UnmarkedProxyMaint2/metadata.xml @@ -0,0 +1,13 @@ + + + + + proxied@example.com + + + proxy-maint@gentoo.org + + + gentoo-dev@gentoo.org + + From 378b0bf6226c5167151c18a5f2e4d6a28cdea274 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Nov 2026 12:07:06 -0500 Subject: [PATCH 4/6] PackageMetadataXmlCheck: require a proxy for every proxied maintainer GLEP 67 says that if a maintainer is listed with proxied="yes", at least one other should be listed with proxied="proxy" or proxied="maintainer-and-proxy". MaintainerWithoutProxy only flagged packages where no maintainer was a developer or a proxy, so a proxied maintainer co-maintaining with a developer passed. Flag those too, and list only the proxied maintainers, since others may be listed. The fix for a co-maintaining developer marks them with proxied="maintainer-and-proxy", added in GLEP 67 v1.2, since they maintain the package as well as serve as its proxy. Signed-off-by: Matt Turner --- src/pkgcheck/checks/metadata_xml.py | 13 +++++++------ .../MaintainerWithoutProxy/expected.json | 1 + .../MaintainerWithoutProxy/fix.patch | 16 ++++++++++++++-- .../MaintainerWithoutProxy3-0.ebuild | 7 +++++++ .../MaintainerWithoutProxy3/metadata.xml | 10 ++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/MaintainerWithoutProxy3-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml diff --git a/src/pkgcheck/checks/metadata_xml.py b/src/pkgcheck/checks/metadata_xml.py index 7ca01455b..4b3b6d06a 100644 --- a/src/pkgcheck/checks/metadata_xml.py +++ b/src/pkgcheck/checks/metadata_xml.py @@ -105,10 +105,11 @@ def desc(self): class MaintainerWithoutProxy(results.PackageResult, results.Warning): """Package has a proxied maintainer without a proxy. - All package maintainers have non-@gentoo.org e-mail addresses. Most likely, - this means that the package is maintained by a proxied maintainer but there - is no explicit proxy (developer or project) listed. This means no Gentoo - developer will be CC-ed on bug reports, and most likely no developer + A maintainer is proxied (``proxied="yes"``, or a non-@gentoo.org e-mail + address without the attribute) but none is a proxy (``proxied="proxy"`` + or ``proxied="maintainer-and-proxy"``, or proxy-maint@gentoo.org without the + attribute), which GLEP 67 requires. If no developer is listed either, no + Gentoo developer will be CC-ed on bug reports, and most likely none oversees the proxied maintainer's activity. """ @@ -585,8 +586,8 @@ def _check_maintainers(self, pkg, loc, doc): proxy_map[self._maintainer_proxied_key(m)].append(m) # check proxy maintainers - if not devs and not proxies: - maintainers = sorted(map(str, pkg.maintainers)) + if proxied and not proxies: + maintainers = sorted(map(str, proxied)) yield MaintainerWithoutProxy(os.path.basename(loc), maintainers, pkg=pkg) elif not proxied and proxies: yield ProxyWithoutProxied(os.path.basename(loc), pkg=pkg) diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/expected.json index dcd255e8c..3e40f5525 100644 --- a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/expected.json +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/expected.json @@ -1,2 +1,3 @@ {"__class__": "MaintainerWithoutProxy", "category": "PackageMetadataXmlCheck", "package": "MaintainerWithoutProxy", "filename": "metadata.xml", "maintainers": ["non-gentoo-dev@email.com"]} {"__class__": "MaintainerWithoutProxy", "category": "PackageMetadataXmlCheck", "package": "MaintainerWithoutProxy2", "filename": "metadata.xml", "maintainers": ["gentoo-dev@gentoo.org"]} +{"__class__": "MaintainerWithoutProxy", "category": "PackageMetadataXmlCheck", "package": "MaintainerWithoutProxy3", "filename": "metadata.xml", "maintainers": ["proxied@example.com"]} diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch index 12d73396b..7e0790f77 100644 --- a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/fix.patch @@ -5,8 +5,8 @@ diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy/metadata.xml fi non-gentoo-dev@email.com -+ -+ random-dev@gentoo.org ++ ++ proxy-maint@gentoo.org + diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/metadata.xml fixed/PackageMetadataXmlCheck/MaintainerWithoutProxy2/metadata.xml @@ -20,3 +20,15 @@ diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy2/metadata.xml f + committing-dev@gentoo.org + +diff -Naur gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml fixed/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml +--- gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml 2026-11-04 23:37:25.468453444 -0500 ++++ fixed/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml 2026-11-05 10:00:00.000000000 -0500 +@@ -4,7 +4,7 @@ + + proxied@example.com + +- ++ + gentoo-dev@gentoo.org + + diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/MaintainerWithoutProxy3-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/MaintainerWithoutProxy3-0.ebuild new file mode 100644 index 000000000..170b05dbf --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/MaintainerWithoutProxy3-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a proxied maintainer and a developer not marked as the proxy" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml new file mode 100644 index 000000000..ec6bd79ca --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/MaintainerWithoutProxy3/metadata.xml @@ -0,0 +1,10 @@ + + + + + proxied@example.com + + + gentoo-dev@gentoo.org + + From 6bf5228d4c9a1e397d92f23d12886ec2a6af3289 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 16 Nov 2026 12:12:34 -0500 Subject: [PATCH 5/6] PackageMetadataXmlCheck: flag cc-on-bugs upstream maintainers without e-mail GLEP 68 v1.6 adds cc-on-bugs="yes" for an upstream maintainer who wants to be CC-ed on bugs, and requires an element with it. The XSD cannot express that, since email is otherwise optional. Add CcOnBugsWithoutEmail for an upstream maintainer with cc-on-bugs="yes" and no e-mail. The attribute is read from the XML rather than from pkgcore's UpstreamMaintainer, which does not have it in released versions. UnmarkedProxiedMaintainer now suggests moving an upstream developer listed only to be CC-ed on bugs to with cc-on-bugs="yes". The testdata gentoo repo's metadata.xsd is updated to accept it, as in data/xml-schema.git commit 0d43c60a151b103c6bb3e93b6e644bf2c63bedcb. Bug: https://bugs.gentoo.org/985978 Signed-off-by: Matt Turner --- src/pkgcheck/checks/metadata_xml.py | 34 +++++++++++++++++++ .../CcOnBugsWithoutEmail/expected.json | 1 + .../CcOnBugsWithoutEmail-0.ebuild | 7 ++++ .../CcOnBugsWithoutEmail/metadata.xml | 16 +++++++++ .../gentoo/metadata/xml-schema/metadata.xsd | 9 +++++ 5 files changed, 67 insertions(+) create mode 100644 testdata/data/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/expected.json create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/CcOnBugsWithoutEmail-0.ebuild create mode 100644 testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/metadata.xml diff --git a/src/pkgcheck/checks/metadata_xml.py b/src/pkgcheck/checks/metadata_xml.py index 4b3b6d06a..f365a9a7a 100644 --- a/src/pkgcheck/checks/metadata_xml.py +++ b/src/pkgcheck/checks/metadata_xml.py @@ -148,6 +148,10 @@ class UnmarkedProxiedMaintainer(results.PackageResult, results.Warning): A maintainer without a @gentoo.org e-mail address cannot push changes directly, so should be listed with ``proxied="yes"``. Without the attribute, GLEP 67 assumes ``proxied="no"``, which says they can. + + An upstream developer listed only to be CC-ed on bugs is not a Gentoo + maintainer. Move them to ```` with ``cc-on-bugs="yes"`` + instead, as described in GLEP 68. """ def __init__(self, filename, maintainers, **kwargs): @@ -199,6 +203,28 @@ def desc(self): return f"{self.filename}: non-@gentoo.org prox{ies}: {maintainers}" +class CcOnBugsWithoutEmail(results.PackageResult, results.Warning): + """Package has an upstream maintainer with ``cc-on-bugs="yes"`` but no e-mail. + + An upstream maintainer can only be CC-ed on bugs at an e-mail address, + so GLEP 68 requires an ```` element when ``cc-on-bugs="yes"``. + """ + + def __init__(self, filename, maintainers, **kwargs): + super().__init__(**kwargs) + self.filename = filename + self.maintainers = tuple(maintainers) + + @property + def desc(self): + s = pluralism(self.maintainers) + maintainers = ", ".join(self.maintainers) + return ( + f'{self.filename}: upstream maintainer{s} with cc-on-bugs="yes" ' + f"but no e-mail: {maintainers}" + ) + + class NonexistentProjectMaintainer(results.PackageResult, results.Warning): """Package specifying nonexistent project as a maintainer.""" @@ -504,6 +530,7 @@ class PackageMetadataXmlCheck(_XmlBaseCheck): UnmarkedProxiedMaintainer, UnmarkedProxyMaint, NonGentooProxy, + CcOnBugsWithoutEmail, RedundantLongDescription, NonexistentProjectMaintainer, WrongMaintainerType, @@ -634,6 +661,13 @@ def _check_maintainers(self, pkg, loc, doc): os.path.basename(loc), sorted(wrong_maintainers), pkg=pkg ) + def _check_upstream_maintainers(self, pkg, loc, doc): + """Validate upstream maintainers in package metadata.""" + xpath = "/pkgmetadata/upstream/maintainer[@cc-on-bugs='yes' and not(email)]" + if maintainers := doc.xpath(xpath): + names = sorted(m.findtext("name", "").strip() for m in maintainers) + yield CcOnBugsWithoutEmail(os.path.basename(loc), names, pkg=pkg) + def _check_longdescription(self, pkg, loc, doc): if pkg.longdescription is not None: match_ratio = SequenceMatcher(None, pkg.description, pkg.longdescription).ratio() diff --git a/testdata/data/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/expected.json b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/expected.json new file mode 100644 index 000000000..4daa805da --- /dev/null +++ b/testdata/data/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/expected.json @@ -0,0 +1 @@ +{"__class__": "CcOnBugsWithoutEmail", "category": "PackageMetadataXmlCheck", "package": "CcOnBugsWithoutEmail", "filename": "metadata.xml", "maintainers": ["Other Upstream Developer"]} diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/CcOnBugsWithoutEmail-0.ebuild b/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/CcOnBugsWithoutEmail-0.ebuild new file mode 100644 index 000000000..a38e3df99 --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/CcOnBugsWithoutEmail-0.ebuild @@ -0,0 +1,7 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +DESCRIPTION="Ebuild with a cc-on-bugs upstream maintainer without e-mail in metadata.xml" +HOMEPAGE="https://github.com/pkgcore/pkgcheck" +LICENSE="BSD" +SLOT="0" diff --git a/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/metadata.xml b/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/metadata.xml new file mode 100644 index 000000000..cd2d636cc --- /dev/null +++ b/testdata/repos/gentoo/PackageMetadataXmlCheck/CcOnBugsWithoutEmail/metadata.xml @@ -0,0 +1,16 @@ + + + + + dev@gentoo.org + + + + Upstream Developer + upstream@example.com + + + Other Upstream Developer + + + diff --git a/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd b/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd index 423dd2839..e264eed83 100644 --- a/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd +++ b/testdata/repos/gentoo/metadata/xml-schema/metadata.xsd @@ -163,6 +163,8 @@ + @@ -173,6 +175,13 @@ + + + + + + + From 2a6ce435a98623347de338da4b9a4903d358efd5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 18 Nov 2026 12:32:39 -0500 Subject: [PATCH 6/6] NEWS: add the GLEP 67/68 maintainer checks and fixes Signed-off-by: Matt Turner --- NEWS.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 3e74b0b8e..f7a316a16 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -15,11 +15,33 @@ pkgcheck 0.10.50 (unreleased) not conditional on ``USE=test``, which run tests with ``USE=-test`` when allowed by ``ALLOW_TEST`` (Arthur Zamarin, #792) +- PackageMetadataXmlCheck: flag ``UnmarkedProxiedMaintainer``, a maintainer + without a gentoo.org address not marked ``proxied="yes"`` (Matt Turner, #796) + +- PackageMetadataXmlCheck: flag ``NonGentooProxy``, a maintainer marked + ``proxied="proxy"`` or ``proxied="maintainer-and-proxy"`` without a + gentoo.org address (Matt Turner, #796) + +- PackageMetadataXmlCheck: flag ``UnmarkedProxyMaint``, proxy-maint@gentoo.org + listed without ``proxied="proxy"`` (Matt Turner, #796) + +- PackageMetadataXmlCheck: flag ``CcOnBugsWithoutEmail``, an upstream + ```` with ``cc-on-bugs="yes"`` and no ```` (Matt Turner, + #796) + **Fixes:** - PythonCompatUpdate, RubyCompatUpdate: no longer suggest targets masked in ``profiles/base/use.mask`` (Arthur Zamarin, #791) +- PackageMetadataXmlCheck: no longer crashes on + ``proxied="maintainer-and-proxy"`` from GLEP 67 v1.2, and counts such a + maintainer as a proxy (Matt Turner, #796) + +- MaintainerWithoutProxy: now also reported when a proxied maintainer + co-maintains with a developer not marked as a proxy, listing only the + proxied maintainers (Matt Turner, #796) + ----------------------------- pkgcheck 0.10.49 (2026-10-24) -----------------------------