Add a patch to fix fcrontab -u systab when using PAM. Thanks to Dmitry Karasik in bug #308799.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 40 insertions, 4 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 88bd8d6de000..506adcb9928c 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.70 2010/03/10 20:14:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.71 2010/03/11 13:17:25 flameeyes Exp $
+
+*fcron-3.0.5-r1 (11 Mar 2010)
+
+  11 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org> -fcron-3.0.5.ebuild,
+  +fcron-3.0.5-r1.ebuild, +files/fcron-3.0.5-pam.patch:
+  Add a patch to fix fcrontab -u systab when using PAM. Thanks to Dmitry
+  Karasik in bug #308799.
 
   10 Mar 2010; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
   UTF8 not permitted in USE flag descriptions.
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index 55005a8b6aa4..b678a61907a3 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX check_system_crontabs.fcron-config-file.patch 1740 RMD160 05a8b1f3ae6a2217482765806dce1b24a4a51c29 SHA1 32125fbe6752fa839e2dc00e21e8ddaee5b26801 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86
 AUX crontab 864 RMD160 f181a337c032df8711384bd54c58e594fd516313 SHA1 db6ce92b9109134d8c8dfb3e6f248dafea217c69 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45
 AUX fcron-3.0.4-docfix.patch 1446 RMD160 1c57256ccd7cb2cd6c6723050e347577123a1afb SHA1 8e96a9b00eeecfe7add5848618c0f21f20cce30f SHA256 24737725423a109860ac77bf34a59211914434225e2e1f7ed1db922595730a47
+AUX fcron-3.0.5-pam.patch 704 RMD160 1045f6e800aab8b32c8931230925561beec7467f SHA1 1b591cdef9f99da8f05385be9abe87448868d8af SHA256 69eb39f40e5a7eea4431fbd3150de01a86a410503da0e1ff60e28ce5a8deef54
 AUX fcron.init 1582 RMD160 e0fd0cadddac8b344ea84f70c3c6e645d9badce2 SHA1 fd5fddb75378af57c37fa57432f3c068521e4a68 SHA256 f5bc89e7204906790b0046bd30a865b7b04c4d21e7ef4154cbad3ae1213d6526
 AUX fcron.init.2 1562 RMD160 6434ae17c2636454a16c8fba1f2bae0933598692 SHA1 52baed45ddebe6b343fb28f187e667a055e40d44 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c
 AUX fcrontab 332 RMD160 062faddf0551bebbf9834b796f9957cf49dbc967 SHA1 063f77dd90a76170a793352530a35c60922283e4 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc
@@ -8,6 +12,13 @@ DIST fcron-3.0.4.src.tar.gz 553609 RMD160 2bb8eb489251eaa1380b4e37b6526d20402913
 DIST fcron-3.0.5.src.tar.gz 551516 RMD160 7523bd7de39bb2aa96e61714ee98f389b1fb68b1 SHA1 73a1fe43305c6afaafd82086a17c03fa1ebcfac3 SHA256 f3360475a2d09598f24254e41d626b11be89aa8680933e6e35b7708edce90671
 EBUILD fcron-3.0.4-r1.ebuild 8833 RMD160 4e0d5b162d05c031fe7a33fe90be94b9d8938bd8 SHA1 255dbcdbc715d84b4196f557dc8211f27b48c934 SHA256 c02d90a080f53a30e3a14002406514e9f83d94201d7c770cdcce4447963663bc
 EBUILD fcron-3.0.4-r2.ebuild 8988 RMD160 33be5526cb595f9311007dc312709338a9431a6c SHA1 47b22e75ba0b08071ede0cec9a8c946896292269 SHA256 d013ac7e4c3174aace5070bec0b1f2dd38b67540785ec40331c64d198d3d915a
