diff options
| author | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-05-08 21:27:43 +0800 |
|---|---|---|
| committer | Xi Ruoyao <xry111@mengyan1223.wang> | 2021-05-08 21:27:43 +0800 |
| commit | c7ef59fa01c0b52663c81133acf2816aa3c34943 (patch) | |
| tree | 79e6004f8e7f0c17ca55495beb8699af3af3e5b7 | |
| parent | 7c1fce4e9070c0a09e1e3e98d6490fc2aa268226 (diff) | |
| parent | 0f7d4cb8a734227ea85f46c5b934ed1b85a51b3c (diff) | |
Merge branch 'trunk' into xry111/usr-move
| -rw-r--r-- | chapter03/packages.xml | 5 | ||||
| -rw-r--r-- | packages.ent | 2 | ||||
| -rw-r--r-- | stylesheets/patcheslist.xsl | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/chapter03/packages.xml b/chapter03/packages.xml index d79a5b729..24db75756 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -614,12 +614,9 @@ <varlistentry> <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term> <listitem> - <!-- <para>Home page: <ulink url="&shadow-home;"/></para> --> + <para>Home page: <ulink url="&shadow-home;"/></para> <para>Download: <ulink url="&shadow-url;"/></para> <para>MD5 sum: <literal>&shadow-md5;</literal></para> - - <!-- Using http://cdn.debian.net/debian/pool/main/s/shadow/ - for now since alioth has not reconstituted shadow --> </listitem> </varlistentry> diff --git a/packages.ent b/packages.ent index 67a838778..10275e794 100644 --- a/packages.ent +++ b/packages.ent @@ -610,7 +610,7 @@ <!ENTITY shadow-size "1,574 KB"> <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz"> <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45"> -<!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> +<!ENTITY shadow-home "https://shadow-maint.github.io/shadow/"> <!ENTITY shadow-fin-du "45 MB"> <!ENTITY shadow-fin-sbu "0.2 SBU"> diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl index 8ef3e6de2..d562ee2d7 100644 --- a/stylesheets/patcheslist.xsl +++ b/stylesheets/patcheslist.xsl @@ -11,7 +11,7 @@ <!-- Allow select the dest dir at runtime --> <xsl:param name="dest.dir"> - <xsl:value-of select="concat('/srv/www/', substring-after('&patches-root;', 'http://'))"/> + <xsl:value-of select="concat('/srv/www/', substring-after('&patches-root;', 'https://'))"/> </xsl:param> <xsl:template match="/"> |