Changeset 33f65424

Timestamp:

04/04/2022 10:39:50 AM (2 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

975b612

Parents:

ee15a73

Message:

gnupg2: comment out everything related to gpg-zip

In 2.3.x we can't install it via the sed anymore. If we need it, we'll
have to get it from somewhere else.

File:

• postlfs/security/gnupg2.xml (modified) (8 diffs)

postlfs/security/gnupg2.xml

@@ -117 +117 @@
   <sect2 role="installation">
     <title>Installation of GnuPG</title>
-
+<!--  This is useless with 2.3.x.  If we need gpg-zip we'll have to fetch
+      it somewhere.
     <para>
       By default GnuPG doesn't install the deprecated gpg-zip script,
@@ -125 +126 @@
 <screen><userinput>sed -e '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' \
     -i tools/Makefile.in</userinput></screen>
-
+-->
 <!-- Seems to be resolved in 2.2.29
     <para>
@@ -150 +151 @@
 makeinfo --html --no-split -o doc/gnupg_nochunks.html doc/gnupg.texi &amp;&amp;
 makeinfo --plaintext       -o doc/gnupg.txt           doc/gnupg.texi &amp;&amp;
-make -C doc html</userinput></screen>
+tmake -C doc html</userinput></screen>
 
     <para>
@@ -167 +168 @@
 
     <para>
+      <!--
       Note that if you have already installed
       <application>GnuPG</application>, the instructions below will overwrite
-      <filename>/usr/share/man/man1/gpg-zip.1</filename>. Now, as the
-      <systemitem class="username">root</systemitem> user:
+      <filename>/usr/share/man/man1/gpg-zip.1</filename>.
+      -->
+      Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
@@ -196 +199 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
+<!--
     <para>
       <command>sed ... tools/Makefile.in</command>:
       This command is needed to build the gpg-zip program.
     </para>
-
+-->
     <para>
       <parameter>--docdir=/usr/share/doc/gnupg-&gnupg2-version;</parameter>:
@@ -237 +240 @@
         <seg>addgnupghome, applygnupgdefaults, dirmngr, dirmngr-client, g13
         (optional), gpg-agent, gpg-connect-agent, gpg, gpgconf, gpgparsemail,
-        gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-server, gpg-zip, kbxutil,
+        gpgscm, gpgsm, gpgsplit, gpgtar, gpgv, gpg-wks-server,
+        <!--gpg-zip, --> kbxutil,
         <!--symcryptrun,--> and watchgnupg</seg>
         <seg>None</seg>
@@ -461 +465 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="gpg-zip">
         <term><command>gpg-zip</command></term>
@@ -473 +477 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="kbxutil">
         <term><command>kbxutil</command></term>