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

Updated colord patch.

Browse Source
This commit is contained in:
Richard Hughes 2011-03-07 13:40:36 +00:00
parent a56c3b5d91
commit e9e839c4d3
3 changed files with 938 additions and 1843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2592
cups-icc.patch
View File

File diff suppressed because it is too large Load Diff

181
cups-lspp.patch
View File

@ -1,6 +1,6 @@
diff -up cups-1.4.6/config.h.in.lspp cups-1.4.6/config.h.in diff -urNp cups-1.4.6.old/config.h.in cups-1.4.6/config.h.in
--- cups-1.4.6/config.h.in.lspp 2011-01-14 17:14:06.357403733 +0000 --- cups-1.4.6.old/config.h.in 2011-03-07 13:34:52.585876279 +0000
+++ cups-1.4.6/config.h.in 2011-01-14 17:14:06.416404437 +0000 +++ cups-1.4.6/config.h.in 2011-03-07 13:35:07.138875913 +0000
@@ -672,6 +672,12 @@ @@ -672,6 +672,12 @@
#undef HAVE_SYS_STATVFS_H #undef HAVE_SYS_STATVFS_H
#undef HAVE_SYS_VFS_H #undef HAVE_SYS_VFS_H
@ -14,9 +14,9 @@ diff -up cups-1.4.6/config.h.in.lspp cups-1.4.6/config.h.in
#endif /* !_CUPS_CONFIG_H_ */ #endif /* !_CUPS_CONFIG_H_ */
diff -up cups-1.4.6/config-scripts/cups-lspp.m4.lspp cups-1.4.6/config-scripts/cups-lspp.m4 diff -urNp cups-1.4.6.old/config-scripts/cups-lspp.m4 cups-1.4.6/config-scripts/cups-lspp.m4
--- cups-1.4.6/config-scripts/cups-lspp.m4.lspp 2011-01-14 17:14:06.417404449 +0000 --- cups-1.4.6.old/config-scripts/cups-lspp.m4 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.4.6/config-scripts/cups-lspp.m4 2011-01-14 17:14:06.417404449 +0000 +++ cups-1.4.6/config-scripts/cups-lspp.m4 2011-03-07 13:35:07.139875938 +0000
@@ -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).
@ -54,9 +54,9 @@ diff -up cups-1.4.6/config-scripts/cups-lspp.m4.lspp cups-1.4.6/config-scripts/c
+ ;; + ;;
+ esac + esac
+fi +fi
diff -up cups-1.4.6/configure.in.lspp cups-1.4.6/configure.in diff -urNp cups-1.4.6.old/configure.in cups-1.4.6/configure.in
--- cups-1.4.6/configure.in.lspp 2010-06-22 22:42:44.000000000 +0100 --- cups-1.4.6.old/configure.in 2011-03-07 13:34:52.521876279 +0000
+++ cups-1.4.6/configure.in 2011-01-14 17:14:06.418404460 +0000 +++ cups-1.4.6/configure.in 2011-03-07 13:35:07.139875938 +0000
@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4) @@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
sinclude(config-scripts/cups-pdf.m4) sinclude(config-scripts/cups-pdf.m4)
sinclude(config-scripts/cups-scripting.m4) sinclude(config-scripts/cups-scripting.m4)
@ -66,9 +66,9 @@ diff -up cups-1.4.6/configure.in.lspp cups-1.4.6/configure.in
INSTALL_LANGUAGES="" INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES="" UNINSTALL_LANGUAGES=""
LANGFILES="" LANGFILES=""
diff -up cups-1.4.6/cups/cups.h.lspp cups-1.4.6/cups/cups.h diff -urNp cups-1.4.6.old/cups/cups.h cups-1.4.6/cups/cups.h
--- cups-1.4.6/cups/cups.h.lspp 2010-11-17 19:59:14.000000000 +0000 --- cups-1.4.6.old/cups/cups.h 2011-03-07 13:34:53.042876279 +0000
+++ cups-1.4.6/cups/cups.h 2011-01-14 17:14:06.419404472 +0000 +++ cups-1.4.6/cups/cups.h 2011-03-07 13:35:07.140875960 +0000
@@ -15,6 +15,9 @@ @@ -15,6 +15,9 @@
* This file is subject to the Apple OS-Developed Software exception. * This file is subject to the Apple OS-Developed Software exception.
*/ */
@ -92,9 +92,9 @@ diff -up cups-1.4.6/cups/cups.h.lspp cups-1.4.6/cups/cups.h
/* /*
* Types and structures... * Types and structures...
*/ */
diff -up cups-1.4.6/data/Makefile.lspp cups-1.4.6/data/Makefile diff -urNp cups-1.4.6.old/data/Makefile cups-1.4.6/data/Makefile
--- cups-1.4.6/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000 --- cups-1.4.6.old/data/Makefile 2011-03-07 13:34:52.596876279 +0000
+++ cups-1.4.6/data/Makefile 2011-01-14 17:14:06.420404484 +0000 +++ cups-1.4.6/data/Makefile 2011-03-07 13:35:07.140875960 +0000
@@ -25,7 +25,10 @@ BANNERS = \ @@ -25,7 +25,10 @@ BANNERS = \
secret \ secret \
standard \ standard \
@ -107,9 +107,9 @@ diff -up cups-1.4.6/data/Makefile.lspp cups-1.4.6/data/Makefile
CHARMAPS = \ CHARMAPS = \
euc-cn.txt \ euc-cn.txt \
diff -up cups-1.4.6/data/mls.lspp cups-1.4.6/data/mls diff -urNp cups-1.4.6.old/data/mls cups-1.4.6/data/mls
--- cups-1.4.6/data/mls.lspp 2011-01-14 17:14:06.420404484 +0000 --- cups-1.4.6.old/data/mls 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.4.6/data/mls 2011-01-14 17:14:06.421404496 +0000 +++ cups-1.4.6/data/mls 2011-03-07 13:35:07.141875981 +0000
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+%!PS-Adobe-3.0 +%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792 +%%BoundingBox: 0 0 612 792
@ -372,9 +372,9 @@ diff -up cups-1.4.6/data/mls.lspp cups-1.4.6/data/mls
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+% +%
+%%EOF +%%EOF
diff -up cups-1.4.6/data/selinux.lspp cups-1.4.6/data/selinux diff -urNp cups-1.4.6.old/data/selinux cups-1.4.6/data/selinux
--- cups-1.4.6/data/selinux.lspp 2011-01-14 17:14:06.422404508 +0000 --- cups-1.4.6.old/data/selinux 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.4.6/data/selinux 2011-01-14 17:14:06.422404508 +0000 +++ cups-1.4.6/data/selinux 2011-03-07 13:35:07.141875981 +0000
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+%!PS-Adobe-3.0 +%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792 +%%BoundingBox: 0 0 612 792
@ -637,9 +637,9 @@ diff -up cups-1.4.6/data/selinux.lspp cups-1.4.6/data/selinux
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+% +%
+%%EOF +%%EOF
diff -up cups-1.4.6/data/te.lspp cups-1.4.6/data/te diff -urNp cups-1.4.6.old/data/te cups-1.4.6/data/te
--- cups-1.4.6/data/te.lspp 2011-01-14 17:14:06.423404520 +0000 --- cups-1.4.6.old/data/te 1970-01-01 01:00:00.000000000 +0100
+++ cups-1.4.6/data/te 2011-01-14 17:14:06.423404520 +0000 +++ cups-1.4.6/data/te 2011-03-07 13:35:07.142875996 +0000
@@ -0,0 +1,261 @@ @@ -0,0 +1,261 @@
+%!PS-Adobe-3.0 +%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792 +%%BoundingBox: 0 0 612 792
@ -902,9 +902,9 @@ diff -up cups-1.4.6/data/te.lspp cups-1.4.6/data/te
+% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $". +% End of "$Id: mls_template,v 1.1 2005/06/27 18:44:46 colmo Exp $".
+% +%
+%%EOF +%%EOF
diff -up cups-1.4.6/filter/common.c.lspp cups-1.4.6/filter/common.c diff -urNp cups-1.4.6.old/filter/common.c cups-1.4.6/filter/common.c
--- cups-1.4.6/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100 --- cups-1.4.6.old/filter/common.c 2011-03-07 13:34:53.361876279 +0000
+++ cups-1.4.6/filter/common.c 2011-01-14 17:14:06.424404532 +0000 +++ cups-1.4.6/filter/common.c 2011-03-07 13:35:07.143876025 +0000
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
* Include necessary headers... * Include necessary headers...
*/ */
@ -1073,9 +1073,9 @@ diff -up cups-1.4.6/filter/common.c.lspp cups-1.4.6/filter/common.c
/* /*
diff -up cups-1.4.6/filter/pstops.c.lspp cups-1.4.6/filter/pstops.c diff -urNp cups-1.4.6.old/filter/pstops.c cups-1.4.6/filter/pstops.c
--- cups-1.4.6/filter/pstops.c.lspp 2011-01-14 17:14:06.204401909 +0000 --- cups-1.4.6.old/filter/pstops.c 2011-03-07 13:34:53.372876279 +0000
+++ cups-1.4.6/filter/pstops.c 2011-01-14 17:14:06.429404592 +0000 +++ cups-1.4.6/filter/pstops.c 2011-03-07 13:35:07.144876057 +0000
@@ -3326,6 +3326,18 @@ write_label_prolog(pstops_doc_t *doc, /* @@ -3326,6 +3326,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{ {
const char *classification; /* CLASSIFICATION environment variable */ const char *classification; /* CLASSIFICATION environment variable */
@ -1231,9 +1231,9 @@ diff -up cups-1.4.6/filter/pstops.c.lspp cups-1.4.6/filter/pstops.c
/* /*
diff -up cups-1.4.6/Makedefs.in.lspp cups-1.4.6/Makedefs.in diff -urNp cups-1.4.6.old/Makedefs.in cups-1.4.6/Makedefs.in
--- cups-1.4.6/Makedefs.in.lspp 2011-01-14 17:14:06.310403173 +0000 --- cups-1.4.6.old/Makedefs.in 2011-03-07 13:34:53.424876279 +0000
+++ cups-1.4.6/Makedefs.in 2011-01-14 17:14:06.431404614 +0000 +++ cups-1.4.6/Makedefs.in 2011-03-07 13:35:07.145876086 +0000
@@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@ @@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@
LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@
LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS) LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@ -1243,18 +1243,9 @@ diff -up cups-1.4.6/Makedefs.in.lspp cups-1.4.6/Makedefs.in
OPTIM = @OPTIM@ OPTIM = @OPTIM@
OPTIONS = OPTIONS =
PAMLIBS = @PAMLIBS@ PAMLIBS = @PAMLIBS@
@@ -258,7 +258,7 @@ DBUSDIR = @DBUSDIR@ diff -urNp cups-1.4.6.old/scheduler/client.c cups-1.4.6/scheduler/client.c
# Rules... --- cups-1.4.6.old/scheduler/client.c 2011-03-07 13:34:53.733876279 +0000
# +++ cups-1.4.6/scheduler/client.c 2011-03-07 13:35:07.150876188 +0000
-.SILENT:
+
.SUFFIXES: .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
.c.o:
diff -up cups-1.4.6/scheduler/client.c.lspp cups-1.4.6/scheduler/client.c
--- cups-1.4.6/scheduler/client.c.lspp 2010-10-17 05:13:56.000000000 +0100
+++ cups-1.4.6/scheduler/client.c 2011-01-14 17:14:06.437404687 +0000
@@ -44,6 +44,7 @@ @@ -44,6 +44,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.
@ -1475,9 +1466,9 @@ diff -up cups-1.4.6/scheduler/client.c.lspp cups-1.4.6/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.4.6/scheduler/client.h.lspp cups-1.4.6/scheduler/client.h diff -urNp cups-1.4.6.old/scheduler/client.h cups-1.4.6/scheduler/client.h
--- cups-1.4.6/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100 --- cups-1.4.6.old/scheduler/client.h 2011-03-07 13:34:53.708876279 +0000
+++ cups-1.4.6/scheduler/client.h 2011-01-14 17:14:06.438404699 +0000 +++ cups-1.4.6/scheduler/client.h 2011-03-07 13:35:07.155876256 +0000
@@ -18,6 +18,13 @@ @@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */ #endif /* HAVE_AUTHORIZATION_H */
@ -1513,9 +1504,9 @@ diff -up cups-1.4.6/scheduler/client.h.lspp cups-1.4.6/scheduler/client.h
/* /*
diff -up cups-1.4.6/scheduler/conf.c.lspp cups-1.4.6/scheduler/conf.c diff -urNp cups-1.4.6.old/scheduler/conf.c cups-1.4.6/scheduler/conf.c
--- cups-1.4.6/scheduler/conf.c.lspp 2011-01-14 17:14:06.148401242 +0000 --- cups-1.4.6.old/scheduler/conf.c 2011-03-07 13:34:53.540876279 +0000
+++ cups-1.4.6/scheduler/conf.c 2011-01-14 17:14:06.442404747 +0000 +++ cups-1.4.6/scheduler/conf.c 2011-03-07 13:35:07.157876274 +0000
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
* read_configuration() - Read a configuration file. * read_configuration() - Read a configuration file.
* read_location() - Read a <Location path> definition. * read_location() - Read a <Location path> definition.
@ -1625,9 +1616,9 @@ diff -up cups-1.4.6/scheduler/conf.c.lspp cups-1.4.6/scheduler/conf.c
/* /*
* 'read_policy()' - Read a <Policy name> definition. * 'read_policy()' - Read a <Policy name> definition.
diff -up cups-1.4.6/scheduler/conf.h.lspp cups-1.4.6/scheduler/conf.h diff -urNp cups-1.4.6.old/scheduler/conf.h cups-1.4.6/scheduler/conf.h
--- cups-1.4.6/scheduler/conf.h.lspp 2011-01-14 17:14:06.149401254 +0000 --- cups-1.4.6.old/scheduler/conf.h 2011-03-07 13:34:53.561876277 +0000
+++ cups-1.4.6/scheduler/conf.h 2011-01-14 17:14:06.444404768 +0000 +++ cups-1.4.6/scheduler/conf.h 2011-03-07 13:35:07.158876277 +0000
@@ -250,6 +250,12 @@ VAR char *ServerKey VALUE(NULL); @@ -250,6 +250,12 @@ VAR char *ServerKey VALUE(NULL);
VAR int SSLOptions VALUE(CUPSD_SSL_NONE); VAR int SSLOptions VALUE(CUPSD_SSL_NONE);
/* SSL/TLS options */ /* SSL/TLS options */
@ -1651,10 +1642,10 @@ diff -up cups-1.4.6/scheduler/conf.h.lspp cups-1.4.6/scheduler/conf.h
/* /*
* Prototypes... * Prototypes...
diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c diff -urNp cups-1.4.6.old/scheduler/ipp.c cups-1.4.6/scheduler/ipp.c
--- cups-1.4.6/scheduler/ipp.c.lspp 2011-01-14 17:14:06.401404258 +0000 --- cups-1.4.6.old/scheduler/ipp.c 2011-03-07 13:34:53.720876279 +0000
+++ cups-1.4.6/scheduler/ipp.c 2011-01-14 17:14:06.454404890 +0000 +++ cups-1.4.6/scheduler/ipp.c 2011-03-07 13:35:07.167876275 +0000
@@ -37,6 +37,7 @@ @@ -41,6 +41,7 @@
* cancel_all_jobs() - Cancel all print jobs. * cancel_all_jobs() - Cancel all print jobs.
* cancel_job() - Cancel a print job. * cancel_job() - Cancel a print job.
* cancel_subscription() - Cancel a subscription. * cancel_subscription() - Cancel a subscription.
@ -1662,7 +1653,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
* check_quotas() - Check quotas for a printer and user. * check_quotas() - Check quotas for a printer and user.
* check_rss_recipient() - Check that we do not have a duplicate RSS * check_rss_recipient() - Check that we do not have a duplicate RSS
* feed URI. * feed URI.
@@ -98,6 +99,9 @@ @@ -102,6 +103,9 @@
* validate_user() - Validate the user for the request. * validate_user() - Validate the user for the request.
*/ */
@ -1672,7 +1663,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* Include necessary headers... * Include necessary headers...
*/ */
@@ -118,6 +122,14 @@ extern int mbr_check_membership_by_id(uu @@ -124,6 +128,14 @@ extern int mbr_check_membership_by_id(uu
# endif /* HAVE_MEMBERSHIPPRIV_H */ # endif /* HAVE_MEMBERSHIPPRIV_H */
#endif /* __APPLE__ */ #endif /* __APPLE__ */
@ -1687,7 +1678,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* Local functions... * Local functions...
@@ -143,6 +155,9 @@ static void cancel_all_jobs(cupsd_client @@ -157,6 +169,9 @@ static void cancel_all_jobs(cupsd_client
static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri); static void cancel_job(cupsd_client_t *con, ipp_attribute_t *uri);
static void cancel_subscription(cupsd_client_t *con, int id); static void cancel_subscription(cupsd_client_t *con, int id);
static int check_rss_recipient(const char *recipient); static int check_rss_recipient(const char *recipient);
@ -1697,7 +1688,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/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 ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr, static ipp_attribute_t *copy_attribute(ipp_t *to, ipp_attribute_t *attr,
int quickcopy); int quickcopy);
@@ -1340,6 +1355,21 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1354,6 +1369,21 @@ add_job(cupsd_client_t *con, /* I - Cl
ipp_attribute_t *media_col, /* media-col attribute */ ipp_attribute_t *media_col, /* media-col attribute */
*media_margin; /* media-*-margin attribute */ *media_margin; /* media-*-margin attribute */
ipp_t *unsup_col; /* media-col in unsupported response */ ipp_t *unsup_col; /* media-col in unsupported response */
@ -1719,7 +1710,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/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))",
@@ -1598,6 +1628,106 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1612,6 +1642,106 @@ add_job(cupsd_client_t *con, /* I - Cl
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
"Untitled"); "Untitled");
@ -1826,7 +1817,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/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,
@@ -1606,6 +1736,32 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1620,6 +1750,32 @@ add_job(cupsd_client_t *con, /* I - Cl
return (NULL); return (NULL);
} }
@ -1859,7 +1850,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT | job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
CUPS_PRINTER_REMOTE); CUPS_PRINTER_REMOTE);
job->attrs = con->request; job->attrs = con->request;
@@ -1811,6 +1967,29 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1825,6 +1981,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]);
} }
@ -1889,7 +1880,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
job->job_sheets = attr; job->job_sheets = attr;
@@ -1841,6 +2020,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1855,6 +2034,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);
@ -1899,7 +1890,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/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,
@@ -1859,6 +2041,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1873,6 +2055,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);
@ -1909,7 +1900,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/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") &&
@@ -1879,6 +2064,9 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1893,6 +2078,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);
@ -1919,7 +1910,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
} }
} }
else if (strcmp(attr->values[0].string.text, Classification) && else if (strcmp(attr->values[0].string.text, Classification) &&
@@ -1919,8 +2107,52 @@ add_job(cupsd_client_t *con, /* I - Cl @@ -1933,8 +2121,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);
@ -1972,7 +1963,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* See if we need to add the starting sheet... * See if we need to add the starting sheet...
@@ -3726,6 +3958,107 @@ check_rss_recipient( @@ -4295,6 +4527,107 @@ check_rss_recipient(
} }
@ -2080,7 +2071,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* 'check_quotas()' - Check quotas for a printer and user. * 'check_quotas()' - Check quotas for a printer and user.
*/ */
@@ -4280,6 +4613,15 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4849,6 +5182,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 */
@ -2096,7 +2087,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
cupsdLogMessage(CUPSD_LOG_DEBUG2, cupsdLogMessage(CUPSD_LOG_DEBUG2,
@@ -4315,6 +4657,82 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4884,6 +5226,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);
@ -2179,7 +2170,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* Try the localized banner file under the subdirectory... * Try the localized banner file under the subdirectory...
@@ -4409,6 +4827,24 @@ copy_banner(cupsd_client_t *con, /* I - @@ -4978,6 +5396,24 @@ copy_banner(cupsd_client_t *con, /* I -
else else
s = attrname; s = attrname;
@ -2204,7 +2195,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
if (!strcmp(s, "printer-name")) if (!strcmp(s, "printer-name"))
{ {
cupsFilePuts(out, job->dest); cupsFilePuts(out, job->dest);
@@ -6382,6 +6818,22 @@ get_job_attrs(cupsd_client_t *con, /* I @@ -6957,6 +7393,22 @@ get_job_attrs(cupsd_client_t *con, /* I
return; return;
} }
@ -2227,7 +2218,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* Copy attributes... * Copy attributes...
*/ */
@@ -6612,6 +7064,11 @@ get_jobs(cupsd_client_t *con, /* I - C @@ -7187,6 +7639,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (username[0] && strcasecmp(username, job->username)) if (username[0] && strcasecmp(username, job->username))
continue; continue;
@ -2239,7 +2230,7 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
if (count > 0) if (count > 0)
ippAddSeparator(con->response); ippAddSeparator(con->response);
@@ -11031,6 +11488,11 @@ validate_user(cupsd_job_t *job, /* I @@ -11606,6 +12063,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen); strlcpy(username, get_username(con), userlen);
@ -2251,9 +2242,9 @@ diff -up cups-1.4.6/scheduler/ipp.c.lspp cups-1.4.6/scheduler/ipp.c
/* /*
* Check the username against the owner... * Check the username against the owner...
*/ */
diff -up cups-1.4.6/scheduler/job.c.lspp cups-1.4.6/scheduler/job.c diff -urNp cups-1.4.6.old/scheduler/job.c cups-1.4.6/scheduler/job.c
--- cups-1.4.6/scheduler/job.c.lspp 2011-01-14 17:14:06.262402601 +0000 --- cups-1.4.6.old/scheduler/job.c 2011-03-07 13:34:53.553876279 +0000
+++ cups-1.4.6/scheduler/job.c 2011-01-14 17:14:06.460404961 +0000 +++ cups-1.4.6/scheduler/job.c 2011-03-07 13:35:07.175876275 +0000
@@ -66,6 +66,9 @@ @@ -66,6 +66,9 @@
* update_job_attrs() - Update the job-printer-* attributes. * update_job_attrs() - Update the job-printer-* attributes.
*/ */
@ -2623,9 +2614,9 @@ diff -up cups-1.4.6/scheduler/job.c.lspp cups-1.4.6/scheduler/job.c
/* /*
* Now start the first file in the job... * Now start the first file in the job...
*/ */
diff -up cups-1.4.6/scheduler/job.h.lspp cups-1.4.6/scheduler/job.h diff -urNp cups-1.4.6.old/scheduler/job.h cups-1.4.6/scheduler/job.h
--- cups-1.4.6/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100 --- cups-1.4.6.old/scheduler/job.h 2011-03-07 13:34:53.530876279 +0000
+++ cups-1.4.6/scheduler/job.h 2011-01-14 17:14:06.462404984 +0000 +++ cups-1.4.6/scheduler/job.h 2011-03-07 13:35:07.177876275 +0000
@@ -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/".
*/ */
@ -2651,9 +2642,9 @@ diff -up cups-1.4.6/scheduler/job.h.lspp cups-1.4.6/scheduler/job.h
}; };
typedef struct cupsd_joblog_s /**** Job log message ****/ typedef struct cupsd_joblog_s /**** Job log message ****/
diff -up cups-1.4.6/scheduler/main.c.lspp cups-1.4.6/scheduler/main.c diff -urNp cups-1.4.6.old/scheduler/main.c cups-1.4.6/scheduler/main.c
--- cups-1.4.6/scheduler/main.c.lspp 2011-01-14 17:14:06.377403972 +0000 --- cups-1.4.6.old/scheduler/main.c 2011-03-07 13:34:53.671876279 +0000
+++ cups-1.4.6/scheduler/main.c 2011-01-14 17:14:06.465405021 +0000 +++ cups-1.4.6/scheduler/main.c 2011-03-07 13:35:07.179876275 +0000
@@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
* usage() - Show scheduler usage. * usage() - Show scheduler usage.
*/ */
@ -2721,10 +2712,10 @@ diff -up cups-1.4.6/scheduler/main.c.lspp cups-1.4.6/scheduler/main.c
return (!stop_scheduler); return (!stop_scheduler);
} }
diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/scheduler/printers.c diff -urNp cups-1.4.6.old/scheduler/printers.c cups-1.4.6/scheduler/printers.c
--- cups-1.4.6/scheduler/printers.c.lspp 2011-01-14 17:14:06.411404377 +0000 --- cups-1.4.6.old/scheduler/printers.c 2011-03-07 13:34:53.708876279 +0000
+++ cups-1.4.6/scheduler/printers.c 2011-01-14 17:14:54.854975766 +0000 +++ cups-1.4.6/scheduler/printers.c 2011-03-07 13:35:07.182876275 +0000
@@ -68,6 +68,8 @@ @@ -59,6 +59,8 @@
* write_xml_string() - Write a string with XML escaping. * write_xml_string() - Write a string with XML escaping.
*/ */
@ -2733,7 +2724,7 @@ diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/scheduler/printers.c
/* /*
* Include necessary headers... * Include necessary headers...
*/ */
@@ -94,6 +96,11 @@ @@ -81,6 +83,11 @@
# include <sys/vfs.h> # include <sys/vfs.h>
#endif /* HAVE_SYS_VFS_H */ #endif /* HAVE_SYS_VFS_H */
@ -2743,9 +2734,9 @@ diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/scheduler/printers.c
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
+ +
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
# include <dbus/dbus.h> # include "colord.h"
# ifdef HAVE_DBUS_MESSAGE_ITER_INIT_APPEND #endif /* HAVE_DBUS */
@@ -2311,6 +2318,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) @@ -2329,6 +2336,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
"username", "username",
"password" "password"
}; };
@ -2759,7 +2750,7 @@ diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/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,
@@ -2441,6 +2455,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p) @@ -2459,6 +2473,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]);
} }
@ -2805,7 +2796,7 @@ diff -up cups-1.4.6/scheduler/printers.c.lspp cups-1.4.6/scheduler/printers.c
} }
p->raw = 0; p->raw = 0;
@@ -5588,7 +5641,6 @@ write_irix_state(cupsd_printer_t *p) /* @@ -5605,7 +5658,6 @@ write_irix_state(cupsd_printer_t *p) /*
} }
#endif /* __sgi */ #endif /* __sgi */

8
cups.spec
View File

@ -13,7 +13,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.4.6 Version: 1.4.6
Release: 12%{?dist} Release: 13%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@ -147,6 +147,9 @@ Requires: acl
# Make sure we have some filters for converting to raster format. # Make sure we have some filters for converting to raster format.
Requires: ghostscript-cups Requires: ghostscript-cups
# Make sure we register devices and profiles with colord.
Requires: colord
%package devel %package devel
Summary: Common Unix Printing System - development environment Summary: Common Unix Printing System - development environment
Group: Development/Libraries Group: Development/Libraries
@ -607,6 +610,9 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so %{php_extdir}/phpcups.so
%changelog %changelog
* Mon Mar 07 2011 Richard Hughes <rhughes@redhat.com> 1:1.4.6-13
- Updated colord patch.
* Fri Feb 25 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-12 * Fri Feb 25 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-12
- Fixed build failure due to php_zend_api macro type. - Fixed build failure due to php_zend_api macro type.