From ed14ae19f0e5337d57447bea298fc4d49a110206 Mon Sep 17 00:00:00 2001
From: Marcela Mašláňová <mmaslano@fedoraproject.org>
Date: Oct 05 2007 11:58:14 +0000
Subject: "Bug 250147 Processed: add optional support for gnome-keyring to passwd pam

    stack" was solved by fixing pam configuration file for at. Also the bug
    250944 was fixed ;-)

---

diff --git a/at-3.1.10-pam_keyring.patch b/at-3.1.10-pam_keyring.patch
new file mode 100644
index 0000000..db7a23a
--- /dev/null
+++ b/at-3.1.10-pam_keyring.patch
@@ -0,0 +1,13 @@
+diff -up at-3.1.10/pam_atd.old at-3.1.10/pam_atd
+--- at-3.1.10/pam_atd.old	2007-10-05 13:32:16.000000000 +0200
++++ at-3.1.10/pam_atd	2007-10-05 13:35:31.000000000 +0200
+@@ -2,8 +2,8 @@
+ #
+ #
+ auth		sufficient	pam_rootok.so
++auth            required        pam_env.so
+ auth		include		system-auth
+-auth		required	pam_env.so
+ account		include		system-auth
+ session		required	pam_loginuid.so 
+ session		include		system-auth
diff --git a/at.spec b/at.spec
index c7195ff..98ecf71 100644
--- a/at.spec
+++ b/at.spec
@@ -6,7 +6,7 @@
 Summary: Job spooling tools
 Name: at
 Version: 3.1.10
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://ftp.debian.org/debian/pool/main/a/at
@@ -28,6 +28,7 @@ Patch10: at-3.1.10-perm.patch
 Patch11: at-3.1.10-opt_V.patch
 Patch12: at-3.1.10-session.patch
 Patch13: at-3.1.10-havepam.patch
+Patch14: at-3.1.10-pam_keyring.patch
 
 BuildRequires: fileutils chkconfig /etc/init.d
 BuildRequires: flex bison autoconf
@@ -75,6 +76,7 @@ cp %{SOURCE1} .
 %patch11 -p1 -b .opt_V
 %patch12 -p1 -b .session
 %patch13 -p1 -b .havepam
+%patch14 -p1 -b .pamkeyring
 
 %build
 # patch10 touches configure.in
@@ -149,13 +151,13 @@ chown daemon:daemon %{_localstatedir}/spool/at/.SEQ
 
 %preun
 if [ "$1" = 0 ] ; then
-	service atd stop >/dev/null 2>&1
+	/sbin/service atd stop >/dev/null 2>&1
 	/sbin/chkconfig --del atd
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-	service atd condrestart >/dev/null 2>&1
+	/sbin/service atd condrestart >/dev/null 2>&1
 fi
 
 %files
@@ -177,6 +179,9 @@ fi
 %attr(4755,root,root)	%{_bindir}/at
 
 %changelog
+* Fri Oct 05 2007 Marcela Maslanova <mmaslano@redhat.com> - 3.1.10-17
+- Bug 250147: add optional support for gnome-keyring to passwd pam stack
+
 * Wed Aug 22 2007 Marcela Maslanova <mmaslano@redhat.com> - 3.1.10-16
 - macro with_pam instead of have_pam
 - license tag is gplv2+ because of license in source files
diff --git a/atd.init b/atd.init
index 98c5fbf..71ba743 100755
--- a/atd.init
+++ b/atd.init
@@ -2,11 +2,11 @@
 #
 #	/etc/rc.d/init.d/atd
 #
-# Starts the at daemon
+# Starts the "at" daemon
 #
 # chkconfig: 345 95 5
-# description: Runs commands scheduled by the at command at the time \
-#    specified when at was run, and runs batch commands when the load \
+# description: Runs commands scheduled by the "at" command at the time \
+#    specified when "at" was run, and runs batch commands when the load \
 #    average is low enough.
 # processname: atd