rpms/cups/devel .cvsignore, 1.41, 1.42 cups-getnameddest.patch, 1.2, 1.3 cups.spec, 1.442, 1.443 sources, 1.44, 1.45 cups-res_init.patch, 1.1, NONE cups-str2892.patch, 1.1, NONE
Tim Waugh
twaugh at fedoraproject.org
Fri Oct 10 09:45:04 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21614
Modified Files:
.cvsignore cups-getnameddest.patch cups.spec sources
Removed Files:
cups-res_init.patch cups-str2892.patch
Log Message:
* Fri Oct 10 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-1
- 1.3.9, including fixes for CVE-2008-3639 (STR #2918, bug #464710),
CVE-2008-3640 (STR #2919, bug #464713) and CVE-2008-3641 (STR #2911,
bug #464716).
- No longer need str2892 or res_init patches.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 28 Jul 2008 16:31:49 -0000 1.41
+++ .cvsignore 10 Oct 2008 09:44:33 -0000 1.42
@@ -33,3 +33,4 @@
cups-1.3.6-source.tar.bz2
cups-1.3.7-source.tar.bz2
cups-1.3.8-source.tar.bz2
+cups-1.3.9-source.tar.bz2
cups-getnameddest.patch:
Index: cups-getnameddest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-getnameddest.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-getnameddest.patch 28 Jul 2008 15:40:15 -0000 1.2
+++ cups-getnameddest.patch 10 Oct 2008 09:44:33 -0000 1.3
@@ -1,6 +1,6 @@
-diff -up cups-1.3.8/berkeley/lpr.c.getnameddest cups-1.3.8/berkeley/lpr.c
---- cups-1.3.8/berkeley/lpr.c.getnameddest 2008-07-28 16:28:24.000000000 +0100
-+++ cups-1.3.8/berkeley/lpr.c 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/berkeley/lpr.c.getnameddest cups-1.3.9/berkeley/lpr.c
+--- cups-1.3.9/berkeley/lpr.c.getnameddest 2008-10-10 09:35:05.000000000 +0100
++++ cups-1.3.9/berkeley/lpr.c 2008-10-10 09:35:05.000000000 +0100
@@ -92,9 +92,7 @@ main(int argc, /* I - Number of comm
int num_copies; /* Number of copies per file */
int num_files; /* Number of files to print */
@@ -55,9 +55,9 @@
_cupsLangPrintf(stderr,
_("%s: Error - %s environment variable names "
"non-existent destination \"%s\"!\n"),
-diff -up cups-1.3.8/cups/cups.h.getnameddest cups-1.3.8/cups/cups.h
---- cups-1.3.8/cups/cups.h.getnameddest 2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/cups/cups.h 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/cups/cups.h.getnameddest cups-1.3.9/cups/cups.h
+--- cups-1.3.9/cups/cups.h.getnameddest 2008-07-23 01:06:46.000000000 +0100
++++ cups-1.3.9/cups/cups.h 2008-10-10 09:35:05.000000000 +0100
@@ -248,6 +248,9 @@ extern void cupsSetDefaultDest(const ch
int num_dests,
cups_dest_t *dests);
@@ -68,9 +68,9 @@
# ifdef __cplusplus
}
-diff -up cups-1.3.8/cups/dest.c.getnameddest cups-1.3.8/cups/dest.c
---- cups-1.3.8/cups/dest.c.getnameddest 2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/cups/dest.c 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/cups/dest.c.getnameddest cups-1.3.9/cups/dest.c
+--- cups-1.3.9/cups/dest.c.getnameddest 2008-09-17 00:37:56.000000000 +0100
++++ cups-1.3.9/cups/dest.c 2008-10-10 09:36:02.000000000 +0100
@@ -25,6 +25,7 @@
* server.
* cupsGetDests2() - Get the list of destinations from the
@@ -128,18 +128,19 @@
return (num_dests);
}
-@@ -330,8 +333,8 @@ cupsGetDests2(http_t *http, /* I -
+@@ -330,9 +333,9 @@ cupsGetDests2(http_t *http, /* I -
* Grab the printers and classes...
*/
- num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, num_dests, dests);
-- num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, num_dests, dests);
+ num_dests = cups_get_sdests(http, CUPS_GET_PRINTERS, NULL, num_dests, dests);
-+ num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, NULL, num_dests, dests);
+ if (cupsLastError() < IPP_REDIRECTION_OTHER_SITE)
+- num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, num_dests, dests);
++ num_dests = cups_get_sdests(http, CUPS_GET_CLASSES, NULL, num_dests, dests);
- /*
- * Make a copy of the "real" queues for a later sanity check...
-@@ -390,7 +393,7 @@ cupsGetDests2(http_t *http, /* I -
+ if (cupsLastError() >= IPP_REDIRECTION_OTHER_SITE)
+ {
+@@ -398,7 +401,7 @@ cupsGetDests2(http_t *http, /* I -
*/
snprintf(filename, sizeof(filename), "%s/lpoptions", cg->cups_serverroot);
@@ -148,7 +149,7 @@
if ((home = getenv("HOME")) != NULL)
{
-@@ -398,7 +401,7 @@ cupsGetDests2(http_t *http, /* I -
+@@ -406,7 +409,7 @@ cupsGetDests2(http_t *http, /* I -
if (access(filename, 0))
snprintf(filename, sizeof(filename), "%s/.lpoptions", home);
@@ -157,7 +158,7 @@
}
/*
-@@ -452,6 +455,136 @@ cupsGetDests2(http_t *http, /* I -
+@@ -460,6 +463,136 @@ cupsGetDests2(http_t *http, /* I -
/*
@@ -294,7 +295,7 @@
* 'cupsRemoveDest()' - Remove a destination from the destination list.
*
* Removing a destination/instance does not delete the class or printer
-@@ -548,19 +681,17 @@ void
+@@ -556,19 +689,17 @@ void
cupsSetDests(int num_dests, /* I - Number of destinations */
cups_dest_t *dests) /* I - Destinations */
{
@@ -318,7 +319,7 @@
}
-@@ -606,8 +737,8 @@ cupsSetDests2(http_t *http, /* I -
+@@ -614,8 +745,8 @@ cupsSetDests2(http_t *http, /* I -
* Get the server destinations...
*/
@@ -329,7 +330,7 @@
/*
* Figure out which file to write to...
-@@ -622,7 +753,7 @@ cupsSetDests2(http_t *http, /* I -
+@@ -630,7 +761,7 @@ cupsSetDests2(http_t *http, /* I -
* Merge in server defaults...
*/
@@ -338,7 +339,7 @@
/*
* Point to user defaults...
-@@ -789,24 +920,88 @@ cupsSetDests2(http_t *http, /* I -
+@@ -797,24 +928,88 @@ cupsSetDests2(http_t *http, /* I -
/*
@@ -428,7 +429,7 @@
/*
* Check environment variables...
*/
-@@ -816,12 +1011,8 @@ cups_get_dests(const char *filename, /*
+@@ -824,12 +1019,8 @@ cups_get_dests(const char *filename, /*
if (strcmp(printer, "lp") == 0)
printer = NULL;
@@ -443,7 +444,7 @@
/*
* Read each printer; each line looks like:
-@@ -830,28 +1021,22 @@ cups_get_dests(const char *filename, /*
+@@ -838,28 +1029,22 @@ cups_get_dests(const char *filename, /*
* Default name[/instance] options
*/
@@ -481,7 +482,7 @@
name = lineptr;
-@@ -862,9 +1047,6 @@ cups_get_dests(const char *filename, /*
+@@ -870,9 +1055,6 @@ cups_get_dests(const char *filename, /*
while (!isspace(*lineptr & 255) && *lineptr && *lineptr != '/')
lineptr ++;
@@ -491,7 +492,7 @@
if (*lineptr == '/')
{
/*
-@@ -884,30 +1066,49 @@ cups_get_dests(const char *filename, /*
+@@ -892,30 +1074,49 @@ cups_get_dests(const char *filename, /*
else
instance = NULL;
@@ -554,7 +555,7 @@
}
/*
-@@ -918,11 +1119,20 @@ cups_get_dests(const char *filename, /*
+@@ -926,11 +1127,20 @@ cups_get_dests(const char *filename, /*
&(dest->options));
/*
@@ -576,7 +577,7 @@
for (i = 0; i < num_dests; i ++)
(*dests)[i].is_default = 0;
-@@ -934,7 +1144,7 @@ cups_get_dests(const char *filename, /*
+@@ -942,7 +1152,7 @@ cups_get_dests(const char *filename, /*
* Close the file and return...
*/
@@ -585,7 +586,7 @@
return (num_dests);
}
-@@ -946,7 +1156,8 @@ cups_get_dests(const char *filename, /*
+@@ -954,7 +1164,8 @@ cups_get_dests(const char *filename, /*
static int /* O - Number of destinations */
cups_get_sdests(http_t *http, /* I - HTTP connection */
@@ -595,7 +596,7 @@
int num_dests, /* I - Number of destinations */
cups_dest_t **dests) /* IO - Destinations */
{
-@@ -963,8 +1174,9 @@ cups_get_sdests(http_t *http, /* I
+@@ -971,8 +1182,9 @@ cups_get_sdests(http_t *http, /* I
const char *info, /* printer-info attribute */
*location, /* printer-location attribute */
*make_model, /* printer-make-and-model attribute */
@@ -607,7 +608,7 @@
auth_info_req[1024], /* auth-info-required attribute */
reasons[1024]; /* printer-state-reasons attribute */
int num_options; /* Number of options */
-@@ -1008,6 +1220,14 @@ cups_get_sdests(http_t *http, /* I
+@@ -1016,6 +1228,14 @@ cups_get_sdests(http_t *http, /* I
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
"requesting-user-name", NULL, cupsUser());
@@ -622,7 +623,7 @@
/*
* Do the request and get back a response...
*/
-@@ -1030,17 +1250,17 @@ cups_get_sdests(http_t *http, /* I
+@@ -1038,17 +1258,17 @@ cups_get_sdests(http_t *http, /* I
* Pull the needed attributes from this printer...
*/
@@ -651,7 +652,7 @@
auth_info_req[0] = '\0';
job_sheets[0] = '\0';
-@@ -1091,7 +1311,7 @@ cups_get_sdests(http_t *http, /* I
+@@ -1099,7 +1319,7 @@ cups_get_sdests(http_t *http, /* I
make_model = attr->values[0].string.text;
else if (!strcmp(attr->name, "printer-name") &&
attr->value_tag == IPP_TAG_NAME)
@@ -660,7 +661,7 @@
else if (!strcmp(attr->name, "printer-state") &&
attr->value_tag == IPP_TAG_ENUM)
state = attr->values[0].integer;
-@@ -1196,7 +1416,7 @@ cups_get_sdests(http_t *http, /* I
+@@ -1204,7 +1424,7 @@ cups_get_sdests(http_t *http, /* I
* See if we have everything needed...
*/
@@ -669,7 +670,7 @@
{
cupsFreeOptions(num_options, options);
-@@ -1206,9 +1426,9 @@ cups_get_sdests(http_t *http, /* I
+@@ -1214,9 +1434,9 @@ cups_get_sdests(http_t *http, /* I
continue;
}
@@ -681,9 +682,9 @@
{
dest->num_options = num_options;
dest->options = options;
-diff -up cups-1.3.8/cups/libcups.exp.getnameddest cups-1.3.8/cups/libcups.exp
---- cups-1.3.8/cups/libcups.exp.getnameddest 2008-04-09 04:39:40.000000000 +0100
-+++ cups-1.3.8/cups/libcups.exp 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/cups/libcups.exp.getnameddest cups-1.3.9/cups/libcups.exp
+--- cups-1.3.9/cups/libcups.exp.getnameddest 2008-04-09 04:39:40.000000000 +0100
++++ cups-1.3.9/cups/libcups.exp 2008-10-10 09:35:05.000000000 +0100
@@ -114,6 +114,7 @@ _cupsGetFd
_cupsGetFile
_cupsGetJobs
@@ -692,9 +693,9 @@
_cupsGetOption
_cupsGetPassword
_cupsGetPPD
-diff -up cups-1.3.8/cups/Makefile.getnameddest cups-1.3.8/cups/Makefile
---- cups-1.3.8/cups/Makefile.getnameddest 2008-02-20 20:18:33.000000000 +0000
-+++ cups-1.3.8/cups/Makefile 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/cups/Makefile.getnameddest cups-1.3.9/cups/Makefile
+--- cups-1.3.9/cups/Makefile.getnameddest 2008-09-06 01:30:39.000000000 +0100
++++ cups-1.3.9/cups/Makefile 2008-10-10 09:35:05.000000000 +0100
@@ -263,7 +263,7 @@ libcups.so.2 libcups.sl.2: $(LIBOBJS)
# libcups.2.dylib
#
@@ -704,9 +705,9 @@
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
-install_name $(libdir)/$@ \
-diff -up cups-1.3.8/cups/testcups.c.getnameddest cups-1.3.8/cups/testcups.c
---- cups-1.3.8/cups/testcups.c.getnameddest 2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/cups/testcups.c 2008-07-28 16:37:24.000000000 +0100
+diff -up cups-1.3.9/cups/testcups.c.getnameddest cups-1.3.9/cups/testcups.c
+--- cups-1.3.9/cups/testcups.c.getnameddest 2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.9/cups/testcups.c 2008-10-10 09:35:05.000000000 +0100
@@ -16,7 +16,8 @@
*
* Contents:
@@ -947,9 +948,9 @@
+/*
* End of "$Id$".
*/
-diff -up cups-1.3.8/systemv/lp.c.getnameddest cups-1.3.8/systemv/lp.c
---- cups-1.3.8/systemv/lp.c.getnameddest 2008-07-11 23:48:49.000000000 +0100
-+++ cups-1.3.8/systemv/lp.c 2008-07-28 16:28:24.000000000 +0100
+diff -up cups-1.3.9/systemv/lp.c.getnameddest cups-1.3.9/systemv/lp.c
+--- cups-1.3.9/systemv/lp.c.getnameddest 2008-07-11 23:48:49.000000000 +0100
++++ cups-1.3.9/systemv/lp.c 2008-10-10 09:35:05.000000000 +0100
@@ -73,9 +73,7 @@ main(int argc, /* I - Number of comm
int num_copies; /* Number of copies per file */
int num_files; /* Number of files to print */
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -r1.442 -r1.443
--- cups.spec 10 Sep 2008 15:21:18 -0000 1.442
+++ cups.spec 10 Oct 2008 09:44:33 -0000 1.443
@@ -6,8 +6,8 @@
Summary: Common Unix Printing System
Name: cups
-Version: 1.3.8
-Release: 6%{?svn:.svn%{svn}}%{?dist}
+Version: 1.3.9
+Release: 1%{?svn:.svn%{svn}}%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?svn:svn-r%{svn}}-source.tar.bz2
@@ -47,10 +47,8 @@
Patch20: cups-logrotate.patch
Patch21: cups-usb-paperout.patch
Patch22: cups-getnameddest.patch
-Patch23: cups-str2892.patch
-Patch24: cups-str2101.patch
-Patch25: cups-res_init.patch
-Patch26: cups-str2536.patch
+Patch23: cups-str2101.patch
+Patch24: cups-str2536.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -186,10 +184,8 @@
%patch20 -p1 -b .logrotate
%patch21 -p1 -b .usb-paperout
%patch22 -p1 -b .getnameddest
-%patch23 -p1 -b .str2892
-%patch24 -p1 -b .str2101
-%patch25 -p1 -b .res_init
-%patch26 -p1 -b .str2536
+%patch23 -p1 -b .str2101
+%patch24 -p1 -b .str2536
%if %lspp
%patch100 -p1 -b .lspp
@@ -481,6 +477,12 @@
%{_libdir}/php/modules/*.so
%changelog
+* Fri Oct 10 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.9-1
+- 1.3.9, including fixes for CVE-2008-3639 (STR #2918, bug #464710),
+ CVE-2008-3640 (STR #2919, bug #464713) and CVE-2008-3641 (STR #2911,
+ bug #464716).
+- No longer need str2892 or res_init patches.
+
* Wed Sep 10 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.8-6
- Backported patch for FatalErrors configuration directive
(bug #314941, STR #2536).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- sources 28 Jul 2008 16:31:49 -0000 1.44
+++ sources 10 Oct 2008 09:44:33 -0000 1.45
@@ -1,2 +1,2 @@
b0bb017098e8e76b8a25e666c41ce540 postscript.ppd.gz
-84e09577d673b212f605dd09caee456c cups-1.3.8-source.tar.bz2
+cf63f451c356e6cabb08972d4d11c365 cups-1.3.9-source.tar.bz2
--- cups-res_init.patch DELETED ---
--- cups-str2892.patch DELETED ---
More information about the scm-commits
mailing list