On 6.10.2014 21:49, [email protected] wrote:
Author: fernando
Date: Mon Oct 6 12:49:44 2014
New Revision: 14515
Log:
Update to CUPS-2.0.0. Thanks Armin for suggestions, including the replacement
of a patch by more visible commands.
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/pst/printing/cups.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Sun Oct 5 22:20:24 2014 (r14514)
+++ trunk/BOOK/general.ent Mon Oct 6 12:49:44 2014 (r14515)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "05"> <!-- Always 2 digits -->
+<!ENTITY day "06"> <!-- Always 2 digits -->
<!ENTITY month "10"> <!-- Always 2 digits -->
<!ENTITY year "2014">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "October 5th, &year;">
+<!ENTITY releasedate "October 6th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development] -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sun Oct 5 22:20:24
2014 (r14514)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Oct 6 12:49:44
2014 (r14515)
@@ -45,6 +45,18 @@
-->
<listitem>
+ <para>October 6th, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[fernando] - Update to CUPS-2.0.0. Thanks Armin for
+ suggestions, including the replacement of a patch by more visible
+ commands. Fixes <ulink
+ url="&blfs-ticket-root;5617">#5617</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>October 5th, 2014</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sun Oct 5 22:20:24 2014 (r14514)
+++ trunk/BOOK/packages.ent Mon Oct 6 12:49:44 2014 (r14515)
@@ -705,7 +705,7 @@
<!-- Part XII -->
<!-- Chapter 42 -->
-<!ENTITY cups-version "1.7.5">
+<!ENTITY cups-version "2.0.0">
<!ENTITY cups-filters-version "1.0.59">
<!ENTITY gs-version "9.15">
<!ENTITY gutenprint-version "5.2.10">
Modified: trunk/BOOK/pst/printing/cups.xml
==============================================================================
--- trunk/BOOK/pst/printing/cups.xml Sun Oct 5 22:20:24 2014 (r14514)
+++ trunk/BOOK/pst/printing/cups.xml Mon Oct 6 12:49:44 2014 (r14515)
@@ -6,10 +6,10 @@
<!ENTITY cups-download-http
"http://www.cups.org/software/&cups-version;/cups-&cups-version;-source.tar.bz2";>
<!ENTITY cups-download-ftp " ">
- <!ENTITY cups-md5sum "5d893edc2957005f78e2b2423fdace2e">
+ <!ENTITY cups-md5sum "2cdd81fea23e9e29555c24bdfd0d7c89">
<!ENTITY cups-size "8.4 MB">
- <!ENTITY cups-buildsize "64 MB (additional 25 MB for the tests)">
- <!ENTITY cups-time "0.6 SBU (additional 4.1 SBU for the tests)">
+ <!ENTITY cups-buildsize "60 MB (additional 28 MB for the tests)">
+ <!ENTITY cups-time "0.5 SBU (additional 4.4 SBU for the tests)">
]>
<sect1 id="cups" xreflabel="Cups-&cups-version;">
@@ -71,22 +71,16 @@
</para>
</listitem>
</itemizedlist>
-
+<!--
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
- Required patch:
- <ulink url="&patch-root;/cups-&cups-version;-blfs-1.patch"/>
- </para>
- </listitem>
- <listitem>
- <para>
Optional patch:
<ulink url="&patch-root;/cups-&cups-version;-content_type-1.patch"/>
</para>
</listitem>
- </itemizedlist>
+ </itemizedlist>-->
<bridgehead renderas="sect3">Cups Dependencies</bridgehead>
@@ -101,7 +95,7 @@
<para role="optional">
<xref linkend="avahi"/>,
<xref linkend="gnutls"/> (if you have it installed, then
- <xref linkend="libgcrypt"/> is required) or <xref linkend="openssl"/>,
+ <xref linkend="libgcrypt"/> is required),
libgcrypt is not required by GnuTLS anymore, but still CUPS looks for
it. Maybe it should be patched so configure omits looking for libgcrypt
too? I suppose all major distros have done that. I am not sure if it
could be converted into a sed easily though.
<xref linkend="libpaper"/>,
<xref linkend="linux-pam"/>,
<xref linkend="mitkrb"/>,
@@ -127,17 +121,17 @@
<note>
<para>
There used to be a conflict between the
<application>Cups</application>
- <application>libusb</application> backend and the usblp kernel
- driver. This is no longer the case and cups will work with both of
these
+ <application>libusb</application> backend and the usblp kernel driver.
+ This is no longer the case and cups will work with both of these
enabled.
</para>
</note>
<para>
If you want to use the kernel usblp driver (for example, if you wish to
- use <application>escputil</application> from <xref
linkend="gutenprint"/>)
- enable the following options in your kernel configuration and recompile
the
- kernel:
+ use <application>escputil</application> from <xref
+ linkend="gutenprint"/>) enable the following options in your kernel
+ configuration and recompile the kernel:
</para>
<screen>Device Drivers --->
@@ -207,34 +201,55 @@
Replace <command>firefox</command> with the web browser of your
choice.
</para>
-
+<!--
<para>
If you need to access a remote <application>Cups</application> print
server, use the following patch:
</para>
-<screen><userinput>patch -Np1 -i
../cups-&cups-version;-content_type-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i
../cups-&cups-version;-content_type-1.patch</userinput></screen>-->
<para>
- Install <application>Cups</application> by running the
- following commands:
+ 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
+ /usr/share/doc - I have modified this, inverting the logic; if it is
+ disliked, please revert my modification (fernando)
+
There is no need to invert it. It was done like this because if someone
does rm -rf /usr/share/doc/* (it can take a lot of space, so there's a
good chance for that) that CUPS web interface remains in tact, because
it's installed in docdir. symlink is created to honor the traditional
docdir. You don't need the reverse symlink, but you have a risk of
losing the web interface.
When not using libdir switch, CUPS will install libraries into /usr/lib64
on a 64 bit system, and since /usr/lib64 is symlink to /usr/lib it might
introduce some difficulties with packaging -->
-<screen><userinput>patch -Np1 -i ../cups-&cups-version;-blfs-1.patch &&
-aclocal -I config-scripts &&
+
+<screen><userinput>cat > conf/pam.std.in << "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>
+
Given that you've decided to put this into separate section, I'd suggest
you move it down below, to the configuring section and create
/etc/pam.d/cups directly.
+ <para>
+ Install <application>Cups</application> by running the
+ following commands:
+ </para>
+
+
+<screen><userinput>sed -i '/MAN.*.EXT/s:.gz::g' \
+ configure config-scripts/cups-manpages.m4 &&
+sed -i 's:555:755:g;s:444:644:g' Makedefs.in &&
+
+aclocal -I config-scripts &&
autoconf -I config-scripts &&
CC=gcc \
This shouldn't be needed anymore. Building with clang works fine since
version 3.4.
-./configure --libdir=/usr/lib \
- --with-rcdir=/tmp/cupsinit \
- --with-docdir=/usr/share/cups/doc \
- --with-system-groups=lpadmin &&
+./configure --libdir=/usr/lib \
+ --disable-systemd \
+ --with-rcdir=/tmp/cupsinit \
+ --with-system-groups=lpadmin \
+ --with-docdir=/usr/share/doc/cups-&cups-version; &&
make</userinput></screen>
<para>
@@ -252,19 +267,19 @@
<screen role="root"><userinput>make install &&
rm -rf /tmp/cupsinit &&
-ln -svfn ../cups/doc /usr/share/doc/cups-&cups-version;</userinput></screen>
+ln -svnf ../doc/cups-&cups-version; /usr/share/cups/doc</userinput></screen>
<para>
- Create a basic <application>Cups</application> client configuration
- file by running the following command as the
- <systemitem class="username">root</systemitem> user:
+ Create a basic <application>Cups</application> client configuration file
+ by running the following command as the <systemitem
+ class="username">root</systemitem> user:
</para>
<screen role="root"><userinput>echo "ServerName /var/run/cups/cups.sock" >
/etc/cups/client.conf</userinput></screen>
<para>
- Remove filters that are now part of the <application>Cups
Filters</application>
- package by running the following commands as the
+ Remove filters that are now part of the <application>Cups
+ Filters</application> package by running the following commands as the
<systemitem class="username">root</systemitem> user:
</para>
@@ -287,21 +302,36 @@
<title>Command Explanations</title>
<para>
+ <command>sed ... cups-manpages.m4</command>: In BLFS, uncompressed man
+ pages are preferred.
+ </para>
+
How about: "This sed prevents compression of the man pages by default."
or similar to what's described in LO (haven't really looked at it for
some time).
+ <para>
+ <command>sed ... Makedefs.in</command>: Fix files and directories
+ permissions.
+ </para>
+
Just files as far as I know. But I could be wrong, so don't take it as
granted.
+ <para>
<envar>CC=gcc</envar>: This environment variable ensures that gcc
is used if clang is installed. The build fails with the clang compiler.
</para>
<para>
- <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells
- the build process to install the shipped bootscript into
- <filename class="directory">/tmp</filename> instead of
- <filename class="directory">/etc/rc.d</filename>.
+ <parameter>--disable-systemd</parameter>: Systemd is not supported by
+ BLFS.
+ </para>
+
+ <para>
+ <parameter>--with-rcdir=/tmp/cupsinit</parameter>: This switch tells the
+ build process to install the shipped bootscript into <filename
+ class="directory">/tmp</filename> instead of <filename
+ class="directory">/etc/rc.d</filename>.
</para>
<para>
<parameter>--with-system-groups=lpadmin</parameter>: This switch ensures
- that only <systemitem class="groupname">lpadmin</systemitem> will be
used as
- the <application>Cups</application> administrative group.
+ that only <systemitem class="groupname">lpadmin</systemitem> will be used
+ as the <application>Cups</application> administrative group.
</para>
<para>
@@ -315,13 +345,6 @@
<application>Cups</application>.
</para>
- <para>
- <option>--disable-gnutls --enable-openssl</option>: This switch tells
the build
- process to use <xref linkend="openssl"/> instead of <xref
linkend="gnutls"/>.
- The current version of <application>GnuTLS</application> might produce
lot of
- warnings during the <application>Cups</application> build.
- </para>
-
</sect2>
<sect2 role="configuration">
@@ -352,14 +375,14 @@
<para>
For non-PostScript printers to print with
- <application>Cups</application>, you need to install <xref
linkend="gs"/>
- to convert PostScript to raster images and a driver (e.g., from
- <xref linkend="gutenprint"/>) to convert the resulting raster images
to a
- form that the printer understands.
- <ulink
url="http://www.linuxprinting.org/foomatic.html";>Foomatic</ulink>
- drivers use Ghostscript to convert PostScript to a printable form
directly,
- but this is considered to be a hack by <application>Cups</application>
- developers.
+ <application>Cups</application>, you need to install <xref
+ linkend="gs"/> to convert PostScript to raster images and a driver
+ (e.g., from <xref linkend="gutenprint"/>) to convert the resulting
+ raster images to a form that the printer understands. <ulink
+ url="http://www.linuxprinting.org/foomatic.html";>Foomatic</ulink>
+ drivers use Ghostscript to convert PostScript to a printable form
+ directly, but this is considered to be a hack by
+ <application>Cups</application> developers.
</para>
</sect3>
@@ -394,16 +417,15 @@
<seglistitem>
<seg>
- accept, cancel, cupsaccept, cupsaddsmb, cups-config,
- cupsctl, cupsd, cupsdisable, cupsenable, cupsfilter,
- cupsreject, cupstestdsc, cupstestppd, ippfind, ipptool,
- lp, lpadmin, lpc, lpinfo, lpmove, lpoptions, lppasswd,
- lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
- ppdpo and reject
+ accept, cancel, cupsaccept, cupsaddsmb, cups-config, cupsctl, cupsd,
+ cupsdisable, cupsenable, cupsfilter, cupsreject, cupstestdsc,
+ cupstestppd, ippfind, ipptool, lp, lpadmin, lpc, lpinfo, lpmove,
+ lpoptions, lpq, lpr, lprm, lpstat, ppdc, ppdhtml, ppdi, ppdmerge,
+ ppdpo, and reject
</seg>
<seg>
libcupscgi.so, libcupsimage.so, libcupsmime.so,
- libcupsppdc.so and libcups.so
+ libcupsppdc.so, and libcups.so
</seg>
<seg>
/etc/cups,
@@ -413,7 +435,7 @@
/usr/share/doc/cups-&cups-version;,
/var/cache/cups,
/var/log/cups,
- /var/run/cups and
+ /var/run/cups, and
/var/spool/cups
</seg>
</seglistitem>
@@ -636,20 +658,6 @@
</indexterm>
</listitem>
</varlistentry>
-
- <varlistentry id="lppasswd">
- <term><command>lppasswd</command></term>
- <listitem>
- <para>
- adds, changes or deletes passwords in the
- <application>Cups</application> digest password file
- <filename>passwd.md5</filename>.
- </para>
- <indexterm zone="cups lppasswd">
- <primary sortas="b-lppasswd">lppasswd</primary>
- </indexterm>
- </listitem>
- </varlistentry>
<varlistentry id="lpq-cups">
<term><command>lpq</command></term>
--
http://lists.linuxfromscratch.org/listinfo/blfs-dev
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
