[cups/f17] Documentation fixes from STR #4223 (bug #915981).
Tim Waugh
twaugh at fedoraproject.org
Tue Mar 5 17:16:35 UTC 2013
commit 19635ac1b10a6573f556960655793a343ebeefec
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Mar 5 15:34:51 2013 +0000
Documentation fixes from STR #4223 (bug #915981).
Resolves: rhbz#915981
cups-str4223.patch | 671 ++++++++++++++++++++++++++++++++++++++++++++--------
cups.spec | 5 +-
2 files changed, 570 insertions(+), 106 deletions(-)
---
diff --git a/cups-str4223.patch b/cups-str4223.patch
index d96a2a6..6c08e4f 100644
--- a/cups-str4223.patch
+++ b/cups-str4223.patch
@@ -1,6 +1,6 @@
diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in
--- cups-1.5.4/conf/cupsd.conf.in.str4223 2010-12-09 21:24:51.000000000 +0000
-+++ cups-1.5.4/conf/cupsd.conf.in 2013-01-04 16:17:54.940629434 +0000
++++ cups-1.5.4/conf/cupsd.conf.in 2013-03-05 14:56:43.465345816 +0000
@@ -9,10 +9,6 @@
# for troubleshooting...
LogLevel @CUPS_LOG_LEVEL@
@@ -13,8 +13,8 @@ diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in
Listen localhost:@DEFAULT_IPP_PORT@
@CUPS_LISTEN_DOMAINSOCKET@
diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.conf.in
---- cups-1.5.4/conf/cups-files.conf.in.str4223 2013-01-04 16:17:54.941629438 +0000
-+++ cups-1.5.4/conf/cups-files.conf.in 2013-01-04 16:17:54.941629438 +0000
+--- cups-1.5.4/conf/cups-files.conf.in.str4223 2013-03-05 14:56:43.465345816 +0000
++++ cups-1.5.4/conf/cups-files.conf.in 2013-03-05 14:56:43.465345816 +0000
@@ -0,0 +1,98 @@
+#
+# "$Id$"
@@ -116,7 +116,7 @@ diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.c
+#
diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-scripts/cups-defaults.m4
--- cups-1.5.4/config-scripts/cups-defaults.m4.str4223 2011-05-06 23:53:53.000000000 +0100
-+++ cups-1.5.4/config-scripts/cups-defaults.m4 2013-01-04 16:17:54.942629443 +0000
++++ cups-1.5.4/config-scripts/cups-defaults.m4 2013-03-05 14:56:43.466345820 +0000
@@ -367,6 +367,7 @@ else
fi
@@ -134,8 +134,8 @@ diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-sc
dnl Default MaxCopies value...
AC_ARG_WITH(max-copies, [ --with-max-copies set default max copies value, default=9999 ],
diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts/cups-ssl.m4
---- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2013-01-04 16:17:54.776628678 +0000
-+++ cups-1.5.4/config-scripts/cups-ssl.m4 2013-01-04 16:17:54.943629448 +0000
+--- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2013-03-05 14:56:43.354345360 +0000
++++ cups-1.5.4/config-scripts/cups-ssl.m4 2013-03-05 14:56:43.466345820 +0000
@@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [ --with-
SSLFLAGS=""
SSLLIBS=""
@@ -183,8 +183,8 @@ diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts
AC_SUBST(SSLFLAGS)
AC_SUBST(SSLLIBS)
diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in
---- cups-1.5.4/configure.in.str4223 2013-01-04 16:17:54.908629287 +0000
-+++ cups-1.5.4/configure.in 2013-01-04 16:17:54.943629448 +0000
+--- cups-1.5.4/configure.in.str4223 2013-03-05 14:56:43.429345668 +0000
++++ cups-1.5.4/configure.in 2013-03-05 14:56:43.466345820 +0000
@@ -66,6 +66,7 @@ AC_SUBST(INSTALL_LANGUAGES)
AC_SUBST(UNINSTALL_LANGUAGES)
@@ -193,7 +193,14 @@ diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in
conf/cupsd.conf
conf/mime.convs
conf/pam.std
-@@ -82,6 +83,7 @@ AC_OUTPUT(Makedefs
+@@ -76,12 +77,14 @@ AC_OUTPUT(Makedefs
+ data/cups.socket
+ data/cups.path
+ desktop/cups.desktop
++ doc/help/ref-cups-files-conf.html
+ doc/help/ref-cupsd-conf.html
+ doc/help/standard.html
+ doc/index.html
man/client.conf.man
man/cups-deviced.man
man/cups-driverd.man
@@ -202,8 +209,8 @@ diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in
man/cupsaddsmb.man
man/cupsd.conf.man
diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile
---- cups-1.5.4/conf/Makefile.str4223 2013-01-04 16:17:54.761628608 +0000
-+++ cups-1.5.4/conf/Makefile 2013-01-04 16:17:54.944629453 +0000
+--- cups-1.5.4/conf/Makefile.str4223 2013-03-05 14:56:43.335345282 +0000
++++ cups-1.5.4/conf/Makefile 2013-03-05 14:56:43.466345820 +0000
@@ -19,7 +19,7 @@ include ../Makedefs
# Config files...
#
@@ -215,8 +222,45 @@ diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile
diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cupsd-conf.html.in
--- cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 2012-01-30 21:40:21.000000000 +0000
-+++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2013-01-04 16:17:54.945629457 +0000
-@@ -191,82 +191,6 @@ HREF="#Location"><CODE>Location</CODE></
++++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2013-03-05 15:06:21.395710588 +0000
+@@ -43,36 +43,6 @@ sudo launchctl load /System/Library/Laun
+ automatically handles restarting the scheduler.</P>
+
+
+-<H2 CLASS="title"><A NAME="AccessLog">AccessLog</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-AccessLog /var/log/cups/access_log
+-AccessLog /var/log/cups/access_log-%s
+-AccessLog syslog
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>AccessLog</CODE> directive sets the name of the
+-access log file. If the filename is not absolute then it is
+-assumed to be relative to the <A
+-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+-access log file is stored in "common log format" and can be used
+-by any web access reporting tool to generate a report on CUPS
+-server activity.</P>
+-
+-<P>The server name can be included in the filename by using
+-<CODE>%s</CODE> in the name.</P>
+-
+-<P>The special name "syslog" can be used to send the access
+-information to the system log instead of a plain file.</P>
+-
+-<P>The default access log file is
+-<VAR>@CUPS_LOGDIR@/access_log</VAR>.</P>
+-
+-
+ <H2 CLASS="title"><A NAME="AccessLogLevel">AccessLogLevel</A></H2>
+
+ <H3>Examples</H3>
+@@ -191,82 +161,6 @@ HREF="#Location"><CODE>Location</CODE></
HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
@@ -299,7 +343,299 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><A NAME="AuthType">AuthType</A></H2>
<H3>Examples</H3>
-@@ -2544,65 +2468,6 @@ purged.</P>
+@@ -898,40 +792,6 @@ used.</P>
+ <P>The default is to not allow classification overrides.</P>
+
+
+-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="ConfigFilePerm">ConfigFilePerm</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-ConfigFilePerm 0644
+-ConfigFilePerm 0640
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>ConfigFilePerm</CODE> directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM at .</P>
+-
+-<BLOCKQUOTE><B>Note:</B>
+-
+-<P>The permissions for the <VAR>printers.conf</VAR> file are always masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature.</P>
+-
+-</BLOCKQUOTE>
+-
+-
+-<H2 CLASS="title"><A NAME="DataDir">DataDir</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-DataDir /usr/share/cups
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>DataDir</CODE> directive sets the directory to use
+-for data files.</P>
+-
+-
+ <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2/Mac OS X 10.5</SPAN><A NAME="DefaultAuthType">DefaultAuthType</A></H2>
+
+ <H3>Examples</H3>
+@@ -1113,32 +973,6 @@ causes the update to occur as soon as po
+ milliseconds.</P>
+
+
+-<H2 CLASS="title"><A NAME="DocumentRoot">DocumentRoot</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-DocumentRoot /usr/share/doc/cups
+-DocumentRoot /foo/bar/doc/cups
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>DocumentRoot</CODE> directive specifies the location
+-of web content for the HTTP server in CUPS. If an absolute path
+-is not specified then it is assumed to be relative to the <A
+-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+-default directory is <VAR>@CUPS_DOCROOT@</VAR>.</P>
+-
+-<P>Documents are first looked up in a sub-directory for the
+-primary language requested by the client (e.g.
+-<VAR>@CUPS_DOCROOT@/fr/...</VAR>) and then directly under
+-the <CODE>DocumentRoot</CODE> directory (e.g.
+-<VAR>@CUPS_DOCROOT@/...</VAR>), so it is possible to
+-localize the web content by providing subdirectories for each
+-language needed.</P>
+-
+-
+ <H2 CLASS="title"><A NAME="Encryption">Encryption</A></H2>
+
+ <H3>Examples</H3>
+@@ -1161,31 +995,6 @@ encryption settings for that location. T
+ <CODE>IfRequested</CODE> for all locations.</P>
+
+
+-<H2 CLASS="title"><A NAME="ErrorLog">ErrorLog</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-ErrorLog /var/log/cups/error_log
+-ErrorLog /var/log/cups/error_log-%s
+-ErrorLog syslog
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>ErrorLog</CODE> directive sets the name of the error
+-log file. If the filename is not absolute then it is assumed to
+-be relative to the <A
+-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+-default error log file is <VAR>@CUPS_LOGDIR@/error_log</VAR>.</P>
+-
+-<P>The server name can be included in the filename by using
+-<CODE>%s</CODE> in the name.</P>
+-
+-<P>The special name "syslog" can be used to send the error
+-information to the system log instead of a plain file.</P>
+-
+-
+ <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.3/Mac OS X 10.5</SPAN><A NAME="ErrorPolicy">ErrorPolicy</A></H2>
+
+ <H3>Examples</H3>
+@@ -1225,90 +1034,6 @@ printer.</P>
+
+
+
+-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.4/Mac OS X 10.6</SPAN><A NAME="FatalErrors">FatalErrors</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-FatalErrors none
+-FatalErrors all
+-FatalErrors browse
+-FatalErrors config
+-FatalErrors listen
+-FatalErrors log
+-FatalErrors permissions
+-FatalErrors all -permissions
+-FatalErrors config permissions log
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>FatalErrors</CODE> directive determines whether certain kinds of
+-errors are fatal. The following kinds of errors are currently recognized:</P>
+-
+-<UL>
+-
+- <LI><CODE>none</CODE> - No errors are fatal</LI>
+-
+- <LI><CODE>all</CODE> - All of the errors below are fatal</LI>
+-
+- <LI><CODE>browse</CODE> - Browsing initialization errors are fatal,
+- for example failed binding to the CUPS browse port or failed connections
+- to LDAP servers</LI>
+-
+- <LI><CODE>config</CODE> - Configuration file syntax errors are
+- fatal</LI>
+-
+- <LI><CODE>listen</CODE> - Listen or Port errors are fatal, except for
+- IPv6 failures on the loopback or "any" addresses</LI>
+-
+- <LI><CODE>log</CODE> - Log file creation or write errors are fatal</LI>
+-
+- <LI><CODE>permissions</CODE> - Bad startup file permissions are
+- fatal, for example shared SSL certificate and key files with world-
+- read permissions</LI>
+-
+-</UL>
+-
+-<P>Multiple errors can be listed, and the form "-kind" can be used with
+-<CODE>all</CODE> to remove specific kinds of errors. The default setting is
+-<CODE>@CUPS_FATAL_ERRORS@</CODE>.</P>
+-
+-
+-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.18</SPAN><A NAME="FileDevice">FileDevice</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-FileDevice Yes
+-FileDevice No
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>FileDevice</CODE> directive determines whether the
+-scheduler allows new printers to be added using device URIs of
+-the form <CODE>file:/filename</CODE>. File devices are most often
+-used to test new printer drivers and do not support raw file
+-printing.</P>
+-
+-<P>The default setting is <CODE>No</CODE>.</P>
+-
+-<BLOCKQUOTE><B>Note:</B>
+-
+-<P>File devices are managed by the scheduler. Since the
+-scheduler normally runs as the root user, file devices
+-can be used to overwrite system files and potentially
+-gain unauthorized access to the system. If you must
+-create printers using file devices, we recommend that
+-you set the <CODE>FileDevice</CODE> directive to
+-<CODE>Yes</CODE> for only as long as you need to add the
+-printers to the system, and then reset the directive to
+-<CODE>No</CODE>.</P>
+-
+-</BLOCKQUOTE>
+-
+-
+ <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="FilterLimit">FilterLimit</A></H2>
+
+ <H3>Examples</H3>
+@@ -1353,39 +1078,6 @@ value to assign to filter processes. The
+ is 0.</P>
+
+
+-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.3</SPAN><A NAME="FontPath">FontPath</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-FontPath /foo/bar/fonts
+-FontPath /usr/share/cups/fonts:/foo/bar/fonts
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>FontPath</CODE> directive specifies the font path to
+-use when searching for fonts. The default font path is
+-<CODE>/usr/share/cups/fonts</CODE>.</P>
+-
+-
+-<H2 CLASS="title"><A NAME="Group">Group</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-Group lp
+-Group nobody
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>Group</CODE> directive specifies the UNIX group that
+-filter and CGI programs run as. The default group is
+-system-specific but is usually <CODE>lp</CODE> or
+-<CODE>nobody</CODE>.</P>
+-
+-
+ <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.10</SPAN><A NAME="HideImplicitMembers">HideImplicitMembers</A></H2>
+
+ <H3>Examples</H3>
+@@ -2030,22 +1722,6 @@ error occurs during printing. The defaul
+ disables debugging history entirely and is not recommended.</P>
+
+
+-<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.15</SPAN><A NAME="LogFilePerm">LogFilePerm</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-LogFilePerm 0644
+-LogFilePerm 0600
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>LogFilePerm</CODE> directive specifies the
+-permissions to use when writing log files. The default
+-is @CUPS_LOG_FILE_PERM at .</P>
+-
+-
+ <H2 CLASS="title"><A NAME="LogLevel">LogLevel</A></H2>
+
+ <H3>Examples</H3>
+@@ -2350,31 +2026,6 @@ HREF="#Location"><CODE>Location</CODE></
+ HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
+
+
+-<H2 CLASS="title"><A NAME="PageLog">PageLog</A></H2>
+-
+-<H3>Examples</H3>
+-
+-<PRE CLASS="command">
+-PageLog /var/log/cups/page_log
+-PageLog /var/log/cups/page_log-%s
+-PageLog syslog
+-</PRE>
+-
+-<H3>Description</H3>
+-
+-<P>The <CODE>PageLog</CODE> directive sets the name of the page
+-log file. If the filename is not absolute then it is assumed to
+-be relative to the <A
+-HREF="#ServerRoot"><CODE>ServerRoot</CODE></A> directory. The
+-default page log file is <VAR>@CUPS_LOGDIR@/page_log</VAR>.</P>
+-
+-<P>The server name can be included in the filename by using
+-<CODE>%s</CODE> in the name.</P>
+-
+-<P>The special name "syslog" can be used to send the page
+-information to the system log instead of a plain file.</P>
+-
+-
+ <H2 CLASS="title"><A NAME="PageLogFormat">PageLogFormat</A></H2>
+
+ <H3>Examples</H3>
+@@ -2544,65 +2195,6 @@ purged.</P>
files as soon as each job is completed, canceled, or aborted.</P>
@@ -365,7 +701,7 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.21</SPAN><A NAME="ReloadTimeout">ReloadTimeout</A></H2>
<H3>Examples</H3>
-@@ -2619,42 +2484,6 @@ of seconds the scheduler will wait for a
+@@ -2619,42 +2211,6 @@ of seconds the scheduler will wait for a
before doing a restart. The default is 30 seconds.</P>
@@ -408,7 +744,7 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.7</SPAN><A NAME="Require">Require</A></H2>
<H3>Examples</H3>
-@@ -2806,64 +2635,6 @@ alternate name with a ServerAlias direct
+@@ -2806,64 +2362,6 @@ alternate name with a ServerAlias direct
</BLOCKQUOTE>
@@ -473,7 +809,7 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><A NAME="ServerName">ServerName</A></H2>
<H3>Examples</H3>
-@@ -2880,23 +2651,6 @@ that is reported to clients. By default
+@@ -2880,23 +2378,6 @@ that is reported to clients. By default
hostname.</P>
@@ -497,7 +833,7 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.21</SPAN><A NAME="ServerTokens">ServerTokens</A></H2>
<H3>Examples</H3>
-@@ -3075,53 +2829,6 @@ subscription values to make private. The
+@@ -3075,53 +2556,6 @@ subscription values to make private. The
HREF="#Policy"><CODE>Policy</CODE></A> section.</P>
@@ -551,7 +887,7 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H2 CLASS="title"><A NAME="Timeout">Timeout</A></H2>
<H3>Examples</H3>
-@@ -3160,31 +2867,6 @@ the same printer available from multiple
+@@ -3160,31 +2594,6 @@ the same printer available from multiple
<P>The default is <CODE>@CUPS_USE_NETWORK_DEFAULT@</CODE>.</P>
@@ -584,9 +920,9 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
<H3>Examples</H3>
diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cups-files-conf.html.in
---- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2013-01-04 16:17:54.945629457 +0000
-+++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2013-01-04 16:17:54.945629457 +0000
-@@ -0,0 +1,531 @@
+--- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2013-03-05 14:56:43.467345823 +0000
++++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2013-03-05 15:01:49.499604711 +0000
+@@ -0,0 +1,513 @@
+<HTML>
+<!-- SECTION: References -->
+<HEAD>
@@ -663,24 +999,6 @@ diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/
+for data files.</P>
+
+
-+<H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2/OS X 10.5</SPAN><A NAME="DefaultAuthType">DefaultAuthType</A></H2>
-+
-+<H3>Examples</H3>
-+
-+<PRE CLASS="command">
-+DefaultAuthType Basic
-+DefaultAuthType BasicDigest
-+DefaultAuthType Digest
-+DefaultAuthType Negotiate
-+</PRE>
-+
-+<H3>Description</H3>
-+
-+<P>The <CODE>DefaultAuthType</CODE> directive specifies the type
-+of authentication to use for IPP operations that require a
-+username. The default is <CODE>Basic</CODE>.</P>
-+
-+
+<H2 CLASS="title"><A NAME="DocumentRoot">DocumentRoot</A></H2>
+
+<H3>Examples</H3>
@@ -1120,7 +1438,7 @@ diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/
+</HTML>
diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile
--- cups-1.5.4/doc/Makefile.str4223 2011-01-17 05:40:28.000000000 +0000
-+++ cups-1.5.4/doc/Makefile 2013-01-04 16:17:54.945629457 +0000
++++ cups-1.5.4/doc/Makefile 2013-03-05 14:56:43.467345823 +0000
@@ -3,7 +3,7 @@
#
# Documentation makefile for CUPS.
@@ -1130,9 +1448,17 @@ diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
+@@ -105,6 +105,7 @@ HELPFILES = \
+ help/ref-classes-conf.html \
+ help/ref-client-conf.html \
+ help/ref-cupsd-conf.html \
++ help/ref-cups-files-conf.html \
+ help/ref-error_log.html \
+ help/ref-mailto-conf.html \
+ help/ref-page_log.html \
diff -up cups-1.5.4/locale/cups_da.po.str4223 cups-1.5.4/locale/cups_da.po
--- cups-1.5.4/locale/cups_da.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_da.po 2013-01-04 16:17:54.946629461 +0000
++++ cups-1.5.4/locale/cups_da.po 2013-03-05 14:56:43.469345832 +0000
@@ -2759,7 +2759,7 @@ msgstr "Arkivmappe - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1157,7 +1483,7 @@ diff -up cups-1.5.4/locale/cups_da.po.str4223 cups-1.5.4/locale/cups_da.po
#~ msgstr "Fixertemperatur høj!"
diff -up cups-1.5.4/locale/cups_de.po.str4223 cups-1.5.4/locale/cups_de.po
--- cups-1.5.4/locale/cups_de.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_de.po 2013-01-04 16:17:54.947629466 +0000
++++ cups-1.5.4/locale/cups_de.po 2013-03-05 14:56:43.470345836 +0000
@@ -2760,7 +2760,7 @@ msgstr "Dateiordner – 9/16 x 3 7/16 Zo
#, c-format
msgid ""
@@ -1182,7 +1508,7 @@ diff -up cups-1.5.4/locale/cups_de.po.str4223 cups-1.5.4/locale/cups_de.po
#~ msgstr "Die Temperatur des Fixierers ist zu hoch!"
diff -up cups-1.5.4/locale/cups_es.po.str4223 cups-1.5.4/locale/cups_es.po
--- cups-1.5.4/locale/cups_es.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_es.po 2013-01-04 16:17:54.948629471 +0000
++++ cups-1.5.4/locale/cups_es.po 2013-03-05 14:56:43.471345840 +0000
@@ -2991,10 +2991,10 @@ msgstr "Carpeta de archivosr - 9/16 x 3
#, c-format
msgid ""
@@ -1198,7 +1524,7 @@ diff -up cups-1.5.4/locale/cups_es.po.str4223 cups-1.5.4/locale/cups_es.po
msgid "Finished page %d."
diff -up cups-1.5.4/locale/cups_eu.po.str4223 cups-1.5.4/locale/cups_eu.po
--- cups-1.5.4/locale/cups_eu.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_eu.po 2013-01-04 16:17:54.949629475 +0000
++++ cups-1.5.4/locale/cups_eu.po 2013-03-05 14:56:43.473345848 +0000
@@ -2793,7 +2793,7 @@ msgstr "Fitxategien karpeta - 9/16 x 3 7
#, c-format
msgid ""
@@ -1223,7 +1549,7 @@ diff -up cups-1.5.4/locale/cups_eu.po.str4223 cups-1.5.4/locale/cups_eu.po
#~ msgstr "Fuser-aren tenperatura altua."
diff -up cups-1.5.4/locale/cups_fi.po.str4223 cups-1.5.4/locale/cups_fi.po
--- cups-1.5.4/locale/cups_fi.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_fi.po 2013-01-04 16:17:54.950629480 +0000
++++ cups-1.5.4/locale/cups_fi.po 2013-03-05 14:56:43.474345852 +0000
@@ -2759,7 +2759,7 @@ msgstr "Arkistokansio - 9/16 x 3 7/16 \"
#, c-format
msgid ""
@@ -1248,7 +1574,7 @@ diff -up cups-1.5.4/locale/cups_fi.po.str4223 cups-1.5.4/locale/cups_fi.po
#~ msgstr "Lämpövastuksen lämpötila on korkea!"
diff -up cups-1.5.4/locale/cups_fr.po.str4223 cups-1.5.4/locale/cups_fr.po
--- cups-1.5.4/locale/cups_fr.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_fr.po 2013-01-04 16:17:54.951629485 +0000
++++ cups-1.5.4/locale/cups_fr.po 2013-03-05 14:56:43.476345861 +0000
@@ -2760,7 +2760,7 @@ msgstr "Dossier de fichier - 9/16 x 3 7/
#, c-format
msgid ""
@@ -1273,7 +1599,7 @@ diff -up cups-1.5.4/locale/cups_fr.po.str4223 cups-1.5.4/locale/cups_fr.po
#~ msgstr "Température de l’unité-fusible élevée."
diff -up cups-1.5.4/locale/cups_hu.po.str4223 cups-1.5.4/locale/cups_hu.po
--- cups-1.5.4/locale/cups_hu.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_hu.po 2013-01-04 16:17:54.951629485 +0000
++++ cups-1.5.4/locale/cups_hu.po 2013-03-05 14:56:43.477345865 +0000
@@ -2963,10 +2963,10 @@ msgstr "Fájlmappa - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1289,7 +1615,7 @@ diff -up cups-1.5.4/locale/cups_hu.po.str4223 cups-1.5.4/locale/cups_hu.po
msgid "Finished page %d."
diff -up cups-1.5.4/locale/cups_id.po.str4223 cups-1.5.4/locale/cups_id.po
--- cups-1.5.4/locale/cups_id.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_id.po 2013-01-04 16:17:54.952629490 +0000
++++ cups-1.5.4/locale/cups_id.po 2013-03-05 14:56:43.478345869 +0000
@@ -2791,7 +2791,7 @@ msgstr "Map - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1314,7 +1640,7 @@ diff -up cups-1.5.4/locale/cups_id.po.str4223 cups-1.5.4/locale/cups_id.po
#~ msgstr "Suhu fusi tinggi!"
diff -up cups-1.5.4/locale/cups_it.po.str4223 cups-1.5.4/locale/cups_it.po
--- cups-1.5.4/locale/cups_it.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_it.po 2013-01-04 16:17:54.953629494 +0000
++++ cups-1.5.4/locale/cups_it.po 2013-03-05 14:56:43.479345873 +0000
@@ -2761,7 +2761,7 @@ msgstr "Cartella documento: 9/16 x 3 7/1
#, c-format
msgid ""
@@ -1339,7 +1665,7 @@ diff -up cups-1.5.4/locale/cups_it.po.str4223 cups-1.5.4/locale/cups_it.po
#~ msgstr "Temperatura del fusibile elevata!"
diff -up cups-1.5.4/locale/cups_ja.po.str4223 cups-1.5.4/locale/cups_ja.po
--- cups-1.5.4/locale/cups_ja.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_ja.po 2013-01-04 16:17:54.954629498 +0000
++++ cups-1.5.4/locale/cups_ja.po 2013-03-05 14:56:43.480345877 +0000
@@ -2788,7 +2788,7 @@ msgstr "ファイルフォルダー - 9/
#, c-format
msgid ""
@@ -1363,7 +1689,7 @@ diff -up cups-1.5.4/locale/cups_ja.po.str4223 cups-1.5.4/locale/cups_ja.po
#~ msgid "Fuser temperature high!"
diff -up cups-1.5.4/locale/cups_ko.po.str4223 cups-1.5.4/locale/cups_ko.po
--- cups-1.5.4/locale/cups_ko.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_ko.po 2013-01-04 16:17:54.955629503 +0000
++++ cups-1.5.4/locale/cups_ko.po 2013-03-05 14:56:43.481345881 +0000
@@ -2759,7 +2759,7 @@ msgstr "파일 폴더 - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1387,7 +1713,7 @@ diff -up cups-1.5.4/locale/cups_ko.po.str4223 cups-1.5.4/locale/cups_ko.po
#~ msgid "Fuser temperature high!"
diff -up cups-1.5.4/locale/cups_nl.po.str4223 cups-1.5.4/locale/cups_nl.po
--- cups-1.5.4/locale/cups_nl.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_nl.po 2013-01-04 16:17:54.956629508 +0000
++++ cups-1.5.4/locale/cups_nl.po 2013-03-05 14:56:43.482345885 +0000
@@ -2760,7 +2760,7 @@ msgstr "Dossiermap - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1412,7 +1738,7 @@ diff -up cups-1.5.4/locale/cups_nl.po.str4223 cups-1.5.4/locale/cups_nl.po
#~ msgstr "Fusertemperatuur te hoog!"
diff -up cups-1.5.4/locale/cups_no.po.str4223 cups-1.5.4/locale/cups_no.po
--- cups-1.5.4/locale/cups_no.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_no.po 2013-01-04 16:17:54.957629513 +0000
++++ cups-1.5.4/locale/cups_no.po 2013-03-05 14:56:43.483345889 +0000
@@ -2759,7 +2759,7 @@ msgstr "Filmappe – 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1437,7 +1763,7 @@ diff -up cups-1.5.4/locale/cups_no.po.str4223 cups-1.5.4/locale/cups_no.po
#~ msgstr "Fikseringsenhetens temperatur er høy!"
diff -up cups-1.5.4/locale/cups_pl.po.str4223 cups-1.5.4/locale/cups_pl.po
--- cups-1.5.4/locale/cups_pl.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_pl.po 2013-01-04 16:17:54.958629517 +0000
++++ cups-1.5.4/locale/cups_pl.po 2013-03-05 14:56:43.484345893 +0000
@@ -2759,7 +2759,7 @@ msgstr "Folder - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1462,7 +1788,7 @@ diff -up cups-1.5.4/locale/cups_pl.po.str4223 cups-1.5.4/locale/cups_pl.po
#~ msgstr "Wysoka temperatura wygrzewacza!"
diff -up cups-1.5.4/locale/cups_pt_BR.po.str4223 cups-1.5.4/locale/cups_pt_BR.po
--- cups-1.5.4/locale/cups_pt_BR.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_pt_BR.po 2013-01-04 16:17:54.959629521 +0000
++++ cups-1.5.4/locale/cups_pt_BR.po 2013-03-05 14:56:43.485345897 +0000
@@ -2759,7 +2759,7 @@ msgstr "Pasta de Arquivo - 9/16 x 3 7/16
#, c-format
msgid ""
@@ -1487,7 +1813,7 @@ diff -up cups-1.5.4/locale/cups_pt_BR.po.str4223 cups-1.5.4/locale/cups_pt_BR.po
#~ msgstr "Temperatura do fuser alta!"
diff -up cups-1.5.4/locale/cups_pt.po.str4223 cups-1.5.4/locale/cups_pt.po
--- cups-1.5.4/locale/cups_pt.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_pt.po 2013-01-04 16:17:54.960629526 +0000
++++ cups-1.5.4/locale/cups_pt.po 2013-03-05 14:56:43.486345902 +0000
@@ -2759,7 +2759,7 @@ msgstr "Pasta de ficheiros - 9/16 x 3 7/
#, c-format
msgid ""
@@ -1512,7 +1838,7 @@ diff -up cups-1.5.4/locale/cups_pt.po.str4223 cups-1.5.4/locale/cups_pt.po
#~ msgstr "Temperatura do fusor elevada!"
diff -up cups-1.5.4/locale/cups_ru.po.str4223 cups-1.5.4/locale/cups_ru.po
--- cups-1.5.4/locale/cups_ru.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_ru.po 2013-01-04 16:17:54.961629531 +0000
++++ cups-1.5.4/locale/cups_ru.po 2013-03-05 14:56:43.487345906 +0000
@@ -2759,7 +2759,7 @@ msgstr "Каталог файла - 9 16
#, c-format
msgid ""
@@ -1537,7 +1863,7 @@ diff -up cups-1.5.4/locale/cups_ru.po.str4223 cups-1.5.4/locale/cups_ru.po
#~ msgstr "Высокая температура термофиксатора!"
diff -up cups-1.5.4/locale/cups_sv.po.str4223 cups-1.5.4/locale/cups_sv.po
--- cups-1.5.4/locale/cups_sv.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_sv.po 2013-01-04 16:17:54.962629536 +0000
++++ cups-1.5.4/locale/cups_sv.po 2013-03-05 14:56:43.489345914 +0000
@@ -2759,7 +2759,7 @@ msgstr "Filmapp - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1562,7 +1888,7 @@ diff -up cups-1.5.4/locale/cups_sv.po.str4223 cups-1.5.4/locale/cups_sv.po
#~ msgstr "Hög fixeringstemperatur!"
diff -up cups-1.5.4/locale/cups_zh.po.str4223 cups-1.5.4/locale/cups_zh.po
--- cups-1.5.4/locale/cups_zh.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_zh.po 2013-01-04 16:17:54.963629540 +0000
++++ cups-1.5.4/locale/cups_zh.po 2013-03-05 14:56:43.490345918 +0000
@@ -2758,7 +2758,7 @@ msgstr "文件夹 - 9/16 x 3 7/16 英寸
#, c-format
msgid ""
@@ -1586,7 +1912,7 @@ diff -up cups-1.5.4/locale/cups_zh.po.str4223 cups-1.5.4/locale/cups_zh.po
#~ msgstr "加热鼓温度过高！"
diff -up cups-1.5.4/locale/cups_zh_TW.po.str4223 cups-1.5.4/locale/cups_zh_TW.po
--- cups-1.5.4/locale/cups_zh_TW.po.str4223 2012-03-07 21:38:28.000000000 +0000
-+++ cups-1.5.4/locale/cups_zh_TW.po 2013-01-04 16:17:54.964629544 +0000
++++ cups-1.5.4/locale/cups_zh_TW.po 2013-03-05 14:56:43.491345922 +0000
@@ -2758,7 +2758,7 @@ msgstr "檔案夾 - 9/16 x 3 7/16\""
#, c-format
msgid ""
@@ -1608,9 +1934,33 @@ diff -up cups-1.5.4/locale/cups_zh_TW.po.str4223 cups-1.5.4/locale/cups_zh_TW.po
#~ msgid "Fuser temperature high!"
#~ msgstr "加熱器溫度高！"
+diff -up cups-1.5.4/man/cupsctl.man.str4223 cups-1.5.4/man/cupsctl.man
+--- cups-1.5.4/man/cupsctl.man.str4223 2011-01-11 03:04:04.000000000 +0000
++++ cups-1.5.4/man/cupsctl.man 2013-03-05 14:56:43.496345943 +0000
+@@ -12,7 +12,7 @@
+ .\" which should have been included with this file. If this file is
+ .\" file is missing or damaged, see the license at "http://www.cups.org/".
+ .\"
+-.TH cupsctl 8 "CUPS" "10 January 2011" "Apple Inc."
++.TH cupsctl 8 "CUPS" "12 December 2012" "Apple Inc."
+ .SH NAME
+ cupsctl \- configure cupsd.conf options
+ .SH SYNOPSIS
+@@ -89,11 +89,6 @@ Disable printer sharing:
+ .nf
+ cupsctl --no-shared-printers
+ .fi
+-.LP
+-Enable printing using the file: pseudo-device:
+-.nf
+- cupsctl FileDevice=Yes
+-.fi
+ .SH KNOWN ISSUES
+ You cannot set the Listen or Port directives using \fIcupsctl\fR.
+ .SH SEE ALSO
diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.in
--- cups-1.5.4/man/cupsd.conf.man.in.str4223 2011-05-18 22:33:35.000000000 +0100
-+++ cups-1.5.4/man/cupsd.conf.man.in 2013-01-04 16:17:54.964629544 +0000
++++ cups-1.5.4/man/cupsd.conf.man.in 2013-03-05 14:56:43.491345922 +0000
@@ -12,12 +12,15 @@
.\" which should have been included with this file. If this file is
.\" file is missing or damaged, see the license at "http://www.cups.org/".
@@ -1875,8 +2225,8 @@ diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.
.br
http://localhost:631/help
diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files.conf.man.in
---- cups-1.5.4/man/cups-files.conf.man.in.str4223 2013-01-04 16:17:54.965629549 +0000
-+++ cups-1.5.4/man/cups-files.conf.man.in 2013-01-04 16:17:54.965629549 +0000
+--- cups-1.5.4/man/cups-files.conf.man.in.str4223 2013-03-05 14:56:43.491345922 +0000
++++ cups-1.5.4/man/cups-files.conf.man.in 2013-03-05 14:56:43.491345922 +0000
@@ -0,0 +1,146 @@
+.\"
+.\" "$Id$"
@@ -2026,7 +2376,7 @@ diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files
+.\"
diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile
--- cups-1.5.4/man/Makefile.str4223 2010-06-22 22:21:37.000000000 +0100
-+++ cups-1.5.4/man/Makefile 2013-01-04 16:17:54.965629549 +0000
++++ cups-1.5.4/man/Makefile 2013-03-05 14:56:43.492345926 +0000
@@ -39,6 +39,7 @@ MAN1 = cancel.$(MAN1EXT) \
ppdpo.$(MAN1EXT)
MAN5 = classes.conf.$(MAN5EXT) \
@@ -2037,7 +2387,7 @@ diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile
ipptoolfile.$(MAN5EXT) \
diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.list.in
--- cups-1.5.4/packaging/cups.list.in.str4223 2012-04-24 00:49:19.000000000 +0100
-+++ cups-1.5.4/packaging/cups.list.in 2013-01-04 16:17:54.965629549 +0000
++++ cups-1.5.4/packaging/cups.list.in 2013-03-05 14:56:43.492345926 +0000
@@ -588,6 +588,7 @@ d 0755 root $CUPS_GROUP $SERVERROOT/inte
d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
d 0700 root $CUPS_GROUP $SERVERROOT/ssl -
@@ -2048,7 +2398,7 @@ diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.lis
%if PAMDIR
diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spec.in
--- cups-1.5.4/packaging/cups.spec.in.str4223 2012-04-23 18:46:53.000000000 +0100
-+++ cups-1.5.4/packaging/cups.spec.in 2013-01-04 16:17:54.965629549 +0000
++++ cups-1.5.4/packaging/cups.spec.in 2013-03-05 14:56:43.492345926 +0000
@@ -152,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%dir /etc/cups
@@ -2058,8 +2408,8 @@ diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spe
%dir /etc/cups/interfaces
%dir /etc/cups/ppd
diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
---- cups-1.5.4/scheduler/client.c.str4223 2013-01-04 16:17:54.895629226 +0000
-+++ cups-1.5.4/scheduler/client.c 2013-01-04 16:17:54.966629554 +0000
+--- cups-1.5.4/scheduler/client.c.str4223 2013-03-05 14:56:43.414345606 +0000
++++ cups-1.5.4/scheduler/client.c 2013-03-05 14:56:43.493345931 +0000
@@ -35,7 +35,7 @@
* data_ready() - Check whether data is available from a client.
* encrypt_client() - Enable encryption for the client...
@@ -2125,7 +2475,7 @@ diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
cups_file_t *in, /* Input file */
*out; /* Output file */
char buffer[16384]; /* Copy buffer */
-@@ -3843,13 +3839,8 @@ install_conf_file(cupsd_client_t *con) /
+@@ -3843,19 +3839,14 @@ install_conf_file(cupsd_client_t *con) /
* Open the new config file...
*/
@@ -2136,11 +2486,42 @@ diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
- mode = ConfigFilePerm;
-
- if ((out = cupsdCreateConfFile(filename, mode)) == NULL)
-+ snprintf(filename, sizeof(filename), "%s/cupsd.conf", ServerRoot);
-+ if ((out = cupsdCreateConfFile(filename, ConfigFilePerm)) == NULL)
++ if ((out = cupsdCreateConfFile(ConfigurationFile, ConfigFilePerm)) == NULL)
{
cupsFileClose(in);
return (HTTP_SERVER_ERROR);
+ }
+
+- cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", filename);
++ cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...",
++ ConfigurationFile);
+
+ /*
+ * Copy from the request to the new config file...
+@@ -3866,12 +3857,12 @@ install_conf_file(cupsd_client_t *con) /
+ {
+ cupsdLogMessage(CUPSD_LOG_ERROR,
+ "Unable to copy to config file \"%s\": %s",
+- filename, strerror(errno));
++ ConfigurationFile, strerror(errno));
+
+ cupsFileClose(in);
+ cupsFileClose(out);
+
+- snprintf(filename, sizeof(filename), "%s%s.N", ServerRoot, con->uri + 11);
++ snprintf(filename, sizeof(filename), "%s.N", ConfigurationFile);
+ cupsdRemoveFile(filename);
+
+ return (HTTP_SERVER_ERROR);
+@@ -3883,7 +3874,7 @@ install_conf_file(cupsd_client_t *con) /
+
+ cupsFileClose(in);
+
+- if (cupsdCloseCreatedConfFile(out, filename))
++ if (cupsdCloseCreatedConfFile(out, ConfigurationFile))
+ return (HTTP_SERVER_ERROR);
+
+ /*
@@ -3894,14 +3885,10 @@ install_conf_file(cupsd_client_t *con) /
cupsdClearString(&con->filename);
@@ -2159,8 +2540,8 @@ diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
/*
diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
---- cups-1.5.4/scheduler/conf.c.str4223 2013-01-04 16:17:54.896629231 +0000
-+++ cups-1.5.4/scheduler/conf.c 2013-01-04 16:20:49.996314384 +0000
+--- cups-1.5.4/scheduler/conf.c.str4223 2013-03-05 14:56:43.415345610 +0000
++++ cups-1.5.4/scheduler/conf.c 2013-03-05 14:56:43.493345931 +0000
@@ -27,7 +27,8 @@
* parse_fatal_errors() - Parse FatalErrors values in a string.
* parse_groups() - Parse system group names in a string.
@@ -2292,7 +2673,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
static int read_location(cups_file_t *fp, char *name, int linenum);
static int read_policy(cups_file_t *fp, char *name, int linenum);
static void set_policy_defaults(cupsd_policy_t *pol);
-@@ -708,21 +716,59 @@ cupsdReadConfiguration(void)
+@@ -708,21 +716,63 @@ cupsdReadConfiguration(void)
cupsdInitEnv();
/*
@@ -2311,7 +2692,9 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
+ if (TestConfigFile)
+ printf("%s contains errors\n", CupsFilesFile);
+ else
-+ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to read %s", CupsFilesFile);
++ syslog(LOG_LPR, "Unable to read \"%s\" due to errors.",
++ CupsFilesFile);
++
+ return (0);
+ }
+ }
@@ -2319,8 +2702,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
+ cupsdLogMessage(CUPSD_LOG_INFO, "No %s, using defaults.", CupsFilesFile);
+ else
+ {
-+ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to open %s: %s", CupsFilesFile,
-+ strerror(errno));
++ syslog(LOG_LPR, "Unable to open \"%s\": %s", CupsFilesFile,
++ strerror(errno));
+ return (0);
+ }
+
@@ -2333,8 +2716,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
if ((fp = cupsFileOpen(ConfigurationFile, "r")) == NULL)
+ {
-+ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to open %s: %s", ConfigurationFile,
-+ strerror(errno));
++ syslog(LOG_LPR, "Unable to open \"%s\": %s", ConfigurationFile,
++ strerror(errno));
return (0);
+ }
@@ -2344,20 +2727,22 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
cupsFileClose(fp);
if (!status)
+- return (0);
+ {
+ if (TestConfigFile)
-+ printf("%s contains error\n", ConfigurationFile);
++ printf("%s contains errors.\n", ConfigurationFile);
+ else
-+ cupsdLogMessage(CUPSD_LOG_CRIT, "Unable to read %s", ConfigurationFile);
- return (0);
--
++ syslog(LOG_LPR, "Unable to read \"%s\" due to errors.",
++ ConfigurationFile);
+
- if (!ErrorLog)
- cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
++ return (0);
+ }
RunUser = getuid();
-@@ -842,6 +888,13 @@ cupsdReadConfiguration(void)
+@@ -842,6 +892,13 @@ cupsdReadConfiguration(void)
BrowseACL = cupsdFindLocation("CUPS_INTERNAL_BROWSE_ACL");
/*
@@ -2371,7 +2756,18 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
* Open the system log for cupsd if necessary...
*/
-@@ -2512,13 +2565,174 @@ parse_protocols(const char *s) /* I - S
+@@ -1002,7 +1059,9 @@ cupsdReadConfiguration(void)
+ Group, 1, 1) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "ssl", 0700, RunUser,
+ Group, 1, 0) < 0 ||
+- cupsdCheckPermissions(ServerRoot, "cupsd.conf", ConfigFilePerm, RunUser,
++ cupsdCheckPermissions(ConfigurationFile, NULL, ConfigFilePerm, RunUser,
++ Group, 0, 0) < 0 ||
++ cupsdCheckPermissions(CupsFilesFile, NULL, ConfigFilePerm, RunUser,
+ Group, 0, 0) < 0 ||
+ cupsdCheckPermissions(ServerRoot, "classes.conf", 0600, RunUser,
+ Group, 0, 0) < 0 ||
+@@ -2512,13 +2571,174 @@ parse_protocols(const char *s) /* I - S
/*
@@ -2549,7 +2945,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
int linenum; /* Current line number */
char line[HTTP_MAX_BUFFER],
/* Line from file */
-@@ -2528,7 +2742,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2528,7 +2748,6 @@ read_configuration(cups_file_t *fp) /* I
*value, /* Pointer to value */
*valueptr; /* Pointer into value */
int valuelen; /* Length of value */
@@ -2557,7 +2953,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
http_addrlist_t *addrlist, /* Address list */
*addr; /* Current address */
unsigned ip[4], /* Address value */
-@@ -2538,7 +2751,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2538,7 +2757,6 @@ read_configuration(cups_file_t *fp) /* I
cupsd_location_t *location; /* Browse location */
cups_file_t *incfile; /* Include file */
char incname[1024]; /* Include filename */
@@ -2565,7 +2961,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
/*
-@@ -2570,7 +2782,7 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2570,7 +2788,7 @@ read_configuration(cups_file_t *fp) /* I
incname, strerror(errno));
else
{
@@ -2574,7 +2970,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
cupsFileClose(incfile);
}
}
-@@ -2594,8 +2806,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2594,8 +2812,6 @@ read_configuration(cups_file_t *fp) /* I
if (linenum == 0)
return (0);
}
@@ -2583,7 +2979,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "FaxRetryInterval") && value)
{
JobRetryInterval = atoi(value);
-@@ -3254,81 +3464,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3254,81 +3470,6 @@ read_configuration(cups_file_t *fp) /* I
}
}
#endif /* HAVE_SSL */
@@ -2665,7 +3061,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "HostNameLookups") && value)
{
/*
-@@ -3407,22 +3542,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3407,22 +3548,6 @@ read_configuration(cups_file_t *fp) /* I
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogTimeFormat %s on line %d.",
value, linenum);
}
@@ -2688,7 +3084,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "ServerTokens") && value)
{
/*
-@@ -3548,117 +3667,193 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3548,117 +3673,193 @@ read_configuration(cups_file_t *fp) /* I
"line %d.", value, linenum);
}
#endif /* HAVE_SSL */
@@ -2976,8 +3372,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
return (1);
diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h
---- cups-1.5.4/scheduler/conf.h.str4223 2013-01-04 16:17:54.769628645 +0000
-+++ cups-1.5.4/scheduler/conf.h 2013-01-04 16:17:54.967629558 +0000
+--- cups-1.5.4/scheduler/conf.h.str4223 2013-03-05 14:56:43.348345335 +0000
++++ cups-1.5.4/scheduler/conf.h 2013-03-05 14:56:43.494345935 +0000
@@ -96,7 +96,9 @@ typedef struct
*/
@@ -2990,8 +3386,8 @@ diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h
/* FQDN for server */
*ServerAdmin VALUE(NULL),
diff -up cups-1.5.4/scheduler/ipp.c.str4223 cups-1.5.4/scheduler/ipp.c
---- cups-1.5.4/scheduler/ipp.c.str4223 2013-01-04 16:17:54.916629324 +0000
-+++ cups-1.5.4/scheduler/ipp.c 2013-01-04 16:17:54.968629563 +0000
+--- cups-1.5.4/scheduler/ipp.c.str4223 2013-03-05 14:56:43.449345750 +0000
++++ cups-1.5.4/scheduler/ipp.c 2013-03-05 14:56:43.495345939 +0000
@@ -2568,7 +2568,7 @@ add_printer(cupsd_client_t *con, /* I -
send_ipp_status(con, IPP_NOT_POSSIBLE,
_("File device URIs have been disabled. "
@@ -3001,9 +3397,70 @@ diff -up cups-1.5.4/scheduler/ipp.c.str4223 cups-1.5.4/scheduler/ipp.c
ServerRoot);
return;
}
+diff -up cups-1.5.4/scheduler/log.c.str4223 cups-1.5.4/scheduler/log.c
+--- cups-1.5.4/scheduler/log.c.str4223 2013-03-05 14:56:43.374345442 +0000
++++ cups-1.5.4/scheduler/log.c 2013-03-05 14:56:43.496345943 +0000
+@@ -44,6 +44,22 @@
+ static int log_linesize = 0; /* Size of line for output file */
+ static char *log_line = NULL; /* Line for output file */
+
++#ifdef HAVE_VSYSLOG
++static const int syslevels[] = /* SYSLOG levels... */
++ {
++ 0,
++ LOG_EMERG,
++ LOG_ALERT,
++ LOG_CRIT,
++ LOG_ERR,
++ LOG_WARNING,
++ LOG_NOTICE,
++ LOG_INFO,
++ LOG_DEBUG,
++ LOG_DEBUG
++ };
++#endif /* HAVE_VSYSLOG */
++
+
+ /*
+ * Local functions...
+@@ -548,8 +564,12 @@ cupsdLogMessage(int level, /* I -
+ if ((TestConfigFile || !ErrorLog) && level <= CUPSD_LOG_WARN)
+ {
+ va_start(ap, message);
++#ifdef HAVE_VSYSLOG
++ vsyslog(LOG_LPR | syslevels[level], message, ap);
++#else
+ vfprintf(stderr, message, ap);
+ putc('\n', stderr);
++#endif /* HAVE_VSYSLOG */
+ va_end(ap);
+
+ return (1);
+@@ -985,21 +1005,6 @@ cupsdWriteErrorLog(int level, /*
+ 'D',
+ 'd'
+ };
+-#ifdef HAVE_VSYSLOG
+- static const int syslevels[] = /* SYSLOG levels... */
+- {
+- 0,
+- LOG_EMERG,
+- LOG_ALERT,
+- LOG_CRIT,
+- LOG_ERR,
+- LOG_WARNING,
+- LOG_NOTICE,
+- LOG_INFO,
+- LOG_DEBUG,
+- LOG_DEBUG
+- };
+-#endif /* HAVE_VSYSLOG */
+
+
+ #ifdef HAVE_VSYSLOG
diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c
---- cups-1.5.4/scheduler/main.c.str4223 2013-01-04 16:17:54.910629295 +0000
-+++ cups-1.5.4/scheduler/main.c 2013-01-04 16:21:30.261470296 +0000
+--- cups-1.5.4/scheduler/main.c.str4223 2013-03-05 14:56:43.431345676 +0000
++++ cups-1.5.4/scheduler/main.c 2013-03-05 14:56:43.496345943 +0000
@@ -225,7 +225,6 @@ main(int argc, /* I - Number of comm
char *current; /* Current directory */
@@ -3078,23 +3535,27 @@ diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c
/*
* If the user hasn't specified "-f", run in the background...
*/
-@@ -512,11 +563,8 @@ main(int argc, /* I - Number of comm
+@@ -511,16 +562,10 @@ main(int argc, /* I - Number of comm
+ */
if (!cupsdReadConfiguration())
- {
+- {
- if (TestConfigFile)
- printf("%s contains errors\n", ConfigurationFile);
- else
- syslog(LOG_LPR, "Unable to read configuration file \'%s\' - exiting!",
- ConfigurationFile);
-+ if (!TestConfigFile)
-+ syslog(LOG_LPR, "Unable to read configuration file - exiting!");
return (1);
- }
+- }
else if (TestConfigFile)
+ {
++ printf("%s is OK\n", CupsFilesFile);
+ printf("%s is OK\n", ConfigurationFile);
+ return (0);
+ }
diff -up cups-1.5.4/test/run-stp-tests.sh.str4223 cups-1.5.4/test/run-stp-tests.sh
--- cups-1.5.4/test/run-stp-tests.sh.str4223 2012-05-15 15:04:18.000000000 +0100
-+++ cups-1.5.4/test/run-stp-tests.sh 2013-01-04 16:17:54.969629568 +0000
++++ cups-1.5.4/test/run-stp-tests.sh 2013-03-05 14:56:43.496345943 +0000
@@ -337,25 +337,10 @@ fi
cat >/tmp/cups-$user/cupsd.conf <<EOF
diff --git a/cups.spec b/cups.spec
index d63a4ad..cc3839f 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.5.4
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -753,6 +753,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man1/ipptool.1.gz
%changelog
+* Tue Mar 5 2013 Tim Waugh <twaugh at redhat.com> 1:1.5.4-21
+- Documentation fixes from STR #4223 (bug #915981).
+
* Fri Jan 18 2013 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-20
- Add quirk rule for Canon MP210 (#847923).
More information about the scm-commits
mailing list