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

Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).

Browse Source 
Migrate configuration keywords as needed.
Resolves: rhbz#875898
This commit is contained in:
Tim Waugh 2012-11-27 11:33:25 +00:00
parent 9efc57eb5f
commit 2ca5fdf9d5
3 changed files with 2934 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
cups-lspp.patch
View File

@ -1,7 +1,7 @@
diff -up cups-1.6b1/config.h.in.lspp cups-1.6b1/config.h.in diff -up cups-1.6.1/config.h.in.lspp cups-1.6.1/config.h.in
--- cups-1.6b1/config.h.in.lspp 2012-05-25 17:01:32.000000000 +0200 --- cups-1.6.1/config.h.in.lspp 2012-11-26 22:47:22.453674634 +0000
+++ cups-1.6b1/config.h.in 2012-05-25 17:03:16.889043298 +0200 +++ cups-1.6.1/config.h.in 2012-11-26 22:47:22.463674686 +0000
@@ -768,6 +768,13 @@ static __inline int _cups_abs(int i) { r @@ -742,6 +742,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.6b1/config.h.in.lspp cups-1.6b1/config.h.in
#endif /* !_CUPS_CONFIG_H_ */ #endif /* !_CUPS_CONFIG_H_ */
/* /*
diff -up cups-1.6b1/config-scripts/cups-lspp.m4.lspp cups-1.6b1/config-scripts/cups-lspp.m4 diff -up cups-1.6.1/config-scripts/cups-lspp.m4.lspp cups-1.6.1/config-scripts/cups-lspp.m4
--- cups-1.6b1/config-scripts/cups-lspp.m4.lspp 2012-05-25 17:01:32.852768495 +0200 --- cups-1.6.1/config-scripts/cups-lspp.m4.lspp 2012-11-26 22:47:22.464674691 +0000
+++ cups-1.6b1/config-scripts/cups-lspp.m4 2012-05-25 17:01:32.853768488 +0200 +++ cups-1.6.1/config-scripts/cups-lspp.m4 2012-11-26 22:47:22.464674691 +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).
@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-lspp.m4.lspp cups-1.6b1/config-scripts/c
+ ;; + ;;
+ esac + esac
+fi +fi
diff -up cups-1.6b1/configure.in.lspp cups-1.6b1/configure.in diff -up cups-1.6.1/configure.in.lspp cups-1.6.1/configure.in
--- cups-1.6b1/configure.in.lspp 2012-05-25 17:01:32.000000000 +0200 --- cups-1.6.1/configure.in.lspp 2012-11-26 22:47:22.457674655 +0000
+++ cups-1.6b1/configure.in 2012-05-25 17:04:03.994714943 +0200 +++ cups-1.6.1/configure.in 2012-11-26 22:47:22.464674691 +0000
@@ -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.6b1/configure.in.lspp cups-1.6b1/configure.in
INSTALL_LANGUAGES="" INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES="" UNINSTALL_LANGUAGES=""
LANGFILES="" LANGFILES=""
diff -up cups-1.6b1/filter/common.c.lspp cups-1.6b1/filter/common.c diff -up cups-1.6.1/filter/common.c.lspp cups-1.6.1/filter/common.c
--- cups-1.6b1/filter/common.c.lspp 2011-05-20 05:49:49.000000000 +0200 --- cups-1.6.1/filter/common.c.lspp 2011-05-20 04:49:49.000000000 +0100
+++ cups-1.6b1/filter/common.c 2012-05-25 17:01:32.854768481 +0200 +++ cups-1.6.1/filter/common.c 2012-11-26 22:47:22.464674691 +0000
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
* Include necessary headers... * Include necessary headers...
*/ */
@ -238,9 +238,9 @@ diff -up cups-1.6b1/filter/common.c.lspp cups-1.6b1/filter/common.c
/* /*
diff -up cups-1.6b1/filter/pstops.c.lspp cups-1.6b1/filter/pstops.c diff -up cups-1.6.1/filter/pstops.c.lspp cups-1.6.1/filter/pstops.c
--- cups-1.6b1/filter/pstops.c.lspp 2012-04-23 21:19:19.000000000 +0200 --- cups-1.6.1/filter/pstops.c.lspp 2012-04-23 20:19:19.000000000 +0100
+++ cups-1.6b1/filter/pstops.c 2012-05-25 17:01:32.855768474 +0200 +++ cups-1.6.1/filter/pstops.c 2012-11-26 22:47:22.465674696 +0000
@@ -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.6b1/filter/pstops.c.lspp cups-1.6b1/filter/pstops.c
/* /*
diff -up cups-1.6b1/Makedefs.in.lspp cups-1.6b1/Makedefs.in diff -up cups-1.6.1/Makedefs.in.lspp cups-1.6.1/Makedefs.in
--- cups-1.6b1/Makedefs.in.lspp 2012-05-25 17:01:32.000000000 +0200 --- cups-1.6.1/Makedefs.in.lspp 2012-11-26 22:47:22.454674639 +0000
+++ cups-1.6b1/Makedefs.in 2012-05-25 17:07:57.325088484 +0200 +++ cups-1.6.1/Makedefs.in 2012-11-26 22:47:22.465674696 +0000
@@ -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.6b1/Makedefs.in.lspp cups-1.6b1/Makedefs.in
OPTIM = @OPTIM@ OPTIM = @OPTIM@
OPTIONS = OPTIONS =
PAMLIBS = @PAMLIBS@ PAMLIBS = @PAMLIBS@
diff -up cups-1.6b1/scheduler/client.c.lspp cups-1.6b1/scheduler/client.c diff -up cups-1.6.1/scheduler/client.c.lspp cups-1.6.1/scheduler/client.c
--- cups-1.6b1/scheduler/client.c.lspp 2012-05-08 00:41:30.000000000 +0200 --- cups-1.6.1/scheduler/client.c.lspp 2012-11-26 22:47:22.460674671 +0000
+++ cups-1.6b1/scheduler/client.c 2012-05-25 17:13:38.947707163 +0200 +++ cups-1.6.1/scheduler/client.c 2012-11-26 22:47:22.466674701 +0000
@@ -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.6b1/scheduler/client.c.lspp cups-1.6b1/scheduler/client.c
status = HTTP_CONTINUE; status = HTTP_CONTINUE;
@@ -2126,6 +2191,67 @@ cupsdReadClient(cupsd_client_t *con) /* @@ -2123,6 +2188,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.6b1/scheduler/client.c.lspp cups-1.6b1/scheduler/client.c
} }
if (con->http.state != HTTP_POST_SEND) if (con->http.state != HTTP_POST_SEND)
@@ -3581,6 +3707,49 @@ is_path_absolute(const char *path) /* I @@ -3568,6 +3694,49 @@ is_path_absolute(const char *path) /* I
return (1); return (1);
} }
@ -626,9 +626,9 @@ diff -up cups-1.6b1/scheduler/client.c.lspp cups-1.6b1/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.6b1/scheduler/client.h.lspp cups-1.6b1/scheduler/client.h diff -up cups-1.6.1/scheduler/client.h.lspp cups-1.6.1/scheduler/client.h
--- cups-1.6b1/scheduler/client.h.lspp 2012-05-25 17:01:32.847768530 +0200 --- cups-1.6.1/scheduler/client.h.lspp 2012-11-26 22:47:22.454674639 +0000
+++ cups-1.6b1/scheduler/client.h 2012-05-25 17:14:12.963470050 +0200 +++ cups-1.6.1/scheduler/client.h 2012-11-26 22:47:22.466674701 +0000
@@ -18,6 +18,13 @@ @@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */ #endif /* HAVE_AUTHORIZATION_H */
@ -664,18 +664,18 @@ diff -up cups-1.6b1/scheduler/client.h.lspp cups-1.6b1/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.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c diff -up cups-1.6.1/scheduler/conf.c.lspp cups-1.6.1/scheduler/conf.c
--- cups-1.6b1/scheduler/conf.c.lspp 2012-05-25 17:01:32.778769011 +0200 --- cups-1.6.1/scheduler/conf.c.lspp 2012-11-26 22:47:22.461674676 +0000
+++ cups-1.6b1/scheduler/conf.c 2012-05-25 17:01:32.860768439 +0200 +++ cups-1.6.1/scheduler/conf.c 2012-11-26 22:49:49.201331930 +0000
@@ -32,6 +32,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.
* set_policy_defaults() - Set default policy values as needed. * set_policy_defaults() - Set default policy values as needed.
+ * is_lspp_config() - Is the system configured for LSPP + * is_lspp_config() - Is the system configured for LSPP
*/ */
/* /*
@@ -57,6 +58,9 @@ @@ -59,6 +60,9 @@
# define INADDR_NONE 0xffffffff # define INADDR_NONE 0xffffffff
#endif /* !INADDR_NONE */ #endif /* !INADDR_NONE */
@ -685,18 +685,18 @@ diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c
/* /*
* Configuration variable structure... * Configuration variable structure...
@@ -164,6 +168,10 @@ static const cupsd_var_t variables[] = @@ -147,6 +151,10 @@ static const cupsd_var_t cupsd_vars[] =
# if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS) { "ServerName", &ServerName, CUPSD_VARTYPE_STRING },
{ "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME }, { "StrictConformance", &StrictConformance, CUPSD_VARTYPE_BOOLEAN },
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */ { "Timeout", &Timeout, CUPSD_VARTYPE_TIME },
+#ifdef WITH_LSPP +#ifdef WITH_LSPP
+ { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER }, + { "AuditLog", &AuditLog, CUPSD_VARTYPE_INTEGER },
+ { "PerPageLabels", &PerPageLabels, CUPSD_VARTYPE_BOOLEAN }, + { "PerPageLabels", &PerPageLabels, CUPSD_VARTYPE_BOOLEAN },
+#endif /* WITH_LSPP */ +#endif /* WITH_LSPP */
#endif /* HAVE_SSL */ { "WebInterface", &WebInterface, CUPSD_VARTYPE_BOOLEAN }
{ "ServerName", &ServerName, CUPSD_VARTYPE_STRING }, };
{ "ServerRoot", &ServerRoot, CUPSD_VARTYPE_PATHNAME }, static const cupsd_var_t cupsfiles_vars[] =
@@ -537,6 +545,9 @@ cupsdReadConfiguration(void) @@ -545,6 +553,9 @@ cupsdReadConfiguration(void)
const char *tmpdir; /* TMPDIR environment variable */ const char *tmpdir; /* TMPDIR environment variable */
struct stat tmpinfo; /* Temporary directory info */ struct stat tmpinfo; /* Temporary directory info */
cupsd_policy_t *p; /* Policy */ cupsd_policy_t *p; /* Policy */
@ -706,7 +706,7 @@ diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c
/* /*
@@ -801,6 +812,25 @@ cupsdReadConfiguration(void) @@ -835,6 +846,25 @@ cupsdReadConfiguration(void)
RunUser = getuid(); RunUser = getuid();
@ -732,7 +732,7 @@ diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/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");
@@ -1185,7 +1215,19 @@ cupsdReadConfiguration(void) @@ -1219,7 +1249,19 @@ cupsdReadConfiguration(void)
cupsdClearString(&Classification); cupsdClearString(&Classification);
if (Classification) if (Classification)
@ -752,7 +752,7 @@ diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c
/* /*
* Check the MaxClients setting, and then allocate memory for it... * Check the MaxClients setting, and then allocate memory for it...
@@ -3423,6 +3465,18 @@ read_location(cups_file_t *fp, /* I - C @@ -3570,6 +3612,18 @@ read_location(cups_file_t *fp, /* I - C
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum); return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
} }
@ -771,10 +771,10 @@ diff -up cups-1.6b1/scheduler/conf.c.lspp cups-1.6b1/scheduler/conf.c
/* /*
* 'read_policy()' - Read a <Policy name> definition. * 'read_policy()' - Read a <Policy name> definition.
diff -up cups-1.6b1/scheduler/conf.h.lspp cups-1.6b1/scheduler/conf.h diff -up cups-1.6.1/scheduler/conf.h.lspp cups-1.6.1/scheduler/conf.h
--- cups-1.6b1/scheduler/conf.h.lspp 2012-05-25 17:01:32.000000000 +0200 --- cups-1.6.1/scheduler/conf.h.lspp 2012-11-26 22:47:22.461674676 +0000
+++ cups-1.6b1/scheduler/conf.h 2012-05-25 17:16:20.522580884 +0200 +++ cups-1.6.1/scheduler/conf.h 2012-11-26 22:47:22.467674707 +0000
@@ -247,6 +247,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 */
@ -788,7 +788,7 @@ diff -up cups-1.6b1/scheduler/conf.h.lspp cups-1.6b1/scheduler/conf.h
#ifdef HAVE_LAUNCHD #ifdef HAVE_LAUNCHD
VAR int LaunchdTimeout VALUE(10); VAR int LaunchdTimeout VALUE(10);
/* Time after which an idle cupsd will exit */ /* Time after which an idle cupsd will exit */
@@ -265,6 +272,9 @@ int HaveServerCreds VALUE(0); @@ -267,6 +274,9 @@ int HaveServerCreds VALUE(0);
gss_cred_id_t ServerCreds; /* Server's GSS credentials */ gss_cred_id_t ServerCreds; /* Server's GSS credentials */
#endif /* HAVE_GSSAPI */ #endif /* HAVE_GSSAPI */
@ -798,9 +798,9 @@ diff -up cups-1.6b1/scheduler/conf.h.lspp cups-1.6b1/scheduler/conf.h
/* /*
* Prototypes... * Prototypes...
diff -up cups-1.6b1/scheduler/cupsd.h.lspp cups-1.6b1/scheduler/cupsd.h diff -up cups-1.6.1/scheduler/cupsd.h.lspp cups-1.6.1/scheduler/cupsd.h
--- cups-1.6b1/scheduler/cupsd.h.lspp 2012-05-21 19:40:22.000000000 +0200 --- cups-1.6.1/scheduler/cupsd.h.lspp 2012-05-21 18:40:22.000000000 +0100
+++ cups-1.6b1/scheduler/cupsd.h 2012-05-25 17:01:32.861768432 +0200 +++ cups-1.6.1/scheduler/cupsd.h 2012-11-26 22:47:22.468674713 +0000
@@ -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.6b1/scheduler/cupsd.h.lspp cups-1.6b1/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.6b1/scheduler/ipp.c.lspp cups-1.6b1/scheduler/ipp.c diff -up cups-1.6.1/scheduler/ipp.c.lspp cups-1.6.1/scheduler/ipp.c
--- cups-1.6b1/scheduler/ipp.c.lspp 2012-05-25 17:01:32.810768787 +0200 --- cups-1.6.1/scheduler/ipp.c.lspp 2012-11-26 22:47:22.431674518 +0000
+++ cups-1.6b1/scheduler/ipp.c 2012-05-25 17:18:06.620841313 +0200 +++ cups-1.6.1/scheduler/ipp.c 2012-11-26 22:47:22.470674723 +0000
@@ -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.
@ -1436,9 +1436,9 @@ diff -up cups-1.6b1/scheduler/ipp.c.lspp cups-1.6b1/scheduler/ipp.c
/* /*
* Check the username against the owner... * Check the username against the owner...
*/ */
diff -up cups-1.6b1/scheduler/job.c.lspp cups-1.6b1/scheduler/job.c diff -up cups-1.6.1/scheduler/job.c.lspp cups-1.6.1/scheduler/job.c
--- cups-1.6b1/scheduler/job.c.lspp 2012-05-25 17:01:32.824768691 +0200 --- cups-1.6.1/scheduler/job.c.lspp 2012-11-26 22:47:22.442674576 +0000
+++ cups-1.6b1/scheduler/job.c 2012-05-25 17:22:50.856860012 +0200 +++ cups-1.6.1/scheduler/job.c 2012-11-26 22:47:22.471674728 +0000
@@ -68,6 +68,9 @@ @@ -68,6 +68,9 @@
* update_job_attrs() - Update the job-printer-* attributes. * update_job_attrs() - Update the job-printer-* attributes.
*/ */
@ -1808,9 +1808,9 @@ diff -up cups-1.6b1/scheduler/job.c.lspp cups-1.6b1/scheduler/job.c
/* /*
* Now start the first file in the job... * Now start the first file in the job...
*/ */
diff -up cups-1.6b1/scheduler/job.h.lspp cups-1.6b1/scheduler/job.h diff -up cups-1.6.1/scheduler/job.h.lspp cups-1.6.1/scheduler/job.h
--- cups-1.6b1/scheduler/job.h.lspp 2012-05-23 03:36:50.000000000 +0200 --- cups-1.6.1/scheduler/job.h.lspp 2012-05-23 02:36:50.000000000 +0100
+++ cups-1.6b1/scheduler/job.h 2012-05-25 17:23:41.802504888 +0200 +++ cups-1.6.1/scheduler/job.h 2012-11-26 22:47:22.471674728 +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/".
*/ */
@ -1836,9 +1836,9 @@ diff -up cups-1.6b1/scheduler/job.h.lspp cups-1.6b1/scheduler/job.h
}; };
typedef struct cupsd_joblog_s /**** Job log message ****/ typedef struct cupsd_joblog_s /**** Job log message ****/
diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/scheduler/main.c diff -up cups-1.6.1/scheduler/main.c.lspp cups-1.6.1/scheduler/main.c
--- cups-1.6b1/scheduler/main.c.lspp 2012-05-25 17:01:32.849768516 +0200 --- cups-1.6.1/scheduler/main.c.lspp 2012-11-26 22:47:22.462674681 +0000
+++ cups-1.6b1/scheduler/main.c 2012-05-25 17:01:32.868768383 +0200 +++ cups-1.6.1/scheduler/main.c 2012-11-26 22:47:22.472674733 +0000
@@ -38,6 +38,8 @@ @@ -38,6 +38,8 @@
* usage() - Show scheduler usage. * usage() - Show scheduler usage.
*/ */
@ -1868,7 +1868,7 @@ diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/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 */
@@ -463,6 +471,25 @@ main(int argc, /* I - Number of comm @@ -514,6 +522,25 @@ main(int argc, /* I - Number of comm
#endif /* DEBUG */ #endif /* DEBUG */
} }
@ -1894,7 +1894,7 @@ diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/scheduler/main.c
/* /*
* Set the timezone info... * Set the timezone info...
*/ */
@@ -1180,6 +1207,11 @@ main(int argc, /* I - Number of comm @@ -1231,6 +1258,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect(); cupsdStopSelect();
@ -1906,9 +1906,9 @@ diff -up cups-1.6b1/scheduler/main.c.lspp cups-1.6b1/scheduler/main.c
return (!stop_scheduler); return (!stop_scheduler);
} }
diff -up cups-1.6b1/scheduler/printers.c.lspp cups-1.6b1/scheduler/printers.c diff -up cups-1.6.1/scheduler/printers.c.lspp cups-1.6.1/scheduler/printers.c
--- cups-1.6b1/scheduler/printers.c.lspp 2012-05-25 17:01:32.786768955 +0200 --- cups-1.6.1/scheduler/printers.c.lspp 2012-11-26 22:47:22.419674456 +0000
+++ cups-1.6b1/scheduler/printers.c 2012-05-25 17:24:11.144300359 +0200 +++ cups-1.6.1/scheduler/printers.c 2012-11-26 22:47:22.472674733 +0000
@@ -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.
*/ */

2816
cups-str4223.patch Normal file
View File

File diff suppressed because it is too large Load Diff

49
cups.spec
View File

@ -10,7 +10,7 @@
Summary: Common Unix Printing System Summary: Common Unix Printing System
Name: cups Name: cups
Version: 1.6.1 Version: 1.6.1
Release: 10%{?dist} Release: 11%{?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
@ -56,6 +56,8 @@ Patch29: cups-ricoh-deviceid-oid.patch
Patch30: cups-systemd-socket.patch Patch30: cups-systemd-socket.patch
Patch31: cups-str4223.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
Epoch: 1 Epoch: 1
@ -107,6 +109,7 @@ Requires: tmpwatch
# Requires /etc/tmpfiles.d (bug #656566) # Requires /etc/tmpfiles.d (bug #656566)
Requires: systemd-units >= 13 Requires: systemd-units >= 13
Requires(post): systemd-units Requires(post): systemd-units
Requires(post): grep, sed
Requires(preun): systemd-units Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
Requires(post): systemd-sysv Requires(post): systemd-sysv
@ -250,6 +253,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# Poettering). # Poettering).
%patch30 -p1 -b .systemd-socket %patch30 -p1 -b .systemd-socket
# Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
%patch31 -p1 -b .str4223
%if %lspp %if %lspp
# LSPP support. # LSPP support.
%patch100 -p1 -b .lspp %patch100 -p1 -b .lspp
@ -387,6 +393,42 @@ s:.*\('%{_datadir}'/\)\([^/_]\+\)\(.*\.po$\):%lang(\2) \1\2\3:
%post %post
# Deal with config migration due to CVE-2012-5519 (STR #4223)
IN=%{_sysconfdir}/cups/cupsd.conf
OUT=%{_sysconfdir}/cups/cups-files.conf
copiedany=no
for keyword in AccessLog CacheDir ConfigFilePerm \
DataDir DocumentRoot ErrorLog FatalErrors \
FileDevice FontPath Group LogFilePerm \
LPDConfigFile PageLog Printcap PrintcapFormat \
RequestRoot ServerBin ServerCertificate \
ServerKey ServerRoot SMBConfigFile StateDir \
SystemGroup SystemGroupAuthKey TempDir User; do
if ! /usr/bin/grep -iq ^$keyword "$IN"; then continue; fi
copy=yes
if /usr/bin/grep -iq ^$keyword "$OUT"; then
if [ "`/usr/bin/grep -i ^$keyword "$IN"`" == \
"`/usr/bin/grep -i ^$keyword "$OUT"`" ]; then
copy=no
else
/usr/bin/sed -i -e "s,^$keyword,#$keyword,i" "$OUT"
fi
fi
if [ "$copy" == "yes" ]; then
if [ "$copiedany" == "no" ]; then
cat >> "$OUT" <<EOF
# Settings automatically moved from cupsd.conf by RPM package:
EOF
fi
/usr/bin/grep -i ^$keyword "$IN" >> "$OUT"
copiedany=yes
fi
/usr/bin/sed -i -e "s,^$keyword,#$keyword,i" "$IN"
done
%systemd_post %{name}.path %{name}.socket %{name}.service %systemd_post %{name}.path %{name}.socket %{name}.service
# Remove old-style certs directory; new-style is /var/run # Remove old-style certs directory; new-style is /var/run
@ -474,6 +516,7 @@ rm -f %{cups_serverbin}/backend/smb
%{_prefix}/lib/tmpfiles.d/cups.conf %{_prefix}/lib/tmpfiles.d/cups.conf
%{_prefix}/lib/tmpfiles.d/cups-lp.conf %{_prefix}/lib/tmpfiles.d/cups-lp.conf
%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf %verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf
%verify(not md5 size mtime) %config(noreplace) %attr(0640,root,lp) %{_sysconfdir}/cups/cups-files.conf
%attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default %attr(0640,root,lp) %{_sysconfdir}/cups/cupsd.conf.default
%verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf %verify(not md5 size mtime) %config(noreplace) %attr(0644,root,lp) %{_sysconfdir}/cups/client.conf
%verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf %verify(not md5 size mtime) %config(noreplace) %attr(0600,root,lp) %{_sysconfdir}/cups/classes.conf
@ -578,6 +621,10 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man1/ipptool.1.gz %{_mandir}/man1/ipptool.1.gz
%changelog %changelog
* Mon Nov 26 2012 Tim Waugh <twaugh@redhat.com> 1:1.6.1-11
- Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
Migrate configuration keywords as needed.
* Mon Nov 19 2012 Tim Waugh <twaugh@redhat.com> 1:1.6.1-10 * Mon Nov 19 2012 Tim Waugh <twaugh@redhat.com> 1:1.6.1-10
- Re-enable the web interface as it is required for adjusting server - Re-enable the web interface as it is required for adjusting server
settings (bug #878090). settings (bug #878090).