Imported Debian patch 1.6.9p11-2

diff --git a/debian/changelog b/debian/changelog
index 159fb183f09d29c185c80780c224cf81e0f717fe..aa713eff2b9566373629b695b7c3d65e49ae54d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sudo (1.6.9p11-2) unstable; urgency=low
+
+  * update version compared in preinst when removing obsolete init.d,
+    closes: #459681
+  * implement pam session config suggestions from Elizabeth Fong, 
+    closes: #452457, #402329
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 04 Feb 2008 21:26:23 -0700
+
 sudo (1.6.9p11-1) unstable; urgency=low
 
   * new upstream version

diff --git a/debian/preinst b/debian/preinst
index 25140b9ba2c63a40fdc7c981de1b01248afbca1a..85d577efee57c6dce5f0b8a61e79f0f6183d388d 100644 (file)
--- a/debian/preinst
+++ b/debian/preinst
@@ -19,7 +19,7 @@ rm_conffile() {
 
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le 1.6.8p12-5; then
+    if dpkg --compare-versions "$2" le 1.6.9p11-2; then
         rm_conffile sudo /etc/init.d/sudo
         update-rc.d sudo remove
     fi

diff --git a/debian/sudo.pam b/debian/sudo.pam
index 814d91341d835a04238077c8b2c718b0580b131f..cef070574a480cb7478fc37132a819621cbbdbc2 100644 (file)
--- a/debian/sudo.pam
+++ b/debian/sudo.pam
@@ -2,3 +2,6 @@
 
 @include common-auth
 @include common-account
+
+session required pam_permit.so
+session required pam_limits.so