diff --git a/cups-str4223.patch b/cups-str4223.patch
index 00ddbd7..256b9e2 100644
--- a/cups-str4223.patch
+++ b/cups-str4223.patch
@@ -1,6 +1,6 @@
diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in
--- cups-1.5.4/conf/cupsd.conf.in.str4223 2010-12-09 21:24:51.000000000 +0000
-+++ cups-1.5.4/conf/cupsd.conf.in 2012-11-28 12:05:00.797524317 +0000
++++ cups-1.5.4/conf/cupsd.conf.in 2012-12-03 09:20:19.744722197 +0000
@@ -9,10 +9,6 @@
# for troubleshooting...
LogLevel @CUPS_LOG_LEVEL@
@@ -13,8 +13,8 @@ diff -up cups-1.5.4/conf/cupsd.conf.in.str4223 cups-1.5.4/conf/cupsd.conf.in
Listen localhost:@DEFAULT_IPP_PORT@
@CUPS_LISTEN_DOMAINSOCKET@
diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.conf.in
---- cups-1.5.4/conf/cups-files.conf.in.str4223 2012-11-28 12:05:00.797524317 +0000
-+++ cups-1.5.4/conf/cups-files.conf.in 2012-11-28 12:05:00.798524321 +0000
+--- cups-1.5.4/conf/cups-files.conf.in.str4223 2012-12-03 09:20:19.744722197 +0000
++++ cups-1.5.4/conf/cups-files.conf.in 2012-12-03 09:20:19.745722201 +0000
@@ -0,0 +1,98 @@
+#
+# "$Id$"
@@ -116,7 +116,7 @@ diff -up cups-1.5.4/conf/cups-files.conf.in.str4223 cups-1.5.4/conf/cups-files.c
+#
diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-scripts/cups-defaults.m4
--- cups-1.5.4/config-scripts/cups-defaults.m4.str4223 2011-05-06 23:53:53.000000000 +0100
-+++ cups-1.5.4/config-scripts/cups-defaults.m4 2012-11-28 12:05:00.798524321 +0000
++++ cups-1.5.4/config-scripts/cups-defaults.m4 2012-12-03 09:20:19.745722201 +0000
@@ -367,6 +367,7 @@ else
fi
@@ -134,8 +134,8 @@ diff -up cups-1.5.4/config-scripts/cups-defaults.m4.str4223 cups-1.5.4/config-sc
dnl Default MaxCopies value...
AC_ARG_WITH(max-copies, [ --with-max-copies set default max copies value, default=9999 ],
diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts/cups-ssl.m4
---- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2012-11-28 12:05:00.730524071 +0000
-+++ cups-1.5.4/config-scripts/cups-ssl.m4 2012-11-28 12:05:00.798524321 +0000
+--- cups-1.5.4/config-scripts/cups-ssl.m4.str4223 2012-12-03 09:20:19.665721902 +0000
++++ cups-1.5.4/config-scripts/cups-ssl.m4 2012-12-03 09:20:19.745722201 +0000
@@ -27,6 +27,8 @@ AC_ARG_WITH(openssl-includes, [ --with-
SSLFLAGS=""
SSLLIBS=""
@@ -183,8 +183,8 @@ diff -up cups-1.5.4/config-scripts/cups-ssl.m4.str4223 cups-1.5.4/config-scripts
AC_SUBST(SSLFLAGS)
AC_SUBST(SSLLIBS)
diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in
---- cups-1.5.4/configure.in.str4223 2012-11-28 12:05:00.790524292 +0000
-+++ cups-1.5.4/configure.in 2012-11-28 12:05:00.798524321 +0000
+--- cups-1.5.4/configure.in.str4223 2012-12-03 09:20:19.740722183 +0000
++++ cups-1.5.4/configure.in 2012-12-03 09:20:19.745722201 +0000
@@ -66,6 +66,7 @@ AC_SUBST(INSTALL_LANGUAGES)
AC_SUBST(UNINSTALL_LANGUAGES)
@@ -202,8 +202,8 @@ diff -up cups-1.5.4/configure.in.str4223 cups-1.5.4/configure.in
man/cupsaddsmb.man
man/cupsd.conf.man
diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile
---- cups-1.5.4/conf/Makefile.str4223 2012-11-28 12:05:00.717524022 +0000
-+++ cups-1.5.4/conf/Makefile 2012-11-28 12:05:00.798524321 +0000
+--- cups-1.5.4/conf/Makefile.str4223 2012-12-03 09:20:19.648721839 +0000
++++ cups-1.5.4/conf/Makefile 2012-12-03 09:20:19.745722201 +0000
@@ -19,7 +19,7 @@ include ../Makedefs
# Config files...
#
@@ -215,7 +215,7 @@ diff -up cups-1.5.4/conf/Makefile.str4223 cups-1.5.4/conf/Makefile
diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cupsd-conf.html.in
--- cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 2012-01-30 21:40:21.000000000 +0000
-+++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2012-11-28 12:05:00.799524325 +0000
++++ cups-1.5.4/doc/help/ref-cupsd-conf.html.in 2012-12-03 09:20:19.746722205 +0000
@@ -191,82 +191,6 @@ HREF="#Location">LocationLimit section.
@@ -584,8 +584,8 @@ diff -up cups-1.5.4/doc/help/ref-cupsd-conf.html.in.str4223 cups-1.5.4/doc/help/
Examples
diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/help/ref-cups-files-conf.html.in
---- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2012-11-28 12:05:00.799524325 +0000
-+++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2012-11-28 12:05:00.799524325 +0000
+--- cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 2012-12-03 09:20:19.746722205 +0000
++++ cups-1.5.4/doc/help/ref-cups-files-conf.html.in 2012-12-03 09:20:19.746722205 +0000
@@ -0,0 +1,531 @@
+
+
@@ -1120,7 +1120,7 @@ diff -up cups-1.5.4/doc/help/ref-cups-files-conf.html.in.str4223 cups-1.5.4/doc/
+
diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile
--- cups-1.5.4/doc/Makefile.str4223 2011-01-17 05:40:28.000000000 +0000
-+++ cups-1.5.4/doc/Makefile 2012-11-28 12:05:00.799524325 +0000
++++ cups-1.5.4/doc/Makefile 2012-12-03 09:20:19.746722205 +0000
@@ -3,7 +3,7 @@
#
# Documentation makefile for CUPS.
@@ -1132,7 +1132,7 @@ diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile
# These coded instructions, statements, and computer programs are the
diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.in
--- cups-1.5.4/man/cupsd.conf.man.in.str4223 2011-05-18 22:33:35.000000000 +0100
-+++ cups-1.5.4/man/cupsd.conf.man.in 2012-11-28 12:05:00.800524329 +0000
++++ cups-1.5.4/man/cupsd.conf.man.in 2012-12-03 09:20:19.747722209 +0000
@@ -12,12 +12,15 @@
.\" which should have been included with this file. If this file is
.\" file is missing or damaged, see the license at "http://www.cups.org/".
@@ -1397,8 +1397,8 @@ diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.
.br
http://localhost:631/help
diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files.conf.man.in
---- cups-1.5.4/man/cups-files.conf.man.in.str4223 2012-11-28 12:05:00.800524329 +0000
-+++ cups-1.5.4/man/cups-files.conf.man.in 2012-11-28 12:05:00.800524329 +0000
+--- cups-1.5.4/man/cups-files.conf.man.in.str4223 2012-12-03 09:20:19.747722209 +0000
++++ cups-1.5.4/man/cups-files.conf.man.in 2012-12-03 09:20:19.747722209 +0000
@@ -0,0 +1,146 @@
+.\"
+.\" "$Id$"
@@ -1548,7 +1548,7 @@ diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files
+.\"
diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile
--- cups-1.5.4/man/Makefile.str4223 2010-06-22 22:21:37.000000000 +0100
-+++ cups-1.5.4/man/Makefile 2012-11-28 12:05:00.800524329 +0000
++++ cups-1.5.4/man/Makefile 2012-12-03 09:20:19.747722209 +0000
@@ -39,6 +39,7 @@ MAN1 = cancel.$(MAN1EXT) \
ppdpo.$(MAN1EXT)
MAN5 = classes.conf.$(MAN5EXT) \
@@ -1559,7 +1559,7 @@ diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile
ipptoolfile.$(MAN5EXT) \
diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.list.in
--- cups-1.5.4/packaging/cups.list.in.str4223 2012-04-24 00:49:19.000000000 +0100
-+++ cups-1.5.4/packaging/cups.list.in 2012-11-28 12:05:00.800524329 +0000
++++ cups-1.5.4/packaging/cups.list.in 2012-12-03 09:20:19.747722209 +0000
@@ -588,6 +588,7 @@ d 0755 root $CUPS_GROUP $SERVERROOT/inte
d 0755 root $CUPS_GROUP $SERVERROOT/ppd -
d 0700 root $CUPS_GROUP $SERVERROOT/ssl -
@@ -1570,7 +1570,7 @@ diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.lis
%if PAMDIR
diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spec.in
--- cups-1.5.4/packaging/cups.spec.in.str4223 2012-04-23 18:46:53.000000000 +0100
-+++ cups-1.5.4/packaging/cups.spec.in 2012-11-28 12:05:00.801524332 +0000
++++ cups-1.5.4/packaging/cups.spec.in 2012-12-03 09:20:19.748722213 +0000
@@ -152,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%dir /etc/cups
@@ -1580,8 +1580,8 @@ diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spe
%dir /etc/cups/interfaces
%dir /etc/cups/ppd
diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
---- cups-1.5.4/scheduler/client.c.str4223 2012-11-28 12:05:00.779524251 +0000
-+++ cups-1.5.4/scheduler/client.c 2012-11-28 12:05:00.801524332 +0000
+--- cups-1.5.4/scheduler/client.c.str4223 2012-12-03 09:20:19.727722134 +0000
++++ cups-1.5.4/scheduler/client.c 2012-12-03 09:20:19.749722217 +0000
@@ -35,7 +35,7 @@
* data_ready() - Check whether data is available from a client.
* encrypt_client() - Enable encryption for the client...
@@ -1681,8 +1681,8 @@ diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c
/*
diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
---- cups-1.5.4/scheduler/conf.c.str4223 2012-11-28 12:05:00.779524251 +0000
-+++ cups-1.5.4/scheduler/conf.c 2012-11-28 12:05:00.803524339 +0000
+--- cups-1.5.4/scheduler/conf.c.str4223 2012-12-03 09:20:19.728722137 +0000
++++ cups-1.5.4/scheduler/conf.c 2012-12-03 09:20:51.014832960 +0000
@@ -27,7 +27,8 @@
* parse_fatal_errors() - Parse FatalErrors values in a string.
* parse_groups() - Parse system group names in a string.
@@ -1738,7 +1738,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
{ "MaxActiveJobs", &MaxActiveJobs, CUPSD_VARTYPE_INTEGER },
{ "MaxClients", &MaxClients, CUPSD_VARTYPE_INTEGER },
{ "MaxClientsPerHost", &MaxClientsPerHost, CUPSD_VARTYPE_INTEGER },
-@@ -155,18 +146,33 @@ static const cupsd_var_t variables[] =
+@@ -155,18 +146,35 @@ static const cupsd_var_t variables[] =
{ "MaxSubscriptionsPerPrinter",&MaxSubscriptionsPerPrinter, CUPSD_VARTYPE_INTEGER },
{ "MaxSubscriptionsPerUser", &MaxSubscriptionsPerUser, CUPSD_VARTYPE_INTEGER },
{ "MultipleOperationTimeout", &MultipleOperationTimeout, CUPSD_VARTYPE_INTEGER },
@@ -1769,6 +1769,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
+ { "ErrorLog", &ErrorLog, CUPSD_VARTYPE_STRING },
+ { "FileDevice", &FileDevice, CUPSD_VARTYPE_BOOLEAN },
+ { "FontPath", &FontPath, CUPSD_VARTYPE_STRING },
++ { "LogFilePerm", &LogFilePerm, CUPSD_VARTYPE_INTEGER },
++ { "LPDConfigFile", &LPDConfigFile, CUPSD_VARTYPE_STRING },
+ { "PageLog", &PageLog, CUPSD_VARTYPE_STRING },
+ { "Printcap", &Printcap, CUPSD_VARTYPE_STRING },
+ { "RequestRoot", &RequestRoot, CUPSD_VARTYPE_STRING },
@@ -1776,7 +1778,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
{ "ServerBin", &ServerBin, CUPSD_VARTYPE_PATHNAME },
#ifdef HAVE_SSL
{ "ServerCertificate", &ServerCertificate, CUPSD_VARTYPE_PATHNAME },
-@@ -174,19 +180,14 @@ static const cupsd_var_t variables[] =
+@@ -174,19 +182,14 @@ static const cupsd_var_t variables[] =
{ "ServerKey", &ServerKey, CUPSD_VARTYPE_PATHNAME },
# endif /* HAVE_LIBSSL || HAVE_GNUTLS */
#endif /* HAVE_SSL */
@@ -1797,7 +1799,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
static const unsigned ones[4] =
-@@ -212,7 +213,12 @@ static int parse_aaa(cupsd_location_t *
+@@ -212,7 +215,12 @@ static int parse_aaa(cupsd_location_t *
static int parse_fatal_errors(const char *s);
static int parse_groups(const char *s);
static int parse_protocols(const char *s);
@@ -1811,7 +1813,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
static int read_location(cups_file_t *fp, char *name, int linenum);
static int read_policy(cups_file_t *fp, char *name, int linenum);
static void set_policy_defaults(cupsd_policy_t *pol);
-@@ -708,22 +714,48 @@ cupsdReadConfiguration(void)
+@@ -708,22 +716,48 @@ cupsdReadConfiguration(void)
cupsdInitEnv();
/*
@@ -1865,7 +1867,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
RunUser = getuid();
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
-@@ -2512,13 +2544,174 @@ parse_protocols(const char *s) /* I - S
+@@ -2512,13 +2546,174 @@ parse_protocols(const char *s) /* I - S
/*
@@ -2043,7 +2045,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
int linenum; /* Current line number */
char line[HTTP_MAX_BUFFER],
/* Line from file */
-@@ -2528,7 +2721,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2528,7 +2723,6 @@ read_configuration(cups_file_t *fp) /* I
*value, /* Pointer to value */
*valueptr; /* Pointer into value */
int valuelen; /* Length of value */
@@ -2051,7 +2053,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
http_addrlist_t *addrlist, /* Address list */
*addr; /* Current address */
unsigned ip[4], /* Address value */
-@@ -2538,7 +2730,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2538,7 +2732,6 @@ read_configuration(cups_file_t *fp) /* I
cupsd_location_t *location; /* Browse location */
cups_file_t *incfile; /* Include file */
char incname[1024]; /* Include filename */
@@ -2059,7 +2061,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
/*
-@@ -2570,7 +2761,7 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2570,7 +2763,7 @@ read_configuration(cups_file_t *fp) /* I
incname, strerror(errno));
else
{
@@ -2068,7 +2070,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
cupsFileClose(incfile);
}
}
-@@ -2594,8 +2785,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -2594,8 +2787,6 @@ read_configuration(cups_file_t *fp) /* I
if (linenum == 0)
return (0);
}
@@ -2077,7 +2079,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "FaxRetryInterval") && value)
{
JobRetryInterval = atoi(value);
-@@ -3254,81 +3443,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3254,81 +3445,6 @@ read_configuration(cups_file_t *fp) /* I
}
}
#endif /* HAVE_SSL */
@@ -2159,7 +2161,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "HostNameLookups") && value)
{
/*
-@@ -3407,22 +3521,6 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3407,22 +3523,6 @@ read_configuration(cups_file_t *fp) /* I
cupsdLogMessage(CUPSD_LOG_WARN, "Unknown LogTimeFormat %s on line %d.",
value, linenum);
}
@@ -2182,7 +2184,7 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
else if (!_cups_strcasecmp(line, "ServerTokens") && value)
{
/*
-@@ -3548,117 +3646,192 @@ read_configuration(cups_file_t *fp) /* I
+@@ -3548,117 +3648,192 @@ read_configuration(cups_file_t *fp) /* I
"line %d.", value, linenum);
}
#endif /* HAVE_SSL */
@@ -2469,8 +2471,8 @@ diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c
return (1);
diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h
---- cups-1.5.4/scheduler/conf.h.str4223 2012-11-28 12:05:00.723524045 +0000
-+++ cups-1.5.4/scheduler/conf.h 2012-11-28 12:05:00.803524339 +0000
+--- cups-1.5.4/scheduler/conf.h.str4223 2012-12-03 09:20:19.658721876 +0000
++++ cups-1.5.4/scheduler/conf.h 2012-12-03 09:20:19.750722221 +0000
@@ -96,7 +96,9 @@ typedef struct
*/
@@ -2483,8 +2485,8 @@ diff -up cups-1.5.4/scheduler/conf.h.str4223 cups-1.5.4/scheduler/conf.h
/* FQDN for server */
*ServerAdmin VALUE(NULL),
diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c
---- cups-1.5.4/scheduler/main.c.str4223 2012-11-28 12:05:00.794524305 +0000
-+++ cups-1.5.4/scheduler/main.c 2012-11-28 12:05:03.125532078 +0000
+--- cups-1.5.4/scheduler/main.c.str4223 2012-12-03 09:20:19.743722194 +0000
++++ cups-1.5.4/scheduler/main.c 2012-12-03 09:20:19.750722221 +0000
@@ -225,7 +225,6 @@ main(int argc, /* I - Number of comm
char *current; /* Current directory */
@@ -2571,7 +2573,7 @@ diff -up cups-1.5.4/scheduler/main.c.str4223 cups-1.5.4/scheduler/main.c
*/
diff -up cups-1.5.4/test/run-stp-tests.sh.str4223 cups-1.5.4/test/run-stp-tests.sh
--- cups-1.5.4/test/run-stp-tests.sh.str4223 2012-05-15 15:04:18.000000000 +0100
-+++ cups-1.5.4/test/run-stp-tests.sh 2012-11-28 12:05:00.803524339 +0000
++++ cups-1.5.4/test/run-stp-tests.sh 2012-12-03 09:20:19.751722224 +0000
@@ -337,25 +337,10 @@ fi
cat >/tmp/cups-$user/cupsd.conf < 1:1.5.4-8
+- Fixed patch for CVE-2012-5519 so that LogFilePerm and LPDConfigFile
+ are recognised keywords for cups-files.conf (bug #882379).
+
* Wed Nov 28 2012 Tim Waugh 1:1.5.4-7
- Fixed paths in config migration %%post script.
- Set default cups-files.conf filename.