Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/cygwin-apps/calm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2019-06-19 20:26:23 +0300
committerJon Turney <jon.turney@dronecode.org.uk>2019-06-20 14:55:51 +0300
commitf92ad1d5c292ed54e7a62f5c52280efab8267f37 (patch)
treea7515347c56fe59b20269b7893191cc12c1855e5
parent7b5e7c5f9a9e981d9165a0486c1407ad9e9b6a09 (diff)
Omit maintainer in package summary page if we don't have any details
Also improve the package/maintainer validation we do, to better detect non-obsolete, maintainer-less packages. Also make some unnecessarily absolute URLs relative.
-rwxr-xr-xcalm/package.py13
-rw-r--r--calm/past_mistakes.py11
-rwxr-xr-xcalm/pkg2html.py12
-rw-r--r--test/testdata/htdocs.expected/summary/arc.html4
-rw-r--r--test/testdata/htdocs.expected/summary/base-cygwin.html4
-rw-r--r--test/testdata/htdocs.expected/summary/corrupt.html4
-rw-r--r--test/testdata/htdocs.expected/summary/cygwin-debuginfo.html4
-rw-r--r--test/testdata/htdocs.expected/summary/cygwin-devel.html4
-rw-r--r--test/testdata/htdocs.expected/summary/cygwin.html4
-rw-r--r--test/testdata/htdocs.expected/summary/keychain.html4
-rw-r--r--test/testdata/htdocs.expected/summary/libdns_sd-devel.html4
-rw-r--r--test/testdata/htdocs.expected/summary/libdns_sd1.html4
-rw-r--r--test/testdata/htdocs.expected/summary/mDNSResponder.html4
-rw-r--r--test/testdata/htdocs.expected/summary/obs-a.html4
-rw-r--r--test/testdata/htdocs.expected/summary/obs-b.html4
-rw-r--r--test/testdata/htdocs.expected/summary/openssh.html4
-rw-r--r--test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html4
-rw-r--r--test/testdata/htdocs.expected/summary/per-version.html4
-rw-r--r--test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html4
-rw-r--r--test/testdata/htdocs.expected/summary/rpm-doc.html4
-rw-r--r--test/testdata/htdocs.expected/summary/staleversion.html4
-rw-r--r--test/testdata/htdocs.expected/summary/test-c.html4
-rw-r--r--test/testdata/htdocs.expected/summary/test-d.html4
-rw-r--r--test/testdata/htdocs.expected/summary/test-e.html4
-rw-r--r--test/testdata/htdocs.expected/summary/testpackage.html4
25 files changed, 69 insertions, 55 deletions
diff --git a/calm/package.py b/calm/package.py
index 5a4ab3e..008d01c 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -807,15 +807,20 @@ def validate_package_maintainers(args, packages):
# validate that all packages are in the package list
for p in sorted(packages):
- # ignore skip packages
- if packages[p].skip:
- continue
# ignore obsolete packages
if any(['_obsolete' in packages[p].version_hints[vr].get('category', '') for vr in packages[p].version_hints]):
continue
+ # validate that the package is in a path which starts with something in the package list
if not is_in_package_list(packages[p].pkgpath, all_packages):
- logging.error("package '%s' is not in the package list" % (p))
+ logging.error("package '%s' on path '%s', which doesn't start with a package in the package list" % (p, packages[p].pkgpath))
error = True
+ # validate that the source package has a maintainer
+ bv = packages[p].best_version
+ es = packages[p].version_hints[bv].get('external-source', p)
+ if es not in all_packages and p not in all_packages:
+ if bv not in past_mistakes.maint_anomalies.get(p, []):
+ logging.error("package '%s' is not obsolete, but has no maintainer" % (p))
+ error = True
return error
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 9a04f3d..31bcb0d 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -169,3 +169,14 @@ mtime_anomalies = [
'subversion-ruby',
'subversion-tools',
]
+
+# packages with maintainer anomalies
+maint_anomalies = {
+ 'libelf0': ['0.8.13-2'], # libelf is called libelf0 in x86 arch
+ 'libelf0-devel': ['0.8.13-2'],
+ 'ksnapshot-debuginfo': ['15.04.3-1'], # should be obsoleted by spectacle(-debuginfo)
+ 'man-debuginfo': ['1.6g-2'], # should be obsoleted by man-db(-debuginfo)
+ 'procps-debuginfo': ['3.2.8-5'], # should be obsoleted by procps-ng(-debuginfo)
+ 'python-debuginfo': ['2.7.12-1'], # should be obsoleted by python2(-debuginfo)
+ 'transfig-debuginfo': ['3.2.5e-2'], # should be obsoleted by xfig(-debuginfo)
+}
diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index 9ce267a..e5c3c06 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -192,11 +192,13 @@ def update_package_listings(args, packages):
m = 'ORPHANED'
else:
m = ', '.join(sorted(pkg_maintainers[es]))
- print('<span class="detail">maintainer(s)</span>: %s ' % m, file=f)
- print(textwrap.dedent('''\
- <span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
- <a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>'''), file=f)
- print('<br><br>', file=f)
+
+ if m:
+ print('<span class="detail">maintainer(s)</span>: %s ' % m, file=f)
+ print(textwrap.dedent('''\
+ <span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+ <a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>'''), file=f)
+ print('<br><br>', file=f)
print('<ul>', file=f)
for arch in sorted(packages):
diff --git a/test/testdata/htdocs.expected/summary/arc.html b/test/testdata/htdocs.expected/summary/arc.html
index 2d988b8..009b8f5 100644
--- a/test/testdata/htdocs.expected/summary/arc.html
+++ b/test/testdata/htdocs.expected/summary/arc.html
@@ -20,8 +20,8 @@ the best of packing, squeezing, or crunching is used.<br><br>
<span class="detail">categories</span>: Archive<br><br>
<span class="detail">binaries</span>: <a href="arc.html">arc</a><br><br>
<span class="detail">maintainer(s)</span>: Jari Aalto
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/base-cygwin.html b/test/testdata/htdocs.expected/summary/base-cygwin.html
index 5ce626f..0ce7e9e 100644
--- a/test/testdata/htdocs.expected/summary/base-cygwin.html
+++ b/test/testdata/htdocs.expected/summary/base-cygwin.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Base<br><br>
<span class="detail">binaries</span>: <br><br>
<span class="detail">maintainer(s)</span>: Corinna Vinschen
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/corrupt.html b/test/testdata/htdocs.expected/summary/corrupt.html
index 9372e74..d7016dc 100644
--- a/test/testdata/htdocs.expected/summary/corrupt.html
+++ b/test/testdata/htdocs.expected/summary/corrupt.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">binaries</span>: <a href="corrupt.html">corrupt</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
index 3565ace..0d613d6 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
@@ -17,8 +17,8 @@ cygwin package with gdb.<br><br>
<span class="detail">depends</span>: <a href="cygwin-debuginfo.html">cygwin-debuginfo</a><br><br>
<span class="detail">source</span>: <a href="cygwin.html">cygwin</a><br><br>
<span class="detail">maintainer(s)</span>: Corinna Vinschen, Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/cygwin-devel.html b/test/testdata/htdocs.expected/summary/cygwin-devel.html
index 82b4a07..2435a15 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-devel.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-devel.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">source</span>: <a href="cygwin.html">cygwin</a><br><br>
<span class="detail">maintainer(s)</span>: Corinna Vinschen, Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/cygwin.html b/test/testdata/htdocs.expected/summary/cygwin.html
index 806f68d..c7c16de 100644
--- a/test/testdata/htdocs.expected/summary/cygwin.html
+++ b/test/testdata/htdocs.expected/summary/cygwin.html
@@ -16,8 +16,8 @@
<span class="detail">depends</span>: <a href="base-cygwin.html">base-cygwin</a><br><br>
<span class="detail">binaries</span>: <a href="cygwin.html">cygwin</a>, <a href="cygwin-debuginfo.html">cygwin-debuginfo</a>, <a href="cygwin-devel.html">cygwin-devel</a><br><br>
<span class="detail">maintainer(s)</span>: Corinna Vinschen, Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/keychain.html b/test/testdata/htdocs.expected/summary/keychain.html
index 91b3578..96f30f7 100644
--- a/test/testdata/htdocs.expected/summary/keychain.html
+++ b/test/testdata/htdocs.expected/summary/keychain.html
@@ -24,8 +24,8 @@ necessary<br><br>
<span class="detail">depends</span>: <a href="openssh.html">openssh</a><br><br>
<span class="detail">binaries</span>: <a href="keychain.html">keychain</a><br><br>
<span class="detail">maintainer(s)</span>: Jari Aalto
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
index f0862a7..e28d111 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
@@ -18,8 +18,8 @@ industry standard IP protocols.<br><br>
<span class="detail">depends</span>: <a href="libdns_sd1.html">libdns_sd1</a><br><br>
<span class="detail">source</span>: <a href="mDNSResponder.html">mDNSResponder</a><br><br>
<span class="detail">maintainer(s)</span>: Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd1.html b/test/testdata/htdocs.expected/summary/libdns_sd1.html
index 2795e55..8fe51cd 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd1.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd1.html
@@ -17,8 +17,8 @@ industry standard IP protocols.<br><br>
<span class="detail">categories</span>: Net<br><br>
<span class="detail">source</span>: <a href="mDNSResponder.html">mDNSResponder</a><br><br>
<span class="detail">maintainer(s)</span>: Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder.html b/test/testdata/htdocs.expected/summary/mDNSResponder.html
index 344b7b7..eac93f9 100644
--- a/test/testdata/htdocs.expected/summary/mDNSResponder.html
+++ b/test/testdata/htdocs.expected/summary/mDNSResponder.html
@@ -18,8 +18,8 @@ industry standard IP protocols.<br><br>
<span class="detail">depends</span>: <a href="libdns_sd1.html">libdns_sd1</a><br><br>
<span class="detail">binaries</span>: <a href="libdns_sd-devel.html">libdns_sd-devel</a>, <a href="libdns_sd1.html">libdns_sd1</a>, <a href="mDNSResponder.html">mDNSResponder</a><br><br>
<span class="detail">maintainer(s)</span>: Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html
index 271bd34..b3f5ac7 100644
--- a/test/testdata/htdocs.expected/summary/obs-a.html
+++ b/test/testdata/htdocs.expected/summary/obs-a.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">binaries</span>: <a href="obs-a.html">obs-a</a><br><br>
<span class="detail">maintainer(s)</span>: ORPHANED
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html
index dccdd0c..436fa94 100644
--- a/test/testdata/htdocs.expected/summary/obs-b.html
+++ b/test/testdata/htdocs.expected/summary/obs-b.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">binaries</span>: <a href="obs-b.html">obs-b</a><br><br>
<span class="detail">maintainer(s)</span>: ORPHANED
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/openssh.html b/test/testdata/htdocs.expected/summary/openssh.html
index e546831..a2f3b78 100644
--- a/test/testdata/htdocs.expected/summary/openssh.html
+++ b/test/testdata/htdocs.expected/summary/openssh.html
@@ -17,8 +17,8 @@
<span class="detail">categories</span>: Net<br><br>
<span class="detail">binaries</span>: <a href="openssh.html">openssh</a><br><br>
<span class="detail">maintainer(s)</span>: Corinna Vinschen
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
index cff252b..8ab2a7f 100644
--- a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
+++ b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
@@ -16,8 +16,8 @@
<span class="detail">depends</span>: <a href="cygwin.html">cygwin</a><br><br>
<span class="detail">binaries</span>: <a href="per-version-replacement-hint-only.html">per-version-replacement-hint-only</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/per-version.html b/test/testdata/htdocs.expected/summary/per-version.html
index c1a0ca0..3fef454 100644
--- a/test/testdata/htdocs.expected/summary/per-version.html
+++ b/test/testdata/htdocs.expected/summary/per-version.html
@@ -16,8 +16,8 @@
<span class="detail">depends</span>: <a href="base-cygwin.html">base-cygwin</a><br><br>
<span class="detail">binaries</span>: <a href="per-version.html">per-version</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
index d432bb6..68f5b81 100644
--- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
+++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
@@ -16,8 +16,8 @@ its network operations in order to support encrypted connections.<br><br>
<span class="detail">categories</span>: Perl<br><br>
<span class="detail">binaries</span>: <a href="perl-Net-SMTP-SSL.html">perl-Net-SMTP-SSL</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey, Yaakov Selkowitz
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html b/test/testdata/htdocs.expected/summary/rpm-doc.html
index 924c2f8..f56be56 100644
--- a/test/testdata/htdocs.expected/summary/rpm-doc.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc.html
@@ -14,10 +14,6 @@
<span class="detail">description</span>: Obsolete package for RPM package management system manual pages (extra text to so repr is not one line)<br><br>
<span class="detail">categories</span>: _obsolete<br><br>
<span class="detail">binaries</span>: <a href="rpm-doc.html">rpm-doc</a><br><br>
-<span class="detail">maintainer(s)</span>:
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
-<br><br>
<ul>
<li><span class="detail">x86</span></li>
<table class="pkgtable">
diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html
index c5d5a2a..0f59ea2 100644
--- a/test/testdata/htdocs.expected/summary/staleversion.html
+++ b/test/testdata/htdocs.expected/summary/staleversion.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Shells Base<br><br>
<span class="detail">binaries</span>: <a href="staleversion.html">staleversion</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html
index 51881e9..188f4b0 100644
--- a/test/testdata/htdocs.expected/summary/test-c.html
+++ b/test/testdata/htdocs.expected/summary/test-c.html
@@ -17,8 +17,8 @@
<span class="detail">obsoletes</span>: <a href="obs-a.html">obs-a</a>, <a href="obs-b.html">obs-b</a><br><br>
<span class="detail">binaries</span>: <a href="test-c.html">test-c</a><br><br>
<span class="detail">maintainer(s)</span>: ORPHANED
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/test-d.html b/test/testdata/htdocs.expected/summary/test-d.html
index 40f019d..ba3ee0e 100644
--- a/test/testdata/htdocs.expected/summary/test-d.html
+++ b/test/testdata/htdocs.expected/summary/test-d.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">binaries</span>: <a href="test-d.html">test-d</a><br><br>
<span class="detail">maintainer(s)</span>: ORPHANED
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/test-e.html b/test/testdata/htdocs.expected/summary/test-e.html
index 0aef3d3..1360f7d 100644
--- a/test/testdata/htdocs.expected/summary/test-e.html
+++ b/test/testdata/htdocs.expected/summary/test-e.html
@@ -16,8 +16,8 @@
<span class="detail">build-depends</span>: libtextcat-devel<br><br>
<span class="detail">binaries</span>: <a href="test-e.html">test-e</a><br><br>
<span class="detail">maintainer(s)</span>: ORPHANED
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>
diff --git a/test/testdata/htdocs.expected/summary/testpackage.html b/test/testdata/htdocs.expected/summary/testpackage.html
index ca5706e..6f6daff 100644
--- a/test/testdata/htdocs.expected/summary/testpackage.html
+++ b/test/testdata/htdocs.expected/summary/testpackage.html
@@ -15,8 +15,8 @@
<span class="detail">categories</span>: Devel<br><br>
<span class="detail">binaries</span>: <a href="testpackage.html">testpackage</a><br><br>
<span class="detail">maintainer(s)</span>: Blooey McFooey
-<span class="smaller">(Use <a href="https://cygwin.com/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
-<a href="https://cygwin.com/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
+<span class="smaller">(Use <a href="/lists.html#cygwin">the mailing list</a> to report bugs or ask questions.
+<a href="/problems.html#personal-email">Do not contact the maintainer(s) directly</a>.)</span>
<br><br>
<ul>
<li><span class="detail">x86</span></li>