[Pkg-cups-devel] r125 - in cupsys/branches/cups-1.2/debian: . patches

[Martin Pitt]

Author: mpitt
Date: Wed Apr  5 13:08:17 2006
New Revision: 125

Modified:
   cupsys/branches/cups-1.2/debian/changelog
   cupsys/branches/cups-1.2/debian/patches/00list
   cupsys/branches/cups-1.2/debian/patches/09_runasuser_fixes.dpatch
Log:
* debian/patches/09_runasuser_fixes.dpatch: Remove group handling bits,
  since RunAsUser was dropped upstream.

also remove the TODO item about RunAsUser



Modified: cupsys/branches/cups-1.2/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2/debian/changelog	(original)
+++ cupsys/branches/cups-1.2/debian/changelog	Wed Apr  5 13:08:17 2006
@@ -12,10 +12,6 @@
     Before compiling, you need to run "autoconf". (it will be unneeded
     when cups 1.2.tar.gz is officially released)
 
-  - Some Debian patches seem be rejected. We need to verify again.
-    09_runasuser_fixes
-  - usb and parallel backend programs won't work when I defined lp
-    as RunAsUser. root works.
   - /etc/cups/client.conf, /usr/sbin/disable, /usr/sbin/enable are
     removed from upstream.
   - gs-esp/other alternatives issue (although other gs needs to apply
@@ -49,8 +45,10 @@
     0660, which is inaccessible for a process which runs as lp:root).
   * debian/rules: Remove --with-cups-{user,group}, upstream does not support
     them any more.
+  * debian/patches/09_runasuser_fixes.dpatch: Remove group handling bits,
+    since RunAsUser was dropped upstream.
 
- -- Martin Pitt <mpitt at debian.org>  Wed,  5 Apr 2006 15:04:08 +0200
+ -- Martin Pitt <mpitt at debian.org>  Wed,  5 Apr 2006 15:06:26 +0200
 
 cupsys (1.1.99.b1.r4885-1) experimental; urgency=low
 

Modified: cupsys/branches/cups-1.2/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/00list	(original)
+++ cupsys/branches/cups-1.2/debian/patches/00list	Wed Apr  5 13:08:17 2006
@@ -7,7 +7,7 @@
 06_disable_backend_setuid.dpatch
 07_removecvstag.dpatch
 08_cupsd.conf.conf.d.dpatch
-#09_runasuser_fixes.dpatch
+09_runasuser_fixes.dpatch
 11_pam.dpatch
 19_cupsaccept.dpatch
 26_modprobe.dpatch

Modified: cupsys/branches/cups-1.2/debian/patches/09_runasuser_fixes.dpatch
==============================================================================
--- cupsys/branches/cups-1.2/debian/patches/09_runasuser_fixes.dpatch	(original)
+++ cupsys/branches/cups-1.2/debian/patches/09_runasuser_fixes.dpatch	Wed Apr  5 13:08:17 2006
@@ -8,23 +8,6 @@
 diff -urNad cupsys~/scheduler/main.c cupsys/scheduler/main.c
 --- cupsys~/scheduler/main.c	2005-12-07 14:51:18.000000000 +0100
 +++ cupsys/scheduler/main.c	2005-12-07 15:00:24.000000000 +0100
-@@ -52,6 +52,7 @@
- #include <sys/resource.h>
- #include <syslog.h>
- #include <grp.h>
-+#include <pwd.h>
- 
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
-@@ -434,7 +435,7 @@
-   if (RunAsUser)
-   {
-     setgid(Group);
--    setgroups(1, &Group);
-+    initgroups(getpwuid(User)->pw_name, Group);
-     setuid(User);
-   }
- 
 @@ -812,8 +813,7 @@
      * Update the root certificate once every 5 minutes...
      */