[Pkg-cups-devel] r707 - in cupsys/trunk: . debian debian/patches

[Martin Pitt]

Author: mpitt
Date: Sun Mar 16 18:48:58 2008
New Revision: 707

Log:
* pidfile.dpatch: Specify PidFile in temporary directory in the self test's
  cupsd.conf.

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/pidfile.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sun Mar 16 18:48:58 2008
@@ -19,8 +19,10 @@
     /etc/cups is the canonical dir which must exist, and /usr/share/cups/mime
     is optional), and also unbreaks the test suite (which does not create this
     directory by default).
+  * pidfile.dpatch: Specify PidFile in temporary directory in the self test's
+    cupsd.conf.
 
- -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 14:24:08 +0100
+ -- Martin Pitt <mpitt at debian.org>  Sun, 16 Mar 2008 14:26:58 +0100
 
 cupsys (1.3.6-1) unstable; urgency=low
 

Modified: cupsys/trunk/debian/patches/pidfile.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/pidfile.dpatch	(original)
+++ cupsys/trunk/debian/patches/pidfile.dpatch	Sun Mar 16 18:48:58 2008
@@ -5,12 +5,12 @@
 ## DP: Forwarded upstream: http://www.cups.org/str.php?L2465
 
 @DPATCH@
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.c cupsys-1.3.0~rc2/scheduler/conf.c
---- cupsys-1.3.0~rc2~/scheduler/conf.c	2007-07-30 17:47:10.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.c	2007-08-01 13:23:12.000000000 +0100
-@@ -167,7 +167,8 @@
+diff -urNad trunk~/scheduler/conf.c trunk/scheduler/conf.c
+--- trunk~/scheduler/conf.c	2008-03-16 14:26:26.000000000 +0100
++++ trunk/scheduler/conf.c	2008-03-16 14:26:26.000000000 +0100
+@@ -168,7 +168,8 @@
  #endif /* HAVE_AUTHORIZATION_H */
-   { "TempDir",			&TempDir,		CUPSD_VARTYPE_STRING },
+   { "TempDir",			&TempDir,		CUPSD_VARTYPE_PATHNAME },
    { "Timeout",			&Timeout,		CUPSD_VARTYPE_INTEGER },
 -  { "UseNetworkDefault",	&UseNetworkDefault,	CUPSD_VARTYPE_BOOLEAN }
 +  { "UseNetworkDefault",	&UseNetworkDefault,	CUPSD_VARTYPE_BOOLEAN },
@@ -18,7 +18,7 @@
  };
  #define NUM_VARS	(sizeof(variables) / sizeof(variables[0]))
  
-@@ -413,6 +414,7 @@
+@@ -414,6 +415,7 @@
    cupsdSetString(&RemoteRoot, "remroot");
    cupsdSetString(&ServerHeader, "CUPS/1.2");
    cupsdSetString(&StateDir, CUPS_STATEDIR);
@@ -26,10 +26,10 @@
  #ifdef HAVE_GSSAPI
    cupsdSetString(&GSSServiceName, CUPS_DEFAULT_GSSSERVICENAME);
  #endif /* HAVE_GSSAPI */
-diff -urNad cupsys-1.3.0~rc2~/scheduler/conf.h cupsys-1.3.0~rc2/scheduler/conf.h
---- cupsys-1.3.0~rc2~/scheduler/conf.h	2007-07-11 22:46:42.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/conf.h	2007-08-01 13:19:41.000000000 +0100
-@@ -186,6 +186,7 @@
+diff -urNad trunk~/scheduler/conf.h trunk/scheduler/conf.h
+--- trunk~/scheduler/conf.h	2008-03-16 14:21:55.000000000 +0100
++++ trunk/scheduler/conf.h	2008-03-16 14:26:26.000000000 +0100
+@@ -189,6 +189,7 @@
  					/* Server key file */
  #  endif /* HAVE_LIBSSL || HAVE_GNUTLS */
  #endif /* HAVE_SSL */
@@ -37,9 +37,9 @@
  
  #ifdef HAVE_LAUNCHD
  VAR int			LaunchdTimeout		VALUE(DEFAULT_TIMEOUT);
-diff -urNad cupsys-1.3.0~rc2~/scheduler/main.c cupsys-1.3.0~rc2/scheduler/main.c
---- cupsys-1.3.0~rc2~/scheduler/main.c	2007-07-19 00:52:15.000000000 +0100
-+++ cupsys-1.3.0~rc2/scheduler/main.c	2007-08-01 13:19:41.000000000 +0100
+diff -urNad trunk~/scheduler/main.c trunk/scheduler/main.c
+--- trunk~/scheduler/main.c	2008-03-16 14:21:55.000000000 +0100
++++ trunk/scheduler/main.c	2008-03-16 14:26:26.000000000 +0100
 @@ -89,6 +89,8 @@
  static void		sigterm_handler(int sig);
  static long		select_timeout(int fds);
@@ -49,7 +49,7 @@
  
  
  /*
-@@ -529,6 +531,11 @@
+@@ -595,6 +597,11 @@
    }
  #endif /* __sgi */
  
@@ -61,7 +61,7 @@
   /*
    * Initialize authentication certificates...
    */
-@@ -1009,9 +1016,39 @@
+@@ -1145,9 +1152,39 @@
  
    cupsdStopSelect();
  
@@ -101,3 +101,14 @@
  
  /*
   * 'cupsdClosePipe()' - Close a pipe as necessary.
+diff -urNad trunk~/test/run-stp-tests.sh trunk/test/run-stp-tests.sh
+--- trunk~/test/run-stp-tests.sh	2007-07-11 23:46:42.000000000 +0200
++++ trunk/test/run-stp-tests.sh	2008-03-16 14:26:48.000000000 +0100
+@@ -302,6 +302,7 @@
+ DocumentRoot $root/doc
+ RequestRoot /tmp/cups-$user/spool
+ TempDir /tmp/cups-$user/spool/temp
++PidFile /tmp/cups-$user/cupsd.pid
+ MaxLogSize 0
+ AccessLog /tmp/cups-$user/log/access_log
+ ErrorLog /tmp/cups-$user/log/error_log