From 16b0f4feabfa6f4dd768497636eeb7350f28fe966a4ab1d681d0f18b32638a5f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 3 Aug 2007 21:18:41 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/sudo?expand=0&rev=5

---
 sudo-1.6.9.tar.bz2                                 |  3 ---
 sudo-1.6.9-__P.diff => sudo-1.6.9p2-__P.diff       |  0
 ...6.9-defaults.diff => sudo-1.6.9p2-defaults.diff |  0
 sudo-1.6.9-env.diff => sudo-1.6.9p2-env.diff       |  0
 sudo-1.6.9-ldap.diff => sudo-1.6.9p2-ldap.diff     |  0
 sudo-1.6.9-prompt.diff => sudo-1.6.9p2-prompt.diff | 14 +++++++-------
 ...cure_path.diff => sudo-1.6.9p2-secure_path.diff |  0
 sudo-1.6.9-strip.diff => sudo-1.6.9p2-strip.diff   |  0
 ...1.6.9-sudoers.diff => sudo-1.6.9p2-sudoers.diff |  0
 sudo-1.6.9.pamd => sudo-1.6.9p2.pamd               |  0
 sudo-1.6.9p2.tar.bz2                               |  3 +++
 sudo.changes                                       | 10 ++++++++++
 sudo.spec                                          | 11 +++++++++--
 13 files changed, 29 insertions(+), 12 deletions(-)
 delete mode 100644 sudo-1.6.9.tar.bz2
 rename sudo-1.6.9-__P.diff => sudo-1.6.9p2-__P.diff (100%)
 rename sudo-1.6.9-defaults.diff => sudo-1.6.9p2-defaults.diff (100%)
 rename sudo-1.6.9-env.diff => sudo-1.6.9p2-env.diff (100%)
 rename sudo-1.6.9-ldap.diff => sudo-1.6.9p2-ldap.diff (100%)
 rename sudo-1.6.9-prompt.diff => sudo-1.6.9p2-prompt.diff (85%)
 rename sudo-1.6.9-secure_path.diff => sudo-1.6.9p2-secure_path.diff (100%)
 rename sudo-1.6.9-strip.diff => sudo-1.6.9p2-strip.diff (100%)
 rename sudo-1.6.9-sudoers.diff => sudo-1.6.9p2-sudoers.diff (100%)
 rename sudo-1.6.9.pamd => sudo-1.6.9p2.pamd (100%)
 create mode 100644 sudo-1.6.9p2.tar.bz2

diff --git a/sudo-1.6.9.tar.bz2 b/sudo-1.6.9.tar.bz2
deleted file mode 100644
index 49136a4..0000000
--- a/sudo-1.6.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85611b0d3be2768c88bc2e56d8f5c5e5ad55cefb9d712364768da5b08cc11f2e
-size 431616
diff --git a/sudo-1.6.9-__P.diff b/sudo-1.6.9p2-__P.diff
similarity index 100%
rename from sudo-1.6.9-__P.diff
rename to sudo-1.6.9p2-__P.diff
diff --git a/sudo-1.6.9-defaults.diff b/sudo-1.6.9p2-defaults.diff
similarity index 100%
rename from sudo-1.6.9-defaults.diff
rename to sudo-1.6.9p2-defaults.diff
diff --git a/sudo-1.6.9-env.diff b/sudo-1.6.9p2-env.diff
similarity index 100%
rename from sudo-1.6.9-env.diff
rename to sudo-1.6.9p2-env.diff
diff --git a/sudo-1.6.9-ldap.diff b/sudo-1.6.9p2-ldap.diff
similarity index 100%
rename from sudo-1.6.9-ldap.diff
rename to sudo-1.6.9p2-ldap.diff
diff --git a/sudo-1.6.9-prompt.diff b/sudo-1.6.9p2-prompt.diff
similarity index 85%
rename from sudo-1.6.9-prompt.diff
rename to sudo-1.6.9p2-prompt.diff
index c93022f..b2b1fc6 100644
--- a/sudo-1.6.9-prompt.diff
+++ b/sudo-1.6.9p2-prompt.diff
@@ -28,15 +28,15 @@
  			p++;
 --- sudoers.man.in
 +++ sudoers.man.in
