[Pkg-cups-devel] r278 - in cupsys/branches/cups-1.2-ubuntu/debian: patches

[Martin Pitt]

Author: mpitt
Date: Tue Jun 27 14:04:41 2006
New Revision: 278

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/44_fixconfdirperms.dpatch

Log:
* debian/patches/44_fixconfdirperms.dpatch:
  - Do not change owner and mode of SSL certificate, in order to not break
    the SSL snakeoil cert/key (and customized global ones). (Grrr, cups, no,
    you cannot own the world!)

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	Tue Jun 27 14:04:41 2006
@@ -1,8 +1,11 @@
 cupsys (1.2.1-2ubuntu2) UNRELEASED-edgy; urgency=low
 
-  * 
+  * debian/patches/44_fixconfdirperms.dpatch:
+    - Do not change owner and mode of SSL certificate, in order to not break
+      the SSL snakeoil cert/key (and customized global ones). (Grrr, cups, no,
+      you cannot own the world!)
 
- -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 15 Jun 2006 21:19:33 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 27 Jun 2006 16:04:51 +0200
 
 cupsys (1.2.1-2ubuntu1) edgy; urgency=low
 

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/44_fixconfdirperms.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/44_fixconfdirperms.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/44_fixconfdirperms.dpatch	Tue Jun 27 14:04:41 2006
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cupsys-1.1.99.rc2~/scheduler/conf.c cupsys-1.1.99.rc2/scheduler/conf.c
---- cupsys-1.1.99.rc2~/scheduler/conf.c	2006-04-06 20:03:32.000000000 +0000
-+++ cupsys-1.1.99.rc2/scheduler/conf.c	2006-04-11 10:35:14.000000000 +0000
-@@ -531,22 +531,10 @@
+diff -urNad cups-1.2-ubuntu~/scheduler/conf.c cups-1.2-ubuntu/scheduler/conf.c
+--- cups-1.2-ubuntu~/scheduler/conf.c	2006-06-27 15:59:30.000000000 +0200
++++ cups-1.2-ubuntu/scheduler/conf.c	2006-06-27 15:59:51.000000000 +0200
+@@ -540,22 +540,10 @@
  
        cupsdLogMessage(CUPSD_LOG_NOTICE,
                        "Group and SystemGroup cannot use the same groups!");
@@ -33,7 +33,29 @@
      }
    }
  
-@@ -630,11 +618,13 @@
+@@ -609,21 +597,10 @@
+   if (ServerCertificate[0] != '/')
+     cupsdSetStringf(&ServerCertificate, "%s/%s", ServerRoot, ServerCertificate);
+ 
+-  if (!strncmp(ServerRoot, ServerCertificate, strlen(ServerRoot)))
+-  {
+-    chown(ServerCertificate, RunUser, Group);
+-    chmod(ServerCertificate, 0600);
+-  }
+-
+ #  if defined(HAVE_LIBSSL) || defined(HAVE_GNUTLS)
+   if (ServerKey[0] != '/')
+     cupsdSetStringf(&ServerKey, "%s/%s", ServerRoot, ServerKey);
+ 
+-  if (!strncmp(ServerRoot, ServerKey, strlen(ServerRoot)))
+-  {
+-    chown(ServerKey, RunUser, Group);
+-    chmod(ServerKey, 0600);
+-  }
+ #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
+ #endif /* HAVE_SSL */
+ 
+@@ -639,11 +616,13 @@
    check_permissions(StateDir, "certs", RunUser ? 0711 : 0511, User,
                      SystemGroupIDs[0], 1, 1);