rpms/cups/devel .cvsignore, 1.43, 1.44 cups-build.patch, 1.1, 1.2 cups-lspp.patch, 1.38, 1.39 cups.spec, 1.452, 1.453 sources, 1.46, 1.47 cups-CVE-2008-5183.patch, 1.1, NONE
Tim Waugh
twaugh at fedoraproject.org
Tue Dec 16 12:32:23 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13988
Modified Files:
.cvsignore cups-build.patch cups-lspp.patch cups.spec sources
Removed Files:
cups-CVE-2008-5183.patch
Log Message:
* Tue Dec 16 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.1
- 1.4b2.
- No longer need CVE-2008-5183 patch.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore 12 Nov 2008 16:14:18 -0000 1.43
+++ .cvsignore 16 Dec 2008 12:31:52 -0000 1.44
@@ -35,3 +35,4 @@
cups-1.3.8-source.tar.bz2
cups-1.3.9-source.tar.bz2
cups-1.4b1-source.tar.bz2
+cups-1.4b2-source.tar.bz2
cups-build.patch:
Index: cups-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-build.patch 12 Nov 2008 16:16:44 -0000 1.1
+++ cups-build.patch 16 Dec 2008 12:31:52 -0000 1.2
@@ -1,18 +1,18 @@
-diff -up cups-1.4b1/Makedefs.in.build cups-1.4b1/Makedefs.in
---- cups-1.4b1/Makedefs.in.build 2008-10-04 06:57:54.000000000 +0100
-+++ cups-1.4b1/Makedefs.in 2008-11-11 16:36:30.000000000 +0000
-@@ -123,7 +123,7 @@ ARCHFLAGS = @ARCHFLAGS@
- ARFLAGS = @ARFLAGS@
+diff -up cups-1.4b2/Makedefs.in.build cups-1.4b2/Makedefs.in
+--- cups-1.4b2/Makedefs.in.build 2008-11-11 00:57:12.000000000 +0000
++++ cups-1.4b2/Makedefs.in 2008-12-16 11:30:09.000000000 +0000
+@@ -124,7 +124,7 @@ ARFLAGS = @ARFLAGS@
BACKLIBS = @BACKLIBS@
+ BANNERTOPS = @BANNERTOPS@
CFLAGS = @CPPFLAGS@ @CFLAGS@
-COMMONLIBS = @LIBS@
+COMMONLIBS = @LIBS@ $(DNSSDLIBS)
CUPSDLIBS = @CUPSDLIBS@
CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
-diff -up cups-1.4b1/scheduler/dirsvc.c.build cups-1.4b1/scheduler/dirsvc.c
---- cups-1.4b1/scheduler/dirsvc.c.build 2008-11-11 16:36:38.000000000 +0000
-+++ cups-1.4b1/scheduler/dirsvc.c 2008-11-11 16:39:09.000000000 +0000
+diff -up cups-1.4b2/scheduler/dirsvc.c.build cups-1.4b2/scheduler/dirsvc.c
+--- cups-1.4b2/scheduler/dirsvc.c.build 2008-10-08 05:26:38.000000000 +0100
++++ cups-1.4b2/scheduler/dirsvc.c 2008-12-16 11:30:09.000000000 +0000
@@ -1948,7 +1948,7 @@ cupsdUpdateDNSSDName(void)
WebIFRef = DNSSDRef;
cups-lspp.patch:
Index: cups-lspp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-lspp.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cups-lspp.patch 12 Nov 2008 16:09:54 -0000 1.38
+++ cups-lspp.patch 16 Dec 2008 12:31:52 -0000 1.39
@@ -1,6 +1,6 @@
-diff -up cups-1.4b1/config.h.in.lspp cups-1.4b1/config.h.in
---- cups-1.4b1/config.h.in.lspp 2008-09-08 23:03:01.000000000 +0100
-+++ cups-1.4b1/config.h.in 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/config.h.in.lspp cups-1.4b2/config.h.in
+--- cups-1.4b2/config.h.in.lspp 2008-09-08 23:03:01.000000000 +0100
++++ cups-1.4b2/config.h.in 2008-12-16 11:50:59.000000000 +0000
@@ -619,6 +619,13 @@
#undef HAVE_TCPD_H
@@ -15,9 +15,9 @@
#endif /* !_CUPS_CONFIG_H_ */
/*
-diff -up /dev/null cups-1.4b1/config-scripts/cups-lspp.m4
---- /dev/null 2008-11-11 08:58:48.466006417 +0000
-+++ cups-1.4b1/config-scripts/cups-lspp.m4 2008-11-11 16:53:28.000000000 +0000
+diff -up /dev/null cups-1.4b2/config-scripts/cups-lspp.m4
+--- /dev/null 2008-12-16 09:52:24.540063413 +0000
++++ cups-1.4b2/config-scripts/cups-lspp.m4 2008-12-16 11:50:59.000000000 +0000
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
@@ -55,9 +55,9 @@
+ ;;
+ esac
+fi
-diff -up cups-1.4b1/configure.in.lspp cups-1.4b1/configure.in
---- cups-1.4b1/configure.in.lspp 2008-08-04 21:55:13.000000000 +0100
-+++ cups-1.4b1/configure.in 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/configure.in.lspp cups-1.4b2/configure.in
+--- cups-1.4b2/configure.in.lspp 2008-11-14 19:32:22.000000000 +0000
++++ cups-1.4b2/configure.in 2008-12-16 11:50:59.000000000 +0000
@@ -42,6 +42,8 @@ sinclude(config-scripts/cups-pap.m4)
sinclude(config-scripts/cups-pdf.m4)
sinclude(config-scripts/cups-scripting.m4)
@@ -67,10 +67,10 @@
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-diff -up cups-1.4b1/configure.lspp cups-1.4b1/configure
---- cups-1.4b1/configure.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/configure 2008-11-11 16:53:28.000000000 +0000
-@@ -827,6 +827,8 @@ PHP
+diff -up cups-1.4b2/configure.lspp cups-1.4b2/configure
+--- cups-1.4b2/configure.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/configure 2008-12-16 11:52:31.000000000 +0000
+@@ -829,6 +829,8 @@ PHP
PHPCONFIG
PHPDIR
PYTHON
@@ -79,15 +79,15 @@
INSTALL_LANGUAGES
UNINSTALL_LANGUAGES
LIBOBJS
-@@ -1455,6 +1457,7 @@ Optional Features:
- --enable-raw-printing enable raw printing by default, default=auto
+@@ -1459,6 +1461,7 @@ Optional Features:
+ --enable-texttops build with default text filter, default=auto
--enable-pap build with AppleTalk support, default=auto
--enable-pdftops build pdftops filter, default=auto
+ --enable-lspp turn on auditing and label support, default=no
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-@@ -4647,7 +4650,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -4651,7 +4654,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
else
ac_cv_header_stdc=no
fi
@@ -96,7 +96,7 @@
fi
-@@ -4668,7 +4671,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -4672,7 +4675,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
else
ac_cv_header_stdc=no
fi
@@ -105,7 +105,7 @@
fi
-@@ -10323,10 +10326,10 @@ case "$uname" in
+@@ -10327,10 +10330,10 @@ case "$uname" in
;;
Linux* | GNU*)
# Linux and GNU Hurd
@@ -120,7 +120,7 @@
MAN8DIR=8
;;
*)
-@@ -18305,7 +18308,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -18309,7 +18312,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
;;
esac
@@ -129,7 +129,7 @@
if test $ac_cv_sys_file_offset_bits = unknown; then
{ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; }
-@@ -18426,7 +18429,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -18430,7 +18433,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
;;
esac
@@ -138,7 +138,7 @@
fi
fi
-@@ -20327,6 +20330,412 @@ fi
+@@ -20495,6 +20498,412 @@ fi
@@ -551,7 +551,7 @@
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-@@ -21284,13 +21693,15 @@ PHP!$PHP$ac_delim
+@@ -21455,13 +21864,15 @@ PHP!$PHP$ac_delim
PHPCONFIG!$PHPCONFIG$ac_delim
PHPDIR!$PHPDIR$ac_delim
PYTHON!$PYTHON$ac_delim
@@ -563,14 +563,14 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 25; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -up cups-1.4b1/cups/cups.h.lspp cups-1.4b1/cups/cups.h
---- cups-1.4b1/cups/cups.h.lspp 2008-09-25 00:08:34.000000000 +0100
-+++ cups-1.4b1/cups/cups.h 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/cups/cups.h.lspp cups-1.4b2/cups/cups.h
+--- cups-1.4b2/cups/cups.h.lspp 2008-12-10 05:03:11.000000000 +0000
++++ cups-1.4b2/cups/cups.h 2008-12-16 11:50:59.000000000 +0000
@@ -15,6 +15,9 @@
* This file is subject to the Apple OS-Developed Software exception.
*/
@@ -581,7 +581,7 @@
#ifndef _CUPS_CUPS_H_
# define _CUPS_CUPS_H_
-@@ -83,6 +86,12 @@ extern "C" {
+@@ -84,6 +87,12 @@ extern "C" {
# define CUPS_WHICHJOBS_COMPLETED 1
@@ -594,9 +594,9 @@
/*
* Types and structures...
*/
-diff -up cups-1.4b1/data/Makefile.lspp cups-1.4b1/data/Makefile
---- cups-1.4b1/data/Makefile.lspp 2008-10-15 19:21:56.000000000 +0100
-+++ cups-1.4b1/data/Makefile 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/data/Makefile.lspp cups-1.4b2/data/Makefile
+--- cups-1.4b2/data/Makefile.lspp 2008-11-12 19:30:57.000000000 +0000
++++ cups-1.4b2/data/Makefile 2008-12-16 11:50:59.000000000 +0000
@@ -25,7 +25,10 @@ BANNERS = \
secret \
standard \
@@ -609,9 +609,9 @@
CHARMAPS = \
euc-cn.txt \
-diff -up /dev/null cups-1.4b1/data/mls
---- /dev/null 2008-11-11 08:58:48.466006417 +0000
-+++ cups-1.4b1/data/mls 2008-11-11 16:53:28.000000000 +0000
+diff -up /dev/null cups-1.4b2/data/mls
+--- /dev/null 2008-12-16 09:52:24.540063413 +0000
++++ cups-1.4b2/data/mls 2008-12-16 11:50:59.000000000 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -874,9 +874,9 @@
+% End of "$Id$".
+%
+%%EOF
-diff -up /dev/null cups-1.4b1/data/selinux
---- /dev/null 2008-11-11 08:58:48.466006417 +0000
-+++ cups-1.4b1/data/selinux 2008-11-11 16:53:28.000000000 +0000
+diff -up /dev/null cups-1.4b2/data/selinux
+--- /dev/null 2008-12-16 09:52:24.540063413 +0000
++++ cups-1.4b2/data/selinux 2008-12-16 11:50:59.000000000 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -1139,9 +1139,9 @@
+% End of "$Id$".
+%
+%%EOF
-diff -up /dev/null cups-1.4b1/data/te
---- /dev/null 2008-11-11 08:58:48.466006417 +0000
-+++ cups-1.4b1/data/te 2008-11-11 16:53:28.000000000 +0000
+diff -up /dev/null cups-1.4b2/data/te
+--- /dev/null 2008-12-16 09:52:24.540063413 +0000
++++ cups-1.4b2/data/te 2008-12-16 11:50:59.000000000 +0000
@@ -0,0 +1,261 @@
+%!PS-Adobe-3.0
+%%BoundingBox: 0 0 612 792
@@ -1404,9 +1404,9 @@
+% End of "$Id$".
+%
+%%EOF
-diff -up cups-1.4b1/filter/common.c.lspp cups-1.4b1/filter/common.c
---- cups-1.4b1/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.4b1/filter/common.c 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/filter/common.c.lspp cups-1.4b2/filter/common.c
+--- cups-1.4b2/filter/common.c.lspp 2007-07-11 22:46:42.000000000 +0100
++++ cups-1.4b2/filter/common.c 2008-12-16 11:50:59.000000000 +0000
@@ -30,6 +30,12 @@
* Include necessary headers...
*/
@@ -1575,10 +1575,10 @@
/*
-diff -up cups-1.4b1/filter/pstops.c.lspp cups-1.4b1/filter/pstops.c
---- cups-1.4b1/filter/pstops.c.lspp 2008-09-24 00:44:33.000000000 +0100
-+++ cups-1.4b1/filter/pstops.c 2008-11-11 16:53:28.000000000 +0000
-@@ -3233,6 +3233,18 @@ write_label_prolog(pstops_doc_t *doc, /*
+diff -up cups-1.4b2/filter/pstops.c.lspp cups-1.4b2/filter/pstops.c
+--- cups-1.4b2/filter/pstops.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/filter/pstops.c 2008-12-16 11:50:59.000000000 +0000
+@@ -3232,6 +3232,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
const char *ptr; /* Temporary string pointer */
@@ -1597,7 +1597,7 @@
/*
-@@ -3255,6 +3267,124 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3254,6 +3266,124 @@ write_label_prolog(pstops_doc_t *doc, /*
return;
}
@@ -1722,7 +1722,7 @@
/*
* Set the classification + page label string...
*/
-@@ -3333,7 +3463,10 @@ write_label_prolog(pstops_doc_t *doc, /*
+@@ -3332,7 +3462,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");
@@ -1733,10 +1733,10 @@
/*
-diff -up cups-1.4b1/Makedefs.in.lspp cups-1.4b1/Makedefs.in
---- cups-1.4b1/Makedefs.in.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/Makedefs.in 2008-11-11 16:53:28.000000000 +0000
-@@ -145,7 +145,7 @@ LIBCUPSORDER = @LIBCUPSORDER@
+diff -up cups-1.4b2/Makedefs.in.lspp cups-1.4b2/Makedefs.in
+--- cups-1.4b2/Makedefs.in.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/Makedefs.in 2008-12-16 11:50:59.000000000 +0000
+@@ -146,7 +146,7 @@ LIBCUPSORDER = @LIBCUPSORDER@
LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@
LINKCUPS = @LINKCUPS@ $(SSLLIBS)
LINKCUPSIMAGE = @LINKCUPSIMAGE@
@@ -1745,7 +1745,7 @@
OPTIM = @OPTIM@
OPTIONS =
PAMLIBS = @PAMLIBS@
-@@ -256,7 +256,7 @@ DBUSDIR = @DBUSDIR@
+@@ -258,7 +258,7 @@ DBUSDIR = @DBUSDIR@
# Rules...
#
@@ -1754,9 +1754,9 @@
.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.4b1/scheduler/client.c.lspp cups-1.4b1/scheduler/client.c
---- cups-1.4b1/scheduler/client.c.lspp 2008-10-27 22:47:12.000000000 +0000
-+++ cups-1.4b1/scheduler/client.c 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/client.c.lspp cups-1.4b2/scheduler/client.c
+--- cups-1.4b2/scheduler/client.c.lspp 2008-11-17 16:29:05.000000000 +0000
++++ cups-1.4b2/scheduler/client.c 2008-12-16 11:50:59.000000000 +0000
@@ -41,6 +41,7 @@
* pipe_command() - Pipe the output of a command to the remote client.
* write_file() - Send a file via HTTP.
@@ -1858,7 +1858,7 @@
status = HTTP_CONTINUE;
-@@ -2091,6 +2157,67 @@ cupsdReadClient(cupsd_client_t *con) /*
+@@ -2125,6 +2191,67 @@ cupsdReadClient(cupsd_client_t *con) /*
fchmod(con->file, 0640);
fchown(con->file, RunUser, Group);
fcntl(con->file, F_SETFD, fcntl(con->file, F_GETFD) | FD_CLOEXEC);
@@ -1926,7 +1926,7 @@
}
if (con->http.state != HTTP_POST_SEND)
-@@ -4402,6 +4529,50 @@ make_certificate(cupsd_client_t *con) /*
+@@ -4436,6 +4563,50 @@ make_certificate(cupsd_client_t *con) /*
#endif /* HAVE_SSL */
@@ -1977,9 +1977,9 @@
/*
* 'pipe_command()' - Pipe the output of a command to the remote client.
*/
-diff -up cups-1.4b1/scheduler/client.h.lspp cups-1.4b1/scheduler/client.h
---- cups-1.4b1/scheduler/client.h.lspp 2008-09-11 02:54:11.000000000 +0100
-+++ cups-1.4b1/scheduler/client.h 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/client.h.lspp cups-1.4b2/scheduler/client.h
+--- cups-1.4b2/scheduler/client.h.lspp 2008-09-11 02:54:11.000000000 +0100
++++ cups-1.4b2/scheduler/client.h 2008-12-16 11:50:59.000000000 +0000
@@ -18,6 +18,13 @@
#endif /* HAVE_AUTHORIZATION_H */
@@ -2015,9 +2015,9 @@
/*
-diff -up cups-1.4b1/scheduler/conf.c.lspp cups-1.4b1/scheduler/conf.c
---- cups-1.4b1/scheduler/conf.c.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/conf.c 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/conf.c.lspp cups-1.4b2/scheduler/conf.c
+--- cups-1.4b2/scheduler/conf.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/conf.c 2008-12-16 11:50:59.000000000 +0000
@@ -27,6 +27,7 @@
* read_configuration() - Read a configuration file.
* read_location() - Read a <Location path> definition.
@@ -2127,9 +2127,9 @@
/*
* 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-1.4b1/scheduler/conf.h.lspp cups-1.4b1/scheduler/conf.h
---- cups-1.4b1/scheduler/conf.h.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/conf.h 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/conf.h.lspp cups-1.4b2/scheduler/conf.h
+--- cups-1.4b2/scheduler/conf.h.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/conf.h 2008-12-16 11:50:59.000000000 +0000
@@ -233,6 +233,12 @@ VAR char *ServerKey VALUE(NULL);
VAR int SSLOptions VALUE(CUPSD_SSL_NONE);
/* SSL/TLS options */
@@ -2153,9 +2153,9 @@
/*
* Prototypes...
-diff -up cups-1.4b1/scheduler/ipp.c.lspp cups-1.4b1/scheduler/ipp.c
---- cups-1.4b1/scheduler/ipp.c.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/ipp.c 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/ipp.c.lspp cups-1.4b2/scheduler/ipp.c
+--- cups-1.4b2/scheduler/ipp.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/ipp.c 2008-12-16 11:50:59.000000000 +0000
@@ -41,6 +41,7 @@
* cancel_all_jobs() - Cancel all print jobs.
* cancel_job() - Cancel a print job.
@@ -2360,8 +2360,8 @@
CUPS_PRINTER_REMOTE);
job->attrs = con->request;
@@ -1743,6 +1897,29 @@ add_job(cupsd_client_t *con, /* I - Cl
- attr->values[0].string.text = _cupsStrAlloc(printer->job_sheets[0]);
- attr->values[1].string.text = _cupsStrAlloc(printer->job_sheets[1]);
+ attr->values[0].string.text = _cupsStrRetain(printer->job_sheets[0]);
+ attr->values[1].string.text = _cupsStrRetain(printer->job_sheets[1]);
}
+#ifdef WITH_LSPP
+ else
@@ -2472,7 +2472,7 @@
/*
* See if we need to add the starting sheet...
-@@ -4186,6 +4416,103 @@ check_rss_recipient(
+@@ -4187,6 +4417,103 @@ check_rss_recipient(
}
@@ -2576,7 +2576,7 @@
/*
* 'check_quotas()' - Check quotas for a printer and user.
*/
-@@ -4714,6 +5041,15 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4736,6 +5063,15 @@ copy_banner(cupsd_client_t *con, /* I -
char attrname[255], /* Name of attribute */
*s; /* Pointer into name */
ipp_attribute_t *attr; /* Attribute */
@@ -2592,7 +2592,7 @@
cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -4749,6 +5085,82 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4771,6 +5107,82 @@ copy_banner(cupsd_client_t *con, /* I -
fchmod(cupsFileNumber(out), 0640);
fchown(cupsFileNumber(out), RunUser, Group);
@@ -2675,7 +2675,7 @@
/*
* Try the localized banner file under the subdirectory...
-@@ -4843,6 +5255,24 @@ copy_banner(cupsd_client_t *con, /* I -
+@@ -4865,6 +5277,24 @@ copy_banner(cupsd_client_t *con, /* I -
else
s = attrname;
@@ -2700,7 +2700,7 @@
if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
-@@ -6745,6 +7175,22 @@ get_job_attrs(cupsd_client_t *con, /* I
+@@ -6782,6 +7212,22 @@ get_job_attrs(cupsd_client_t *con, /* I
return;
}
@@ -2723,7 +2723,7 @@
/*
* Copy attributes...
*/
-@@ -6955,6 +7401,11 @@ get_jobs(cupsd_client_t *con, /* I - C
+@@ -6997,6 +7443,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (count > 0)
ippAddSeparator(con->response);
@@ -2735,7 +2735,7 @@
count ++;
cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: count = %d", count);
-@@ -11250,6 +11701,11 @@ validate_user(cupsd_job_t *job, /* I
+@@ -11314,6 +11765,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen);
@@ -2747,10 +2747,10 @@
/*
* Check the username against the owner...
*/
-diff -up cups-1.4b1/scheduler/job.c.lspp cups-1.4b1/scheduler/job.c
---- cups-1.4b1/scheduler/job.c.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/job.c 2008-11-11 16:53:28.000000000 +0000
-@@ -60,6 +60,9 @@
+diff -up cups-1.4b2/scheduler/job.c.lspp cups-1.4b2/scheduler/job.c
+--- cups-1.4b2/scheduler/job.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/job.c 2008-12-16 11:50:59.000000000 +0000
+@@ -62,6 +62,9 @@
* update_job_attrs() - Update the job-printer-* attributes.
*/
@@ -2760,7 +2760,7 @@
/*
* Include necessary headers...
*/
-@@ -69,6 +72,14 @@
+@@ -71,6 +74,14 @@
#include <cups/backend.h>
#include <cups/dir.h>
@@ -2775,7 +2775,7 @@
/*
* Local globals...
-@@ -1151,6 +1162,23 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
+@@ -1176,6 +1187,23 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
return;
}
@@ -2799,7 +2799,7 @@
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed",
IPP_TAG_INTEGER);
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -1508,6 +1536,13 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -1537,6 +1565,13 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
{
char filename[1024]; /* Job control filename */
cups_file_t *fp; /* Job file */
@@ -2813,7 +2813,7 @@
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -1526,6 +1561,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -1555,6 +1590,76 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
fchmod(cupsFileNumber(fp), 0600);
fchown(cupsFileNumber(fp), RunUser, Group);
@@ -2890,7 +2890,7 @@
job->attrs->state = IPP_IDLE;
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -2511,6 +2616,21 @@ start_job(cupsd_job_t *job, /* I -
+@@ -2545,6 +2650,21 @@ start_job(cupsd_job_t *job, /* I -
/* RIP_MAX_CACHE env variable */
static char *options = NULL;/* Full list of options */
static int optlength = 0; /* Length of option buffer */
@@ -2912,7 +2912,7 @@
cupsdLogJob(job, CUPSD_LOG_DEBUG2, "start_job: file = %d/%d",
-@@ -2783,6 +2903,106 @@ start_job(cupsd_job_t *job, /* I -
+@@ -2817,6 +2937,106 @@ start_job(cupsd_job_t *job, /* I -
fcntl(job->side_pipes[1], F_GETFL) | O_NONBLOCK);
}
@@ -3019,7 +3019,7 @@
/*
* Determine if we are printing a banner page or not...
*/
-@@ -2920,6 +3140,18 @@ start_job(cupsd_job_t *job, /* I -
+@@ -2954,6 +3174,18 @@ start_job(cupsd_job_t *job, /* I -
banner_page)
continue;
@@ -3038,7 +3038,7 @@
/*
* Otherwise add them to the list...
*/
-@@ -3169,6 +3401,67 @@ start_job(cupsd_job_t *job, /* I -
+@@ -3203,6 +3435,67 @@ start_job(cupsd_job_t *job, /* I -
}
}
@@ -3106,9 +3106,9 @@
if (Classification && !banner_page)
{
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-diff -up cups-1.4b1/scheduler/job.h.lspp cups-1.4b1/scheduler/job.h
---- cups-1.4b1/scheduler/job.h.lspp 2008-08-28 21:38:13.000000000 +0100
-+++ cups-1.4b1/scheduler/job.h 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/job.h.lspp cups-1.4b2/scheduler/job.h
+--- cups-1.4b2/scheduler/job.h.lspp 2008-08-28 21:38:13.000000000 +0100
++++ cups-1.4b2/scheduler/job.h 2008-12-16 11:50:59.000000000 +0000
@@ -13,6 +13,13 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -3134,9 +3134,9 @@
} cupsd_job_t;
-diff -up cups-1.4b1/scheduler/main.c.lspp cups-1.4b1/scheduler/main.c
---- cups-1.4b1/scheduler/main.c.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/main.c 2008-11-11 16:53:28.000000000 +0000
+diff -up cups-1.4b2/scheduler/main.c.lspp cups-1.4b2/scheduler/main.c
+--- cups-1.4b2/scheduler/main.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/main.c 2008-12-16 11:50:59.000000000 +0000
@@ -35,6 +35,8 @@
* usage() - Show scheduler usage.
*/
@@ -3192,7 +3192,7 @@
/*
* Set the timezone info...
*/
-@@ -1200,6 +1227,11 @@ main(int argc, /* I - Number of comm
+@@ -1212,6 +1239,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
@@ -3204,9 +3204,9 @@
return (!stop_scheduler);
}
-diff -up cups-1.4b1/scheduler/printers.c.lspp cups-1.4b1/scheduler/printers.c
---- cups-1.4b1/scheduler/printers.c.lspp 2008-11-11 16:53:28.000000000 +0000
-+++ cups-1.4b1/scheduler/printers.c 2008-11-11 17:00:31.000000000 +0000
+diff -up cups-1.4b2/scheduler/printers.c.lspp cups-1.4b2/scheduler/printers.c
+--- cups-1.4b2/scheduler/printers.c.lspp 2008-12-16 11:50:59.000000000 +0000
++++ cups-1.4b2/scheduler/printers.c 2008-12-16 11:50:59.000000000 +0000
@@ -52,6 +52,8 @@
* write_xml_string() - Write a string with XML escaping.
*/
@@ -3227,7 +3227,7 @@
/*
* 'cupsdAddPrinter()' - Add a printer to the system.
-@@ -2081,6 +2087,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2115,6 +2121,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
{ /* No authentication */
"none"
};
@@ -3241,7 +3241,7 @@
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2226,6 +2239,42 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2260,6 +2273,42 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
@@ -3284,7 +3284,7 @@
}
p->raw = 0;
-@@ -4606,7 +4655,6 @@ write_irix_state(cupsd_printer_t *p) /*
+@@ -4650,7 +4699,6 @@ write_irix_state(cupsd_printer_t *p) /*
}
#endif /* __sgi */
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- cups.spec 13 Dec 2008 11:34:46 -0000 1.452
+++ cups.spec 16 Dec 2008 12:31:52 -0000 1.453
@@ -1,4 +1,4 @@
-%define pre b1
+%define pre b2
%define initdir /etc/rc.d/init.d
%define use_alternatives 1
%define lspp 1
@@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
-Release: 0.%{pre}.6%{?dist}
+Release: 0.%{pre}.1%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}-source.tar.bz2
@@ -28,7 +28,6 @@
Patch2: cups-1.1.16-system-auth.patch
Patch3: cups-multilib.patch
Patch4: cups-str2831.patch
-Patch5: cups-CVE-2008-5183.patch
Patch6: cups-banners.patch
Patch7: cups-serverbin-compat.patch
Patch8: cups-no-export-ssllibs.patch
@@ -169,7 +168,6 @@
%patch2 -p1 -b .system-auth
%patch3 -p1 -b .multilib
%patch4 -p1 -b .str2831
-%patch5 -p1 -b .CVE-2008-5183
%patch6 -p1 -b .banners
%patch7 -p1 -b .serverbin-compat
%patch8 -p1 -b .no-export-ssllibs
@@ -410,6 +408,8 @@
%{_datadir}/cups/model
%dir %{_datadir}/cups/templates
%config(noreplace) %{_datadir}/cups/templates/*.tmpl
+%config(noreplace) %{_datadir}/cups/templates/es/*.tmpl
+%{_datadir}/locale/*
%{_datadir}/ppd
%dir %attr(1770,root,lp) /var/spool/cups/tmp
%dir %attr(0710,root,lp) /var/spool/cups
@@ -450,6 +450,10 @@
%{_libdir}/php/modules/*.so
%changelog
+* Tue Dec 16 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b2.1
+- 1.4b2.
+- No longer need CVE-2008-5183 patch.
+
* Sat Dec 13 2008 Tim Waugh <twaugh at redhat.com> 1:1.4-0.b1.6
- Start cupsd at priority 25: after avahi-daemon but before haldaemon
(bug #468709).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 12 Nov 2008 16:14:18 -0000 1.46
+++ sources 16 Dec 2008 12:31:53 -0000 1.47
@@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
-ddb969a6c5db86f3524ec265cb06ed35 cups-1.4b1-source.tar.bz2
+23f540e6145e4ab3298700d9f496bcd1 cups-1.4b2-source.tar.bz2
--- cups-CVE-2008-5183.patch DELETED ---
More information about the fedora-extras-commits
mailing list