Changeset 2c1a7b7f for pst/printing

Timestamp:

10/07/2014 03:18:51 PM (10 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, 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:

c77f4066

Parents:

6e5365b

Message:

Several modifications in CUPS-2.0.0. Thanks Armin.
XScreenSaver-5.30 and ConsoleKit-0.4.6: tweaks.

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

File:

• pst/printing/cups.xml (modified) (8 diffs)

pst/printing/cups.xml

@@ -95 +95 @@
     <para role="optional">
       <xref linkend="avahi"/>,
-      <xref linkend="gnutls"/> (if you have it installed, then
-      <xref linkend="libgcrypt"/> is required),
+      <xref linkend="gnutls"/>,
       <xref linkend="libpaper"/>,
       <xref linkend="linux-pam"/>,
@@ -210 +209 @@
 <screen><userinput>patch -Np1 -i ../cups-&cups-version;-content_type-1.patch</userinput></screen>-->
 
-    <para>
-      PAM module needs to be modified for BLFS:
-    </para>
     <!-- docdir is also document root for cups administration interface, so
-    let's just put it in /usr/share/cups/doc and create symlink in
-    /usr/share/doc - I have modified this, inverting the logic; if it is
-    disliked, please revert my modification (fernando)
+    let's just put it in /usr/share/cups/doc-&cups-version; and create symlink
+    in /usr/share/doc/cups-&cups-version;
 
     When not using libdir switch, CUPS will install libraries into /usr/lib64
@@ -222 +217 @@
     introduce some difficulties with packaging -->
 
-<screen><userinput>cat &gt; conf/pam.std.in  &lt;&lt; "EOF"
-<literal># Begin /etc/pam.d/cups
-
-auth    include system-auth
-account include system-account
-session include system-session
-
-# End /etc/pam.d/cups</literal>
-EOF</userinput></screen>
-
     <para>
       Install <application>Cups</application> by running the
@@ -237 +222 @@
     </para>
 
-
-<screen><userinput>sed -i '/MAN.*.EXT/s:.gz::g' \
-       configure config-scripts/cups-manpages.m4 &amp;&amp;
-sed -i 's:555:755:g;s:444:644:g' Makedefs.in     &amp;&amp;
+<screen><userinput>sed -i 's:555:755:g;s:444:644:g' Makedefs.in           &amp;&amp;
+sed -i '/MAN.*.EXT/s:.gz::g' \
+       configure config-scripts/cups-manpages.m4       &amp;&amp;
+sed -i '/LIBGCRYPTCONFIG/d' config-scripts/cups-ssl.m4 &amp;&amp;
 
 aclocal  -I config-scripts &amp;&amp;
 autoconf -I config-scripts &amp;&amp;
 
-CC=gcc \
 ./configure --libdir=/usr/lib            \
             --disable-systemd            \
             --with-rcdir=/tmp/cupsinit   \
             --with-system-groups=lpadmin \
-            --with-docdir=/usr/share/doc/cups-&cups-version; &amp;&amp;
+            --with-docdir=/usr/share/cups/doc-&cups-version; &amp;&amp;
 make</userinput></screen>
 
@@ -268 +252 @@
 <screen role="root"><userinput>make install &amp;&amp;
 rm -rf /tmp/cupsinit &amp;&amp;
-ln -svnf ../doc/cups-&cups-version; /usr/share/cups/doc</userinput></screen>
+ln -svnf ../cups/doc-&cups-version; /usr/share/doc/cups-&cups-version;</userinput></screen>
 
     <para>
@@ -303 +287 @@
 
     <para>
-      <command>sed ... cups-manpages.m4</command>: In BLFS, uncompressed man
-      pages are preferred.
-    </para>
-
-    <para>
       <command>sed ... Makedefs.in</command>: Fix files and directories
       permissions.
@@ -313 +292 @@
 
     <para>
-      <envar>CC=gcc</envar>: This environment variable ensures that gcc
-      is used if clang is installed.  The build fails with the clang compiler.
+      <command>sed ... cups-manpages.m4</command>: This sed prevents
+      compression of the man pages by default.
+    </para>
+
+    <para>
+      <command>sed ... cups-ssl.m4</command>: Prevent
+      <command>configure</command> script from searching
+      <command>libgcrypt-config</command>, because
+      <application>libgcrypt</application> is not used anywere else in the
+      package.
     </para>
 
@@ -385 +372 @@
         <application>Cups</application> developers.
       </para>
+
+    </sect3>
+
+    <sect3>
+      <title>Linux PAM Configuration</title>
+
+      <para>
+        If <application>CUPS</application> has been built with
+        <application>Linux PAM</application> support, you need to create a
+        <application>PAM</application> configuration file, to get it working
+        correctly with BLFS.
+      </para>
+
+      <para>
+        Issue the following command as the <systemitem
+        class="username">root</systemitem> user to create the configuration
+        file for <application>Linux PAM</application>:
+      </para>
+
+<screen><userinput>cat &gt; /etc/pam.d/cups &lt;&lt; "EOF"
+<literal># Begin /etc/pam.d/cups
+
+auth    include system-auth
+account include system-account
+session include system-session
+
+# End /etc/pam.d/cups</literal>
+EOF</userinput></screen>
 
     </sect3>