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

[Martin Pitt]

Author: mpitt
Date: Sat Sep  6 10:44:15 2008
New Revision: 850

Log:
confdirperms.dpatch, manpage-translations.dpatch: Revert note that Debian
doesn't install lppasswd suid root, since we do. (Closes: #478280)

Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/confdirperms.dpatch
   cupsys/trunk/debian/patches/manpage-translations.dpatch

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sat Sep  6 10:44:15 2008
@@ -6,8 +6,10 @@
   * Add quiesce-bonjour-warning.dpatch: Silence the "Apple Bonjour
     compatibility layer of Avahi" warning, since it can cause SIGPIPE crashes
     when being issued in a child process without stderr. (Closes: #497492)
+  * confdirperms.dpatch, manpage-translations.dpatch: Revert note that Debian
+    doesn't install lppasswd suid root, since we do. (Closes: #478280)
 
- -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 11:59:53 +0200
+ -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 12:23:35 +0200
 
 cups (1.3.8-7) experimental; urgency=low
 

Modified: cupsys/trunk/debian/patches/confdirperms.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/confdirperms.dpatch	(original)
+++ cupsys/trunk/debian/patches/confdirperms.dpatch	Sat Sep  6 10:44:15 2008
@@ -5,17 +5,6 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad cups-1.3.0~rc2~/man/lppasswd.man cups-1.3.0~rc2/man/lppasswd.man
---- cups-1.3.0~rc2~/man/lppasswd.man	2007-07-11 22:46:42.000000000 +0100
-+++ cups-1.3.0~rc2/man/lppasswd.man	2007-08-02 16:30:14.000000000 +0100
-@@ -50,6 +50,7 @@
- that could grant super-user privileges to unprivileged users,
- paranoid system administrators may wish to disable or change the
- ownership of the program to an unprivileged account.
-+(So Debian installs \fIlppasswd\fR command with setuid to lp)
- .SH SEE ALSO
- \fIlp(1)\fR, \fIlpr(1)\fR,
- .br
 diff -urNad cups-1.3.0~rc2~/scheduler/conf.c cups-1.3.0~rc2/scheduler/conf.c
 --- cups-1.3.0~rc2~/scheduler/conf.c	2007-07-30 17:47:10.000000000 +0100
 +++ cups-1.3.0~rc2/scheduler/conf.c	2007-08-02 16:30:54.000000000 +0100

Modified: cupsys/trunk/debian/patches/manpage-translations.dpatch
==============================================================================
--- cupsys/trunk/debian/patches/manpage-translations.dpatch	(original)
+++ cupsys/trunk/debian/patches/manpage-translations.dpatch	Sat Sep  6 10:44:15 2008
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad trunk~/man/Makefile trunk/man/Makefile
---- trunk~/man/Makefile	2007-07-13 03:01:14.000000000 +0200
-+++ trunk/man/Makefile	2008-07-23 08:51:46.000000000 +0200
+--- trunk~/man/Makefile	2008-09-06 12:20:53.000000000 +0200
++++ trunk/man/Makefile	2008-09-06 12:22:44.000000000 +0200
 @@ -62,7 +62,12 @@
  # Make everything...
  #
@@ -52,7 +52,7 @@
  #
 diff -urNad trunk~/man/Makefile.l10n trunk/man/Makefile.l10n
 --- trunk~/man/Makefile.l10n	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/man/Makefile.l10n	2008-07-23 08:51:46.000000000 +0200
++++ trunk/man/Makefile.l10n	2008-09-06 12:22:44.000000000 +0200
 @@ -0,0 +1,209 @@
 +#
 +# "$Id: $"
@@ -265,7 +265,7 @@
 +#
 diff -urNad trunk~/man/fr/Makefile trunk/man/fr/Makefile
 --- trunk~/man/fr/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/man/fr/Makefile	2008-07-23 08:51:46.000000000 +0200
++++ trunk/man/fr/Makefile	2008-09-06 12:22:44.000000000 +0200
 @@ -0,0 +1,13 @@
 +#
 +# "$Id: $"
@@ -282,7 +282,7 @@
 +#
 diff -urNad trunk~/man/po4a/cups.cfg trunk/man/po4a/cups.cfg
 --- trunk~/man/po4a/cups.cfg	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/man/po4a/cups.cfg	2008-07-23 08:51:46.000000000 +0200
++++ trunk/man/po4a/cups.cfg	2008-09-06 12:22:44.000000000 +0200
 @@ -0,0 +1,39 @@
 +[po4a_paths] po4a/po/cups.pot fr:po4a/po/fr.po
 +
@@ -325,8 +325,8 @@
 +
 diff -urNad trunk~/man/po4a/po/fr.po trunk/man/po4a/po/fr.po
 --- trunk~/man/po4a/po/fr.po	1970-01-01 01:00:00.000000000 +0100
-+++ trunk/man/po4a/po/fr.po	2008-07-23 08:53:21.000000000 +0200
-@@ -0,0 +1,8409 @@
++++ trunk/man/po4a/po/fr.po	2008-09-06 12:23:07.000000000 +0200
+@@ -0,0 +1,8407 @@
 +# Translation of the cups manpages into French.
 +#
 +# Original translations from:
@@ -7461,15 +7461,13 @@
 +"been made to make it secure against exploits that could grant super-user "
 +"privileges to unprivileged users, paranoid system administrators may wish to "
 +"disable or change the ownership of the program to an unprivileged account.  "
-+"(So Debian installs I<lppasswd> command with setuid to lp)"
 +msgstr ""
 +"La commande B<lppasswd> est installée avec le bit setuid activé. Toutes les "
 +"précautions ont été prises pour empêcher les failles permettant l'accès aux "
 +"privilèges du super-utilisateur par un utilisateur non privilégié. "
 +"Cependant, certains administrateurs systèmes paranoïaques peuvent vouloir "
 +"désactiver ce programme ou en modifier le propriétaire en un utilisateur non "
-+"privilégié (c'est la raison pour laquelle le propriétaire de B<lppasswd> sur "
-+"les systèmes Debian est lp)."
++"privilégié."
 +
 +# type: Plain text
 +#: lppasswd.man:56