Changeset 5156197

Timestamp:

04/21/2021 05:47:11 PM (3 years ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0f0dc82

Parents:

45ab6c7

git-author:

Xi Ruoyao <xry111@…> (04/21/2021 05:35:09 PM)

git-committer:

Xi Ruoyao <xry111@…> (04/21/2021 05:47:11 PM)

Message:

Revert "Fix a header file in python for certain use cases;"

This reverts commit 7b66ed21ded4cdc68b8147266864d4d647151b54.

Python maintainers rejected the proposed fix in
​https://bugs.python.org/issue39026. We'll need to make a correct fix,
or patch the downstream packages (cracklib) instead.

Files:

• general/prog/python3.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• postlfs/security/cracklib.xml (modified) (4 diffs)

general/prog/python3.xml

@@ -114 +114 @@
   <sect2 role="installation">
     <title>Installation of Python 3</title>
-
-    <para>
-      Fix a header file, which is needed for some use cases:
-    </para>
-
-<screen><userinput>sed 's|cpython/||' -i Include/cpython/pystate.h</userinput></screen>
 
     <para>

introduction/welcome/changelog.xml

@@ -43 +43 @@
 
    <listitem>
+      <para>April 21th, 2021</para>
+      <itemizedlist>
+         <listitem>
+            <para>[xry111] - Revert 7b66ed21, as the proposed fix in it
+            is rejected by Python maintainers.</para>
+         </listitem>
+      </itemizedlist>
+   </listitem>
+
+   <listitem>
       <para>April 19th, 2021</para>
       <itemizedlist>

postlfs/security/cracklib.xml

@@ -119 +119 @@
       </para>
     </important>
-<!--
+
     <bridgehead renderas="sect3">CrackLib Dependencies</bridgehead>
 
@@ -126 +126 @@
       <xref linkend="python2"/>
     </para>
--->
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/cracklib"/>
@@ -142 +142 @@
 <screen><userinput>sed -i '/skipping/d' util/packer.c &amp;&amp;
 
-PYTHON=python3               \
 ./configure --prefix=/usr    \
             --disable-static \
@@ -208 +207 @@
 
     <para>
-      <command>PYTHON=python3</command>: This forces the installation of
-      python bindings for python3, even if python2 is installed.
-    </para>
-
-    <para>
       <parameter>--with-default-dict=/lib/cracklib/pw_dict</parameter>:
       This parameter forces the installation of the