-EBUILD fcron-3.0.5.ebuild 9626 RMD160 1b5f62cc1a49e9568583aaa498b7c568ec6fcc78 SHA1 d0767fd412d1922f85c9695b4bb70805d2806de5 SHA256 9910755b3c16bb088058181a523afd8548de272a4d128b5b97eff1f9ba1ef007
-MISC ChangeLog 17967 RMD160 9bcd276a4a56cb797102a4f3f19656388cd33616 SHA1 8cbdf8bd9f55b3a745ebefab995d095276246b1c SHA256 92a71d95c8aacb596a480efd25f6ec79f13da89388bdc57362a7dfe8e5b19b25
+EBUILD fcron-3.0.5-r1.ebuild 9682 RMD160 8ce236b01bdfc431a1095609f0774b2bc70b914c SHA1 4beb8f64bec46ea9b1936e461d777e224bfdc830 SHA256 6a3eaa6051d8a12ccc13153914476d9fd76c226969fe48a264f87ea305c093a7
+MISC ChangeLog 18233 RMD160 e2e05e0c83337598ce5f36162beb1ac306a3083e SHA1 ce42eea8d60da901b5f683811b85541a1e2a9d6f SHA256 e6d098428e3af722d2d2965ce704db598a9dac791c30e6b8c76e1b97d596657f
 MISC metadata.xml 1339 RMD160 52ce6f7f857513f37c32a193082b3ab5c416decc SHA1 ae84fe903dfb1ef235e088ecf59e26bd0d3fc42e SHA256 3b6ed143cd47d298191633e6c0ec05ff761c5f03b0b92537b67b75f9172bcaaf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuY7WQACgkQAiZjviIA2Xhm4QCdEvnb2J4V7LEZ9B0f7IxaSgZe
+myEAn0Mz0mb+mgmKMG2rKV7+qu5JPKV4
+=DvYm
+-----END PGP SIGNATURE-----
diff --git a/sys-process/fcron/fcron-3.0.5.ebuild b/sys-process/fcron/fcron-3.0.5-r1.ebuild
index f80e1bdd4b9b..3b005dab3710 100644
--- a/sys-process/fcron/fcron-3.0.5.ebuild
+++ b/sys-process/fcron/fcron-3.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.5.ebuild,v 1.1 2010/03/10 01:38:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.5-r1.ebuild,v 1.1 2010/03/11 13:17:25 flameeyes Exp $
 
 inherit cron pam eutils
 
@@ -41,6 +41,9 @@ src_unpack() {
 	# patch check_system_crontabs to support "-c /path/to/fcron.conf"
 	epatch "${FILESDIR}"/check_system_crontabs.fcron-config-file.patch
 
+	# bug #308799
+	epatch "${FILESDIR}"/${P}-pam.patch
+
 	# the script contains bashism, so until upstream fixes it we're
 	# going to simply require bash for this to work, sorry!
 	# see also bug #282214
diff --git a/sys-process/fcron/files/fcron-3.0.5-pam.patch b/sys-process/fcron/files/fcron-3.0.5-pam.patch
new file mode 100644
index 000000000000..25ccbb5bb8f3
--- /dev/null
+++ b/sys-process/fcron/files/fcron-3.0.5-pam.patch
@@ -0,0 +1,15 @@
+Index: fcron-3.0.5/fcrontab.c
+===================================================================
+--- fcron-3.0.5.orig/fcrontab.c
++++ fcron-3.0.5/fcrontab.c
+@@ -1038,8 +1038,8 @@ main(int argc, char **argv)
+     /* Open PAM session for the user and obtain any security
+        credentials we might need */
+ 
+-    debug("username: %s", user);
+-    retcode = pam_start("fcrontab", user, &apamconv, &pamh);
++    debug("username: %s runas: %s", user, runas);
++    retcode = pam_start("fcrontab", runas, &apamconv, &pamh);
+     if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not start PAM");
+     retcode = pam_authenticate(pamh, 0);    /* is user really user? */
+     if (retcode != PAM_SUCCESS)