[cups] 2.0.1
Jiří Popelka
jpopelka at fedoraproject.org
Sat Nov 15 14:46:09 UTC 2014
commit fce8f58b491a3a38616a6cc63fe6f2993332cba4
Author: Jiri Popelka <jpopelka at redhat.com>
Date: Sat Nov 15 15:42:30 2014 +0100
2.0.1
.gitignore | 1 +
cups-lpd.socket | 9 -
cups-lpd at .service | 8 -
cups-lspp.patch | 114 +++++-----
cups-str4476.patch | 599 ---------------------------------------------
cups-str4496.patch | 14 -
cups-str4500.patch | 16 --
cups-systemd-socket.patch | 33 ++--
cups.spec | 29 +--
sources | 2 +-
10 files changed, 84 insertions(+), 741 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ceb184..0984f35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ cups-1.4.4-source.tar.bz2
/cups-1.7.5-source.tar.bz2
/cups-2.0rc1-source.tar.bz2
/cups-2.0.0-source.tar.bz2
+/cups-2.0.1-source.tar.bz2
diff --git a/cups-lspp.patch b/cups-lspp.patch
index feff07b..15d1bcb 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.0.0/config.h.in.lspp cups-2.0.0/config.h.in
---- cups-2.0.0/config.h.in.lspp 2014-08-30 02:51:22.000000000 +0100
-+++ cups-2.0.0/config.h.in 2014-11-06 14:49:08.220421810 +0000
+diff -up cups-2.0.1/config.h.in.lspp cups-2.0.1/config.h.in
+--- cups-2.0.1/config.h.in.lspp 2014-08-30 03:51:22.000000000 +0200
++++ cups-2.0.1/config.h.in 2014-11-15 15:22:47.838306259 +0100
@@ -709,6 +709,13 @@ static __inline int _cups_abs(int i) { r
# endif /* __GNUC__ || __STDC_VERSION__ */
#endif /* !HAVE_ABS && !abs */
@@ -15,9 +15,9 @@ diff -up cups-2.0.0/config.h.in.lspp cups-2.0.0/config.h.in
#endif /* !_CUPS_CONFIG_H_ */
/*
-diff -up cups-2.0.0/config-scripts/cups-lspp.m4.lspp cups-2.0.0/config-scripts/cups-lspp.m4
---- cups-2.0.0/config-scripts/cups-lspp.m4.lspp 2014-11-06 14:49:08.220421810 +0000
-+++ cups-2.0.0/config-scripts/cups-lspp.m4 2014-11-06 14:49:08.220421810 +0000
+diff -up cups-2.0.1/config-scripts/cups-lspp.m4.lspp cups-2.0.1/config-scripts/cups-lspp.m4
+--- cups-2.0.1/config-scripts/cups-lspp.m4.lspp 2014-11-15 15:22:47.838306259 +0100
++++ cups-2.0.1/config-scripts/cups-lspp.m4 2014-11-15 15:22:47.838306259 +0100
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@ diff -up cups-2.0.0/config-scripts/cups-lspp.m4.lspp cups-2.0.0/config-scripts/c
+ ;;
+ esac
+fi
-diff -up cups-2.0.0/configure.ac.lspp cups-2.0.0/configure.ac
---- cups-2.0.0/configure.ac.lspp 2014-04-21 13:22:03.000000000 +0100
-+++ cups-2.0.0/configure.ac 2014-11-06 14:49:08.220421810 +0000
+diff -up cups-2.0.1/configure.ac.lspp cups-2.0.1/configure.ac
+--- cups-2.0.1/configure.ac.lspp 2014-10-21 13:55:01.000000000 +0200
++++ cups-2.0.1/configure.ac 2014-11-15 15:22:47.838306259 +0100
@@ -36,6 +36,8 @@ sinclude(config-scripts/cups-startup.m4)
sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@ diff -up cups-2.0.0/configure.ac.lspp cups-2.0.0/configure.ac
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-diff -up cups-2.0.0/filter/common.c.lspp cups-2.0.0/filter/common.c
---- cups-2.0.0/filter/common.c.lspp 2014-02-06 18:33:34.000000000 +0000
-+++ cups-2.0.0/filter/common.c 2014-11-06 14:49:08.220421810 +0000
+diff -up cups-2.0.1/filter/common.c.lspp cups-2.0.1/filter/common.c
+--- cups-2.0.1/filter/common.c.lspp 2014-02-06 19:33:34.000000000 +0100
++++ cups-2.0.1/filter/common.c 2014-11-15 15:22:47.838306259 +0100
@@ -19,6 +19,12 @@
* Include necessary headers...
*/
@@ -238,9 +238,9 @@ diff -up cups-2.0.0/filter/common.c.lspp cups-2.0.0/filter/common.c
/*
-diff -up cups-2.0.0/filter/pstops.c.lspp cups-2.0.0/filter/pstops.c
---- cups-2.0.0/filter/pstops.c.lspp 2014-02-06 18:33:34.000000000 +0000
-+++ cups-2.0.0/filter/pstops.c 2014-11-06 14:49:08.221421819 +0000
+diff -up cups-2.0.1/filter/pstops.c.lspp cups-2.0.1/filter/pstops.c
+--- cups-2.0.1/filter/pstops.c.lspp 2014-02-06 19:33:34.000000000 +0100
++++ cups-2.0.1/filter/pstops.c 2014-11-15 15:22:47.839306246 +0100
@@ -3173,6 +3173,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
@@ -396,9 +396,9 @@ diff -up cups-2.0.0/filter/pstops.c.lspp cups-2.0.0/filter/pstops.c
/*
-diff -up cups-2.0.0/Makedefs.in.lspp cups-2.0.0/Makedefs.in
---- cups-2.0.0/Makedefs.in.lspp 2014-11-06 14:49:08.186421483 +0000
-+++ cups-2.0.0/Makedefs.in 2014-11-06 14:49:08.232421926 +0000
+diff -up cups-2.0.1/Makedefs.in.lspp cups-2.0.1/Makedefs.in
+--- cups-2.0.1/Makedefs.in.lspp 2014-11-15 15:22:47.766307192 +0100
++++ cups-2.0.1/Makedefs.in 2014-11-15 15:22:47.840306233 +0100
@@ -145,7 +145,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
@@ -408,9 +408,9 @@ diff -up cups-2.0.0/Makedefs.in.lspp cups-2.0.0/Makedefs.in
ONDEMANDFLAGS = @ONDEMANDFLAGS@
ONDEMANDLIBS = @ONDEMANDLIBS@
OPTIM = @OPTIM@
-diff -up cups-2.0.0/scheduler/client.c.lspp cups-2.0.0/scheduler/client.c
---- cups-2.0.0/scheduler/client.c.lspp 2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.0/scheduler/client.c 2014-11-06 14:54:15.305993839 +0000
+diff -up cups-2.0.1/scheduler/client.c.lspp cups-2.0.1/scheduler/client.c
+--- cups-2.0.1/scheduler/client.c.lspp 2014-08-28 17:37:22.000000000 +0200
++++ cups-2.0.1/scheduler/client.c 2014-11-15 15:22:47.842306207 +0100
@@ -24,12 +24,20 @@
#define _HTTP_NO_PRIVATE
#include "cupsd.h"
@@ -630,9 +630,9 @@ diff -up cups-2.0.0/scheduler/client.c.lspp cups-2.0.0/scheduler/client.c
/*
* 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.0.0/scheduler/client.h.lspp cups-2.0.0/scheduler/client.h
---- cups-2.0.0/scheduler/client.h.lspp 2014-03-21 16:42:53.000000000 +0000
-+++ cups-2.0.0/scheduler/client.h 2014-11-06 14:49:08.222421829 +0000
+diff -up cups-2.0.1/scheduler/client.h.lspp cups-2.0.1/scheduler/client.h
+--- cups-2.0.1/scheduler/client.h.lspp 2014-03-21 17:42:53.000000000 +0100
++++ cups-2.0.1/scheduler/client.h 2014-11-15 15:22:47.842306207 +0100
@@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */
@@ -668,9 +668,9 @@ diff -up cups-2.0.0/scheduler/client.h.lspp cups-2.0.0/scheduler/client.h
#ifdef HAVE_SSL
extern int cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.0.0/scheduler/conf.c.lspp cups-2.0.0/scheduler/conf.c
---- cups-2.0.0/scheduler/conf.c.lspp 2014-11-06 14:49:08.215421762 +0000
-+++ cups-2.0.0/scheduler/conf.c 2014-11-06 14:49:08.222421829 +0000
+diff -up cups-2.0.1/scheduler/conf.c.lspp cups-2.0.1/scheduler/conf.c
+--- cups-2.0.1/scheduler/conf.c.lspp 2014-11-15 15:22:47.832306336 +0100
++++ cups-2.0.1/scheduler/conf.c 2014-11-15 15:22:47.844306181 +0100
@@ -36,6 +36,9 @@
# define INADDR_NONE 0xffffffff
#endif /* !INADDR_NONE */
@@ -702,7 +702,7 @@ diff -up cups-2.0.0/scheduler/conf.c.lspp cups-2.0.0/scheduler/conf.c
/*
-@@ -829,6 +839,25 @@ cupsdReadConfiguration(void)
+@@ -831,6 +841,25 @@ cupsdReadConfiguration(void)
RunUser = getuid();
@@ -728,7 +728,7 @@ diff -up cups-2.0.0/scheduler/conf.c.lspp cups-2.0.0/scheduler/conf.c
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
RemotePort ? "enabled" : "disabled");
-@@ -1220,7 +1249,19 @@ cupsdReadConfiguration(void)
+@@ -1225,7 +1254,19 @@ cupsdReadConfiguration(void)
cupsdClearString(&Classification);
if (Classification)
@@ -748,7 +748,7 @@ diff -up cups-2.0.0/scheduler/conf.c.lspp cups-2.0.0/scheduler/conf.c
/*
* Check the MaxClients setting, and then allocate memory for it...
-@@ -3652,6 +3693,18 @@ read_location(cups_file_t *fp, /* I - C
+@@ -3700,6 +3741,18 @@ read_location(cups_file_t *fp, /* I - C
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
}
@@ -767,9 +767,9 @@ diff -up cups-2.0.0/scheduler/conf.c.lspp cups-2.0.0/scheduler/conf.c
/*
* 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.0.0/scheduler/conf.h.lspp cups-2.0.0/scheduler/conf.h
---- cups-2.0.0/scheduler/conf.h.lspp 2014-11-06 14:49:08.212421733 +0000
-+++ cups-2.0.0/scheduler/conf.h 2014-11-06 14:49:08.222421829 +0000
+diff -up cups-2.0.1/scheduler/conf.h.lspp cups-2.0.1/scheduler/conf.h
+--- cups-2.0.1/scheduler/conf.h.lspp 2014-11-15 15:22:47.825306427 +0100
++++ cups-2.0.1/scheduler/conf.h 2014-11-15 15:22:47.845306168 +0100
@@ -248,6 +248,13 @@ VAR char *ServerKeychain VALUE(NULL);
/* Keychain holding cert + key */
#endif /* HAVE_SSL */
@@ -794,9 +794,9 @@ diff -up cups-2.0.0/scheduler/conf.h.lspp cups-2.0.0/scheduler/conf.h
/*
* Prototypes...
-diff -up cups-2.0.0/scheduler/cupsd.h.lspp cups-2.0.0/scheduler/cupsd.h
---- cups-2.0.0/scheduler/cupsd.h.lspp 2014-11-06 14:49:08.205421665 +0000
-+++ cups-2.0.0/scheduler/cupsd.h 2014-11-06 14:49:08.222421829 +0000
+diff -up cups-2.0.1/scheduler/cupsd.h.lspp cups-2.0.1/scheduler/cupsd.h
+--- cups-2.0.1/scheduler/cupsd.h.lspp 2014-11-15 15:22:47.805306686 +0100
++++ cups-2.0.1/scheduler/cupsd.h 2014-11-15 15:22:47.846306155 +0100
@@ -13,6 +13,8 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -828,9 +828,9 @@ diff -up cups-2.0.0/scheduler/cupsd.h.lspp cups-2.0.0/scheduler/cupsd.h
/*
* Some OS's don't have hstrerror(), most notably Solaris...
*/
-diff -up cups-2.0.0/scheduler/ipp.c.lspp cups-2.0.0/scheduler/ipp.c
---- cups-2.0.0/scheduler/ipp.c.lspp 2014-11-06 14:49:08.175421377 +0000
-+++ cups-2.0.0/scheduler/ipp.c 2014-11-06 15:07:01.724894473 +0000
+diff -up cups-2.0.1/scheduler/ipp.c.lspp cups-2.0.1/scheduler/ipp.c
+--- cups-2.0.1/scheduler/ipp.c.lspp 2014-11-15 15:22:47.739307542 +0100
++++ cups-2.0.1/scheduler/ipp.c 2014-11-15 15:22:47.851306090 +0100
@@ -16,6 +16,9 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1444,9 +1444,9 @@ diff -up cups-2.0.0/scheduler/ipp.c.lspp cups-2.0.0/scheduler/ipp.c
/*
* Check the username against the owner...
*/
-diff -up cups-2.0.0/scheduler/job.c.lspp cups-2.0.0/scheduler/job.c
---- cups-2.0.0/scheduler/job.c.lspp 2014-11-06 14:49:08.182421444 +0000
-+++ cups-2.0.0/scheduler/job.c 2014-11-06 15:07:38.589074429 +0000
+diff -up cups-2.0.1/scheduler/job.c.lspp cups-2.0.1/scheduler/job.c
+--- cups-2.0.1/scheduler/job.c.lspp 2014-11-15 15:22:47.755307335 +0100
++++ cups-2.0.1/scheduler/job.c 2014-11-15 15:22:47.855306038 +0100
@@ -13,6 +13,9 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1825,9 +1825,9 @@ diff -up cups-2.0.0/scheduler/job.c.lspp cups-2.0.0/scheduler/job.c
/*
* Now start the first file in the job...
*/
-diff -up cups-2.0.0/scheduler/job.h.lspp cups-2.0.0/scheduler/job.h
---- cups-2.0.0/scheduler/job.h.lspp 2014-07-31 01:02:30.000000000 +0100
-+++ cups-2.0.0/scheduler/job.h 2014-11-06 14:49:08.225421858 +0000
+diff -up cups-2.0.1/scheduler/job.h.lspp cups-2.0.1/scheduler/job.h
+--- cups-2.0.1/scheduler/job.h.lspp 2014-07-31 02:02:30.000000000 +0200
++++ cups-2.0.1/scheduler/job.h 2014-11-15 15:22:47.856306025 +0100
@@ -13,6 +13,13 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1853,9 +1853,9 @@ diff -up cups-2.0.0/scheduler/job.h.lspp cups-2.0.0/scheduler/job.h
};
typedef struct cupsd_joblog_s /**** Job log message ****/
-diff -up cups-2.0.0/scheduler/main.c.lspp cups-2.0.0/scheduler/main.c
---- cups-2.0.0/scheduler/main.c.lspp 2014-11-06 14:49:08.206421675 +0000
-+++ cups-2.0.0/scheduler/main.c 2014-11-06 14:49:08.225421858 +0000
+diff -up cups-2.0.1/scheduler/main.c.lspp cups-2.0.1/scheduler/main.c
+--- cups-2.0.1/scheduler/main.c.lspp 2014-11-15 15:22:47.808306648 +0100
++++ cups-2.0.1/scheduler/main.c 2014-11-15 15:27:00.487987203 +0100
@@ -56,6 +56,9 @@ extern int launch_activate_socket(const
# include <sys/param.h>
#endif /* HAVE_SYS_PARAM_H */
@@ -1866,18 +1866,18 @@ diff -up cups-2.0.0/scheduler/main.c.lspp cups-2.0.0/scheduler/main.c
/*
* Local functions...
-@@ -116,6 +119,9 @@ main(int argc, /* I - Number of comm
+@@ -120,6 +123,9 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
+#if WITH_LSPP
+ auditfail_t failmode; /* Action for audit_open failure */
+#endif /* WITH_LSPP */
- int run_as_child = 0;
- /* Needed for background fork/exec */
#ifdef __APPLE__
-@@ -490,6 +496,25 @@ main(int argc, /* I - Number of comm
- #endif /* DEBUG */
+ int use_sysman = 1; /* Use system management functions? */
+ #else
+@@ -498,6 +504,25 @@ main(int argc, /* I - Number of comm
+ exit(errno);
}
+#ifdef WITH_LSPP
@@ -1902,7 +1902,7 @@ diff -up cups-2.0.0/scheduler/main.c.lspp cups-2.0.0/scheduler/main.c
/*
* Set the timezone info...
*/
-@@ -1149,6 +1174,11 @@ main(int argc, /* I - Number of comm
+@@ -1160,6 +1185,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
@@ -1914,9 +1914,9 @@ diff -up cups-2.0.0/scheduler/main.c.lspp cups-2.0.0/scheduler/main.c
return (!stop_scheduler);
}
-diff -up cups-2.0.0/scheduler/printers.c.lspp cups-2.0.0/scheduler/printers.c
---- cups-2.0.0/scheduler/printers.c.lspp 2014-11-06 14:49:08.160421232 +0000
-+++ cups-2.0.0/scheduler/printers.c 2014-11-06 14:49:08.226421868 +0000
+diff -up cups-2.0.1/scheduler/printers.c.lspp cups-2.0.1/scheduler/printers.c
+--- cups-2.0.1/scheduler/printers.c.lspp 2014-11-15 15:22:47.716307840 +0100
++++ cups-2.0.1/scheduler/printers.c 2014-11-15 15:22:47.860305973 +0100
@@ -13,6 +13,8 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
diff --git a/cups-systemd-socket.patch b/cups-systemd-socket.patch
index 619f3af..7f1b0b2 100644
--- a/cups-systemd-socket.patch
+++ b/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
---- cups-2.0.0/cups/usersys.c.systemd-socket 2014-08-28 16:37:22.000000000 +0100
-+++ cups-2.0.0/cups/usersys.c 2014-10-16 14:39:05.839530224 +0100
-@@ -1028,7 +1028,7 @@ cups_read_client_conf(
+diff -up cups-2.0.1/cups/usersys.c.systemd-socket cups-2.0.1/cups/usersys.c
+--- cups-2.0.1/cups/usersys.c.systemd-socket 2014-10-20 20:24:56.000000000 +0200
++++ cups-2.0.1/cups/usersys.c 2014-11-15 15:19:11.108125832 +0100
+@@ -1078,7 +1078,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -10,10 +10,10 @@ diff -up cups-2.0.0/cups/usersys.c.systemd-socket cups-2.0.0/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
---- cups-2.0.0/scheduler/main.c.systemd-socket 2014-10-16 14:39:05.811530076 +0100
-+++ cups-2.0.0/scheduler/main.c 2014-10-16 14:39:05.839530224 +0100
-@@ -653,6 +653,12 @@ main(int argc, /* I - Number of comm
+diff -up cups-2.0.1/scheduler/main.c.systemd-socket cups-2.0.1/scheduler/main.c
+--- cups-2.0.1/scheduler/main.c.systemd-socket 2014-11-15 15:19:11.057126510 +0100
++++ cups-2.0.1/scheduler/main.c 2014-11-15 15:19:11.108125832 +0100
+@@ -661,6 +661,12 @@ main(int argc, /* I - Number of comm
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started on demand.");
else
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */
@@ -26,9 +26,9 @@ diff -up cups-2.0.0/scheduler/main.c.systemd-socket cups-2.0.0/scheduler/main.c
if (fg)
cupsdAddEvent(CUPSD_EVENT_SERVER_STARTED, NULL, NULL, "Scheduler started in foreground.");
else
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.path.in
---- cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.path.in 2014-10-16 14:39:05.839530224 +0100
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.path.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.path.in.systemd-socket 2014-03-21 15:50:24.000000000 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.path.in 2014-11-15 15:19:11.108125832 +0100
@@ -2,7 +2,7 @@
Description=CUPS Scheduler
@@ -38,11 +38,13 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.path.in.systemd-socket cups-2.0.0/s
[Install]
WantedBy=multi-user.target
-diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.0/scheduler/org.cups.cupsd.service.in
---- cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-03-21 14:50:24.000000000 +0000
-+++ cups-2.0.0/scheduler/org.cups.cupsd.service.in 2014-10-16 14:39:28.636650224 +0100
-@@ -2,9 +2,10 @@
+diff -up cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.1/scheduler/org.cups.cupsd.service.in
+--- cups-2.0.1/scheduler/org.cups.cupsd.service.in.systemd-socket 2014-11-15 15:19:11.109125818 +0100
++++ cups-2.0.1/scheduler/org.cups.cupsd.service.in 2014-11-15 15:19:56.480528155 +0100
+@@ -1,10 +1,11 @@
+ [Unit]
Description=CUPS Scheduler
+ Documentation=man:cupsd(8)
+After=network.target
[Service]
@@ -53,4 +55,3 @@ diff -up cups-2.0.0/scheduler/org.cups.cupsd.service.in.systemd-socket cups-2.0.
[Install]
Also=org.cups.cupsd.socket org.cups.cupsd.path
- WantedBy=printer.target
diff --git a/cups.spec b/cups.spec
index 0d9b801..34c5aa5 100644
--- a/cups.spec
+++ b/cups.spec
@@ -10,17 +10,13 @@
Summary: CUPS printing system
Name: cups
Epoch: 1
-Version: 2.0.0
-Release: 12%{?dist}
+Version: 2.0.1
+Release: 1%{?dist}
License: GPLv2
Url: http://www.cups.org/
-Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
+Source0: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
# Pixmap for desktop file
Source2: cupsprinter.png
-# socket unit for cups-lpd service
-Source3: cups-lpd.socket
-# cups-lpd service unit configuration
-Source4: cups-lpd at .service
# Logrotate configuration
Source6: cups.logrotate
# Backend for NCP protocol
@@ -30,7 +26,6 @@ Source8: macros.cups
Patch1: cups-no-gzip-man.patch
Patch2: cups-system-auth.patch
Patch3: cups-multilib.patch
-Patch4: cups-str4476.patch
Patch5: cups-banners.patch
Patch6: cups-serverbin-compat.patch
Patch7: cups-no-export-ssllibs.patch
@@ -65,8 +60,6 @@ Patch35: cups-ipp-multifile.patch
Patch36: cups-web-devices-timeout.patch
Patch37: cups-journal.patch
Patch38: cups-synconclose.patch
-Patch39: cups-str4500.patch
-Patch40: cups-str4496.patch
Patch100: cups-lspp.patch
@@ -196,9 +189,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch2 -p1 -b .system-auth
# Prevent multilib conflict in cups-config script.
%patch3 -p1 -b .multilib
-# Re-introduce SSLOptions configuration directive, disable SSL3 by
-# default (STR #4476).
-%patch4 -p1 -b .str4476
# Ignore rpm save/new files in the banners directory.
%patch5 -p1 -b .banners
# Use compatibility fallback path for ServerBin.
@@ -266,12 +256,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch37 -p1 -b .journal
# Set the default for SyncOnClose to Yes.
%patch38 -p1 -b .synconclose
-# Fix cupsGetPPD3() so it doesn't give the caller an unreadable file
-# (bug #1150917, STR #4500).
-%patch39 -p1 -b .str4500
-# Upstream fix for cupsd crash on restart when colord not available
-# (STR #4496).
-%patch40 -p1 -b .str4496
%if %lspp
# LSPP support.
@@ -345,12 +329,12 @@ popd
mv $RPM_BUILD_ROOT%{_unitdir}/org.cups.cupsd.path $RPM_BUILD_ROOT%{_unitdir}/cups.path
mv $RPM_BUILD_ROOT%{_unitdir}/org.cups.cupsd.service $RPM_BUILD_ROOT%{_unitdir}/cups.service
mv $RPM_BUILD_ROOT%{_unitdir}/org.cups.cupsd.socket $RPM_BUILD_ROOT%{_unitdir}/cups.socket
+mv $RPM_BUILD_ROOT%{_unitdir}/org.cups.cups-lpd.socket $RPM_BUILD_ROOT%{_unitdir}/cups-lpd.socket
+mv $RPM_BUILD_ROOT%{_unitdir}/org.cups.cups-lpd at .service $RPM_BUILD_ROOT%{_unitdir}/cups-lpd at .service
/bin/sed -i -e "s,org.cups.cupsd,cups,g" $RPM_BUILD_ROOT%{_unitdir}/cups.service
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps $RPM_BUILD_ROOT%{_sysconfdir}/X11/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}
install -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/cups
install -p -m 755 %{SOURCE7} $RPM_BUILD_ROOT%{cups_serverbin}/backend/ncp
@@ -618,6 +602,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
+* Sat Nov 15 2014 Jiri Popelka <jpopelka at redhat.com> - 1:2.0.1-1
+- 2.0.1
+
* Fri Nov 7 2014 Tim Waugh <twaugh at redhat.com> - 1:2.0.0-12
- Re-introduce SSLOptions configuration directive, disable SSL3 by
default (STR #4476).
diff --git a/sources b/sources
index b335198..b605784 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cdd81fea23e9e29555c24bdfd0d7c89 cups-2.0.0-source.tar.bz2
+7f7c33071035fb20d0879929a42da711 cups-2.0.1-source.tar.bz2
More information about the scm-commits
mailing list