rpms/cups/F-12 cups-str3503.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 cups-CVE-2010-0302.patch, 1.1, 1.2 cups-lspp.patch, 1.47, 1.48 cups-str3382.patch, 1.1, 1.2 cups-str3399.patch, 1.2, 1.3 cups.spec, 1.581, 1.582 sources, 1.52, 1.53 cups-CVE-2009-3553.patch, 1.1, NONE cups-media-empty-warning.patch, 1.1, NONE cups-negative-snmp-string-length.patch, 1.2, NONE cups-sidechannel-intrs.patch, 1.1, NONE cups-str3285_v2-str3503.patch, 1.1, NONE cups-str3381.patch, 1.1, NONE cups-str3390.patch, 1.1, NONE cups-str3391.patch, 1.1, NONE cups-str3403.patch, 1.1, NONE cups-str3407.patch, 1.1, NONE cups-str3413.patch, 1.2, NONE cups-str3418.patch, 1.1, NONE cups-str3422.patch, 1.1, NONE cups-str3425.patch, 1.4, NONE cups-str3428.patch, 1.1, NONE cups-str3431.patch, 1.1, NONE cups-str3435.patch, 1.1, NONE cups-str3436.patch, 1.1, NONE cups-str3439.patch, 1.2, NONE cups-str3440.patch, 1.1, NONE cups-str3442.patch, 1.1, NONE cups-str3448.patch, 1.1, NONE cups-str3458.patch, 1.1, NONE cups-str3460.patch, 1.1, NONE
Jiří Popelka
jpopelka at fedoraproject.org
Wed Mar 31 13:10:46 UTC 2010
- Previous message: rpms/webkitgtk/F-12 webkit-1.1.15.4-atomic-word.patch, 1.1, 1.2 webkitgtk.spec, 1.29, 1.30
- Next message: rpms/cups/F-13 cups-str3503.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 cups-CVE-2010-0302.patch, 1.1, 1.2 cups-lspp.patch, 1.47, 1.48 cups-str3382.patch, 1.1, 1.2 cups-str3399.patch, 1.2, 1.3 cups.spec, 1.591, 1.592 sources, 1.52, 1.53 cups-CVE-2009-3553.patch, 1.1, NONE cups-media-empty-warning.patch, 1.1, NONE cups-negative-snmp-string-length.patch, 1.2, NONE cups-sidechannel-intrs.patch, 1.1, NONE cups-str3285_v2-str3503.patch, 1.1, NONE cups-str3381.patch, 1.1, NONE cups-str3390.patch, 1.1, NONE cups-str3391.patch, 1.1, NONE cups-str3403.patch, 1.1, NONE cups-str3407.patch, 1.1, NONE cups-str3413.patch, 1.2, NONE cups-str3418.patch, 1.1, NONE cups-str3422.patch, 1.1, NONE cups-str3425.patch, 1.4, NONE cups-str3428.patch, 1.1, NONE cups-str3431.patch, 1.1, NONE cups-str3435.patch, 1.1, NONE cups-str3436.patch, 1.1, NONE cups-str3439.patch, 1.2, NONE cups-str3440.patch, 1.1, NONE cups-str3442.patch, 1.1, NONE cups-str3448.patch, 1.1, NONE cups-str3458.patch, 1.1, NONE cups-str3460.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jpopelka
Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3947
Modified Files:
.cvsignore cups-CVE-2010-0302.patch cups-lspp.patch
cups-str3382.patch cups-str3399.patch cups.spec sources
Added Files:
cups-str3503.patch
Removed Files:
cups-CVE-2009-3553.patch cups-media-empty-warning.patch
cups-negative-snmp-string-length.patch
cups-sidechannel-intrs.patch cups-str3285_v2-str3503.patch
cups-str3381.patch cups-str3390.patch cups-str3391.patch
cups-str3403.patch cups-str3407.patch cups-str3413.patch
cups-str3418.patch cups-str3422.patch cups-str3425.patch
cups-str3428.patch cups-str3431.patch cups-str3435.patch
cups-str3436.patch cups-str3439.patch cups-str3440.patch
cups-str3442.patch cups-str3448.patch cups-str3458.patch
cups-str3460.patch
Log Message:
* Wed Mar 31 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.3-1
- 1.4.3.
- No longer need CVE-2009-3553, str3381, str3390, str3391,
str3403, str3407, str3413, str3418, str3422, str3425,
str3428, str3431, str3435, str3436, str3439, str3440,
str3442, str3448, str3458, str3460, cups-sidechannel-intrs,
negative-snmp-string-length, cups-media-empty-warning patches.
cups-str3503.patch:
dest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cups-str3503.patch ---
diff -up cups-1.4.3/cups/dest.c.str3503 cups-1.4.3/cups/dest.c
--- cups-1.4.3/cups/dest.c.str3503 2010-03-31 13:31:42.000000000 +0200
+++ cups-1.4.3/cups/dest.c 2010-03-31 13:32:52.000000000 +0200
@@ -553,7 +553,7 @@ cupsGetNamedDest(http_t *http, /* I
if (!cups_get_sdests(http, op, name, 0, &dest))
{
- if (op == CUPS_GET_DEFAULT || name)
+ if (op == CUPS_GET_DEFAULT || (name && !set_as_default))
return (NULL);
/*
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore 10 Nov 2009 13:09:53 -0000 1.48
+++ .cvsignore 31 Mar 2010 13:10:44 -0000 1.49
@@ -41,3 +41,4 @@ cups-1.4rc1-source.tar.bz2
cups-1.4.0-source.tar.bz2
cups-1.4b2-source.tar.bz2
cups-1.4b2-svn8404-source.tar.bz2
+cups-1.4.3-source.tar.bz2
cups-CVE-2010-0302.patch:
select.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
Index: cups-CVE-2010-0302.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-CVE-2010-0302.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-CVE-2010-0302.patch 5 Mar 2010 10:53:16 -0000 1.1
+++ cups-CVE-2010-0302.patch 31 Mar 2010 13:10:45 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up cups-1.4.2/scheduler/select.c.CVE-2010-0302 cups-1.4.2/scheduler/select.c
---- cups-1.4.2/scheduler/select.c.CVE-2010-0302 2010-03-05 10:37:49.990476887 +0000
-+++ cups-1.4.2/scheduler/select.c 2010-03-05 10:38:01.803478081 +0000
+diff -up cups-1.4.3/scheduler/select.c.CVE-2010-0302 cups-1.4.3/scheduler/select.c
+--- cups-1.4.3/scheduler/select.c.CVE-2010-0302 2010-01-14 23:40:19.000000000 +0100
++++ cups-1.4.3/scheduler/select.c 2010-03-31 13:54:30.000000000 +0200
@@ -454,7 +454,8 @@ cupsdDoSelect(long timeout) /* I - Time
if (fdptr->read_cb && event->filter == EVFILT_READ)
(*(fdptr->read_cb))(fdptr->data);
@@ -11,12 +11,11 @@ diff -up cups-1.4.2/scheduler/select.c.C
(*(fdptr->write_cb))(fdptr->data);
release_fd(fdptr);
-@@ -499,7 +500,9 @@ cupsdDoSelect(long timeout) /* I - Time
- if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
+@@ -500,7 +501,8 @@ cupsdDoSelect(long timeout) /* I - Time
(*(fdptr->read_cb))(fdptr->data);
-- if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
-+ if (fdptr->use > 1 && fdptr->write_cb &&
+ if (fdptr->use > 1 && fdptr->write_cb &&
+- (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) &&
+ !cupsArrayFind(cupsd_inactive_fds, fdptr))
(*(fdptr->write_cb))(fdptr->data);
cups-lspp.patch:
Makedefs.in | 4
config-scripts/cups-lspp.m4 | 36 +++
config.h.in | 7
configure.in | 2
cups/cups.h | 9
data/Makefile | 5
data/mls | 261 +++++++++++++++++++++++++
data/selinux | 261 +++++++++++++++++++++++++
data/te | 261 +++++++++++++++++++++++++
filter/common.c | 139 +++++++++++++
filter/pstops.c | 133 ++++++++++++
scheduler/client.c | 171 ++++++++++++++++
scheduler/client.h | 14 +
scheduler/conf.c | 56 +++++
scheduler/conf.h | 9
scheduler/ipp.c | 456 ++++++++++++++++++++++++++++++++++++++++++++
scheduler/job.c | 303 ++++++++++++++++++++++++++++-
scheduler/job.h | 11 +
scheduler/main.c | 32 +++
scheduler/printers.c | 53 +++++
20 files changed, 2215 insertions(+), 8 deletions(-)
Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-lspp.patch,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- cups-lspp.patch 23 Nov 2009 13:10:07 -0000 1.47
+++ cups-lspp.patch 31 Mar 2010 13:10:45 -0000 1.48
@@ -1,7 +1,7 @@
-diff -up cups-1.4.1/config.h.in.lspp cups-1.4.1/config.h.in
---- cups-1.4.1/config.h.in.lspp 2009-09-14 16:59:30.108873598 +0100
-+++ cups-1.4.1/config.h.in 2009-09-14 16:59:30.122873526 +0100
-@@ -619,6 +619,13 @@
+diff -up cups-1.4.3/config.h.in.lspp cups-1.4.3/config.h.in
+--- cups-1.4.3/config.h.in.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/config.h.in 2010-03-31 14:08:57.000000000 +0200
+@@ -633,6 +633,13 @@
#undef HAVE_TCPD_H
@@ -15,9 +15,9 @@ diff -up cups-1.4.1/config.h.in.lspp cup
#endif /* !_CUPS_CONFIG_H_ */
/*
-diff -up /dev/null cups-1.4.1/config-scripts/cups-lspp.m4
---- /dev/null 2009-09-14 09:02:25.290577766 +0100
-+++ cups-1.4.1/config-scripts/cups-lspp.m4 2009-09-14 16:59:30.124872629 +0100
+diff -up cups-1.4.3/config-scripts/cups-lspp.m4.lspp cups-1.4.3/config-scripts/cups-lspp.m4
+--- cups-1.4.3/config-scripts/cups-lspp.m4.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/config-scripts/cups-lspp.m4 2010-03-31 14:08:57.000000000 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@ diff -up /dev/null cups-1.4.1/config-scr
+ ;;
+ esac
+fi
-diff -up cups-1.4.1/configure.in.lspp cups-1.4.1/configure.in
---- cups-1.4.1/configure.in.lspp 2008-11-14 19:32:22.000000000 +0000
-+++ cups-1.4.1/configure.in 2009-09-14 16:59:30.125879233 +0100
+diff -up cups-1.4.3/configure.in.lspp cups-1.4.3/configure.in
+--- cups-1.4.3/configure.in.lspp 2008-11-14 20:32:22.000000000 +0100
++++ cups-1.4.3/configure.in 2010-03-31 14:08:57.000000000 +0200
@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
sinclude(config-scripts/cups-pdf.m4)
sinclude(config-scripts/cups-scripting.m4)
@@ -67,9 +67,9 @@ diff -up cups-1.4.1/configure.in.lspp cu
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-diff -up cups-1.4.1/cups/cups.h.lspp cups-1.4.1/cups/cups.h
---- cups-1.4.1/cups/cups.h.lspp 2009-08-28 18:51:05.000000000 +0100
-+++ cups-1.4.1/cups/cups.h 2009-09-14 16:59:30.127873074 +0100
+diff -up cups-1.4.3/cups/cups.h.lspp cups-1.4.3/cups/cups.h
+--- cups-1.4.3/cups/cups.h.lspp 2009-11-16 18:11:56.000000000 +0100
++++ cups-1.4.3/cups/cups.h 2010-03-31 14:08:57.000000000 +0200
@@ -15,6 +15,9 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -93,9 +93,9 @@ diff -up cups-1.4.1/cups/cups.h.lspp cup
/*
* Types and structures...
*/
-diff -up cups-1.4.1/data/Makefile.lspp cups-1.4.1/data/Makefile
---- cups-1.4.1/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000
-+++ cups-1.4.1/data/Makefile 2009-09-14 16:59:30.129874067 +0100
+diff -up cups-1.4.3/data/Makefile.lspp cups-1.4.3/data/Makefile
+--- cups-1.4.3/data/Makefile.lspp 2008-11-12 20:30:57.000000000 +0100
++++ cups-1.4.3/data/Makefile 2010-03-31 14:08:57.000000000 +0200
@@ -25,7 +25,10 @@ BANNERS = \
secret \
standard \
@@ -108,9 +108,9 @@ diff -up cups-1.4.1/data/Makefile.lspp c
CHARMAPS = \
euc-cn.txt \
-diff -up /dev/null cups-1.4.1/data/mls
---- /dev/null 2009-09-14 09:02:25.290577766 +0100
-+++ cups-1.4.1/data/mls 2009-09-14 16:59:30.131873095 +0100
+diff -up cups-1.4.3/data/mls.lspp cups-1.4.3/data/mls
+--- cups-1.4.3/data/mls.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/data/mls 2010-03-31 14:08:57.000000000 +0200
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -373,9 +373,9 @@ diff -up /dev/null cups-1.4.1/data/mls
+% End of "$Id$".
+%
+%%EOF
-diff -up /dev/null cups-1.4.1/data/selinux
---- /dev/null 2009-09-14 09:02:25.290577766 +0100
-+++ cups-1.4.1/data/selinux 2009-09-14 16:59:30.133872489 +0100
+diff -up cups-1.4.3/data/selinux.lspp cups-1.4.3/data/selinux
+--- cups-1.4.3/data/selinux.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/data/selinux 2010-03-31 14:08:57.000000000 +0200
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -638,9 +638,9 @@ diff -up /dev/null cups-1.4.1/data/selin
+% End of "$Id$".
+%
+%%EOF
-diff -up /dev/null cups-1.4.1/data/te
---- /dev/null 2009-09-14 09:02:25.290577766 +0100
-+++ cups-1.4.1/data/te 2009-09-14 16:59:30.135873116 +0100
+diff -up cups-1.4.3/data/te.lspp cups-1.4.3/data/te
+--- cups-1.4.3/data/te.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/data/te 2010-03-31 14:08:57.000000000 +0200
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -903,9 +903,9 @@ diff -up /dev/null cups-1.4.1/data/te
+% End of "$Id$".
+%
+%%EOF
-diff -up cups-1.4.1/filter/common.c.lspp cups-1.4.1/filter/common.c
---- cups-1.4.1/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.4.1/filter/common.c 2009-09-14 16:59:30.137872500 +0100
+diff -up cups-1.4.3/filter/common.c.lspp cups-1.4.3/filter/common.c
+--- cups-1.4.3/filter/common.c.lspp 2007-07-11 23:46:42.000000000 +0200
++++ cups-1.4.3/filter/common.c 2010-03-31 14:08:57.000000000 +0200
@@ -30,6 +30,12 @@
* Include necessary headers...
*/
@@ -1074,10 +1074,10 @@ diff -up cups-1.4.1/filter/common.c.lspp
/*
-diff -up cups-1.4.1/filter/pstops.c.lspp cups-1.4.1/filter/pstops.c
---- cups-1.4.1/filter/pstops.c.lspp 2009-09-14 16:59:29.803998275 +0100
-+++ cups-1.4.1/filter/pstops.c 2009-09-14 16:59:30.141872862 +0100
-@@ -3242,6 +3242,18 @@ write_label_prolog(pstops_doc_t *doc, /*
+diff -up cups-1.4.3/filter/pstops.c.lspp cups-1.4.3/filter/pstops.c
+--- cups-1.4.3/filter/pstops.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/filter/pstops.c 2010-03-31 14:08:57.000000000 +0200
+@@ -3275,6 +3275,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
const char *ptr; /* Temporary string pointer */
@@ -1096,7 +1096,7 @@ diff -up cups-1.4.1/filter/pstops.c.lspp
/*
-@@ -3264,6 +3276,124 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3297,6 +3309,124 @@ write_label_prolog(pstops_doc_t *doc, /*
return;
}
@@ -1221,7 +1221,7 @@ diff -up cups-1.4.1/filter/pstops.c.lspp
/*
* Set the classification + page label string...
*/
-@@ -3342,7 +3472,10 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3375,7 +3505,10 @@ write_label_prolog(pstops_doc_t *doc, /*
doc_printf(doc, " %.0f moveto ESPpl show\n", top - 14.0);
doc_puts(doc, "pop\n");
doc_puts(doc, "}bind put\n");
@@ -1232,9 +1232,9 @@ diff -up cups-1.4.1/filter/pstops.c.lspp
/*
-diff -up cups-1.4.1/Makedefs.in.lspp cups-1.4.1/Makedefs.in
---- cups-1.4.1/Makedefs.in.lspp 2009-09-14 16:59:30.024872775 +0100
-+++ cups-1.4.1/Makedefs.in 2009-09-14 16:59:30.143872406 +0100
+diff -up cups-1.4.3/Makedefs.in.lspp cups-1.4.3/Makedefs.in
+--- cups-1.4.3/Makedefs.in.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/Makedefs.in 2010-03-31 14:08:57.000000000 +0200
@@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@
LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@
LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS)
@@ -1253,9 +1253,9 @@ diff -up cups-1.4.1/Makedefs.in.lspp cup
.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.1/scheduler/client.c.lspp cups-1.4.1/scheduler/client.c
---- cups-1.4.1/scheduler/client.c.lspp 2009-07-15 00:02:05.000000000 +0100
-+++ cups-1.4.1/scheduler/client.c 2009-09-14 16:59:30.148872510 +0100
+diff -up cups-1.4.3/scheduler/client.c.lspp cups-1.4.3/scheduler/client.c
+--- cups-1.4.3/scheduler/client.c.lspp 2009-07-15 01:02:05.000000000 +0200
++++ cups-1.4.3/scheduler/client.c 2010-03-31 14:08:57.000000000 +0200
@@ -44,6 +44,7 @@
* valid_host() - Is the Host: field valid?
* write_file() - Send a file via HTTP.
@@ -1476,9 +1476,9 @@ diff -up cups-1.4.1/scheduler/client.c.l
/*
* 'pipe_command()' - Pipe the output of a command to the remote client.
*/
-diff -up cups-1.4.1/scheduler/client.h.lspp cups-1.4.1/scheduler/client.h
---- cups-1.4.1/scheduler/client.h.lspp 2009-05-26 23:01:23.000000000 +0100
-+++ cups-1.4.1/scheduler/client.h 2009-09-14 16:59:30.150872942 +0100
+diff -up cups-1.4.3/scheduler/client.h.lspp cups-1.4.3/scheduler/client.h
+--- cups-1.4.3/scheduler/client.h.lspp 2009-05-27 00:01:23.000000000 +0200
++++ cups-1.4.3/scheduler/client.h 2010-03-31 14:08:57.000000000 +0200
@@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */
@@ -1514,9 +1514,9 @@ diff -up cups-1.4.1/scheduler/client.h.l
/*
-diff -up cups-1.4.1/scheduler/conf.c.lspp cups-1.4.1/scheduler/conf.c
---- cups-1.4.1/scheduler/conf.c.lspp 2009-09-14 16:59:29.837998036 +0100
-+++ cups-1.4.1/scheduler/conf.c 2009-09-14 16:59:30.155872264 +0100
+diff -up cups-1.4.3/scheduler/conf.c.lspp cups-1.4.3/scheduler/conf.c
+--- cups-1.4.3/scheduler/conf.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/conf.c 2010-03-31 14:08:57.000000000 +0200
@@ -29,6 +29,7 @@
* read_configuration() - Read a configuration file.
* read_location() - Read a <Location path> definition.
@@ -1626,9 +1626,9 @@ diff -up cups-1.4.1/scheduler/conf.c.lsp
/*
* 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.4.1/scheduler/conf.h.lspp cups-1.4.1/scheduler/conf.h
---- cups-1.4.1/scheduler/conf.h.lspp 2009-09-14 16:59:29.839997456 +0100
-+++ cups-1.4.1/scheduler/conf.h 2009-09-14 16:59:30.157872484 +0100
+diff -up cups-1.4.3/scheduler/conf.h.lspp cups-1.4.3/scheduler/conf.h
+--- cups-1.4.3/scheduler/conf.h.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/conf.h 2010-03-31 14:08:57.000000000 +0200
@@ -253,6 +253,12 @@ VAR char *ServerKey VALUE(NULL);
VAR int SSLOptions VALUE(CUPSD_SSL_NONE);
/* SSL/TLS options */
@@ -1652,9 +1652,9 @@ diff -up cups-1.4.1/scheduler/conf.h.lsp
/*
* Prototypes...
-diff -up cups-1.4.1/scheduler/ipp.c.lspp cups-1.4.1/scheduler/ipp.c
---- cups-1.4.1/scheduler/ipp.c.lspp 2009-09-14 16:59:29.974871379 +0100
-+++ cups-1.4.1/scheduler/ipp.c 2009-09-14 16:59:30.168872218 +0100
+diff -up cups-1.4.3/scheduler/ipp.c.lspp cups-1.4.3/scheduler/ipp.c
+--- cups-1.4.3/scheduler/ipp.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/ipp.c 2010-03-31 14:11:37.000000000 +0200
@@ -41,6 +41,7 @@
* cancel_all_jobs() - Cancel all print jobs.
* cancel_job() - Cancel a print job.
@@ -1698,7 +1698,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
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,
int quickcopy);
-@@ -1338,6 +1353,21 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1337,6 +1352,21 @@ add_job(cupsd_client_t *con, /* I - Cl
int kbytes; /* Size of print file */
int i; /* Looping var */
int lowerpagerange; /* Page range bound */
@@ -1720,9 +1720,9 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
cupsdLogMessage(CUPSD_LOG_DEBUG2, "add_job(%p[%d], %p(%s), %p(%s/%s))",
-@@ -1554,6 +1584,104 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1550,6 +1580,104 @@ add_job(cupsd_client_t *con, /* I - Cl
ippAddString(con->request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL,
- title = "Untitled");
+ "Untitled");
+#ifdef WITH_LSPP
+ if (is_lspp_config())
@@ -1825,7 +1825,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
if ((job = cupsdAddJob(priority, printer->name)) == NULL)
{
send_ipp_status(con, IPP_INTERNAL_ERROR,
-@@ -1562,6 +1690,32 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1558,6 +1686,32 @@ add_job(cupsd_client_t *con, /* I - Cl
return (NULL);
}
@@ -1858,7 +1858,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
job->dtype = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
CUPS_PRINTER_REMOTE);
job->attrs = con->request;
-@@ -1769,6 +1923,29 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1763,6 +1917,29 @@ add_job(cupsd_client_t *con, /* I - Cl
attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]);
attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]);
}
@@ -1888,7 +1888,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
job->job_sheets = attr;
-@@ -1799,6 +1976,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1793,6 +1970,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s,none\", "
"job-originating-user-name=\"%s\"",
Classification, job->username);
@@ -1898,7 +1898,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
}
else if (attr->num_values == 2 &&
strcmp(attr->values[0].string.text,
-@@ -1817,6 +1997,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1811,6 +1991,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"",
attr->values[0].string.text,
attr->values[1].string.text, job->username);
@@ -1908,7 +1908,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
}
else if (strcmp(attr->values[0].string.text, Classification) &&
strcmp(attr->values[0].string.text, "none") &&
-@@ -1837,6 +2020,9 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1831,6 +2014,9 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-originating-user-name=\"%s\"",
attr->values[0].string.text,
attr->values[1].string.text, job->username);
@@ -1918,7 +1918,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
}
}
else if (strcmp(attr->values[0].string.text, Classification) &&
-@@ -1877,8 +2063,52 @@ add_job(cupsd_client_t *con, /* I - Cl
+@@ -1871,8 +2057,52 @@ add_job(cupsd_client_t *con, /* I - Cl
"job-sheets=\"%s\", "
"job-originating-user-name=\"%s\"",
Classification, job->username);
@@ -2199,7 +2199,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
-@@ -6829,6 +7259,22 @@ get_job_attrs(cupsd_client_t *con, /* I
+@@ -6844,6 +7274,22 @@ get_job_attrs(cupsd_client_t *con, /* I
return;
}
@@ -2222,7 +2222,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
/*
* Copy attributes...
*/
-@@ -7048,6 +7494,11 @@ get_jobs(cupsd_client_t *con, /* I - C
+@@ -7074,6 +7520,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (username[0] && strcasecmp(username, job->username))
continue;
@@ -2234,7 +2234,7 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
if (count > 0)
ippAddSeparator(con->response);
-@@ -11430,6 +11881,11 @@ validate_user(cupsd_job_t *job, /* I
+@@ -11460,6 +11911,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen);
@@ -2246,9 +2246,9 @@ diff -up cups-1.4.1/scheduler/ipp.c.lspp
/*
* Check the username against the owner...
*/
-diff -up cups-1.4.1/scheduler/job.c.lspp cups-1.4.1/scheduler/job.c
---- cups-1.4.1/scheduler/job.c.lspp 2009-09-14 16:59:30.058872907 +0100
-+++ cups-1.4.1/scheduler/job.c 2009-09-14 17:00:42.616998003 +0100
+diff -up cups-1.4.3/scheduler/job.c.lspp cups-1.4.3/scheduler/job.c
+--- cups-1.4.3/scheduler/job.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/job.c 2010-03-31 14:08:57.000000000 +0200
@@ -66,6 +66,9 @@
* update_job_attrs() - Update the job-printer-* attributes.
*/
@@ -2403,7 +2403,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed",
IPP_TAG_INTEGER);
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1975,6 +2069,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2013,6 +2107,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
{
char filename[1024]; /* Job control filename */
cups_file_t *fp; /* Job file */
@@ -2418,7 +2418,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1993,6 +2095,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2031,6 +2133,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
fchmod(cupsFileNumber(fp), 0600);
fchown(cupsFileNumber(fp), RunUser, Group);
@@ -2495,7 +2495,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
job->attrs->state = IPP_IDLE;
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3138,6 +3310,18 @@ get_options(cupsd_job_t *job, /* I - Jo
+@@ -3177,6 +3349,18 @@ get_options(cupsd_job_t *job, /* I - Jo
banner_page)
continue;
@@ -2514,7 +2514,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
/*
* Otherwise add them to the list...
*/
-@@ -3810,6 +3994,19 @@ static void
+@@ -3849,6 +4033,19 @@ static void
start_job(cupsd_job_t *job, /* I - Job ID */
cupsd_printer_t *printer) /* I - Printer to print job */
{
@@ -2534,7 +2534,7 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
cupsdLogMessage(CUPSD_LOG_DEBUG2, "start_job(job=%p(%d), printer=%p(%s))",
job, job->id, printer, printer->name);
-@@ -3932,6 +4129,106 @@ start_job(cupsd_job_t *job, /* I -
+@@ -3971,6 +4168,106 @@ start_job(cupsd_job_t *job, /* I -
fcntl(job->side_pipes[1], F_SETFD,
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
@@ -2641,9 +2641,9 @@ diff -up cups-1.4.1/scheduler/job.c.lspp
/*
* Now start the first file in the job...
*/
-diff -up cups-1.4.1/scheduler/job.h.lspp cups-1.4.1/scheduler/job.h
---- cups-1.4.1/scheduler/job.h.lspp 2009-05-11 23:46:01.000000000 +0100
-+++ cups-1.4.1/scheduler/job.h 2009-09-14 16:59:30.177872674 +0100
+diff -up cups-1.4.3/scheduler/job.h.lspp cups-1.4.3/scheduler/job.h
+--- cups-1.4.3/scheduler/job.h.lspp 2009-05-12 00:46:01.000000000 +0200
++++ cups-1.4.3/scheduler/job.h 2010-03-31 14:08:57.000000000 +0200
@@ -13,6 +13,13 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -2669,9 +2669,9 @@ diff -up cups-1.4.1/scheduler/job.h.lspp
};
typedef struct cupsd_joblog_s /**** Job log message ****/
-diff -up cups-1.4.1/scheduler/main.c.lspp cups-1.4.1/scheduler/main.c
---- cups-1.4.1/scheduler/main.c.lspp 2009-09-14 16:59:29.925872130 +0100
-+++ cups-1.4.1/scheduler/main.c 2009-09-14 16:59:30.180872667 +0100
+diff -up cups-1.4.3/scheduler/main.c.lspp cups-1.4.3/scheduler/main.c
+--- cups-1.4.3/scheduler/main.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/main.c 2010-03-31 14:08:57.000000000 +0200
@@ -35,6 +35,8 @@
* usage() - Show scheduler usage.
*/
@@ -2701,7 +2701,7 @@ diff -up cups-1.4.1/scheduler/main.c.lsp
#ifdef HAVE_GETEUID
-@@ -462,6 +470,25 @@ main(int argc, /* I - Number of comm
+@@ -465,6 +473,25 @@ main(int argc, /* I - Number of comm
#endif /* DEBUG */
}
@@ -2727,7 +2727,7 @@ diff -up cups-1.4.1/scheduler/main.c.lsp
/*
* Set the timezone info...
*/
-@@ -1230,6 +1257,11 @@ main(int argc, /* I - Number of comm
+@@ -1235,6 +1262,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
@@ -2739,9 +2739,9 @@ diff -up cups-1.4.1/scheduler/main.c.lsp
return (!stop_scheduler);
}
-diff -up cups-1.4.1/scheduler/printers.c.lspp cups-1.4.1/scheduler/printers.c
---- cups-1.4.1/scheduler/printers.c.lspp 2009-09-14 16:59:29.866997809 +0100
-+++ cups-1.4.1/scheduler/printers.c 2009-09-14 16:59:30.185871787 +0100
+diff -up cups-1.4.3/scheduler/printers.c.lspp cups-1.4.3/scheduler/printers.c
+--- cups-1.4.3/scheduler/printers.c.lspp 2010-03-31 14:08:57.000000000 +0200
++++ cups-1.4.3/scheduler/printers.c 2010-03-31 14:08:57.000000000 +0200
@@ -58,6 +58,8 @@
* write_xml_string() - Write a string with XML escaping.
*/
@@ -2762,7 +2762,7 @@ diff -up cups-1.4.1/scheduler/printers.c
/*
* 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -2166,6 +2172,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2173,6 +2179,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
"username",
"password"
};
@@ -2776,7 +2776,7 @@ diff -up cups-1.4.1/scheduler/printers.c
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2296,6 +2309,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2303,6 +2316,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
@@ -2822,7 +2822,7 @@ diff -up cups-1.4.1/scheduler/printers.c
}
p->raw = 0;
-@@ -4827,7 +4876,6 @@ write_irix_state(cupsd_printer_t *p) /*
+@@ -4834,7 +4886,6 @@ write_irix_state(cupsd_printer_t *p) /*
}
#endif /* __sgi */
cups-str3382.patch:
tempfile.c | 31 ++++++++++++-------------------
1 file changed, 12 insertions(+), 19 deletions(-)
Index: cups-str3382.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3382.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3382.patch 20 Oct 2009 13:43:45 -0000 1.1
+++ cups-str3382.patch 31 Mar 2010 13:10:45 -0000 1.2
@@ -1,6 +1,6 @@
-diff -up cups-1.4.1/cups/tempfile.c.str3382 cups-1.4.1/cups/tempfile.c
---- cups-1.4.1/cups/tempfile.c.str3382 2008-12-10 06:03:11.000000000 +0100
-+++ cups-1.4.1/cups/tempfile.c 2009-10-20 15:08:39.000000000 +0200
+diff -up cups-1.4.3/cups/tempfile.c.str3382 cups-1.4.3/cups/tempfile.c
+--- cups-1.4.3/cups/tempfile.c.str3382 2010-01-18 19:47:12.000000000 +0100
++++ cups-1.4.3/cups/tempfile.c 2010-03-31 13:26:52.000000000 +0200
@@ -35,6 +35,7 @@
# include <io.h>
#else
@@ -33,8 +33,8 @@ diff -up cups-1.4.1/cups/tempfile.c.str3
- * Format a string using the hex time values...
- */
-
-- snprintf(filename, len - 1, "%s/%08lx%05lx", tmpdir,
-- (unsigned long)curtime.tv_sec, (unsigned long)curtime.tv_usec);
+- snprintf(filename, len - 1, "%s/%05x%08x", tmpdir, (unsigned)getpid(),
+- (unsigned)(curtime.tv_sec + curtime.tv_usec + tries));
-#endif /* WIN32 */
/*
cups-str3399.patch:
main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: cups-str3399.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups-str3399.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cups-str3399.patch 2 Mar 2010 11:26:45 -0000 1.2
+++ cups-str3399.patch 31 Mar 2010 13:10:45 -0000 1.3
@@ -1,27 +1,4 @@
-diff -up cups-1.4.2/CHANGES-1.4.txt.str3399 cups-1.4.2/CHANGES-1.4.txt
-diff -up cups-1.4.2/scheduler/process.c.str3399 cups-1.4.2/scheduler/process.c
---- cups-1.4.2/scheduler/process.c.str3399 2009-05-16 04:04:48.000000000 +0100
-+++ cups-1.4.2/scheduler/process.c 2009-11-16 17:15:26.104542409 +0000
-@@ -505,6 +505,7 @@ cupsdStartProcess(
- #ifdef HAVE_SIGSET
- sigset(SIGTERM, SIG_DFL);
- sigset(SIGCHLD, SIG_DFL);
-+ sigset(SIGPIPE, SIG_DFL);
- #elif defined(HAVE_SIGACTION)
- memset(&action, 0, sizeof(action));
-
-@@ -513,9 +514,11 @@ cupsdStartProcess(
-
- sigaction(SIGTERM, &action, NULL);
- sigaction(SIGCHLD, &action, NULL);
-+ sigaction(SIGPIPE, &action, NULL);
- #else
- signal(SIGTERM, SIG_DFL);
- signal(SIGCHLD, SIG_DFL);
-+ signal(SIGPIPE, SIG_DFL);
- #endif /* HAVE_SIGSET */
-
- cupsdReleaseSignals();
+diff -up cups-1.4.2/scheduler/main.c.str3399 cups-1.4.2/scheduler/main.c
--- cups-1.4.2/scheduler/main.c.str3399 2010-03-02 11:04:28.968100478 +0000
+++ cups-1.4.2/scheduler/main.c 2010-03-02 11:04:47.442226409 +0000
@@ -1733,7 +1733,7 @@ process_children(void)
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -p -r1.581 -r1.582
--- cups.spec 30 Mar 2010 16:39:21 -0000 1.581
+++ cups.spec 31 Mar 2010 13:10:46 -0000 1.582
@@ -7,8 +7,8 @@
Summary: Common Unix Printing System
Name: cups
-Version: 1.4.2
-Release: 30%{?dist}
+Version: 1.4.3
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -31,61 +31,37 @@ Patch4: cups-serial.patch
Patch5: cups-banners.patch
Patch6: cups-serverbin-compat.patch
Patch7: cups-no-export-ssllibs.patch
-Patch8: cups-str3448.patch
-Patch9: cups-direct-usb.patch
-Patch10: cups-lpr-help.patch
-Patch11: cups-peercred.patch
-Patch12: cups-pid.patch
-Patch13: cups-page-label.patch
-Patch14: cups-eggcups.patch
-Patch15: cups-getpass.patch
-Patch16: cups-driverd-timeout.patch
-Patch17: cups-strict-ppd-line-length.patch
-Patch18: cups-logrotate.patch
-Patch19: cups-usb-paperout.patch
-Patch20: cups-build.patch
-Patch21: cups-res_init.patch
-Patch22: cups-filter-debug.patch
-Patch23: cups-uri-compat.patch
-Patch24: cups-cups-get-classes.patch
-Patch25: cups-avahi.patch
-Patch26: cups-str3382.patch
-Patch27: cups-str3285_v2-str3503.patch
-Patch28: cups-str3390.patch
-Patch29: cups-str3391.patch
-Patch30: cups-str3381.patch
-Patch31: cups-str3399.patch
-Patch32: cups-str3403.patch
-Patch33: cups-str3407.patch
-Patch34: cups-str3418.patch
-Patch35: cups-CVE-2009-3553.patch
-Patch36: cups-str3422.patch
-Patch37: cups-str3413.patch
-Patch38: cups-str3439.patch
-Patch39: cups-str3440.patch
-Patch40: cups-str3442.patch
-Patch41: cups-negative-snmp-string-length.patch
-Patch42: cups-sidechannel-intrs.patch
-Patch43: cups-media-empty-warning.patch
-Patch44: cups-str3435.patch
-Patch45: cups-str3436.patch
-Patch46: cups-str3425.patch
-Patch47: cups-str3428.patch
-Patch48: cups-str3431.patch
-Patch49: cups-gnutls-gcrypt-threads.patch
-Patch50: cups-str3458.patch
-Patch51: cups-0755.patch
-Patch52: cups-str3460.patch
-Patch53: cups-EAI_AGAIN.patch
-Patch54: cups-str3505.patch
-Patch55: cups-str3541.patch
+Patch8: cups-direct-usb.patch
+Patch9: cups-lpr-help.patch
+Patch10: cups-peercred.patch
+Patch11: cups-pid.patch
+Patch12: cups-page-label.patch
+Patch13: cups-eggcups.patch
+Patch14: cups-getpass.patch
+Patch15: cups-driverd-timeout.patch
+Patch16: cups-strict-ppd-line-length.patch
+Patch17: cups-logrotate.patch
+Patch18: cups-usb-paperout.patch
+Patch19: cups-build.patch
+Patch20: cups-res_init.patch
+Patch21: cups-filter-debug.patch
+Patch22: cups-uri-compat.patch
+Patch23: cups-cups-get-classes.patch
+Patch24: cups-avahi.patch
+Patch25: cups-str3382.patch
+Patch26: cups-str3503.patch
+Patch27: cups-str3399.patch
+Patch28: cups-gnutls-gcrypt-threads.patch
+Patch29: cups-0755.patch
+Patch30: cups-EAI_AGAIN.patch
+Patch31: cups-str3505.patch
+Patch32: cups-str3541.patch
Patch100: cups-lspp.patch
## SECURITY PATCHES:
Patch200: cups-CVE-2010-0302.patch
-
Epoch: 1
Url: http://www.cups.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -217,54 +193,31 @@ module.
%patch5 -p1 -b .banners
%patch6 -p1 -b .serverbin-compat
%patch7 -p1 -b .no-export-ssllibs
-%patch8 -p1 -b .str3448
-%patch9 -p1 -b .direct-usb
-%patch10 -p1 -b .lpr-help
-%patch11 -p1 -b .peercred
-%patch12 -p1 -b .pid
-%patch13 -p1 -b .page-label
-%patch14 -p1 -b .eggcups
-%patch15 -p1 -b .getpass
-%patch16 -p1 -b .driverd-timeout
-%patch17 -p1 -b .strict-ppd-line-length
-%patch18 -p1 -b .logrotate
-%patch19 -p1 -b .usb-paperout
-%patch20 -p1 -b .build
-%patch21 -p1 -b .res_init
-%patch22 -p1 -b .filter-debug
-%patch23 -p1 -b .uri-compat
-%patch24 -p1 -b .cups-get-classes
-%patch25 -p1 -b .avahi
-%patch26 -p1 -b .str3382
-%patch27 -p1 -b .str3285_v2-str3503
-%patch28 -p1 -b .str3390
-%patch29 -p1 -b .str3391
-%patch30 -p1 -b .str3381
-%patch31 -p1 -b .str3399
-%patch32 -p1 -b .str3403
-%patch33 -p1 -b .str3407
-%patch34 -p1 -b .str3418
-%patch35 -p1 -b .CVE-2009-3553
-%patch36 -p1 -b .str3422
-%patch37 -p1 -b .str3413
-%patch38 -p1 -b .str3439
-%patch39 -p1 -b .str3440
-%patch40 -p1 -b .str3442
-%patch41 -p1 -b .negative-snmp-string-length
-%patch42 -p1 -b .sidechannel-intrs
-%patch43 -p1 -b .media-empty-warning
-%patch44 -p1 -b .str3435
-%patch45 -p1 -b .str3436
-%patch46 -p1 -b .str3425
-%patch47 -p1 -b .str3428
-%patch48 -p1 -b .str3431
-#%patch49 -p1 -b .gnutls-gcrypt-threads
-%patch50 -p1 -b .str3458
-%patch51 -p1 -b .0755
-%patch52 -p1 -b .str3460
-%patch53 -p1 -b .EAI_AGAIN
-%patch54 -p1 -b .str3505
-%patch55 -p1 -b .str3541
+%patch8 -p1 -b .direct-usb
+%patch9 -p1 -b .lpr-help
+%patch10 -p1 -b .peercred
+%patch11 -p1 -b .pid
+%patch12 -p1 -b .page-label
+%patch13 -p1 -b .eggcups
+%patch14 -p1 -b .getpass
+%patch15 -p1 -b .driverd-timeout
+%patch16 -p1 -b .strict-ppd-line-length
+%patch17 -p1 -b .logrotate
+%patch18 -p1 -b .usb-paperout
+%patch19 -p1 -b .build
+%patch20 -p1 -b .res_init
+%patch21 -p1 -b .filter-debug
+%patch22 -p1 -b .uri-compat
+%patch23 -p1 -b .cups-get-classes
+%patch24 -p1 -b .avahi
+%patch25 -p1 -b .str3382
+%patch26 -p1 -b .str3503
+%patch27 -p1 -b .str3399
+#%patch28 -p1 -b .gnutls-gcrypt-threads
+%patch29 -p1 -b .0755
+%patch30 -p1 -b .EAI_AGAIN
+%patch31 -p1 -b .str3505
+%patch32 -p1 -b .str3541
%if %lspp
%patch100 -p1 -b .lspp
@@ -486,6 +439,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %doc %{_datadir}/%{name}/www/de/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/es/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/eu/index.html
+%config(noreplace) %doc %{_datadir}/%{name}/www/id/index.html
+%config(noreplace) %doc %{_datadir}/%{name}/www/it/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/ja/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/pl/index.html
%config(noreplace) %doc %{_datadir}/%{name}/www/ru/index.html
@@ -521,6 +476,8 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_datadir}/cups/templates/de/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/eu/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/id/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/it/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/ja/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/pl/*.tmpl
%config(noreplace) %{_datadir}/cups/templates/ru/*.tmpl
@@ -564,6 +521,14 @@ rm -rf $RPM_BUILD_ROOT
%{php_extdir}/phpcups.so
%changelog
+* Wed Mar 31 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.3-1
+- 1.4.3.
+- No longer need CVE-2009-3553, str3381, str3390, str3391,
+ str3403, str3407, str3413, str3418, str3422, str3425,
+ str3428, str3431, str3435, str3436, str3439, str3440,
+ str3442, str3448, str3458, str3460, cups-sidechannel-intrs,
+ negative-snmp-string-length, cups-media-empty-warning patches.
+
* Tue Mar 30 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-30
- Fixed lpstat to adhere to -o option (bug #577901, STR #3541).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- sources 10 Nov 2009 13:09:53 -0000 1.52
+++ sources 31 Mar 2010 13:10:46 -0000 1.53
@@ -1 +1 @@
-d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2
+e70b1c3f60143d7310c1d74c111a21ab cups-1.4.3-source.tar.bz2
--- cups-CVE-2009-3553.patch DELETED ---
--- cups-media-empty-warning.patch DELETED ---
--- cups-negative-snmp-string-length.patch DELETED ---
--- cups-sidechannel-intrs.patch DELETED ---
--- cups-str3285_v2-str3503.patch DELETED ---
--- cups-str3381.patch DELETED ---
--- cups-str3390.patch DELETED ---
--- cups-str3391.patch DELETED ---
--- cups-str3403.patch DELETED ---
--- cups-str3407.patch DELETED ---
--- cups-str3413.patch DELETED ---
--- cups-str3418.patch DELETED ---
--- cups-str3422.patch DELETED ---
--- cups-str3425.patch DELETED ---
--- cups-str3428.patch DELETED ---
--- cups-str3431.patch DELETED ---
--- cups-str3435.patch DELETED ---
--- cups-str3436.patch DELETED ---
--- cups-str3439.patch DELETED ---
--- cups-str3440.patch DELETED ---
--- cups-str3442.patch DELETED ---
--- cups-str3448.patch DELETED ---
--- cups-str3458.patch DELETED ---
--- cups-str3460.patch DELETED ---
- Previous message: rpms/webkitgtk/F-12 webkit-1.1.15.4-atomic-word.patch, 1.1, 1.2 webkitgtk.spec, 1.29, 1.30
- Next message: rpms/cups/F-13 cups-str3503.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 cups-CVE-2010-0302.patch, 1.1, 1.2 cups-lspp.patch, 1.47, 1.48 cups-str3382.patch, 1.1, 1.2 cups-str3399.patch, 1.2, 1.3 cups.spec, 1.591, 1.592 sources, 1.52, 1.53 cups-CVE-2009-3553.patch, 1.1, NONE cups-media-empty-warning.patch, 1.1, NONE cups-negative-snmp-string-length.patch, 1.2, NONE cups-sidechannel-intrs.patch, 1.1, NONE cups-str3285_v2-str3503.patch, 1.1, NONE cups-str3381.patch, 1.1, NONE cups-str3390.patch, 1.1, NONE cups-str3391.patch, 1.1, NONE cups-str3403.patch, 1.1, NONE cups-str3407.patch, 1.1, NONE cups-str3413.patch, 1.2, NONE cups-str3418.patch, 1.1, NONE cups-str3422.patch, 1.1, NONE cups-str3425.patch, 1.4, NONE cups-str3428.patch, 1.1, NONE cups-str3431.patch, 1.1, NONE cups-str3435.patch, 1.1, NONE cups-str3436.patch, 1.1, NONE cups-str3439.patch, 1.2, NONE cups-str3440.patch, 1.1, NONE cups-str3442.patch, 1.1, NONE cups-str3448.patch, 1.1, NONE cups-str3458.patch, 1.1, NONE cups-str3460.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list