[cups] Set default cups-files.conf filename.
Tim Waugh
twaugh at fedoraproject.org
Wed Nov 28 12:11:26 UTC 2012
commit dfde8cd29da02e6be5dee94eebf90f0fae66ed51
Author: Tim Waugh <twaugh at redhat.com>
Date: Wed Nov 28 11:42:47 2012 +0000
Set default cups-files.conf filename.
cups-str4223.patch | 66 ++++++++++++++++++++++++++++++----------------------
cups.spec | 1 +
2 files changed, 39 insertions(+), 28 deletions(-)
---
diff --git a/cups-str4223.patch b/cups-str4223.patch
index de633b6..7bddb1e 100644
--- a/cups-str4223.patch
+++ b/cups-str4223.patch
@@ -1,6 +1,6 @@
diff -up cups-1.6.1/conf/cupsd.conf.in.str4223 cups-1.6.1/conf/cupsd.conf.in
--- cups-1.6.1/conf/cupsd.conf.in.str4223 2010-12-09 21:24:51.000000000 +0000
-+++ cups-1.6.1/conf/cupsd.conf.in 2012-11-26 22:50:55.705648591 +0000
++++ cups-1.6.1/conf/cupsd.conf.in 2012-11-28 12:02:12.812981877 +0000
@@ -9,10 +9,6 @@
# for troubleshooting...
LogLevel @CUPS_LOG_LEVEL@
@@ -13,8 +13,8 @@ diff -up cups-1.6.1/conf/cupsd.conf.in.str4223 cups-1.6.1/conf/cupsd.conf.in
Listen localhost:@DEFAULT_IPP_PORT@
@CUPS_LISTEN_DOMAINSOCKET@
diff -up cups-1.6.1/conf/cups-files.conf.in.str4223 cups-1.6.1/conf/cups-files.conf.in
---- cups-1.6.1/conf/cups-files.conf.in.str4223 2012-11-26 22:50:55.705648591 +0000
-+++ cups-1.6.1/conf/cups-files.conf.in 2012-11-26 22:50:55.705648591 +0000
+--- cups-1.6.1/conf/cups-files.conf.in.str4223 2012-11-28 12:02:12.813981881 +0000
++++ cups-1.6.1/conf/cups-files.conf.in 2012-11-28 12:02:12.813981881 +0000
@@ -0,0 +1,98 @@
+#
+# "$Id$"
@@ -116,7 +116,7 @@ diff -up cups-1.6.1/conf/cups-files.conf.in.str4223 cups-1.6.1/conf/cups-files.c
+#
diff -up cups-1.6.1/config-scripts/cups-defaults.m4.str4223 cups-1.6.1/config-scripts/cups-defaults.m4
--- cups-1.6.1/config-scripts/cups-defaults.m4.str4223 2012-04-23 18:26:57.000000000 +0100
-+++ cups-1.6.1/config-scripts/cups-defaults.m4 2012-11-26 22:50:55.705648591 +0000
++++ cups-1.6.1/config-scripts/cups-defaults.m4 2012-11-28 12:02:12.813981881 +0000
@@ -305,6 +305,7 @@ else
fi
@@ -134,8 +134,8 @@ diff -up cups-1.6.1/config-scripts/cups-defaults.m4.str4223 cups-1.6.1/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.6.1/config-scripts/cups-ssl.m4.str4223 cups-1.6.1/config-scripts/cups-ssl.m4
---- cups-1.6.1/config-scripts/cups-ssl.m4.str4223 2012-11-26 22:50:55.669648403 +0000
-+++ cups-1.6.1/config-scripts/cups-ssl.m4 2012-11-26 22:50:55.706648596 +0000
+--- cups-1.6.1/config-scripts/cups-ssl.m4.str4223 2012-11-28 12:02:12.775981737 +0000
++++ cups-1.6.1/config-scripts/cups-ssl.m4 2012-11-28 12:02:12.813981881 +0000
@@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [ --with-
SSLFLAGS=""
SSLLIBS=""
@@ -183,8 +183,8 @@ diff -up cups-1.6.1/config-scripts/cups-ssl.m4.str4223 cups-1.6.1/config-scripts
AC_SUBST(SSLFLAGS)
AC_SUBST(SSLLIBS)
diff -up cups-1.6.1/configure.in.str4223 cups-1.6.1/configure.in
---- cups-1.6.1/configure.in.str4223 2012-11-26 22:50:55.702648576 +0000
-+++ cups-1.6.1/configure.in 2012-11-26 22:50:55.706648596 +0000
+--- cups-1.6.1/configure.in.str4223 2012-11-28 12:02:12.809981864 +0000
++++ cups-1.6.1/configure.in 2012-11-28 12:02:12.813981881 +0000
@@ -61,6 +61,7 @@ AC_SUBST(INSTALL_LANGUAGES)
AC_SUBST(UNINSTALL_LANGUAGES)
@@ -202,8 +202,8 @@ diff -up cups-1.6.1/configure.in.str4223 cups-1.6.1/configure.in
man/cups-snmp.man
man/cupsaddsmb.man
diff -up cups-1.6.1/conf/Makefile.str4223 cups-1.6.1/conf/Makefile
---- cups-1.6.1/conf/Makefile.str4223 2012-11-26 22:50:55.658648346 +0000
-+++ cups-1.6.1/conf/Makefile 2012-11-26 22:50:55.706648596 +0000
+--- cups-1.6.1/conf/Makefile.str4223 2012-11-28 12:02:12.764981698 +0000
++++ cups-1.6.1/conf/Makefile 2012-11-28 12:02:12.813981881 +0000
@@ -19,7 +19,7 @@ include ../Makedefs
# Config files...
#
@@ -215,7 +215,7 @@ diff -up cups-1.6.1/conf/Makefile.str4223 cups-1.6.1/conf/Makefile
diff -up cups-1.6.1/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.6.1/doc/help/ref-cupsd-conf.html.in
--- cups-1.6.1/doc/help/ref-cupsd-conf.html.in.str4223 2012-05-18 20:51:02.000000000 +0100
-+++ cups-1.6.1/doc/help/ref-cupsd-conf.html.in 2012-11-26 22:50:55.706648596 +0000
++++ cups-1.6.1/doc/help/ref-cupsd-conf.html.in 2012-11-28 12:02:12.814981885 +0000
@@ -197,82 +197,6 @@ HREF="#Location"><CODE>Location</CODE></
HREF="#Limit"><CODE>Limit</CODE></A> section.</P>
@@ -606,8 +606,8 @@ diff -up cups-1.6.1/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.6.1/doc/help/
<H3>Examples</H3>
diff -up cups-1.6.1/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.6.1/doc/help/ref-cups-files-conf.html.in
---- cups-1.6.1/doc/help/ref-cups-files-conf.html.in.str4223 2012-11-26 22:50:55.707648601 +0000
-+++ cups-1.6.1/doc/help/ref-cups-files-conf.html.in 2012-11-26 22:50:55.707648601 +0000
+--- cups-1.6.1/doc/help/ref-cups-files-conf.html.in.str4223 2012-11-28 12:02:12.814981885 +0000
++++ cups-1.6.1/doc/help/ref-cups-files-conf.html.in 2012-11-28 12:02:12.814981885 +0000
@@ -0,0 +1,531 @@
+<HTML>
+<!-- SECTION: References -->
@@ -1142,7 +1142,7 @@ diff -up cups-1.6.1/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.6.1/doc/
+</HTML>
diff -up cups-1.6.1/doc/Makefile.str4223 cups-1.6.1/doc/Makefile
--- cups-1.6.1/doc/Makefile.str4223 2012-04-23 19:04:24.000000000 +0100
-+++ cups-1.6.1/doc/Makefile 2012-11-26 22:50:55.707648601 +0000
++++ cups-1.6.1/doc/Makefile 2012-11-28 12:02:12.814981885 +0000
@@ -3,7 +3,7 @@
#
# Documentation makefile for CUPS.
@@ -1154,7 +1154,7 @@ diff -up cups-1.6.1/doc/Makefile.str4223 cups-1.6.1/doc/Makefile
# These coded instructions, statements, and computer programs are the
diff -up cups-1.6.1/man/cupsd.conf.man.in.str4223 cups-1.6.1/man/cupsd.conf.man.in
--- cups-1.6.1/man/cupsd.conf.man.in.str4223 2012-05-18 20:51:02.000000000 +0100
-+++ cups-1.6.1/man/cupsd.conf.man.in 2012-11-26 22:50:55.707648601 +0000
++++ cups-1.6.1/man/cupsd.conf.man.in 2012-11-28 12:02:12.815981889 +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/".
@@ -1419,8 +1419,8 @@ diff -up cups-1.6.1/man/cupsd.conf.man.in.str4223 cups-1.6.1/man/cupsd.conf.man.
.br
http://localhost:631/help
diff -up cups-1.6.1/man/cups-files.conf.man.in.str4223 cups-1.6.1/man/cups-files.conf.man.in
---- cups-1.6.1/man/cups-files.conf.man.in.str4223 2012-11-26 22:50:55.707648601 +0000
-+++ cups-1.6.1/man/cups-files.conf.man.in 2012-11-26 22:50:55.707648601 +0000
+--- cups-1.6.1/man/cups-files.conf.man.in.str4223 2012-11-28 12:02:12.815981889 +0000
++++ cups-1.6.1/man/cups-files.conf.man.in 2012-11-28 12:02:12.815981889 +0000
@@ -0,0 +1,146 @@
+.\"
+.\" "$Id$"
@@ -1570,7 +1570,7 @@ diff -up cups-1.6.1/man/cups-files.conf.man.in.str4223 cups-1.6.1/man/cups-files
+.\"
diff -up cups-1.6.1/man/Makefile.str4223 cups-1.6.1/man/Makefile
--- cups-1.6.1/man/Makefile.str4223 2012-05-25 04:11:46.000000000 +0100
-+++ cups-1.6.1/man/Makefile 2012-11-26 22:50:55.708648606 +0000
++++ cups-1.6.1/man/Makefile 2012-11-28 12:02:12.815981889 +0000
@@ -39,6 +39,7 @@ MAN1 = cancel.$(MAN1EXT) \
ppdpo.$(MAN1EXT)
MAN5 = classes.conf.$(MAN5EXT) \
@@ -1581,7 +1581,7 @@ diff -up cups-1.6.1/man/Makefile.str4223 cups-1.6.1/man/Makefile
ipptoolfile.$(MAN5EXT) \
diff -up cups-1.6.1/packaging/cups.list.in.str4223 cups-1.6.1/packaging/cups.list.in
--- cups-1.6.1/packaging/cups.list.in.str4223 2012-05-07 23:41:42.000000000 +0100
-+++ cups-1.6.1/packaging/cups.list.in 2012-11-26 22:50:55.708648606 +0000
++++ cups-1.6.1/packaging/cups.list.in 2012-11-28 12:02:12.815981889 +0000
@@ -534,6 +534,8 @@ d 0755 root sys $SERVERROOT -
d 0755 root $CUPS_GROUP $SERVERROOT/interfaces -
d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
@@ -1593,7 +1593,7 @@ diff -up cups-1.6.1/packaging/cups.list.in.str4223 cups-1.6.1/packaging/cups.lis
c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/snmp.conf conf/snmp.conf
diff -up cups-1.6.1/packaging/cups.spec.in.str4223 cups-1.6.1/packaging/cups.spec.in
--- cups-1.6.1/packaging/cups.spec.in.str4223 2012-07-27 21:33:27.000000000 +0100
-+++ cups-1.6.1/packaging/cups.spec.in 2012-11-26 22:50:55.708648606 +0000
++++ cups-1.6.1/packaging/cups.spec.in 2012-11-28 12:02:12.815981889 +0000
@@ -135,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%dir /etc/cups
@@ -1604,7 +1604,7 @@ diff -up cups-1.6.1/packaging/cups.spec.in.str4223 cups-1.6.1/packaging/cups.spe
%dir /etc/cups/ppd
diff -up cups-1.6.1/scheduler/client.c.str4223 cups-1.6.1/scheduler/client.c
--- cups-1.6.1/scheduler/client.c.str4223 2012-05-07 23:41:30.000000000 +0100
-+++ cups-1.6.1/scheduler/client.c 2012-11-26 22:50:55.709648612 +0000
++++ cups-1.6.1/scheduler/client.c 2012-11-28 12:02:12.816981892 +0000
@@ -32,7 +32,7 @@
* compare_clients() - Compare two client connections.
* data_ready() - Check whether data is available from a client.
@@ -1704,8 +1704,8 @@ diff -up cups-1.6.1/scheduler/client.c.str4223 cups-1.6.1/scheduler/client.c
/*
diff -up cups-1.6.1/scheduler/conf.c.str4223 cups-1.6.1/scheduler/conf.c
---- cups-1.6.1/scheduler/conf.c.str4223 2012-11-26 22:50:55.664648377 +0000
-+++ cups-1.6.1/scheduler/conf.c 2012-11-26 22:51:01.927676373 +0000
+--- cups-1.6.1/scheduler/conf.c.str4223 2012-11-28 12:02:12.770981719 +0000
++++ cups-1.6.1/scheduler/conf.c 2012-11-28 12:02:12.817981895 +0000
@@ -14,23 +14,25 @@
*
* Contents:
@@ -2669,8 +2669,8 @@ diff -up cups-1.6.1/scheduler/conf.c.str4223 cups-1.6.1/scheduler/conf.c
return (1);
diff -up cups-1.6.1/scheduler/conf.h.str4223 cups-1.6.1/scheduler/conf.h
---- cups-1.6.1/scheduler/conf.h.str4223 2012-11-26 22:50:55.665648383 +0000
-+++ cups-1.6.1/scheduler/conf.h 2012-11-26 22:50:55.710648618 +0000
+--- cups-1.6.1/scheduler/conf.h.str4223 2012-11-28 12:02:12.770981719 +0000
++++ cups-1.6.1/scheduler/conf.h 2012-11-28 12:02:12.817981895 +0000
@@ -96,7 +96,9 @@ typedef struct
*/
@@ -2683,8 +2683,8 @@ diff -up cups-1.6.1/scheduler/conf.h.str4223 cups-1.6.1/scheduler/conf.h
/* FQDN for server */
*ServerAdmin VALUE(NULL),
diff -up cups-1.6.1/scheduler/main.c.str4223 cups-1.6.1/scheduler/main.c
---- cups-1.6.1/scheduler/main.c.str4223 2012-11-26 22:50:55.703648581 +0000
-+++ cups-1.6.1/scheduler/main.c 2012-11-26 22:50:55.710648618 +0000
+--- cups-1.6.1/scheduler/main.c.str4223 2012-11-28 12:02:12.811981873 +0000
++++ cups-1.6.1/scheduler/main.c 2012-11-28 12:02:18.164998519 +0000
@@ -216,7 +216,6 @@ main(int argc, /* I - Number of comm
char *current; /* Current directory */
@@ -2759,9 +2759,19 @@ diff -up cups-1.6.1/scheduler/main.c.str4223 cups-1.6.1/scheduler/main.c
#ifdef __APPLE__
case 'S' : /* Disable system management functions */
fputs("cupsd: -S (disable system management) for internal "
+@@ -309,6 +360,9 @@ main(int argc, /* I - Number of comm
+ if (!ConfigurationFile)
+ cupsdSetString(&ConfigurationFile, CUPS_SERVERROOT "/cupsd.conf");
+
++ if (!CupsFilesFile)
++ cupsdSetString(&CupsFilesFile, CUPS_SERVERROOT "/cups-files.conf");
++
+ /*
+ * If the user hasn't specified "-f", run in the background...
+ */
diff -up cups-1.6.1/test/run-stp-tests.sh.str4223 cups-1.6.1/test/run-stp-tests.sh
--- cups-1.6.1/test/run-stp-tests.sh.str4223 2012-05-21 16:35:25.000000000 +0100
-+++ cups-1.6.1/test/run-stp-tests.sh 2012-11-26 22:50:55.711648623 +0000
++++ cups-1.6.1/test/run-stp-tests.sh 2012-11-28 12:02:12.818981899 +0000
@@ -385,26 +385,11 @@ fi
cat >/tmp/cups-$user/cupsd.conf <<EOF
StrictConformance Yes
diff --git a/cups.spec b/cups.spec
index 6eb0cb7..5a81db4 100644
--- a/cups.spec
+++ b/cups.spec
@@ -623,6 +623,7 @@ rm -f %{cups_serverbin}/backend/smb
%changelog
* Wed Nov 28 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-12
- Fixed paths in config migration %%post script.
+- Set default cups-files.conf filename.
* Mon Nov 26 2012 Tim Waugh <twaugh at redhat.com> 1:1.6.1-11
- Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
More information about the scm-commits
mailing list