rpms/cups/devel cups-svn.patch,1.4,1.5 cups.spec,1.181,1.182
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri May 5 16:45:37 UTC 2006
Author: twaugh
Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27372
Modified Files:
cups-svn.patch cups.spec
Log Message:
* Fri May 5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.4
- Sync to svn5493.
cups-svn.patch:
0 files changed
Index: cups-svn.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-svn.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cups-svn.patch 5 May 2006 13:07:46 -0000 1.4
+++ cups-svn.patch 5 May 2006 16:45:33 -0000 1.5
@@ -11332,7 +11332,7 @@
+
+#
--- backend/pap.c (revision 0)
-+++ backend/pap.c (revision 5491)
++++ backend/pap.c (revision 5493)
@@ -0,0 +1,1568 @@
+/*
+* "$Id$"
@@ -12927,7 +12927,7 @@
+ if test x$enable_pie = xyes; then
+ echo "Sorry, --enable-pie is not supported on this OS!"
--- config-scripts/cups-pap.m4 (revision 0)
-+++ config-scripts/cups-pap.m4 (revision 5491)
++++ config-scripts/cups-pap.m4 (revision 5493)
@@ -0,0 +1,37 @@
+dnl
+dnl "$Id$"
@@ -13044,6 +13044,16 @@
+<P>The default is <CODE>yes</CODE>.</P>
+
+
+--- cups/array.c (revision 5460)
++++ cups/array.c (working copy)
+@@ -942 +942 @@
+- diff = 0;
++ diff = 1;
+@@ -945,0 +946,2 @@
++ {
++ diff = 0;
+@@ -946,0 +949 @@
++ }
--- cups/Makefile (revision 5460)
+++ cups/Makefile (working copy)
@@ -274 +274 @@
@@ -13219,7 +13229,7 @@
+ printers.conf.$(MAN5EXT) \
+ subscriptions.conf.$(MAN5EXT)
--- man/subscriptions.conf.man (revision 0)
-+++ man/subscriptions.conf.man (revision 5491)
++++ man/subscriptions.conf.man (revision 5493)
@@ -0,0 +1,98 @@
+.\"
+.\" "$Id$"
@@ -13321,12 +13331,108 @@
+.\"
--- test/run-stp-tests.sh (revision 5460)
+++ test/run-stp-tests.sh (working copy)
-@@ -227,0 +228 @@
+@@ -26,0 +27,2 @@
++argcount=$#
++
+@@ -70 +72,6 @@
+-read testtype
++if test $# -gt 0; then
++ testtype=$1
++ shift
++else
++ read testtype
++fi
+@@ -121 +128,6 @@
+-read ssltype
++if test $# -gt 0; then
++ ssltype=$1
++ shift
++else
++ read ssltype
++fi
+@@ -189 +201,6 @@
+-read usevalgrind
++if test $# -gt 0; then
++ usevalgrind=$1
++ shift
++else
++ read usevalgrind
++fi
+@@ -206,0 +224,2 @@
++echo "Creating directories for test..."
++
+@@ -227,0 +247 @@
+ln -s $root/backend/snmp /tmp/cups-$user/bin/backend
-@@ -248,0 +250 @@
+@@ -248,0 +269 @@
+ln -s $root/data /tmp/cups-$user/share/charmaps
+@@ -263,0 +285,2 @@
++echo "Creating cupsd.conf for test..."
++
+@@ -289 +312 @@
+-LogLevel debug
++LogLevel debug2
+@@ -307,0 +331,2 @@
++echo "Creating printers.conf for test..."
++
+@@ -351,0 +377,2 @@
++echo "Setting up environment variables for test..."
++
+@@ -396 +423 @@
+-echo " $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log &"
++echo " $valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 &"
+@@ -399 +426 @@
+-$valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log &
++$valgrind ../scheduler/cupsd -c /tmp/cups-$user/cupsd.conf -f >/tmp/cups-$user/log/debug_log 2>&1 &
+@@ -415,4 +442,9 @@
+-echo "Scheduler is PID $cupsd; run debugger now if you need to."
+-echo ""
+-echo $ac_n "Press ENTER to continue... $ac_c"
+-read junk
++if test $argcount -eq 0; then
++ echo "Scheduler is PID $cupsd; run debugger now if you need to."
++ echo ""
++ echo $ac_n "Press ENTER to continue... $ac_c"
++ read junk
++else
++ echo "Scheduler is PID $cupsd."
++ sleep 2
++fi
+@@ -444,0 +477 @@
++echo ""
+@@ -472,0 +506 @@
++echo ""
+@@ -549,2 +582,0 @@
+-echo "Formatting reports..."
+-
+@@ -561,8 +593,2 @@
+-if test "x$valgrind" != x; then
+- echo "Valgrind log files can be found in /tmp/cups-$user/log."
+-fi
+-
+-echo ""
+-echo "See the following file for details:"
+-echo ""
+-echo " $strfile"
++echo "Log files can be found in /tmp/cups-$user/log."
++echo "A HTML report was created in test/$strfile."
+--- test/4.3-job-ops.test (revision 5460)
++++ test/4.3-job-ops.test (working copy)
+@@ -58 +58 @@
+- NAME "Print PostScript Job to Test2"
++ NAME "Print JPEG Job to Test2"
+@@ -74 +74 @@
+- FILE testfile.ps
++ FILE testfile.jpg
+--- test/4.2-cups-printer-ops.test (revision 5460)
++++ test/4.2-cups-printer-ops.test (working copy)
+@@ -133 +133 @@
+- FILE testps.ppd
++ FILE testhp.ppd
+@@ -208 +208 @@
+- FILE testhp.ppd
++ FILE testps.ppd
--- standards/rfc1213.txt (revision 0)
-+++ standards/rfc1213.txt (revision 5491)
++++ standards/rfc1213.txt (revision 5493)
@@ -0,0 +1,3923 @@
+
+
@@ -17252,7 +17358,7 @@
+SNMP Working Group [Page 70]
+
--- standards/rfc3805.txt (revision 0)
-+++ standards/rfc3805.txt (revision 5491)
++++ standards/rfc3805.txt (revision 5493)
@@ -0,0 +1,9579 @@
+
+
@@ -26834,7 +26940,7 @@
+Bergman, et al. Standards Track [Page 171]
+
--- standards/rfc2578.txt (revision 0)
-+++ standards/rfc2578.txt (revision 5491)
++++ standards/rfc2578.txt (revision 5493)
@@ -0,0 +1,2541 @@
+
+
@@ -30020,12 +30126,14 @@
+++ CHANGES.txt (working copy)
@@ -1 +1 @@
-CHANGES.txt - 2006-04-24
-+CHANGES.txt - 2006-05-03
-@@ -3,0 +4,40 @@
++CHANGES.txt - 2006-05-05
+@@ -3,0 +4,42 @@
+CHANGES IN CUPS V1.2
+
+ - Documentation updates (STR #1618, STR #1620, STR #1622,
+ STR #1637)
++ - The scheduler did not decode the backend exit code
++ properly (STR #1648)
+ - The MacOS X USB backend did not report the 1284 device ID,
+ nor did it fix device IDs returned by HP printers.
+ - The scheduler started more slowly than 1.1.x with large
@@ -30611,19 +30719,37 @@
@@ -1223 +1223 @@
- cupsdSetStringf(&p->name, name);
+ cupsdSetString(&p->name, name);
+--- scheduler/server.c (revision 5460)
++++ scheduler/server.c (working copy)
+@@ -149 +149 @@
+- if (Clients != NULL)
++ if (Clients)
+@@ -151 +151 @@
+- free(Clients);
++ cupsArrayDelete(Clients);
--- scheduler/job.c (revision 5460)
+++ scheduler/job.c (working copy)
-@@ -469,0 +470,10 @@
+@@ -470 +470,19 @@
+- switch (-job->status)
++ int exit_code; /* Exit code from backend */
++
++
++ if (WIFEXITED(-job->status))
++ exit_code = WEXITSTATUS(-job->status);
++ else
++ exit_code = job->status;
++
+ cupsdLogMessage(CUPSD_LOG_INFO, "[Job %d] Backend returned status %d (%s)",
-+ job->id, -job->status,
-+ -job->status == CUPS_BACKEND_FAILED ? "failed" :
-+ -job->status == CUPS_BACKEND_AUTH_REQUIRED ?
++ job->id, exit_code,
++ exit_code == CUPS_BACKEND_FAILED ? "failed" :
++ exit_code == CUPS_BACKEND_AUTH_REQUIRED ?
+ "authentication required" :
-+ -job->status == CUPS_BACKEND_HOLD ? "hold job" :
-+ -job->status == CUPS_BACKEND_STOP ? "stop printer" :
-+ -job->status == CUPS_BACKEND_CANCEL ? "cancel job" :
-+ "unknown");
++ exit_code == CUPS_BACKEND_HOLD ? "hold job" :
++ exit_code == CUPS_BACKEND_STOP ? "stop printer" :
++ exit_code == CUPS_BACKEND_CANCEL ? "cancel job" :
++ exit_code < 0 ? "crashed" : "unknown");
+
++ switch (exit_code)
--- scheduler/log.c (revision 5460)
+++ scheduler/log.c (working copy)
@@ -6 +6 @@
@@ -30647,7 +30773,7 @@
+ MaxLogSize > 0))
@@ -511 +513,2 @@
- if (cupsFileTell(*lf) > MaxLogSize && MaxLogSize > 0)
-+ if (strncmp(filename, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
++ if (strncmp(logname, "/dev/", 5) && cupsFileTell(*lf) > MaxLogSize &&
+ MaxLogSize > 0)
@@ -533,5 +536,3 @@
- if (strncmp(filename, "/dev/", 5))
@@ -30683,15 +30809,25 @@
+++ scheduler/filter.c (working copy)
@@ -62,0 +63 @@
+static int compare_srcs(mime_filter_t *, mime_filter_t *);
-@@ -117 +118,4 @@
-- if (!mime->filters)
-+ if (!mime->srcs)
-+ mime->srcs = cupsArrayNew((cups_array_func_t)compare_srcs, NULL);
-+
-+ if (!mime->filters || !mime->srcs)
-@@ -132,0 +137 @@
-+ cupsArrayAdd(mime->srcs, temp);
-@@ -198,0 +204,18 @@
+@@ -170,0 +172,17 @@
++ * (Re)build the source lookup array as needed...
++ */
++
++ if (!mime->srcs)
++ {
++ mime_filter_t *current; /* Current filter */
++
++
++ mime->srcs = cupsArrayNew((cups_array_func_t)compare_srcs, NULL);
++
++ for (current = mimeFirstFilter(mime);
++ current;
++ current = mimeNextFilter(mime))
++ cupsArrayAdd(mime->srcs, current);
++ }
++
++ /*
+@@ -198,0 +217,18 @@
+ * 'compare_srcs()' - Compare two srcs...
+ */
+
@@ -30710,15 +30846,15 @@
+
+
+/*
-@@ -213 +236,2 @@
+@@ -213 +249,2 @@
- mime_filter_t *current; /* Current filter */
+ mime_filter_t *current, /* Current filter */
+ srckey; /* Source type key */
-@@ -240,0 +265,3 @@
+@@ -240,0 +278,3 @@
+ if (!cost)
+ return (mintemp);
+
-@@ -264,9 +291 @@
+@@ -264,9 +304 @@
- for (current = (mime_filter_t *)cupsArrayFirst(mime->filters);
- current;
- current = (mime_filter_t *)cupsArrayNext(mime->filters))
@@ -30729,7 +30865,7 @@
- * type (this avoids extra filter looping...)
- */
+ srckey.src = src;
-@@ -274,3 +293,8 @@
+@@ -274,3 +306,8 @@
- for (listptr = list; listptr; listptr = listptr->next)
- if (current->dst == listptr->src)
- break;
@@ -30741,38 +30877,38 @@
+ * See if we have already tried the destination type as a source
+ * type (this avoids extra filter looping...)
+ */
-@@ -278,2 +302 @@
+@@ -278,2 +315 @@
- if (listptr)
- continue;
+ mime_type_t *current_dst; /* Current destination type */
-@@ -281,4 +303,0 @@
+@@ -281,4 +316,0 @@
- /*
- * See if we have any filters that can convert from the destination type
- * of this filter to the final type...
- */
-@@ -286 +305,13 @@
+@@ -286 +318,5 @@
- listnode.src = current->src;
+ for (listptr = list, current_dst = current->dst;
+ listptr;
+ listptr = listptr->next)
+ if (current_dst == listptr->src)
+ break;
-+
+@@ -288,3 +324,2 @@
+- cupsArraySave(mime->filters);
+- temp = find_filters(mime, current->dst, dst, &tempcost, &listnode);
+- cupsArrayRestore(mime->filters);
+ if (listptr)
+ continue;
-+
+@@ -292,2 +327,25 @@
+- if (!temp)
+- continue;
+ /*
+ * See if we have any filters that can convert from the destination type
+ * of this filter to the final type...
+ */
-@@ -288,3 +319 @@
-- cupsArraySave(mime->filters);
-- temp = find_filters(mime, current->dst, dst, &tempcost, &listnode);
-- cupsArrayRestore(mime->filters);
++
+ listnode.src = current->src;
-@@ -292,2 +321,18 @@
-- if (!temp)
-- continue;
++
+ cupsArraySave(mime->srcs);
+ temp = find_filters(mime, current->dst, dst, &tempcost, &listnode);
+ cupsArrayRestore(mime->srcs);
@@ -30791,12 +30927,12 @@
+ if (tempcost < mincost)
+ {
+ cupsArrayDelete(mintemp);
-@@ -296,2 +341,2 @@
+@@ -296,2 +354,2 @@
- * Found a match; see if this one is less costly than the last (if
- * any...)
+ * Hey, we got a match! Add the current filter to the beginning of the
+ * filter list...
-@@ -300,15 +345,3 @@
+@@ -300,15 +358,3 @@
- if (tempcost < mincost)
- {
- cupsArrayDelete(mintemp);
@@ -30815,7 +30951,7 @@
+ mintemp = temp;
+ mincost = tempcost + current->cost;
+ cupsArrayInsert(mintemp, current);
-@@ -315,0 +349,3 @@
+@@ -315,0 +362,3 @@
+ else
+ cupsArrayDelete(temp);
+ }
@@ -30823,6 +30959,18 @@
+++ scheduler/mime.c (working copy)
@@ -122,0 +123 @@
+ cupsArrayDelete(mime->srcs);
+@@ -139,0 +141,11 @@
++
++ /*
++ * Deleting a filter invalidates the source lookup cache used by
++ * mimeFilter()...
++ */
++
++ if (mime->srcs)
++ {
++ cupsArrayDelete(mime->srcs);
++ mime->srcs = NULL;
++ }
--- scheduler/mime.h (revision 5460)
+++ scheduler/mime.h (working copy)
@@ -113,0 +114 @@
Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- cups.spec 5 May 2006 13:08:02 -0000 1.181
+++ cups.spec 5 May 2006 16:45:34 -0000 1.182
@@ -6,7 +6,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.2
-Release: 0.5.%{beta}.3
+Release: 0.5.%{beta}.4
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test/cups-1.2%{beta}-source.tar.bz2
@@ -25,6 +25,7 @@
Patch1: cups-1.1.15-initscript.patch
Patch2: cups-no-gzip-man.patch
Patch3: cups-1.1.16-system-auth.patch
+Patch4: cups-str1659.patch
Patch5: cups-ext.patch
Patch6: cups-includeifexists.patch
Patch7: cups-banners.patch
@@ -106,6 +107,7 @@
%patch1 -p1 -b .noinit
%patch2 -p1 -b .no-gzip-man
%patch3 -p1 -b .system-auth
+%patch4 -p1 -b .str1659
%patch5 -p1 -b .ext
%patch6 -p1 -b .includeifexists
%patch7 -p1 -b .banners
@@ -371,6 +373,9 @@
%{cups_serverbin}/daemon/cups-lpd
%changelog
+* Fri May 5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.4
+- Sync to svn5493.
+
* Fri May 5 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.5.rc3.3
- Sync to svn5491.
More information about the fedora-cvs-commits
mailing list