[Pkg-cups-devel] r374 - in cupsys/branches/cups-1.2-ubuntu/debian:
. patches
Martin Pitt
mpitt at costa.debian.org
Fri Sep 15 17:31:42 UTC 2006
Author: mpitt
Date: Fri Sep 15 17:31:42 2006
New Revision: 374
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/00_r5958.dpatch
- copied unchanged from r373, /cupsys/branches/cups-1.2/debian/patches/00_r5958.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/64_driverfolder.dpatch
- copied unchanged from r373, /cupsys/branches/cups-1.2/debian/patches/64_driverfolder.dpatch
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch
cupsys/branches/cups-1.2-ubuntu/debian/patches/62_classes_crash.dpatch
Log:
merge recent Debian bug fixes
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Fri Sep 15 17:31:42 2006
@@ -1,10 +1,42 @@
-cupsys (1.2.3-0ubuntu2) edgy; urgency=low
+cupsys (1.2.3-1ubuntu2) edgy; urgency=low
+ * Merge recent bug fixes from Debian (see Kenshi's changes in 1.2.3-1 for
+ Ubuntu-relevant details):
* debian/cupsys.init.d: Always make sure that log files have proper
permissions. Closes: LP#54277
-- Martin Pitt <martin.pitt at ubuntu.com> Tue, 12 Sep 2006 12:02:43 +0200
+cupsys (1.2.3-1) unstable; urgency=medium
+
+ * New upstream release
+ - The parallel and USB backends no longer wait for the
+ printer to go on-line - this caused problems with
+ certain printers that don't follow with the IEEE-1284
+ standard (STR #1738, closes: #383091)
+ - fixed Printer options were not always honored when printing
+ from Windows clients (STR#1839, closes: #385605)
+
+ [ Martin Pitt ]
+ * Add appropriate Replaces: to cupsys-common to unbreak upgrades.
+ * debian/patches/44_fixconfdirperms.dpatch: Fix file mode specification:
+ 3755 -> 03755 (regression of svn commit 353).
+
+ [ Kenshi Muto ]
+ * Apply upstream svn r5958.
+ * check modprobe command and /proc/modules dir exist before running
+ modprobe (closes: #387176).
+ * 62_classes_crash: fix incorrect code. old code returned an error
+ even if user use the correct class configuration. (closes: #380663, #384654)
+ * bump up libcupsys2.shlibs version to 1.2.3. (closes: #385724)
+ * Merge old separated style configuration to the single format
+ only if user upgraded from an affected version. (closes: #386551)
+ * Provide /usr/share/cups/drivers to contain Windows drivers.
+ * 57_cupsaddsmb: original cupsaddsmb easily goes infinite and DoS-like
+ loop. Debian cupsaddsmb ends soon when it catches an error.
+
+ -- Kenshi Muto <kmuto at debian.org> Fri, 8 Sep 2006 11:28:12 +0200
+
cupsys (1.2.3-0ubuntu1) edgy; urgency=medium
* New upstream bugfix release (UVF exception approved by Colin Watson).
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.dirs Fri Sep 15 17:31:42 2006
@@ -1,5 +1,6 @@
var/run/cups
usr/share/doc/cupsys
+usr/share/cups/drivers
etc/default
etc/cups/ssl
usr/lib/cups/backend-available
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d Fri Sep 15 17:31:42 2006
@@ -40,7 +40,8 @@
done
if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
- -a -f /proc/devices -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
+ -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe \
+ -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
modprobe -q lp || true
modprobe -q ppdev || true # for ISO-1284 device name detection
fi
Modified: cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/libcupsys2.shlibs Fri Sep 15 17:31:42 2006
@@ -1 +1 @@
-libcups 2 libcupsys2 (>= 1.2.1)
+libcups 2 libcupsys2 (>= 1.2.3)
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Fri Sep 15 17:31:42 2006
@@ -1,3 +1,4 @@
+00_r5958.dpatch
02_configure.dpatch
#03_manext.dpatch
03_clean.dpatch
@@ -21,12 +22,13 @@
54_cups-config_modeldir.dpatch
55_ppd_okidata_name.dpatch
56_dirsvc.dpatch
-#57_cupsaddsmb.dpatch
+57_cupsaddsmb.dpatch
#58_fixdestc.dpatch
#59_de_docroot.dpatch
60_device_uri.dpatch
58_cupsd.conf-AllowLocal.dpatch
#61_job_c_strangeloop.dpatch
-#62_classes_crash.dpatch
+62_classes_crash.dpatch
+#64_driverfolder.dpatch
ubuntu-disable-browsing.dpatch
ubuntu-external-pam-helper.dpatch
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/57_cupsaddsmb.dpatch Fri Sep 15 17:31:42 2006
@@ -1,46 +1,19 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 56_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
+## 57_cupsaddsmb.dpatch by Kenshi Muto <kmuto at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.1~/systemv/cupsaddsmb.c cupsys-1.2.1/systemv/cupsaddsmb.c
---- cupsys-1.2.1~/systemv/cupsaddsmb.c 2006-07-01 10:54:43.000000000 +0000
-+++ cupsys-1.2.1/systemv/cupsaddsmb.c 2006-07-01 12:14:15.000000000 +0000
-@@ -240,26 +240,30 @@
- * Try to export it...
- */
-
-- for (status = 0; !status;)
-- {
-+/* for (status = 0; !status;)
-+ { */
- /*
- * Get the password, as needed...
- */
-
- if (!SAMBAPassword)
- {
-- snprintf(prompt, sizeof(prompt),
-+ /* snprintf(prompt, sizeof(prompt),
- _("Password for %s required to access %s via SAMBA: "),
- SAMBAUser, SAMBAServer);
-
- if ((SAMBAPassword = cupsGetPassword(prompt)) == NULL)
-- break;
-+ break; */
-+ _cupsLangPrintf(stderr,
-+ _("Password for %s required to access %s via SAMBA: "),
-+ SAMBAUser, SAMBAServer); /* localize */
-+ SAMBAPassword = cupsGetPassword("");
- }
-
+diff -urNad cupsys-1.2.3~/systemv/cupsaddsmb.c cupsys-1.2.3/systemv/cupsaddsmb.c
+--- cupsys-1.2.3~/systemv/cupsaddsmb.c 2006-09-15 14:45:03.000000000 +0000
++++ cupsys-1.2.3/systemv/cupsaddsmb.c 2006-09-15 14:46:16.000000000 +0000
+@@ -263,6 +263,8 @@
status = cupsAdminExportSamba(dest, ppdfile, SAMBAServer,
SAMBAUser, SAMBAPassword,
Verbosity ? stderr : NULL);
-- }
-+ /* } */
++
++ break; /* Debian patch: anyway force to break */
+ }
unlink(ppdfile);
-
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/62_classes_crash.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/62_classes_crash.dpatch (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/62_classes_crash.dpatch Fri Sep 15 17:31:42 2006
@@ -5,19 +5,18 @@
## DP: No description.
@DPATCH@
-diff -urNad cupsys-1.2.2~/scheduler/classes.c cupsys-1.2.2/scheduler/classes.c
---- cupsys-1.2.2~/scheduler/classes.c 2006-08-13 08:07:43.000000000 +0000
-+++ cupsys-1.2.2/scheduler/classes.c 2006-08-13 08:56:01.000000000 +0000
-@@ -274,6 +274,12 @@
- * Thanks to Joel Fredrikson for helping us get this right!
- */
+diff -urNad cupsys-1.2.3~/scheduler/classes.c cupsys-1.2.3/scheduler/classes.c
+--- cupsys-1.2.3~/scheduler/classes.c 2006-02-22 22:43:17.000000000 +0000
++++ cupsys-1.2.3/scheduler/classes.c 2006-09-15 12:33:25.000000000 +0000
+@@ -279,6 +279,11 @@
+ if (i >= c->num_printers)
+ i = 0;
-+ if (c->last_printer == 0)
-+ {
-+ cupsdLogMessage(CUPSD_LOG_ERROR, "Class \"%s\" hasn't any printers!", name);
-+ return (NULL); /* strange, but there is no printer in class */
-+ }
++ if (c->num_printers == 0) {
++ cupsdLogMessage(CUPSD_LOG_ERROR, "Class \"%s\" hasn't any printers!", name);
++ return (NULL);
++ }
+
- for (i = c->last_printer + 1; ; i ++)
- {
- if (i >= c->num_printers)
+ if (c->printers[i]->accepting &&
+ (c->printers[i]->state == IPP_PRINTER_IDLE ||
+ ((c->printers[i]->type & CUPS_PRINTER_REMOTE) && !c->printers[i]->job)))
More information about the Pkg-cups-devel
mailing list