-@@ -663,6 +663,11 @@
- .IX Item "%U"
- expanded to the login name of the user the command will
- be run as (defaults to root)
+@@ -893,6 +893,11 @@
+ .el .IP "\f(CW%h\fR" 8
+ .IX Item "%h"
+ expanded to the local hostname without the domain name
 +.ie n .IP "%p" 8
 +.el .IP "\f(CW%p\fR" 8
 +.IX Item "%p"
 +expanded to the login name of the user whose password
 +is requested
- .ie n .IP "%h" 8
- .el .IP "\f(CW%h\fR" 8
- .IX Item "%h"
+ .ie n .IP "%U" 8
+ .el .IP "\f(CW%U\fR" 8
+ .IX Item "%U"
diff --git a/sudo-1.6.9-secure_path.diff b/sudo-1.6.9p2-secure_path.diff
similarity index 100%
rename from sudo-1.6.9-secure_path.diff
rename to sudo-1.6.9p2-secure_path.diff
diff --git a/sudo-1.6.9-strip.diff b/sudo-1.6.9p2-strip.diff
similarity index 100%
rename from sudo-1.6.9-strip.diff
rename to sudo-1.6.9p2-strip.diff
diff --git a/sudo-1.6.9-sudoers.diff b/sudo-1.6.9p2-sudoers.diff
similarity index 100%
rename from sudo-1.6.9-sudoers.diff
rename to sudo-1.6.9p2-sudoers.diff
diff --git a/sudo-1.6.9.pamd b/sudo-1.6.9p2.pamd
similarity index 100%
rename from sudo-1.6.9.pamd
rename to sudo-1.6.9p2.pamd
diff --git a/sudo-1.6.9p2.tar.bz2 b/sudo-1.6.9p2.tar.bz2
new file mode 100644
index 0000000..bc038bd
--- /dev/null
+++ b/sudo-1.6.9p2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5ef0addc8518ec538f41acabb0a706cf9698f73e1a1f6c0c25c60f2d4dd991
+size 431004
diff --git a/sudo.changes b/sudo.changes
index f29e1cd..be0683e 100644
--- a/sudo.changes
+++ b/sudo.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jul 31 10:18:36 CEST 2007 - prusnak@suse.cz
+
+- updated to 1.6.9p2
+  * fixed a crash in the error logging function
+  * worked around a crash when no tty was present in some PAM
+    implementations
+  * fixed updating of the saved environment when the environ pointer
+    gets changed out from underneath us
+
 -------------------------------------------------------------------
 Tue Jul 24 15:49:47 CEST 2007 - prusnak@suse.cz
 
diff --git a/sudo.spec b/sudo.spec
index b3a1118..c9adfa3 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package sudo (Version 1.6.9)
+# spec file for package sudo (Version 1.6.9p2)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
 Name:           sudo
 BuildRequires:  openldap2-devel pam-devel postfix
 PreReq:         coreutils
-Version:        1.6.9
+Version:        1.6.9p2
 Release:        1
 Autoreqprov:    on
 Group:          System/Base
@@ -116,6 +116,13 @@ rm -rf $RPM_BUILD_ROOT
 /var/run/sudo
 
 %changelog
+* Tue Jul 31 2007 - prusnak@suse.cz
+- updated to 1.6.9p2
+  * fixed a crash in the error logging function
+  * worked around a crash when no tty was present in some PAM
+  implementations
+  * fixed updating of the saved environment when the environ pointer
+  gets changed out from underneath us
 * Tue Jul 24 2007 - prusnak@suse.cz
 - updated to 1.6.9
   * added to the list of variables to remove from the environment