[Pkg-shadow-commits] r935 - in trunk/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-03-30 10:02:52 +0000 (Thu, 30 Mar 2006)
New Revision: 935

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/series
Log:
Activate the fix for #276419
Set a first version for Conflicts (to be checked by nekral)
We will definitely use this patch in the next version, due out in 4-5 days


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-03-29 07:07:18 UTC (rev 934)
+++ trunk/debian/changelog	2006-03-30 10:02:52 UTC (rev 935)
@@ -7,6 +7,12 @@
     - parse /etc/default/locale for locale environment variables in login and
       su default PAM configuration files. Thanks to Denis Barbier for the
       patch. Closes: #359163
+    - su: Do not concatenate the additional arguments, and support an
+          environment variable to revert to the old Debian's su behavior.
+          Closes: #276419
+	  To avoid breaking packages using the old-style way to pass
+	  arguments, set Conflicts with "gnunet, amavisd-new, python-4suite,
+          backupninja (<= 0.9.3-4), echolot"
   * Upstream bugs or fixes not already fixed in upstream releases or CVS:
     - 486_chgpasswd.8: add a manpage for chgpasswd.
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-03-29 07:07:18 UTC (rev 934)
+++ trunk/debian/control	2006-03-30 10:02:52 UTC (rev 935)
@@ -23,7 +23,7 @@
 Architecture: any
 Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Depends: libpam-modules (>= 0.72-5)
-Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50)
+Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50), gnunet, amavisd-new, python-4suite, backupninja (<= 0.9.3-4), echolot
 Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fi (<< 0.2-4), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-2), manpages-ko (<< 20050219-2), manpages-ja (<< 0.5.0.0.20050915-1), manpages-pl (<= 20020406-1), manpages-de (<< 0.4-10), manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh
 Essential: yes
 Section: admin

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-03-29 07:07:18 UTC (rev 934)
+++ trunk/debian/patches/series	2006-03-30 10:02:52 UTC (rev 935)
@@ -32,8 +32,7 @@
 466_fflush-prompt
 468_duplicate_passwd_struct_before_usage
 423_su_arguments_are_concatenated
-# Not for experimental yet
-# 423_su_arguments_are_no_more_concatenated_by_default
+423_su_arguments_are_no_more_concatenated_by_default
 479_chowntty_debug
 480_getopt_args_reorder
 482_libmisc_copydir_check_return_values