Changeset 8da5263

Timestamp:

06/07/2020 03:17:43 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

1af702d2

Parents:

53b511a

Message:

Update to polkit-cf22af32. Allows use of js68.
Archive js60.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23262 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• archive/js60.xml (moved) (moved from general/genlib/js60.xml )
• general/genlib/genlib.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/security/polkit.xml (modified) (7 diffs)

general/genlib/genlib.xml

@@ -82 +82 @@
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js38.xml"/> -->
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js52.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js60.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js60.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js68.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to polkit-cf22af32. Allows 
+          use of js68.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to cups-filters-1.27.5. Fixes
           <ulink url="&blfs-ticket-root;13206">#13206</ulink>.</para>

packages.ent

@@ -36 +36 @@
 <!ENTITY openssl10-version            "1.0.2q">
 <!ENTITY p11-kit-version              "0.23.20">
-<!ENTITY polkit-version               "0.116">
+<!ENTITY polkit-version               "cf22af32">
 <!ENTITY polkit-gnome-version         "0.105">
 <!ENTITY shadow-version               "4.8.1">

postlfs/security/polkit.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY polkit-download-http
-           "https://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
-  <!ENTITY polkit-download-ftp  " ">
-  <!ENTITY polkit-md5sum        "4b37258583393e83069a0e2e89c0162a">
-  <!ENTITY polkit-size          "1.5 MB">
-  <!ENTITY polkit-buildsize     "15 MB (with tests)">
-  <!ENTITY polkit-time          "0.4 SBU (with tests)">
+  <!ENTITY polkit-download-http "&sources-anduin-http;/polkit/polkit-&polkit-version;.tar.xz">
+  <!ENTITY polkit-download-ftp  "&sources-anduin-ftp;/polkit/polkit-&polkit-version;.tar.xz">
+  <!ENTITY polkit-md5sum        "3178fb1dcc6896178515861fe6910c6b">
+  <!ENTITY polkit-size          "656 KB">
+  <!ENTITY polkit-buildsize     "21 MB (with tests)">
+  <!ENTITY polkit-time          "0.4 SBU (Using parallelism=4; with tests)">
 ]>
+
+<!-- 
+  The tarball above was generated from a merge request using 
+        git fetch "https://gitlab.freedesktop.org/xry111/polkit.git" "js68"
+  and merging the polkit-0.116 patch and running autogen.sh NOCONFIGURE=1
+
+  If/when this is actually merged with a new release, we need 
+  to go back to that.
+-->
 
 <sect1 id="polkit" xreflabel="Polkit-&polkit-version;">
@@ -72 +80 @@
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3" revision="sysv">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact" revision="sysv">
@@ -82 +90 @@
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
 
@@ -88 +96 @@
     <para role="required">
       <xref linkend="glib2"/> and
-      <xref linkend="js60"/>
+      <xref linkend="js68"/>
     </para>
 
@@ -117 +125 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dbus-python"/> and 
+      <xref linkend="python-dbusmock"/> (for tests),
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/>,
@@ -187 +197 @@
 <screen><userinput>sed -i "s:/sys/fs/cgroup/systemd/:/sys:g" configure</userinput></screen>
     </note>
-
+<!--
     <para revision="sysv">
       Fix an issue introduced in recent <application>Polkit</application>
@@ -195 +205 @@
 <screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
 autoreconf -fi</userinput></screen>
+-->
     <para>
       Install <application>Polkit</application> by running the following