Changeset c7ef59f

Timestamp:

05/08/2021 01:27:43 PM (7 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

xry111/usr-move

Children:

4bcd65c

Parents:

7c1fce4e (diff), 0f7d4cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' into xry111/usr-move

Files:

• chapter03/packages.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• stylesheets/patcheslist.xsl (modified) (1 diff)

chapter03/packages.xml

@@ -615 +615 @@
       <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>

packages.ent

@@ -611 +611 @@
 <!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">

stylesheets/patcheslist.xsl

@@ -12 +12 @@
     <!-- 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>