rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1.6.2

Browse Source
This commit is contained in:
Jiri Popelka 2013-03-18 19:26:09 +01:00
parent 15160404c4
commit 389e11ef97
11 changed files with 192 additions and 3632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -53,3 +53,4 @@ cups-1.4.4-source.tar.bz2
/cups-1.5.3-source.tar.bz2 /cups-1.5.3-source.tar.bz2
/cups-1.5.4-source.tar.bz2 /cups-1.5.4-source.tar.bz2
/cups-1.6.1-source.tar.bz2 /cups-1.6.1-source.tar.bz2
/cups-1.6.2-source.tar.bz2

42
cups-build.patch
View File

@ -1,42 +0,0 @@
diff -up cups-1.5b1/Makedefs.in.build cups-1.5b1/Makedefs.in
--- cups-1.5b1/Makedefs.in.build 2011-05-04 06:28:00.000000000 +0200
+++ cups-1.5b1/Makedefs.in 2011-05-24 15:54:03.000000000 +0200
@@ -138,7 +138,7 @@ BACKLIBS = @BACKLIBS@
BANNERTOPS = @BANNERTOPS@
BUILDDIRS = @BUILDDIRS@
CFLAGS = @CPPFLAGS@ @CFLAGS@
-COMMONLIBS = @LIBS@
+COMMONLIBS = @LIBS@ $(DNSSDLIBS)
CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
diff -up cups-1.5b1/scheduler/dirsvc.c.build cups-1.5b1/scheduler/dirsvc.c
--- cups-1.5b1/scheduler/dirsvc.c.build 2011-05-20 05:49:49.000000000 +0200
+++ cups-1.5b1/scheduler/dirsvc.c 2011-05-24 15:55:26.000000000 +0200
@@ -2047,7 +2047,7 @@ cupsdUpdateDNSSDName(void)
WebIFRef = DNSSDRef;
if ((error = DNSServiceRegister(&WebIFRef,
- kDNSServiceFlagsShareConnection,
+ 0,
0, webif, "_http._tcp", NULL,
NULL, htons(DNSSDPort), 7,
"\006path=/", dnssdRegisterCallback,
@@ -2769,7 +2769,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
do
{
p->ipp_ref = DNSSDRef;
- if ((se = DNSServiceRegister(&p->ipp_ref, kDNSServiceFlagsShareConnection,
+ if ((se = DNSServiceRegister(&p->ipp_ref, 0,
0, name, regtype, NULL, NULL,
htons(DNSSDPort), ipp_len, ipp_txt,
dnssdRegisterCallback,
@@ -2866,7 +2866,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
p->printer_ref = DNSSDRef;
if ((se = DNSServiceRegister(&p->printer_ref,
- kDNSServiceFlagsShareConnection,
+ 0,
0, name, "_printer._tcp", NULL, NULL,
htons(printer_port), printer_len, printer_txt,
dnssdRegisterCallback,

27
cups-directives.patch
View File

@ -1,27 +0,0 @@
From 3f4855845fc8c3c41c3564bd91add767d35841e1 Mon Sep 17 00:00:00 2001
From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 28 Aug 2012 22:03:51 +0000
Subject: [PATCH] The cupsd.conf file included obsolete browsing directives
(STR #4157)
git-svn-id: http://svn.easysw.com/public/cups/trunk@10575 7a7537e8-13f0-0310-91df-b6672ffda945
---
conf/cupsd.conf.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in
index 2ce33e3..8ed157e 100644
--- a/conf/cupsd.conf.in
+++ b/conf/cupsd.conf.in
@@ -19,8 +19,6 @@ Listen localhost:@DEFAULT_IPP_PORT@
# Show shared printers on the local network.
Browsing On
-BrowseOrder allow,deny
-BrowseAllow all
BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
# Default authentication type, when authentication is required...
--
1.8.1.4

8
cups-lpd-manpage.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.6.1/man/cups-lpd.man.in.lpd-manpage cups-1.6.1/man/cups-lpd.man.in diff -up cups-1.6.2/man/cups-lpd.man.in.lpd-manpage cups-1.6.2/man/cups-lpd.man.in
--- cups-1.6.1/man/cups-lpd.man.in.lpd-manpage 2012-04-23 18:26:57.000000000 +0100 --- cups-1.6.2/man/cups-lpd.man.in.lpd-manpage 2013-01-10 17:58:21.000000000 +0100
+++ cups-1.6.1/man/cups-lpd.man.in 2013-03-05 17:31:57.182856029 +0000 +++ cups-1.6.2/man/cups-lpd.man.in 2013-03-18 18:59:46.837056613 +0100
@@ -26,39 +26,8 @@ cups-lpd \- receive print jobs and repor @@ -26,39 +26,8 @@ cups-lpd \- receive print jobs and repor
\fIcups-lpd\fR is the CUPS Line Printer Daemon ("LPD") \fIcups-lpd\fR is the CUPS Line Printer Daemon ("LPD")
mini-server that supports legacy client systems that use the LPD mini-server that supports legacy client systems that use the LPD
@ -63,4 +63,4 @@ diff -up cups-1.6.1/man/cups-lpd.man.in.lpd-manpage cups-1.6.1/man/cups-lpd.man.
+\fIcups(1)\fR, \fIcupsd(8)\fR, \fIsystemd(1)\fR, +\fIcups(1)\fR, \fIcupsd(8)\fR, \fIsystemd(1)\fR,
http://localhost:631/help http://localhost:631/help
.SH COPYRIGHT .SH COPYRIGHT
Copyright 2007-2012 by Apple Inc. Copyright 2007-2013 by Apple Inc.

180
cups-lspp.patch
View File

@ -1,7 +1,7 @@
diff -up cups-1.6.1/config.h.in.lspp cups-1.6.1/config.h.in diff -up cups-1.6.2/config.h.in.lspp cups-1.6.2/config.h.in
--- cups-1.6.1/config.h.in.lspp 2012-11-26 22:47:22.453674634 +0000 --- cups-1.6.2/config.h.in.lspp 2013-03-18 19:00:30.704448157 +0100
+++ cups-1.6.1/config.h.in 2012-11-26 22:47:22.463674686 +0000 +++ cups-1.6.2/config.h.in 2013-03-18 19:00:30.724447879 +0100
@@ -742,6 +742,13 @@ static __inline int _cups_abs(int i) { r @@ -746,6 +746,13 @@ static __inline int _cups_abs(int i) { r
# endif /* __GNUC__ || __STDC_VERSION__ */ # endif /* __GNUC__ || __STDC_VERSION__ */
#endif /* !HAVE_ABS && !abs */ #endif /* !HAVE_ABS && !abs */
@ -15,9 +15,9 @@ diff -up cups-1.6.1/config.h.in.lspp cups-1.6.1/config.h.in
#endif /* !_CUPS_CONFIG_H_ */ #endif /* !_CUPS_CONFIG_H_ */
/* /*
diff -up cups-1.6.1/config-scripts/cups-lspp.m4.lspp cups-1.6.1/config-scripts/cups-lspp.m4 diff -up cups-1.6.2/config-scripts/cups-lspp.m4.lspp cups-1.6.2/config-scripts/cups-lspp.m4
--- cups-1.6.1/config-scripts/cups-lspp.m4.lspp 2012-11-26 22:47:22.464674691 +0000 --- cups-1.6.2/config-scripts/cups-lspp.m4.lspp 2013-03-18 19:00:30.724447879 +0100
+++ cups-1.6.1/config-scripts/cups-lspp.m4 2012-11-26 22:47:22.464674691 +0000 +++ cups-1.6.2/config-scripts/cups-lspp.m4 2013-03-18 19:00:30.724447879 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+dnl +dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS). +dnl LSPP code for the Common UNIX Printing System (CUPS).
@ -55,9 +55,9 @@ diff -up cups-1.6.1/config-scripts/cups-lspp.m4.lspp cups-1.6.1/config-scripts/c
+ ;; + ;;
+ esac + esac
+fi +fi
diff -up cups-1.6.1/configure.in.lspp cups-1.6.1/configure.in diff -up cups-1.6.2/configure.in.lspp cups-1.6.2/configure.in
--- cups-1.6.1/configure.in.lspp 2012-11-26 22:47:22.457674655 +0000 --- cups-1.6.2/configure.in.lspp 2013-03-18 19:00:30.705448143 +0100
+++ cups-1.6.1/configure.in 2012-11-26 22:47:22.464674691 +0000 +++ cups-1.6.2/configure.in 2013-03-18 19:00:30.724447879 +0100
@@ -37,6 +37,8 @@ sinclude(config-scripts/cups-systemd.m4) @@ -37,6 +37,8 @@ sinclude(config-scripts/cups-systemd.m4)
sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4) sinclude(config-scripts/cups-scripting.m4)
@ -67,9 +67,9 @@ diff -up cups-1.6.1/configure.in.lspp cups-1.6.1/configure.in
INSTALL_LANGUAGES="" INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES="" UNINSTALL_LANGUAGES=""
LANGFILES="" LANGFILES=""
diff -up cups-1.6.1/filter/common.c.lspp cups-1.6.1/filter/common.c diff -up cups-1.6.2/filter/common.c.lspp cups-1.6.2/filter/common.c
--- cups-1.6.1/filter/common.c.lspp 2011-05-20 04:49:49.000000000 +0100 --- cups-1.6.2/filter/common.c.lspp 2011-05-20 05:49:49.000000000 +0200
+++ cups-1.6.1/filter/common.c 2012-11-26 22:47:22.464674691 +0000 +++ cups-1.6.2/filter/common.c 2013-03-18 19:00:30.725447865 +0100
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
* Include necessary headers... * Include necessary headers...
*/ */
@ -238,9 +238,9 @@ diff -up cups-1.6.1/filter/common.c.lspp cups-1.6.1/filter/common.c
/* /*
diff -up cups-1.6.1/filter/pstops.c.lspp cups-1.6.1/filter/pstops.c diff -up cups-1.6.2/filter/pstops.c.lspp cups-1.6.2/filter/pstops.c
--- cups-1.6.1/filter/pstops.c.lspp 2012-04-23 20:19:19.000000000 +0100 --- cups-1.6.2/filter/pstops.c.lspp 2012-04-23 21:19:19.000000000 +0200
+++ cups-1.6.1/filter/pstops.c 2012-11-26 22:47:22.465674696 +0000 +++ cups-1.6.2/filter/pstops.c 2013-03-18 19:00:30.726447852 +0100
@@ -3202,6 +3202,18 @@ write_label_prolog(pstops_doc_t *doc, /* @@ -3202,6 +3202,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{ {
const char *classification; /* CLASSIFICATION environment variable */ const char *classification; /* CLASSIFICATION environment variable */
@ -396,9 +396,9 @@ diff -up cups-1.6.1/filter/pstops.c.lspp cups-1.6.1/filter/pstops.c
/* /*
diff -up cups-1.6.1/Makedefs.in.lspp cups-1.6.1/Makedefs.in diff -up cups-1.6.2/Makedefs.in.lspp cups-1.6.2/Makedefs.in
--- cups-1.6.1/Makedefs.in.lspp 2012-11-26 22:47:22.454674639 +0000 --- cups-1.6.2/Makedefs.in.lspp 2013-03-18 19:00:30.706448129 +0100
+++ cups-1.6.1/Makedefs.in 2012-11-26 22:47:22.465674696 +0000 +++ cups-1.6.2/Makedefs.in 2013-03-18 19:00:30.726447852 +0100
@@ -146,7 +146,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f @@ -146,7 +146,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ)
@ -408,9 +408,9 @@ diff -up cups-1.6.1/Makedefs.in.lspp cups-1.6.1/Makedefs.in
OPTIM = @OPTIM@ OPTIM = @OPTIM@
OPTIONS = OPTIONS =
PAMLIBS = @PAMLIBS@ PAMLIBS = @PAMLIBS@
diff -up cups-1.6.1/scheduler/client.c.lspp cups-1.6.1/scheduler/client.c diff -up cups-1.6.2/scheduler/client.c.lspp cups-1.6.2/scheduler/client.c
--- cups-1.6.1/scheduler/client.c.lspp 2012-11-26 22:47:22.460674671 +0000 --- cups-1.6.2/scheduler/client.c.lspp 2013-01-21 16:29:47.000000000 +0100
+++ cups-1.6.1/scheduler/client.c 2012-11-26 22:47:22.466674701 +0000 +++ cups-1.6.2/scheduler/client.c 2013-03-18 19:00:30.727447838 +0100
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
* valid_host() - Is the Host: field valid? * valid_host() - Is the Host: field valid?
* write_file() - Send a file via HTTP. * write_file() - Send a file via HTTP.
@ -508,7 +508,7 @@ diff -up cups-1.6.1/scheduler/client.c.lspp cups-1.6.1/scheduler/client.c
status = HTTP_CONTINUE; status = HTTP_CONTINUE;
@@ -2123,6 +2188,67 @@ cupsdReadClient(cupsd_client_t *con) /* @@ -2134,6 +2199,67 @@ cupsdReadClient(cupsd_client_t *con) /*
fchmod(con->file, 0640); fchmod(con->file, 0640);
fchown(con->file, RunUser, Group); fchown(con->file, RunUser, Group);
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC); fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@ -576,7 +576,7 @@ diff -up cups-1.6.1/scheduler/client.c.lspp cups-1.6.1/scheduler/client.c
} }
if (con->http.state != HTTP_POST_SEND) if (con->http.state != HTTP_POST_SEND)
@@ -3568,6 +3694,49 @@ is_path_absolute(const char *path) /* I @@ -3572,6 +3698,49 @@ is_path_absolute(const char *path) /* I
return (1); return (1);
} }
@ -626,9 +626,9 @@ diff -up cups-1.6.1/scheduler/client.c.lspp cups-1.6.1/scheduler/client.c
/* /*
* 'pipe_command()' - Pipe the output of a command to the remote client. * 'pipe_command()' - Pipe the output of a command to the remote client.
diff -up cups-1.6.1/scheduler/client.h.lspp cups-1.6.1/scheduler/client.h diff -up cups-1.6.2/scheduler/client.h.lspp cups-1.6.2/scheduler/client.h
--- cups-1.6.1/scheduler/client.h.lspp 2012-11-26 22:47:22.454674639 +0000 --- cups-1.6.2/scheduler/client.h.lspp 2013-03-18 19:00:30.706448129 +0100
+++ cups-1.6.1/scheduler/client.h 2012-11-26 22:47:22.466674701 +0000 +++ cups-1.6.2/scheduler/client.h 2013-03-18 19:00:30.727447838 +0100
@@ -18,6 +18,13 @@ @@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */ #endif /* HAVE_AUTHORIZATION_H */
@ -664,9 +664,9 @@ diff -up cups-1.6.1/scheduler/client.h.lspp cups-1.6.1/scheduler/client.h
#ifdef HAVE_SSL #ifdef HAVE_SSL
extern int cupsdEndTLS(cupsd_client_t *con); extern int cupsdEndTLS(cupsd_client_t *con);
diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c diff -up cups-1.6.2/scheduler/conf.c.lspp cups-1.6.2/scheduler/conf.c
--- cups-1.6.1/scheduler/conf.c.lspp 2012-11-26 22:47:22.461674676 +0000 --- cups-1.6.2/scheduler/conf.c.lspp 2013-03-18 19:00:30.643449003 +0100
+++ cups-1.6.1/scheduler/conf.c 2012-11-26 22:49:49.201331930 +0000 +++ cups-1.6.2/scheduler/conf.c 2013-03-18 19:00:30.728447824 +0100
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
* read_location() - Read a <Location path> definition. * read_location() - Read a <Location path> definition.
* read_policy() - Read a <Policy name> definition. * read_policy() - Read a <Policy name> definition.
@ -685,7 +685,7 @@ diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
/* /*
* Configuration variable structure... * Configuration variable structure...
@@ -147,6 +151,10 @@ static const cupsd_var_t cupsd_vars[] = @@ -146,6 +150,10 @@ static const cupsd_var_t cupsd_vars[] =
{ "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, { "ServerName", &ServerName, CUPSD_VARTYPE_STRING },
{ "StrictConformance", &StrictConformance, CUPSD_VARTYPE_BOOLEAN }, { "StrictConformance", &StrictConformance, CUPSD_VARTYPE_BOOLEAN },
{ "Timeout", &Timeout, CUPSD_VARTYPE_TIME }, { "Timeout", &Timeout, CUPSD_VARTYPE_TIME },
@ -706,7 +706,7 @@ diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
/* /*
@@ -835,6 +846,25 @@ cupsdReadConfiguration(void) @@ -851,6 +862,25 @@ cupsdReadConfiguration(void)
RunUser = getuid(); RunUser = getuid();
@ -732,7 +732,7 @@ diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.", cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
RemotePort ? "enabled" : "disabled"); RemotePort ? "enabled" : "disabled");
@@ -1219,7 +1249,19 @@ cupsdReadConfiguration(void) @@ -1253,7 +1283,19 @@ cupsdReadConfiguration(void)
cupsdClearString(&Classification); cupsdClearString(&Classification);
if (Classification) if (Classification)
@ -752,7 +752,7 @@ diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
/* /*
* Check the MaxClients setting, and then allocate memory for it... * Check the MaxClients setting, and then allocate memory for it...
@@ -3570,6 +3612,18 @@ read_location(cups_file_t *fp, /* I - C @@ -3639,6 +3681,18 @@ read_location(cups_file_t *fp, /* I - C
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
} }
@ -771,9 +771,9 @@ diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
/* /*
* 'read_policy()' - Read a <Policy name> definition. * 'read_policy()' - Read a <Policy name> definition.
diff -up cups-1.6.1/scheduler/conf.h.lspp cups-1.6.1/scheduler/conf.h diff -up cups-1.6.2/scheduler/conf.h.lspp cups-1.6.2/scheduler/conf.h
--- cups-1.6.1/scheduler/conf.h.lspp 2012-11-26 22:47:22.461674676 +0000 --- cups-1.6.2/scheduler/conf.h.lspp 2013-03-18 19:00:30.643449003 +0100
+++ cups-1.6.1/scheduler/conf.h 2012-11-26 22:47:22.467674707 +0000 +++ cups-1.6.2/scheduler/conf.h 2013-03-18 19:00:30.729447810 +0100
@@ -249,6 +249,13 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NO @@ -249,6 +249,13 @@ VAR int SSLOptions VALUE(CUPSD_SSL_NO
/* SSL/TLS options */ /* SSL/TLS options */
#endif /* HAVE_SSL */ #endif /* HAVE_SSL */
@ -798,9 +798,9 @@ diff -up cups-1.6.1/scheduler/conf.h.lspp cups-1.6.1/scheduler/conf.h
/* /*
* Prototypes... * Prototypes...
diff -up cups-1.6.1/scheduler/cupsd.h.lspp cups-1.6.1/scheduler/cupsd.h diff -up cups-1.6.2/scheduler/cupsd.h.lspp cups-1.6.2/scheduler/cupsd.h
--- cups-1.6.1/scheduler/cupsd.h.lspp 2012-05-21 18:40:22.000000000 +0100 --- cups-1.6.2/scheduler/cupsd.h.lspp 2012-12-17 23:17:08.000000000 +0100
+++ cups-1.6.1/scheduler/cupsd.h 2012-11-26 22:47:22.468674713 +0000 +++ cups-1.6.2/scheduler/cupsd.h 2013-03-18 19:00:30.729447810 +0100
@@ -13,6 +13,8 @@ @@ -13,6 +13,8 @@
* file is missing or damaged, see the license at "http://www.cups.org/". * file is missing or damaged, see the license at "http://www.cups.org/".
*/ */
@ -832,9 +832,9 @@ diff -up cups-1.6.1/scheduler/cupsd.h.lspp cups-1.6.1/scheduler/cupsd.h
/* /*
* Some OS's don't have hstrerror(), most notably Solaris... * Some OS's don't have hstrerror(), most notably Solaris...
*/ */
diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c diff -up cups-1.6.2/scheduler/ipp.c.lspp cups-1.6.2/scheduler/ipp.c
--- cups-1.6.1/scheduler/ipp.c.lspp 2012-11-26 22:47:22.431674518 +0000 --- cups-1.6.2/scheduler/ipp.c.lspp 2013-03-18 19:00:30.668448656 +0100
+++ cups-1.6.1/scheduler/ipp.c 2012-11-26 22:47:22.470674723 +0000 +++ cups-1.6.2/scheduler/ipp.c 2013-03-18 19:05:00.416706472 +0100
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
* cancel_all_jobs() - Cancel all or selected print jobs. * cancel_all_jobs() - Cancel all or selected print jobs.
* cancel_job() - Cancel a print job. * cancel_job() - Cancel a print job.
@ -878,10 +878,10 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p); static int check_quotas(cupsd_client_t *con, cupsd_printer_t *p);
static void close_job(cupsd_client_t *con, ipp_attribute_t *uri); static void close_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra, static void copy_attrs(ipp_t *to, ipp_t *from, cups_array_t *ra,
@@ -1285,6 +1300,21 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1300,6 +1315,21 @@ add_job(cupsd_client_t *con, /* I - Cl
ipp_attribute_t *media_col, /* media-col attribute */ "time-at-creation",
*media_margin; /* media-*-margin attribute */ "time-at-processing"
ipp_t *unsup_col; /* media-col in unsupported response */ };
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+ char *audit_message; /* Audit message string */ + char *audit_message; /* Audit message string */
+ char *printerfile; /* device file pointed to by the printer */ + char *printerfile; /* device file pointed to by the printer */
@ -900,9 +900,9 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))", cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
@@ -1542,6 +1572,106 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1640,6 +1670,106 @@ add_job(cupsd_client_t *con, /* I - Cl
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, }
"Untitled"); }
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+ if (is_lspp_config()) + if (is_lspp_config())
@ -1007,7 +1007,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
if ((job = cupsdAddJob(priority, printer->name)) == NULL) if ((job = cupsdAddJob(priority, printer->name)) == NULL)
{ {
send_ipp_status(con, IPP_INTERNAL_ERROR, send_ipp_status(con, IPP_INTERNAL_ERROR,
@@ -1550,6 +1680,32 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1648,6 +1778,32 @@ add_job(cupsd_client_t *con, /* I - Cl
return (NULL); return (NULL);
} }
@ -1040,7 +1040,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE); job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE);
job->attrs = con->request; job->attrs = con->request;
job->dirty = 1; job->dirty = 1;
@@ -1759,6 +1915,29 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1857,6 +2013,29 @@ add_job(cupsd_client_t *con, /* I - Cl
attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]); attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]);
attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]); attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]);
} }
@ -1070,7 +1070,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
job->job_sheets = attr; job->job_sheets = attr;
@@ -1789,6 +1968,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1887,6 +2066,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s,none\", " "job-sheets=\"%s,none\", "
"job-originating-user-name=\"%s\"", "job-originating-user-name=\"%s\"",
Classification, job->username); Classification, job->username);
@ -1080,7 +1080,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
} }
else if (attr->num_values == 2 && else if (attr->num_values == 2 &&
strcmp(attr->values[0].string.text, strcmp(attr->values[0].string.text,
@@ -1807,6 +1989,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1905,6 +2087,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"", "job-originating-user-name=\"%s\"",
attr->values[0].string.text, attr->values[0].string.text,
attr->values[1].string.text, job->username); attr->values[1].string.text, job->username);
@ -1090,7 +1090,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
} }
else if (strcmp(attr->values[0].string.text, Classification) && else if (strcmp(attr->values[0].string.text, Classification) &&
strcmp(attr->values[0].string.text, "none") && strcmp(attr->values[0].string.text, "none") &&
@@ -1827,6 +2012,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1925,6 +2110,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"", "job-originating-user-name=\"%s\"",
attr->values[0].string.text, attr->values[0].string.text,
attr->values[1].string.text, job->username); attr->values[1].string.text, job->username);
@ -1100,7 +1100,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
} }
} }
else if (strcmp(attr->values[0].string.text, Classification) && else if (strcmp(attr->values[0].string.text, Classification) &&
@@ -1867,8 +2055,52 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1965,8 +2153,52 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s\", " "job-sheets=\"%s\", "
"job-originating-user-name=\"%s\"", "job-originating-user-name=\"%s\"",
Classification, job->username); Classification, job->username);
@ -1153,7 +1153,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
/* /*
* See if we need to add the starting sheet... * See if we need to add the starting sheet...
@@ -3615,6 +3847,111 @@ check_rss_recipient( @@ -3730,6 +3962,111 @@ check_rss_recipient(
} }
@ -1265,7 +1265,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
/* /*
* 'check_quotas()' - Check quotas for a printer and user. * 'check_quotas()' - Check quotas for a printer and user.
*/ */
@@ -4067,6 +4404,15 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4182,6 +4519,15 @@ copy_banner(cupsd_client_t *con, /* I -
char attrname[255], /* Name of attribute */ char attrname[255], /* Name of attribute */
*s; /* Pointer into name */ *s; /* Pointer into name */
ipp_attribute_t *attr; /* Attribute */ ipp_attribute_t *attr; /* Attribute */
@ -1281,7 +1281,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
cupsdLogMessage(CUPSD_LOG_DEBUG2, cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -4102,6 +4448,82 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4217,6 +4563,82 @@ copy_banner(cupsd_client_t *con, /* I -
fchmod(cupsFileNumber(out), 0640); fchmod(cupsFileNumber(out), 0640);
fchown(cupsFileNumber(out), RunUser, Group); fchown(cupsFileNumber(out), RunUser, Group);
@ -1364,7 +1364,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
/* /*
* Try the localized banner file under the subdirectory... * Try the localized banner file under the subdirectory...
@@ -4196,6 +4618,24 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4311,6 +4733,24 @@ copy_banner(cupsd_client_t *con, /* I -
else else
s = attrname; s = attrname;
@ -1389,7 +1389,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
if (!strcmp(s, "printer-name")) if (!strcmp(s, "printer-name"))
{ {
cupsFilePuts(out, job->dest); cupsFilePuts(out, job->dest);
@@ -6273,6 +6713,22 @@ get_job_attrs(cupsd_client_t *con, /* I @@ -6388,6 +6828,22 @@ get_job_attrs(cupsd_client_t *con, /* I
exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username); exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
@ -1412,7 +1412,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
/* /*
* Copy attributes... * Copy attributes...
*/ */
@@ -6626,6 +7082,11 @@ get_jobs(cupsd_client_t *con, /* I - C @@ -6741,6 +7197,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (username[0] && _cups_strcasecmp(username, job->username)) if (username[0] && _cups_strcasecmp(username, job->username))
continue; continue;
@ -1424,7 +1424,7 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
if (count > 0) if (count > 0)
ippAddSeparator(con->response); ippAddSeparator(con->response);
@@ -11106,6 +11567,11 @@ validate_user(cupsd_job_t *job, /* I @@ -11303,6 +11764,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen); strlcpy(username, get_username(con), userlen);
@ -1436,9 +1436,9 @@ diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
/* /*
* Check the username against the owner... * Check the username against the owner...
*/ */
diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c diff -up cups-1.6.2/scheduler/job.c.lspp cups-1.6.2/scheduler/job.c
--- cups-1.6.1/scheduler/job.c.lspp 2012-11-26 22:47:22.442674576 +0000 --- cups-1.6.2/scheduler/job.c.lspp 2013-03-18 19:00:30.686448406 +0100
+++ cups-1.6.1/scheduler/job.c 2012-11-26 22:47:22.471674728 +0000 +++ cups-1.6.2/scheduler/job.c 2013-03-18 19:00:30.735447727 +0100
@@ -68,6 +68,9 @@ @@ -68,6 +68,9 @@
* update_job_attrs() - Update the job-printer-* attributes. * update_job_attrs() - Update the job-printer-* attributes.
*/ */
@ -1660,7 +1660,7 @@ diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c
job->attrs->state = IPP_IDLE; job->attrs->state = IPP_IDLE;
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL, if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
@@ -3735,6 +3907,18 @@ get_options(cupsd_job_t *job, /* I - Jo @@ -3756,6 +3928,18 @@ get_options(cupsd_job_t *job, /* I - Jo
banner_page) banner_page)
continue; continue;
@ -1679,7 +1679,7 @@ diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c
/* /*
* Otherwise add them to the list... * Otherwise add them to the list...
*/ */
@@ -4457,6 +4641,19 @@ static void @@ -4480,6 +4664,19 @@ static void
start_job(cupsd_job_t *job, /* I - Job ID */ start_job(cupsd_job_t *job, /* I - Job ID */
cupsd_printer_t *printer) /* I - Printer to print job */ cupsd_printer_t *printer) /* I - Printer to print job */
{ {
@ -1699,7 +1699,7 @@ diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c
cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))", cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))",
job, job->id, printer, printer->name); job, job->id, printer, printer->name);
@@ -4599,6 +4796,108 @@ start_job(cupsd_job_t *job, /* I - @@ -4622,6 +4819,108 @@ start_job(cupsd_job_t *job, /* I -
fcntl(job->side_pipes[1], F_SETFD, fcntl(job->side_pipes[1], F_SETFD,
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC); fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
@ -1808,9 +1808,9 @@ diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c
/* /*
* Now start the first file in the job... * Now start the first file in the job...
*/ */
diff -up cups-1.6.1/scheduler/job.h.lspp cups-1.6.1/scheduler/job.h diff -up cups-1.6.2/scheduler/job.h.lspp cups-1.6.2/scheduler/job.h
--- cups-1.6.1/scheduler/job.h.lspp 2012-05-23 02:36:50.000000000 +0100 --- cups-1.6.2/scheduler/job.h.lspp 2012-05-23 03:36:50.000000000 +0200
+++ cups-1.6.1/scheduler/job.h 2012-11-26 22:47:22.471674728 +0000 +++ cups-1.6.2/scheduler/job.h 2013-03-18 19:00:30.736447713 +0100
@@ -13,6 +13,13 @@ @@ -13,6 +13,13 @@
* file is missing or damaged, see the license at "http://www.cups.org/". * file is missing or damaged, see the license at "http://www.cups.org/".
*/ */
@ -1836,9 +1836,9 @@ diff -up cups-1.6.1/scheduler/job.h.lspp cups-1.6.1/scheduler/job.h
}; };
typedef struct cupsd_joblog_s /**** Job log message ****/ typedef struct cupsd_joblog_s /**** Job log message ****/
diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c diff -up cups-1.6.2/scheduler/main.c.lspp cups-1.6.2/scheduler/main.c
--- cups-1.6.1/scheduler/main.c.lspp 2012-11-26 22:47:22.462674681 +0000 --- cups-1.6.2/scheduler/main.c.lspp 2013-03-18 19:00:30.708448101 +0100
+++ cups-1.6.1/scheduler/main.c 2012-11-26 22:47:22.472674733 +0000 +++ cups-1.6.2/scheduler/main.c 2013-03-18 19:05:36.422206888 +0100
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
* usage() - Show scheduler usage. * usage() - Show scheduler usage.
*/ */
@ -1848,9 +1848,9 @@ diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
/* /*
* Include necessary headers... * Include necessary headers...
*/ */
@@ -75,6 +77,9 @@ @@ -80,6 +82,9 @@
# include <notify.h> # include <sys/param.h>
#endif /* HAVE_NOTIFY_H */ #endif /* HAVE_SYS_PARAM_H */
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+# include <libaudit.h> +# include <libaudit.h>
@ -1858,7 +1858,7 @@ diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
/* /*
* Local functions... * Local functions...
@@ -138,6 +143,9 @@ main(int argc, /* I - Number of comm @@ -143,6 +148,9 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET) #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */ struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */ #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@ -1868,7 +1868,7 @@ diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
#ifdef __sgi #ifdef __sgi
cups_file_t *fp; /* Fake lpsched lock file */ cups_file_t *fp; /* Fake lpsched lock file */
struct stat statbuf; /* Needed for checking lpsched FIFO */ struct stat statbuf; /* Needed for checking lpsched FIFO */
@@ -514,6 +522,25 @@ main(int argc, /* I - Number of comm @@ -522,6 +530,25 @@ main(int argc, /* I - Number of comm
#endif /* DEBUG */ #endif /* DEBUG */
} }
@ -1894,7 +1894,7 @@ diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
/* /*
* Set the timezone info... * Set the timezone info...
*/ */
@@ -1231,6 +1258,11 @@ main(int argc, /* I - Number of comm @@ -1216,6 +1243,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect(); cupsdStopSelect();
@ -1906,9 +1906,9 @@ diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
return (!stop_scheduler); return (!stop_scheduler);
} }
diff -up cups-1.6.1/scheduler/printers.c.lspp cups-1.6.1/scheduler/printers.c diff -up cups-1.6.2/scheduler/printers.c.lspp cups-1.6.2/scheduler/printers.c
--- cups-1.6.1/scheduler/printers.c.lspp 2012-11-26 22:47:22.419674456 +0000 --- cups-1.6.2/scheduler/printers.c.lspp 2013-03-18 19:00:30.649448920 +0100
+++ cups-1.6.1/scheduler/printers.c 2012-11-26 22:47:22.472674733 +0000 +++ cups-1.6.2/scheduler/printers.c 2013-03-18 19:07:48.244377673 +0100
@@ -56,6 +56,8 @@ @@ -56,6 +56,8 @@
* write_xml_string() - Write a string with XML escaping. * write_xml_string() - Write a string with XML escaping.
*/ */
@ -1929,10 +1929,10 @@ diff -up cups-1.6.1/scheduler/printers.c.lspp cups-1.6.1/scheduler/printers.c
/* /*
* Local functions... * Local functions...
@@ -2101,6 +2107,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) @@ -2090,6 +2096,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
"username", ipp_attribute_t *attr; /* Attribute data */
"password" char *name, /* Current user/group name */
}; *filter; /* Current filter */
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+ char *audit_message; /* Audit message string */ + char *audit_message; /* Audit message string */
+ char *printerfile; /* Path to a local printer dev */ + char *printerfile; /* Path to a local printer dev */
@ -1943,7 +1943,7 @@ diff -up cups-1.6.1/scheduler/printers.c.lspp cups-1.6.1/scheduler/printers.c
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
@@ -2234,6 +2247,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) @@ -2212,6 +2225,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ? attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]); Classification : p->job_sheets[1]);
} }
@ -1989,7 +1989,7 @@ diff -up cups-1.6.1/scheduler/printers.c.lspp cups-1.6.1/scheduler/printers.c
} }
p->raw = 0; p->raw = 0;
@@ -5320,7 +5372,6 @@ write_irix_state(cupsd_printer_t *p) /* @@ -5298,7 +5350,6 @@ write_irix_state(cupsd_printer_t *p) /*
} }
#endif /* __sgi */ #endif /* __sgi */

3238
cups-str4223.patch
View File

File diff suppressed because it is too large Load Diff

12
cups-str4276.patch
View File

@ -1,12 +0,0 @@
diff -up cups-1.6.1/scheduler/colorman.c.str4276 cups-1.6.1/scheduler/colorman.c
--- cups-1.6.1/scheduler/colorman.c.str4276 2013-02-15 17:09:23.053544061 +0000
+++ cups-1.6.1/scheduler/colorman.c 2013-02-15 17:10:07.972783360 +0000
@@ -1128,7 +1128,7 @@ colord_delete_device(
message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice");
dbus_message_iter_init_append(message, &args);
- dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_id);
+ dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
/*
* Send the DeleteDevice request synchronously...

100
cups-systemd-socket.patch
View File

@ -1,7 +1,7 @@
diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in diff -up cups-1.6.2/config.h.in.systemd-socket cups-1.6.2/config.h.in
--- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200 --- cups-1.6.2/config.h.in.systemd-socket 2012-12-17 23:17:08.000000000 +0100
+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200 +++ cups-1.6.2/config.h.in 2013-03-18 18:53:53.768961644 +0100
@@ -506,6 +506,13 @@ @@ -487,6 +487,13 @@
/* /*
@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
* Various scripting languages... * Various scripting languages...
*/ */
diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4 diff -up cups-1.6.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.6.2/config-scripts/cups-systemd.m4
--- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200 --- cups-1.6.2/config-scripts/cups-systemd.m4.systemd-socket 2013-03-18 18:53:53.769961630 +0100
+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200 +++ cups-1.6.2/config-scripts/cups-systemd.m4 2013-03-18 18:53:53.769961630 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+dnl +dnl
+dnl "$Id$" +dnl "$Id$"
@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con
+dnl +dnl
+dnl "$Id$" +dnl "$Id$"
+dnl +dnl
diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in diff -up cups-1.6.2/configure.in.systemd-socket cups-1.6.2/configure.in
--- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200 --- cups-1.6.2/configure.in.systemd-socket 2013-03-18 18:00:03.000000000 +0100
+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200 +++ cups-1.6.2/configure.in 2013-03-18 18:55:30.773612461 +0100
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4) @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4) sinclude(config-scripts/cups-dnssd.m4)
@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4) sinclude(config-scripts/cups-scripting.m4)
@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs @@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs
conf/snmp.conf conf/snmp.conf
cups-config cups-config
data/testprint data/testprint
+ data/cups.service + data/cups.service
+ data/cups.socket + data/cups.socket
+ data/cups.path + data/cups.path
desktop/cups.desktop desktop/cups.desktop
doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html doc/help/ref-cupsd-conf.html
doc/help/standard.html diff -up cups-1.6.2/cups/usersys.c.systemd-socket cups-1.6.2/cups/usersys.c
diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c --- cups-1.6.2/cups/usersys.c.systemd-socket 2013-03-12 15:26:28.000000000 +0100
--- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200 +++ cups-1.6.2/cups/usersys.c 2013-03-18 18:53:53.769961630 +0100
+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200 @@ -964,7 +964,7 @@ cups_read_client_conf(
@@ -975,7 +975,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */ struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) && if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET; cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in diff -up cups-1.6.2/data/cups.path.in.systemd-socket cups-1.6.2/data/cups.path.in
--- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 --- cups-1.6.2/data/cups.path.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200 +++ cups-1.6.2/data/cups.path.in 2013-03-18 18:53:53.770961616 +0100
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+[Unit] +[Unit]
+Description=CUPS Printer Service Spool +Description=CUPS Printer Service Spool
@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i
+ +
+[Install] +[Install]
+WantedBy=multi-user.target +WantedBy=multi-user.target
diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in diff -up cups-1.6.2/data/cups.service.in.systemd-socket cups-1.6.2/data/cups.service.in
--- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200 --- cups-1.6.2/data/cups.service.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200 +++ cups-1.6.2/data/cups.service.in 2013-03-18 18:53:53.770961616 +0100
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service +Description=CUPS Printing Service
@ -114,9 +114,9 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser
+[Install] +[Install]
+Also=cups.socket cups.path +Also=cups.socket cups.path
+WantedBy=printer.target +WantedBy=printer.target
diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in diff -up cups-1.6.2/data/cups.socket.in.systemd-socket cups-1.6.2/data/cups.socket.in
--- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200 --- cups-1.6.2/data/cups.socket.in.systemd-socket 2013-03-18 18:53:53.770961616 +0100
+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200 +++ cups-1.6.2/data/cups.socket.in 2013-03-18 18:53:53.770961616 +0100
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+[Unit] +[Unit]
+Description=CUPS Printing Service Sockets +Description=CUPS Printing Service Sockets
@ -126,9 +126,9 @@ diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.sock
+ +
+[Install] +[Install]
+WantedBy=sockets.target +WantedBy=sockets.target
diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile diff -up cups-1.6.2/data/Makefile.systemd-socket cups-1.6.2/data/Makefile
--- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200 --- cups-1.6.2/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200
+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200 +++ cups-1.6.2/data/Makefile 2013-03-18 18:53:53.770961616 +0100
@@ -100,6 +100,12 @@ install-data: @@ -100,6 +100,12 @@ install-data:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \ $(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done done
@ -152,9 +152,9 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
# #
diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in diff -up cups-1.6.2/Makedefs.in.systemd-socket cups-1.6.2/Makedefs.in
--- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200 --- cups-1.6.2/Makedefs.in.systemd-socket 2013-03-18 18:53:53.758961783 +0100
+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200 +++ cups-1.6.2/Makedefs.in 2013-03-18 18:53:53.771961602 +0100
@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ @@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@ CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIER = @DBUS_NOTIFIER@
@ -177,9 +177,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
# #
diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h diff -up cups-1.6.2/scheduler/client.h.systemd-socket cups-1.6.2/scheduler/client.h
--- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100 --- cups-1.6.2/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100
+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200 +++ cups-1.6.2/scheduler/client.h 2013-03-18 18:53:53.771961602 +0100
@@ -77,6 +77,9 @@ typedef struct @@ -77,6 +77,9 @@ typedef struct
int fd; /* File descriptor for this server */ int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */ http_addr_t address; /* Bind address of socket */
@ -190,9 +190,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien
} cupsd_listener_t; } cupsd_listener_t;
diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c diff -up cups-1.6.2/scheduler/listen.c.systemd-socket cups-1.6.2/scheduler/listen.c
--- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200 --- cups-1.6.2/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200
+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200 +++ cups-1.6.2/scheduler/listen.c 2013-03-18 18:53:53.771961602 +0100
@@ -401,7 +401,11 @@ cupsdStopListening(void) @@ -401,7 +401,11 @@ cupsdStopListening(void)
lis; lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners)) lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@ -206,9 +206,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste
{ {
#ifdef WIN32 #ifdef WIN32
closesocket(lis->fd); closesocket(lis->fd);
diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c diff -up cups-1.6.2/scheduler/main.c.systemd-socket cups-1.6.2/scheduler/main.c
--- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200 --- cups-1.6.2/scheduler/main.c.systemd-socket 2013-03-18 18:53:53.724962256 +0100
+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200 +++ cups-1.6.2/scheduler/main.c 2013-03-18 18:53:53.772961588 +0100
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
* launchd_checkin() - Check-in with launchd and collect the listening * launchd_checkin() - Check-in with launchd and collect the listening
* fds. * fds.
@ -229,7 +229,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO) #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h> # include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
@@ -78,6 +84,9 @@ @@ -83,6 +89,9 @@
static void launchd_checkin(void); static void launchd_checkin(void);
static void launchd_checkout(void); static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -239,7 +239,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
static void parent_handler(int sig); static void parent_handler(int sig);
static void process_children(void); static void process_children(void);
static void sigchld_handler(int sig); static void sigchld_handler(int sig);
@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm @@ -581,6 +590,13 @@ main(int argc, /* I - Number of comm
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -253,7 +253,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/* /*
* Startup the server... * Startup the server...
*/ */
@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm @@ -791,6 +807,15 @@ main(int argc, /* I - Number of comm
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -269,7 +269,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/* /*
* Startup the server... * Startup the server...
*/ */
@@ -1516,6 +1541,102 @@ launchd_checkout(void) @@ -1552,6 +1577,102 @@ launchd_checkout(void)
} }
#endif /* HAVE_LAUNCHD */ #endif /* HAVE_LAUNCHD */
@ -372,9 +372,9 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/* /*
* 'parent_handler()' - Catch USR1/CHLD signals... * 'parent_handler()' - Catch USR1/CHLD signals...
diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile diff -up cups-1.6.2/scheduler/Makefile.systemd-socket cups-1.6.2/scheduler/Makefile
--- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200 --- cups-1.6.2/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200
+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200 +++ cups-1.6.2/scheduler/Makefile 2013-03-18 18:53:53.772961588 +0100
@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu @@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \

112
cups-usblp-quirks.patch
View File

@ -1,112 +0,0 @@
diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-libusb.c
--- cups-1.5.4/backend/usb-libusb.c.usblp-quirks 2012-07-16 19:16:46.000000000 +0200
+++ cups-1.5.4/backend/usb-libusb.c 2012-10-17 16:30:58.571793169 +0200
@@ -70,7 +70,7 @@ typedef struct usb_printer_s /**** USB
read_endp, /* Read endpoint */
protocol, /* Protocol: 1 = Uni-di, 2 = Bi-di. */
usblp_attached, /* "usblp" kernel module attached? */
- opened_for_job; /* Set to 1 by print_device() */
+ reset_after_job; /* Set to 1 by print_device() */
unsigned int quirks; /* Quirks flags */
struct libusb_device_handle *handle; /* Open handle to device */
} usb_printer_t;
@@ -122,6 +122,8 @@ struct quirk_printer_struct {
#define USBLP_QUIRK_USB_INIT 0x2 /* needs vendor USB init string */
#define USBLP_QUIRK_BAD_CLASS 0x4 /* descriptor uses vendor-specific
Class or SubClass */
+#define USBLP_QUIRK_RESET 0x4000 /* After printing do a reset
+ for clean-up */
#define USBLP_QUIRK_NO_REATTACH 0x8000 /* After printing we cannot re-attach
the usblp kernel module */
@@ -141,15 +143,45 @@ static const struct quirk_printer_struct
{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
by zut <kernel@zut.de> */
+ { 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
+ Printer, http://www.cups.org/str.php?L4155 */
+ { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
+ Printer, https://bugs.launchpad.net/bugs/1032385 */
+ { 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
+ https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
+ { 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
+ Printer, https://bugs.launchpad.net/bugs/1032456 */
+ { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
+ Printer, https://bugs.launchpad.net/bugs/1050009 */
+ { 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
+ Printer, http://www.cups.org/str.php?L4155 */
+ { 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
+ Printer, http://www.cups.org/str.php?L4155 */
+ { 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
+ HL-1430 Laser Printer,
+ https://bugs.launchpad.net/bugs/1038695 */
{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- HL-1440 Laser Printer */
+ HL-1440 Laser Printer,
+ https://bugs.launchpad.net/bugs/1000253 */
+ { 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
+ Okipage 14ex Printer,
+ https://bugs.launchpad.net/bugs/872483 */
+ { 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
+ https://bugs.launchpad.net/bugs/872483 */
{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
Printer M129C */
{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
- USBLP_QUIRK_NO_REATTACH },
+ USBLP_QUIRK_NO_REATTACH |
+ USBLP_QUIRK_RESET },
+ { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
+ https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
/* Prolific Technology, Inc. PL2305 Parallel Port
- (USB -> Parallel adapter) */
+ (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
+ { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
+ https://bugs.launchpad.net/bugs/1032456 */
+ { 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
+ https://bugs.launchpad.net/bugs/1001028 */
{ 0, 0 }
};
@@ -256,7 +286,12 @@ print_device(const char *uri, /* I - De
}
g.print_fd = print_fd;
- g.printer->opened_for_job = 1;
+
+ /*
+ * Some devices need a reset after finishing a job, these devices are
+ * marked with the USBLP_QUIRK_RESET quirk.
+ */
+ g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
/*
* If we are printing data from a print driver on stdin, ignore SIGTERM
@@ -772,7 +807,7 @@ close_device(usb_printer_t *printer) /*
* Reset the device to clean up after the job
*/
- if (printer->opened_for_job == 1)
+ if (printer->reset_after_job == 1)
{
if ((errcode = libusb_reset_device(printer->handle)) < 0)
fprintf(stderr,
@@ -1288,7 +1323,7 @@ open_device(usb_printer_t *printer, /* I
}
printer->usblp_attached = 0;
- printer->opened_for_job = 0;
+ printer->reset_after_job = 0;
if (verbose)
fputs("STATE: +connecting-to-device\n", stderr);
@@ -1586,7 +1621,8 @@ static unsigned int quirks(int vendor, i
for (i = 0; quirk_printers[i].vendorId; i++)
{
if (vendor == quirk_printers[i].vendorId &&
- product == quirk_printers[i].productId)
+ (quirk_printers[i].productId == 0x0000 ||
+ product == quirk_printers[i].productId))
return quirk_printers[i].quirks;
}
return 0;

102
cups.spec
View File

@ -10,8 +10,8 @@
Summary: CUPS printing system Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.6.1 Version: 1.6.2
Release: 26%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -40,28 +40,20 @@ Patch9: cups-lpr-help.patch
Patch10: cups-peercred.patch Patch10: cups-peercred.patch
Patch11: cups-pid.patch Patch11: cups-pid.patch
Patch12: cups-eggcups.patch Patch12: cups-eggcups.patch
Patch13: cups-str4276.patch Patch13: cups-driverd-timeout.patch
Patch14: cups-driverd-timeout.patch Patch14: cups-strict-ppd-line-length.patch
Patch15: cups-strict-ppd-line-length.patch Patch15: cups-logrotate.patch
Patch16: cups-logrotate.patch Patch16: cups-usb-paperout.patch
Patch17: cups-usb-paperout.patch Patch17: cups-res_init.patch
#Patch18: cups-build.patch Patch18: cups-filter-debug.patch
Patch19: cups-res_init.patch Patch19: cups-uri-compat.patch
Patch20: cups-filter-debug.patch Patch20: cups-str3382.patch
Patch21: cups-uri-compat.patch Patch21: cups-0755.patch
Patch22: cups-directives.patch Patch22: cups-hp-deviceid-oid.patch
Patch23: cups-str3382.patch Patch23: cups-dnssd-deviceid.patch
Patch24: cups-usblp-quirks.patch Patch24: cups-ricoh-deviceid-oid.patch
Patch25: cups-0755.patch Patch25: cups-systemd-socket.patch
Patch26: cups-lpd-manpage.patch
Patch27: cups-hp-deviceid-oid.patch
Patch28: cups-dnssd-deviceid.patch
Patch29: cups-ricoh-deviceid-oid.patch
Patch30: cups-systemd-socket.patch
Patch31: cups-str4223.patch
Patch32: cups-lpd-manpage.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -200,52 +192,35 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch11 -p1 -b .pid %patch11 -p1 -b .pid
# Fix implementation of com.redhat.PrinterSpooler D-Bus object. # Fix implementation of com.redhat.PrinterSpooler D-Bus object.
%patch12 -p1 -b .eggcups %patch12 -p1 -b .eggcups
# Applied colorman fix from STR #4232 and STR #4276.
%patch13 -p1 -b .str4276
# Increase driverd timeout to 70s to accommodate foomatic (bug #744715). # Increase driverd timeout to 70s to accommodate foomatic (bug #744715).
%patch14 -p1 -b .driverd-timeout %patch13 -p1 -b .driverd-timeout
# Only enforce maximum PPD line length when in strict mode. # Only enforce maximum PPD line length when in strict mode.
%patch15 -p1 -b .strict-ppd-line-length %patch14 -p1 -b .strict-ppd-line-length
# Re-open the log if it has been logrotated under us. # Re-open the log if it has been logrotated under us.
%patch16 -p1 -b .logrotate %patch15 -p1 -b .logrotate
# Support for errno==ENOSPACE-based USB paper-out reporting. # Support for errno==ENOSPACE-based USB paper-out reporting.
%patch17 -p1 -b .usb-paperout %patch16 -p1 -b .usb-paperout
# Simplify the DNSSD parts so they can build using the compat library.
#%%patch18 -p1 -b .build
# Re-initialise the resolver on failure in httpAddrGetList() (bug #567353). # Re-initialise the resolver on failure in httpAddrGetList() (bug #567353).
%patch19 -p1 -b .res_init %patch17 -p1 -b .res_init
# Log extra debugging information if no filters are available. # Log extra debugging information if no filters are available.
%patch20 -p1 -b .filter-debug %patch18 -p1 -b .filter-debug
# Allow the usb backend to understand old-style URI formats. # Allow the usb backend to understand old-style URI formats.
%patch21 -p1 -b .uri-compat %patch19 -p1 -b .uri-compat
# Remove obsolete browsing directives from cupsd.conf (bug #880826, STR #4157).
%patch22 -p1 -b .directives
# Fix temporary filename creation. # Fix temporary filename creation.
%patch23 -p1 -b .str3382 %patch20 -p1 -b .str3382
# Problem is a port reset which is done by the new USB backend of CUPS 1.5.4 and 1.6.x to clean up after the job.
# This patch adds a quirk handler for this reset so that it will not be done for all printers.
# (bug #847923, STR #4155, STR #4191)
# bug #867392
%patch24 -p1 -b .usblp-quirks
# Use mode 0755 for binaries and libraries where appropriate. # Use mode 0755 for binaries and libraries where appropriate.
%patch25 -p1 -b .0755 %patch21 -p1 -b .0755
# Add an SNMP query for HP's device ID OID (STR #3552). # Add an SNMP query for HP's device ID OID (STR #3552).
%patch27 -p1 -b .hp-deviceid-oid %patch22 -p1 -b .hp-deviceid-oid
# Mark DNS-SD Device IDs that have been guessed at with "FZY:1;". # Mark DNS-SD Device IDs that have been guessed at with "FZY:1;".
%patch28 -p1 -b .dnssd-deviceid %patch23 -p1 -b .dnssd-deviceid
# Add an SNMP query for Ricoh's device ID OID (STR #3552). # Add an SNMP query for Ricoh's device ID OID (STR #3552).
%patch29 -p1 -b .ricoh-deviceid-oid %patch24 -p1 -b .ricoh-deviceid-oid
# Add support for systemd socket activation (patch from Lennart # Add support for systemd socket activation (patch from Lennart
# Poettering). # Poettering).
%patch30 -p1 -b .systemd-socket %patch25 -p1 -b .systemd-socket
# Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
%patch31 -p1 -b .str4223
# Talk about systemd in cups-lpd manpage (part of bug #884641). # Talk about systemd in cups-lpd manpage (part of bug #884641).
%patch32 -p1 -b .lpd-manpage %patch26 -p1 -b .lpd-manpage
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -349,7 +324,7 @@ rm -rf $RPM_BUILD_ROOT%{_mandir}/cat? $RPM_BUILD_ROOT%{_mandir}/*/cat?
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/applications/cups.desktop
rm -rf $RPM_BUILD_ROOT%{_datadir}/icons rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
# banners are also shipped with cups-filters # banners can be shipped with cups-filters
# but we don't use them yet (#919489) # but we don't use them yet (#919489)
#rm -rf $RPM_BUILD_ROOT%%{_datadir}/cups/banners #rm -rf $RPM_BUILD_ROOT%%{_datadir}/cups/banners
#rm -f $RPM_BUILD_ROOT%%{_datadir}/cups/data/testprint #rm -f $RPM_BUILD_ROOT%%{_datadir}/cups/data/testprint
@ -537,16 +512,22 @@ rm -f %{cups_serverbin}/backend/smb
%config(noreplace) %{_sysconfdir}/logrotate.d/cups %config(noreplace) %{_sysconfdir}/logrotate.d/cups
%dir %{_datadir}/%{name}/www %dir %{_datadir}/%{name}/www
%dir %{_datadir}/%{name}/www/ca %dir %{_datadir}/%{name}/www/ca
%dir %{_datadir}/%{name}/www/cs
%dir %{_datadir}/%{name}/www/es %dir %{_datadir}/%{name}/www/es
%dir %{_datadir}/%{name}/www/fr
%dir %{_datadir}/%{name}/www/ja %dir %{_datadir}/%{name}/www/ja
%dir %{_datadir}/%{name}/www/ru
%{_datadir}/%{name}/www/images %{_datadir}/%{name}/www/images
%{_datadir}/%{name}/www/*.css %{_datadir}/%{name}/www/*.css
%doc %{_datadir}/%{name}/www/index.html %doc %{_datadir}/%{name}/www/index.html
%doc %{_datadir}/%{name}/www/help %doc %{_datadir}/%{name}/www/help
%doc %{_datadir}/%{name}/www/robots.txt %doc %{_datadir}/%{name}/www/robots.txt
%doc %{_datadir}/%{name}/www/ca/index.html %doc %{_datadir}/%{name}/www/ca/index.html
%doc %{_datadir}/%{name}/www/cs/index.html
%doc %{_datadir}/%{name}/www/es/index.html %doc %{_datadir}/%{name}/www/es/index.html
%doc %{_datadir}/%{name}/www/fr/index.html
%doc %{_datadir}/%{name}/www/ja/index.html %doc %{_datadir}/%{name}/www/ja/index.html
%doc %{_datadir}/%{name}/www/ru/index.html
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_unitdir}/%{name}.socket %{_unitdir}/%{name}.socket
%{_unitdir}/%{name}.path %{_unitdir}/%{name}.path
@ -577,12 +558,18 @@ rm -f %{cups_serverbin}/backend/smb
%{_datadir}/cups/data/testprint %{_datadir}/cups/data/testprint
%dir %{_datadir}/cups/templates %dir %{_datadir}/cups/templates
%dir %{_datadir}/cups/templates/ca %dir %{_datadir}/cups/templates/ca
%dir %{_datadir}/cups/templates/cs
%dir %{_datadir}/cups/templates/es %dir %{_datadir}/cups/templates/es
%dir %{_datadir}/cups/templates/fr
%dir %{_datadir}/cups/templates/ja %dir %{_datadir}/cups/templates/ja
%dir %{_datadir}/cups/templates/ru
%{_datadir}/cups/templates/*.tmpl %{_datadir}/cups/templates/*.tmpl
%{_datadir}/cups/templates/ca/*.tmpl %{_datadir}/cups/templates/ca/*.tmpl
%{_datadir}/cups/templates/cs/*.tmpl
%{_datadir}/cups/templates/es/*.tmpl %{_datadir}/cups/templates/es/*.tmpl
%{_datadir}/cups/templates/fr/*.tmpl
%{_datadir}/cups/templates/ja/*.tmpl %{_datadir}/cups/templates/ja/*.tmpl
%{_datadir}/cups/templates/ru/*.tmpl
%dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp %dir %attr(1770,root,lp) %{_localstatedir}/spool/cups/tmp
%dir %attr(0710,root,lp) %{_localstatedir}/spool/cups %dir %attr(0710,root,lp) %{_localstatedir}/spool/cups
%dir %attr(0755,lp,sys) %{_localstatedir}/log/cups %dir %attr(0755,lp,sys) %{_localstatedir}/log/cups
@ -634,6 +621,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Mon Mar 18 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.2-1
- 1.6.2
* Wed Mar 13 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.1-26 * Wed Mar 13 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.1-26
- ship banners again (#919489) - ship banners again (#919489)

2
sources
View File

@ -1 +1 @@
87ade07e3d1efd03c9c3add949cf9c00 cups-1.6.1-source.tar.bz2 13c8b2b2336d42001abe4899766b62dc cups-1.6.2-source.tar.bz2