From af884a422e62e6085afa39c4990d7398376f3e23 Mon Sep 17 00:00:00 2001
From: Radovan Sroka <rsroka@redhat.com>
Date: Jul 14 2015 12:02:08 +0000
Subject: Add patch3 sudo.1.8.14b4-passexpire.patch that makes change in documentation about timestamp_time


Resolves: rhbz#1162070

---

diff --git a/sudo-1.8.14b4-docpassexpire.patch b/sudo-1.8.14b4-docpassexpire.patch
new file mode 100644
index 0000000..cb7fe8a
--- /dev/null
+++ b/sudo-1.8.14b4-docpassexpire.patch
@@ -0,0 +1,38 @@
+diff -up sudo-1.8.14b4/doc/sudoers.cat.docpassexpire sudo-1.8.14b4/doc/sudoers.cat
+--- sudo-1.8.14b4/doc/sudoers.cat.docpassexpire	2015-06-09 00:47:07.000000000 +0200
++++ sudo-1.8.14b4/doc/sudoers.cat	2015-07-14 13:11:11.116000185 +0200
+@@ -1328,8 +1328,8 @@ SSUUDDOOEERRSS OOPPTTIIOONN
+                        fractional component if minute granularity is
+                        insufficient, for example 2.5.  The default is 5.  Set
+                        this to 0 to always prompt for a password.  If set to a
+-                       value less than 0 the user's time stamp will never
+-                       expire.  This can be used to allow users to create or
++                       value less than 0 the user's time stamp will not
++                       expire until reboot.  This can be used to allow users to create or
+                        delete their own time stamps via ``sudo -v'' and ``sudo
+                        -k'' respectively.
+ 
+diff -up sudo-1.8.14b4/doc/sudoers.man.in.docpassexpire sudo-1.8.14b4/doc/sudoers.man.in
+--- sudo-1.8.14b4/doc/sudoers.man.in.docpassexpire	2015-07-14 13:11:11.116000185 +0200
++++ sudo-1.8.14b4/doc/sudoers.man.in	2015-07-14 13:14:17.261222481 +0200
+@@ -2822,7 +2822,7 @@ Set this to
+ to always prompt for a password.
+ If set to a value less than
+ \fR0\fR
+-the user's time stamp will never expire.
++the user's time stamp will not expire until reboot.
+ This can be used to allow users to create or delete their own time stamps via
+ \(Lq\fRsudo -v\fR\(Rq
+ and
+diff -up sudo-1.8.14b4/doc/sudoers.mdoc.in.docpassexpire sudo-1.8.14b4/doc/sudoers.mdoc.in
+--- sudo-1.8.14b4/doc/sudoers.mdoc.in.docpassexpire	2015-04-07 18:15:50.000000000 +0200
++++ sudo-1.8.14b4/doc/sudoers.mdoc.in	2015-07-14 13:11:11.117000176 +0200
+@@ -2647,7 +2647,7 @@ Set this to
+ to always prompt for a password.
+ If set to a value less than
+ .Li 0
+-the user's time stamp will never expire.
++the user's time stamp will not expire until reboot.
+ This can be used to allow users to create or delete their own time stamps via
+ .Dq Li sudo -v
+ and
diff --git a/sudo.spec b/sudo.spec
index ec1f861..491ab6b 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
 Version: 1.8.14b4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ISC
 Group: Applications/System
 URL: http://www.courtesan.com/sudo/
@@ -28,6 +28,9 @@ BuildRequires: zlib-devel
 Patch1: sudo-1.6.7p5-strip.patch
 # Patch to read ldap.conf more closely to nss_ldap
 Patch2: sudo-1.8.14b3-ldapconfpatch.patch
+# Patch makes changes in documentation bz:1162070
+Patch3: sudo-1.8.14b4-docpassexpire.patch
+
 
 %description
 Sudo (superuser do) allows a system administrator to give certain
@@ -54,6 +57,7 @@ plugins that use %{name}.
 
 %patch1 -p1 -b .strip
 %patch2 -p1 -b .ldapconfpatch
+%patch3 -p1 -b .docpassexpire
 
 %build
 # Remove bundled copy of zlib
@@ -189,6 +193,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/sudo/libsudo_util.so
 
 %changelog
+* Tue Jul 14 2015 Radovan Sroka <rsroka@redhat.com> 1.8.12-2
+- add patch3 sudo.1.8.14b4-passexpire.patch that makes change in documentation about timestamp_time
+- Resolves: rhbz#1162070
+
 * Fri Jul 10 2015 Radovan Sroka <rsroka@redhat.com> - 1.8.14b4-1
 - Update to 1.8.14b4
 - Add own %%{_tmpfilesdir}/sudo.conf