[Pkg-cups-devel] Ubuntu patches for 1.2 cups

[Martin-Éric Racine]

ti, 2005-11-29 kello 10:25 +0100, Martin Pitt kirjoitti:

> | diff -u cupsys-1.1.99.b1.r4841/debian/local/enable_browsing cupsys-1.1.99.b1.r4841/debian/local/enable_browsing
> | --- cupsys-1.1.99.b1.r4841/debian/local/enable_browsing
> | +++ cupsys-1.1.99.b1.r4841/debian/local/enable_browsing
> | @@ -13,7 +13,7 @@
> |  # 1: enabled browsing
> |  # Return 0 on success, or 1 on failure (prints error to stderr)
> |  
> | -CONF=/etc/cups/cupsd-browsing.conf
> | +CONF=/etc/cups/cups.d/browse.conf
> |  STATUS_SCRIPT=/usr/share/cups/browsing_status
> |  
> |  [ -x $STATUS_SCRIPT ] || {
> | @@ -54,7 +54,3 @@
> |  if [ -x "/etc/init.d/cupsys" ]; then
> | -    if [ -x /usr/sbin/invoke-rc.d ]; then
> | -	invoke-rc.d cupsys restart || exit 0
> | -    else
> | -	/etc/init.d/cupsys restart || exit 0
> | -    fi
> | +    /etc/init.d/cupsys restart || exit 0
> 
> Makes more sense for me to not use invoke-rc.d.

Isn't directly invoking init.d scripts against recommended practise?
Personally, I would stick with invoke-rc.d here.


> | --- cupsys-1.1.99.b1.r4841.orig/debian/patches/ubuntu-sanitize-conffile-handling.dpatch
> | +++ cupsys-1.1.99.b1.r4841/debian/patches/ubuntu-sanitize-conffile-handling.dpatch
> | @@ -0,0 +1,58 @@
> | +#! /bin/sh /usr/share/dpatch/dpatch-run
> | +## ubuntu-disable-conffile-chmod.dpatch by  <martin.pitt at ubuntu.com>
> | +##
> | +## All lines beginning with `## DP:' are a description of the patch.
> | +## DP: No description.
> | +
> | + at DPATCH@
> | +diff -urNad cupsys-1.1.99.b1.r4841~/scheduler/conf.c cupsys-1.1.99.b1.r4841/scheduler/conf.c
> | +--- cupsys-1.1.99.b1.r4841~/scheduler/conf.c	2005-11-23 11:44:07.000000000 +0100
> | ++++ cupsys-1.1.99.b1.r4841/scheduler/conf.c	2005-11-23 11:45:40.000000000 +0100
> | +@@ -371,7 +371,7 @@
> | +   * Find the default group (nobody)...
> | +   */
> | + 
> | +-  group = getgrnam("nobody");
> | ++  group = getgrnam("root");
> | +   endgrent();
> | + 
> | +   if (group != NULL)
> | +@@ -383,7 +383,7 @@
> | +     * complement number...)
> | +     */
> | + 
> | +-    Group = 65534;
> | ++    Group = 0;
> | +   }
> | + 
> | +  /*
> | +@@ -517,7 +517,7 @@
> | + 
> | +       cupsdLogMessage(CUPSD_LOG_NOTICE,
> | +                       "Group and SystemGroup cannot use the same groups!");
> | +-      cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"nobody\"...");
> | ++      cupsdLogMessage(CUPSD_LOG_INFO, "Resetting Group to \"root\"...");
> | + 
> | +       group = getgrnam("nobody");
> | +       endgrent();
> | +@@ -531,7 +531,7 @@
> | + 	* complement number...)
> | + 	*/
> | + 
> | +-	Group = 65534;
> | ++	Group = 0;
> | +       }
> | +     }
> | +   }
> 
> So far: do not create config files with group nogroup/user nobody,
> this is evil. root is much better for that and more compliant with the
> Debian policy.

This appears in direct contradiction with Ubuntu's low-priviledge user
strategy.  Additionally, Ubuntu discourages the utilization of dpatch.

-- 
Martin-Éric Racine
http://q-funk.iki.fi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digitaalisesti allekirjoitettu viestin osa
Url : http://lists.alioth.debian.org/pipermail/pkg-cups-devel/attachments/20051207/d9c6e126/attachment-0001.pgp