Ignore:
Timestamp:
10/29/2021 08:19:57 PM (2 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
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:
c43e605
Parents:
265da10b (diff), 14dc396e (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' of git.linuxfromscratch.org:blfs into trunk

File:
1 edited

Legend:

Unmodified
Added
Removed

  • postlfs/security/polkit.xml

    r265da10b r1ee750e  
    77  <!ENTITY polkit-download-http "https://www.freedesktop.org/software/polkit/releases/polkit-&polkit-version;.tar.gz">
    88  <!ENTITY polkit-download-ftp  " ">
    9   <!ENTITY polkit-md5sum        "b945e683eb5d633745864af6c5746726">
    10   <!ENTITY polkit-size          "1.3 MB">
    11   <!ENTITY polkit-buildsize     "23 MB (add 2 MB for tests)">
    12   <!ENTITY polkit-time          "0.2 SBU (Using parallelism=4; add 0.3 SBU for tests)">
     9  <!ENTITY polkit-md5sum        "a6efe21d021fafe4191ee30331ef801c">
     10  <!ENTITY polkit-size          "1.6 MB">
     11  <!ENTITY polkit-buildsize     "12 MB">
     12  <!ENTITY polkit-time          "0.1 SBU (Using parallelism=4)">
    1313]>
    1414
    … …  
    7171    </itemizedlist>
    7272
     73<!-- With the move to meson, the patch is no longer needed
    7374    <bridgehead renderas="sect3"
    7475                revision="sysv">Additional Downloads</bridgehead>
    … …  
    8182      </listitem>
    8283    </itemizedlist>
     84-->
    8385
    8486    <bridgehead renderas="sect3">Polkit Dependencies</bridgehead>
    … …  
    9294    <bridgehead renderas="sect4">Recommended</bridgehead>
    9395    <para role="recommended">
     96      <xref linkend="gobject-introspection"/>,
     97      <xref linkend="libxslt"/>,
    9498      <xref linkend="linux-pam"/>
    9599      <phrase revision="sysv">
    … …  
    111115
    112116
     117    <!-- Due to the fact that meson will not autodetect g-i and
     118         has it set to required unless you pass an option, and the likelihood
     119         of users ignoring a command explanation and then sending in mails
     120         regarding KDE or GNOME not working after installing polkit, let's move
     121         it to recommended. See #15640 for logic
    113122    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
    114123    <para role="optional">
    115124      <xref linkend="gobject-introspection"/>
    116125    </para>
     126    -->
    117127
    118128    <bridgehead renderas="sect4">Optional</bridgehead>
    119129    <para role="optional">
    120130      <xref linkend="dbus-python"/> and
    121       <xref linkend="python-dbusmock"/> (for tests),
    122       <xref linkend="DocBook"/>,
    123       <xref linkend="docbook-xsl"/>,
    124       <xref linkend="gtk-doc"/>, and
    125       <xref linkend="libxslt"/>
     131      <xref linkend="python-dbusmock"/> (for tests), and
     132      <!--<xref linkend="DocBook"/>, (Part of libxslt's chain)
     133      <xref linkend="docbook-xsl"/>,-->
     134      <xref linkend="gtk-doc"/>
    126135    </para>
    127136
    … …  
    152161        required. If you have installed <xref linkend="libxslt"/>, but you do
    153162        not want to install any of the DocBook packages mentioned, you will
    154         need to use <option>--disable-man-pages</option> in the instructions
     163        need to use <option>-Dman=false</option> in the instructions
    155164        below.
    156165      </para>
    … …  
    176185        -g polkitd -s /bin/false polkitd</userinput></screen>
    177186
     187<!-- All of this is irrelevant with meson
    178188    <note revision="systemd">
    179189      <para>
    … …  
    198208<screen revision="sysv"><userinput>patch -Np1 -i ../polkit-&polkit-version;-fix_elogind_detection-1.patch &amp;&amp;
    199209autoreconf -fv</userinput></screen>
    200 
     210-->
     211
     212    <para>
     213      First, fix problems with setting permissions during installation and with
     214      meson-0.60.0:
     215    </para>
     216
     217<screen><userinput remap="pre">sed '/0,/s/^/#/' -i meson_post_install.py &amp;&amp;
     218sed '/policy,/d' -i actions/meson.build \
     219                 -i src/examples/meson.build</userinput></screen>
    201220    <para>
    202221      Install <application>Polkit</application> by running the following
    … …  
    204223    </para>
    205224
    206 <screen revision="systemd"><userinput>./configure --prefix=/usr        \
    207             --sysconfdir=/etc    \
    208             --localstatedir=/var \
    209             --disable-static     \
    210             --with-os-type=LFS   &amp;&amp;
    211 make</userinput></screen>
    212 
    213 <screen revision="sysv"><userinput>./configure --prefix=/usr        \
    214             --sysconfdir=/etc    \
    215             --localstatedir=/var \
    216             --disable-static     \
    217             --with-os-type=LFS   \
    218             --disable-libsystemd-login &amp;&amp;
    219 make</userinput></screen>
    220 
     225<screen revision="systemd"><userinput>mkdir build &amp;&amp;
     226cd    build &amp;&amp;
     227
     228meson --prefix=/usr                       \
     229      -Dman=true                          \
     230      -Dsession_tracking=libsystemd-login \
     231      --buildtype=release                 \
     232      ..                                  &amp;&amp;
     233ninja</userinput></screen>
     234
     235<screen revision="sysv"><userinput>mkdir build &amp;&amp;
     236cd    build &amp;&amp;
     237
     238meson --prefix=/usr                 \
     239      -Dman=true                    \
     240      -Dsession_tracking=libelogind \
     241      -Dsystemdsystemunitdir=/tmp   \
     242      --buildtype=release           \
     243      ..                            &amp;&amp;
     244ninja</userinput></screen>
     245
     246<!--
    221247    <para>
    222248      To test the results, first ensure that the system
    … …  
    224250      Then run <command>make check</command>.
    225251    </para>
     252-->
     253
     254<!-- The subprojects directory which contains a wrapper for 'mocklibc'
     255     is not shipped in the tarball like it should be. Whenever that is
     256     fixed, -Dtests=true and ninja test is the ticket. -->
     257
     258    <para>
     259      This package does not ship with a working test suite.
     260    </para>
    226261
    227262    <para>
    … …  
    229264    </para>
    230265
    231 <screen role="root"><userinput>make install</userinput></screen>
     266<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
     267
     268<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
     269rm -v /tmp/*.service</userinput></screen>
    232270
    233271  </sect2>
    … …  
    236274    <title>Command Explanations</title>
    237275
     276    <!--
    238277    <para revision="sysv">
    239       <parameter>--disable-libsystemd-login</parameter>: This switch forces
     278      <parameter>- -disable-libsystemd-login</parameter>: This switch forces
    240279      polkit to build with elogind support (if available) rather than
    241280      systemd-logind.
    242281    </para>
    243282
     283   
    244284    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    245285      href="../../xincludes/static-libraries.xml"/>
    246 
    247     <para>
    248       <option>--with-authfw=shadow</option>: This switch enables the
     286    -->
     287   
     288    <para>
     289      <option>-Dauthfw=shadow</option>: This switch enables the
    249290      package to use the <application>Shadow</application> rather than the
    250291      <application>Linux PAM</application> Authentication framework. Use it
    … …  
    252293    </para>
    253294
     295    <!--
    254296    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    255297    href="../../xincludes/gtk-doc-rebuild.xml"/>
     298    -->
     299
     300    <para>
     301      <option>-Dintrospection=false</option>: Use this option if you are certain
     302      that you do not need gobject-introspection files for polkit, or do not have
     303      gobject-introspection installed.
     304    </para>
     305
     306    <para>
     307      <option>-Dman=false</option>: Use this option to disable generating and
     308      installing manual pages. This is useful if libxslt is not installed.
     309    </para>
     310
     311    <para>
     312      <option>-Dexamples=true</option>: Use this option to build the example
     313      programs.
     314    </para>
     315
     316    <para>
     317      <option>-Dgtk_doc=true</option>: Use this option to enable building and
     318      installing the API documentation.
     319    </para>
    256320
    257321  </sect2>
    … …  
    305369      <seglistitem>
    306370        <seg>
    307           pkaction, pkcheck, pk-example-frobnicate, pkexec,
     371          pkaction, pkcheck, <!--pk-example-frobnicate,--> pkexec,
    308372          pkttyagent and polkitd
    309373        </seg>
    … …  
    351415      </varlistentry>
    352416
     417<!--
    353418      <varlistentry id="pk-example-frobnicate">
    354419        <term><command>pk-example-frobnicate</command></term>
    … …  
    363428        </listitem>
    364429      </varlistentry>
    365 
     430-->
     431     
    366432      <varlistentry id="pkexec">
    367433        <term><command>pkexec</command></term>
Note: See TracChangeset for help on using the changeset viewer.