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

[Martin Pitt]

Author: mpitt
Date: Wed Mar 14 15:00:06 2007
New Revision: 441

Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/patches/98_search_mime_files_in_usr_share.dpatch
Log:
* 98_search_mime_files_in_usr_share.dpatch: CUPS failed reading the
  *.types and *.convs files in /etc/cups when /usr/share/cups/mime
  did not exist. Fixed (closes: LP#92205).

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	Wed Mar 14 15:00:06 2007
@@ -1,3 +1,11 @@
+cupsys (1.2.8-0ubuntu6) feisty; urgency=low
+
+  * 98_search_mime_files_in_usr_share.dpatch: CUPS failed reading the
+    *.types and *.convs files in /etc/cups when /usr/share/cups/mime
+    did not exist. Fixed (closes: LP#92205).
+	
+ -- Till Kamppeter <till.kamppeter at gmail.com>  Tue, 13 Mar 2007 12:22:06 +0000
+
 cupsys (1.2.8-0ubuntu5) feisty; urgency=low
 
   * debian/cupsys.postinst: Assure that special permissions of lpd backend
@@ -18,7 +26,7 @@
        broken (upstream STR #2278).
      o The LPD mini-daemon did not handle the document-format
        option correctly (upstream STR #2266).
-
+	
  -- Till Kamppeter <till.kamppeter at gmail.com>  Mon, 12 Mar 2007 15:22:06 +0000
 
 cupsys (1.2.8-0ubuntu4) feisty; urgency=low

Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/98_search_mime_files_in_usr_share.dpatch
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/98_search_mime_files_in_usr_share.dpatch	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/98_search_mime_files_in_usr_share.dpatch	Wed Mar 14 15:00:06 2007
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad cupsys-1.2.8~/scheduler/conf.c cupsys-1.2.8/scheduler/conf.c
---- cupsys-1.2.8~/scheduler/conf.c	2007-03-13 17:43:16.000000000 +0000
-+++ cupsys-1.2.8/scheduler/conf.c	2007-03-13 17:48:52.000000000 +0000
+--- cupsys-1.2.8~/scheduler/conf.c	2007-03-14 12:22:15.000000000 +0000
++++ cupsys-1.2.8/scheduler/conf.c	2007-03-14 12:22:16.000000000 +0000
 @@ -216,6 +216,7 @@
    cups_file_t	*fp;			/* Configuration file */
    int		status;			/* Return status */
@@ -42,7 +42,7 @@
     /*
 diff -urNad cupsys-1.2.8~/scheduler/mime.c cupsys-1.2.8/scheduler/mime.c
 --- cupsys-1.2.8~/scheduler/mime.c	2006-05-30 20:40:34.000000000 +0100
-+++ cupsys-1.2.8/scheduler/mime.c	2007-03-13 17:45:01.000000000 +0000
++++ cupsys-1.2.8/scheduler/mime.c	2007-03-14 12:23:11.000000000 +0000
 @@ -217,9 +217,12 @@
  
  mime_t *				/* O - Updated MIME database */
@@ -75,24 +75,23 @@
 - /*
 -  * If "mime" is NULL, make a new, blank database...
 -  */
-+    if ((dir = cupsDirOpen(dirname)) == NULL)
-+      continue;
++    if ((dir = cupsDirOpen(dirname)) != NULL) {
  
 -  if (!mime)
 -    mime = mimeNew();
 -  if (!mime)
 -    return (NULL);
-+    /*
-+     * If "mime" is NULL, make a new, blank database...
-+     */
++      /*
++       * If "mime" is NULL, make a new, blank database...
++       */
  
 - /*
 -  * Read all the .types files...
 -  */
-+    if (!mime)
-+      mime = mimeNew();
-+    if (!mime)
-+      return (NULL);
++      if (!mime)
++	mime = mimeNew();
++      if (!mime)
++	return (NULL);
  
 -  while ((dent = cupsDirRead(dir)) != NULL)
 -  {
@@ -102,35 +101,35 @@
 -     /*
 -      * Load a mime.types file...
 -      */
-+    /*
-+     * Read all the .types files...
-+     */
++      /*
++       * Read all the .types files...
++       */
  
 -      snprintf(filename, sizeof(filename), "%s/%s", pathname, dent->filename);
 -      load_types(mime, filename);
--    }
--  }
-+    while ((dent = cupsDirRead(dir)) != NULL)
-+      {
-+	if (strlen(dent->filename) > 6 &&
-+	    !strcmp(dent->filename + strlen(dent->filename) - 6, ".types"))
-+	  {
-+	    /*
-+	     * Load a mime.types file...
-+	     */
-+ 
-+	    snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
-+	    load_types(mime, filename);
-+	  }
-+      }
- 
--  cupsDirRewind(dir);
-+    cupsDirClose(dir);
++      while ((dent = cupsDirRead(dir)) != NULL)
++	{
++	  if (strlen(dent->filename) > 6 &&
++	      !strcmp(dent->filename + strlen(dent->filename) - 6, ".types"))
++	    {
++	      /*
++	       * Load a mime.types file...
++	       */
++
++	      snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
++	      load_types(mime, filename);
++	    }
++	}
++
++      cupsDirClose(dir);
+     }
 +    if (colon != NULL) dirname = colon + 1;
-+  }
+   }
 +  free(paths); /* We need to copy the original path again for reading
 +		  the convs */
  
+-  cupsDirRewind(dir);
+-
 - /*
 -  * Read all the .convs files...
 -  */
@@ -158,25 +157,24 @@
  
 -      snprintf(filename, sizeof(filename), "%s/%s", pathname, dent->filename);
 -      load_convs(mime, filename, filterpath, filtercache);
--    }
-+    if ((dir = cupsDirOpen(dirname)) == NULL)
-+      continue;
++    if ((dir = cupsDirOpen(dirname)) != NULL) {
 +
-+    while ((dent = cupsDirRead(dir)) != NULL)
-+      {
-+	if (strlen(dent->filename) > 6 &&
-+	    !strcmp(dent->filename + strlen(dent->filename) - 6, ".convs"))
-+	  {
-+	    /*
-+	     * Load a mime.convs file...
-+	     */
++      while ((dent = cupsDirRead(dir)) != NULL)
++	{
++	  if (strlen(dent->filename) > 6 &&
++	      !strcmp(dent->filename + strlen(dent->filename) - 6, ".convs"))
++	    {
++	      /*
++	       * Load a mime.convs file...
++	       */
 +
-+	    snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
-+	    load_convs(mime, filename, filterpath, filtercache);
-+	  }
-+      }
++	      snprintf(filename, sizeof(filename), "%s/%s", dirname, dent->filename);
++	      load_convs(mime, filename, filterpath, filtercache);
++	    }
++	}
 +
-+    cupsDirClose(dir);
++      cupsDirClose(dir);
+     }
 +    if (colon != NULL) dirname = colon + 1;
    }
 +  free(paths);