[Pkg-cups-devel] r7 - in cupsys/trunk/debian: . patches
Kenshi Muto
kmuto at costa.debian.org
Sun Jul 17 20:17:20 UTC 2005
Author: kmuto
Date: Sun Jul 17 20:17:19 2005
New Revision: 7
Added:
cupsys/trunk/debian/patches/46_ppdsdat.dpatch (contents, props changed)
Modified:
cupsys/trunk/debian/changelog
cupsys/trunk/debian/cupsys.postinst
cupsys/trunk/debian/cupsys.postrm
cupsys/trunk/debian/patches/00list
cupsys/trunk/debian/patches/33_jobsauthorize.dpatch
Log:
move /etc/cups/ppds.dat to /var/lib/cups/ppds.dat. Unapply NOAUTH handling from 33_jobauthorize. Now, I'll upload this to unstable. This may be final upload by only myself
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Sun Jul 17 20:17:19 2005
@@ -1,9 +1,10 @@
-cupsys (1.1.23-11) UNRELEASED; urgency=low
+cupsys (1.1.23-11) unstable; urgency=low
+ * "At Debconf 5" release.
* Now CUPS is maintained by Debian CUPS Maintainers Team.
<pkg-cups-devel at lists.alioth.deban.org>
* Do "sleep 2" to wait daemon's wake up. (this is just workaround...
- needs better solution, for #309794)
+ needs better solution, for #309794 and #315017)
* Added Vietnamese translation. (closes: #310152)
* Check whether daemon is running or not before restart in logrotate.
(closes: #310535)
@@ -13,6 +14,10 @@
* Apply status option for init script (closes: #312683). Thanks Stephen.
* Suggests cupsys-driver-gutenprint, this package is new name of
cupsys-driver-gimpprint.
+ * 46_ppdsdat: Move /etc/cups/ppds.dat to /var/lib/cups/ppds.dat and
+ make symlink. (closes: #317905)
+ * Unapply NOAUTH handling from 33_jobauthorize. A user warns me
+ it's dangerous to use.
-- Kenshi Muto <kmuto at debian.org> Fri, 20 May 2005 11:07:42 +0900
Modified: cupsys/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst (original)
+++ cupsys/trunk/debian/cupsys.postinst Sun Jul 17 20:17:19 2005
@@ -73,6 +73,8 @@
chgrp lpadmin /var/lib/cups/certs
+ [ -f /etc/cups/ppds.dat ] && mv /etc/cups/ppds.dat /var/lib/cups
+
# Set up smb backend by symlinking to smbspool.
if [ -x /usr/bin/smbspool -a ! -e /usr/lib/cups/backend/smb ]; then
ln -sf /usr/bin/smbspool /usr/lib/cups/backend/smb
Modified: cupsys/trunk/debian/cupsys.postrm
==============================================================================
--- cupsys/trunk/debian/cupsys.postrm (original)
+++ cupsys/trunk/debian/cupsys.postrm Sun Jul 17 20:17:19 2005
@@ -29,7 +29,7 @@
rm -rf /etc/cups/interfaces
rm -rf /etc/cups/ppd
rm -f /etc/cups/printers.conf* /etc/cups/classes.conf.* \
- /etc/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types
+ /var/lib/cups/ppds.dat /etc/cups/raw.convs /etc/cups/raw.types
rmdir /etc/cups 2>/dev/null || true
update-rc.d cupsys remove > /dev/null 2>&1
;;
Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list (original)
+++ cupsys/trunk/debian/patches/00list Sun Jul 17 20:17:19 2005
@@ -23,3 +23,4 @@
43_filtercost.dpatch
44_fixconfdirperms.dpatch
45_slashprinternames.dpatch
+46_ppdsdat.dpatch
Modified: cupsys/trunk/debian/patches/33_jobsauthorize.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/33_jobsauthorize.dpatch (original)
+++ cupsys/trunk/debian/patches/33_jobsauthorize.dpatch Sun Jul 17 20:17:19 2005
@@ -25,27 +25,3 @@
#<Location /printers>
#
-diff -urNad cupsys-1.1.23/scheduler/ipp.c /tmp/dpep.F4C4OL/cupsys-1.1.23/scheduler/ipp.c
---- cupsys-1.1.23/scheduler/ipp.c 2005-01-03 19:29:59.000000000 +0000
-+++ /tmp/dpep.F4C4OL/cupsys-1.1.23/scheduler/ipp.c 2005-04-17 03:49:42.016723056 +0000
-@@ -6792,7 +6792,9 @@
- struct passwd *user; /* User info */
- struct group *group; /* System group info */
- char junk[33]; /* MD5 password (not used) */
-+ location_t *loc; /* Authentication location */
-
-+ loc = FindBest(con->uri, con->http.state);
-
- LogMessage(L_DEBUG2, "validate_user(%p[%d], \"%s\", %p, %d)\n",
- con, con->http.fd, owner, username, userlen);
-@@ -6801,6 +6803,10 @@
- * Validate input...
- */
-
-+ if (loc->type == AUTH_NONE) {
-+ return (1);
-+ }
-+
- if (con == NULL || owner == NULL || username == NULL || userlen <= 0)
- return (0);
-
Added: cupsys/trunk/debian/patches/46_ppdsdat.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/46_ppdsdat.dpatch Sun Jul 17 20:17:19 2005
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 46_ppdsdat.dpatch by Kenshi Muto <kmuto at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./scheduler/ppds.c /tmp/dpep-work.Vnwffe/cupsys-1.1.23/scheduler/ppds.c
+--- ./scheduler/ppds.c 2005-01-03 19:29:59.000000000 +0000
++++ /tmp/dpep-work.Vnwffe/cupsys-1.1.23/scheduler/ppds.c 2005-07-17 20:09:28.727276629 +0000
+@@ -104,7 +104,7 @@
+ ppds = (ppd_info_t *)0;
+ changed_ppd = 0;
+
+- snprintf(filename, sizeof(filename), "%s/ppds.dat", ServerRoot);
++ snprintf(filename, sizeof(filename), "%s/ppds.dat", "/var/lib/cups");
+ if (!stat(filename, &fileinfo) &&
+ (num_ppds = fileinfo.st_size / sizeof(ppd_rec_t)) > 0)
+ {
More information about the Pkg-cups-devel
mailing list