Bug #343537: refactor pam.d/atd to use system-services stack.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 95 insertions, 23 deletions

diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog
index 7f4b410eeea1..b80a5ffcd594 100644
--- a/sys-process/at/ChangeLog
+++ b/sys-process/at/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/at
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.31 2011/10/31 01:17:19 polynomial-c Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.32 2012/01/10 02:19:12 robbat2 Exp $
+
+*at-3.1.13-r1 (10 Jan 2012)
+
+  10 Jan 2012; Robin H. Johnson <robbat2@gentoo.org> +at-3.1.13-r1.ebuild,
+  +files/at.pamd-3.1.13-r1:
+  Bug #343537: refactor pam.d/atd to use system-services stack.
 
   31 Oct 2011; Lars Wendler <polynomial-c@gentoo.org> at-3.1.10.2-r1.ebuild,
   at-3.1.10.2-r2.ebuild, at-3.1.13.ebuild:
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index 1cc094cde0cf..e694c7e17076 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX at-3.1.10.1-Makefile.patch 1879 RMD160 f90d36075ccbbf21a67671ce0ab89ba00a5e1c5d SHA1 f21e759f85e8f68b3298fed4a5ecd9a81497b390 SHA256 5bd7903e088334e26de876c8435375423077ad1e8d13eca642ac1a2a74a4acff
 AUX at-3.1.10.2-Makefile.in-parallel-make-fix.patch 369 RMD160 022d330668b939b1247345d0694fb835562ab115 SHA1 2d88e3b4dc4c383299d6a471bbd6300110ad41c7 SHA256 6c0c26e27ed65f8342f113ec4edb00da7ec20f9c471f6c03c59a3545d8e839e0
 AUX at-3.1.10.2-configure.in-fix-PAM-automagick-dep.patch 655 RMD160 8984239d265481cda3994897b37b9ffb618068f5 SHA1 1bb86ee28e14148cd0e12ec71d2fedfc270119fe SHA256 4dd613213711f0e35dd946ec0a5c8431e5c3c59c5875bf752c6971539e2a012c
@@ -8,29 +5,14 @@ AUX at-3.1.13-Makefile.patch 719 RMD160 f938b686638a0a37a78bc4c902775fc122dde009
 AUX at-3.1.13-configure.in-fix-PAM-automagick-dep.patch 614 RMD160 4402859f12eac27ae1b7a33facf5510df2128a36 SHA1 cc8c590fe3a43c2f0382f20bbb373b4b3fa31889 SHA256 97e0e5874a0e8830c610715149d35406cfed8060cdfbc6b3365a813e9a30b42f
 AUX at-3.1.8-more-deny.patch 171 RMD160 406ca3530c5faa72d7d390d80df7f6fc80779c2e SHA1 cfbdef586a9b479e8a724a0847247b7e000fab32 SHA256 53c4f9a4976480369039072f92a8760abd663a0b4f74e95b011c9c9134704866
 AUX at.pamd 234 RMD160 8dcf99d6cedd4bc9a75e129a6f22ea55d04f3d62 SHA1 412dfda6e7268da26f835b574f917407c294fe21 SHA256 1ec02d1a39dc2d2d3ea35ade82c883304a24d6027a36d4397b2d008b0252ed44
+AUX at.pamd-3.1.13-r1 208 RMD160 fa532ee72bb5b23fbd98dc25a91709b0f164bb7a SHA1 84c885b5e3a94709a4e780554b4115c0702e7319 SHA256 f2ceb0c0c47b26679b406bd0aa855208bb9e8661ce252087dd0558f443076dbe
 AUX atd.confd 315 RMD160 55c9e4b07c9b58c130bfc7f9bd6078293f6ac837 SHA1 edb6f7b65f62d2c8229e4606640cabffed5f449f SHA256 92350108a385cc66dffab8c9fc9cc1c85ca1abf36d0ffb007a4e1e55291e0179
 AUX atd.rc6 524 RMD160 1cefe64271837b857bf9f9d12d9a2dd3de90603d SHA1 9f16f63cebae8ed637558f5d186bb33a1972c719 SHA256 697d2007427c3e89a0fe087b5d1beb0388fc84ae260ed530b3e3f11554e8ada2
 DIST at_3.1.10.2.tar.gz 100137 RMD160 4d06f91a0e0d1284ec1a9b5a32fa9e7fab257cd3 SHA1 7834e319b8307983981f192aa221520b95624f67 SHA256 35c4ab4248ba5898ccaddc5efe8722a8f3639deeb07623fa2d41f740e337690f
 DIST at_3.1.13.orig.tar.gz 122544 RMD160 d0e77b60d8daf0a8cc411ca57803b6940a539b5c SHA1 9873e0c38403ef58364912d0b505fd20798fd400 SHA256 3a8b90868d615d21a92f4986ea9a823886329af8fae8dd7ab4eed9b273bca072
 EBUILD at-3.1.10.2-r1.ebuild 2241 RMD160 c522bdb3e8fbedb3236f8c81d39f2bc8b0499972 SHA1 f2b556639a24a42a32e9b68b7e44047d92b2d70c SHA256 cc85e4114fb89ac4712e28458d14b556c507cbddf8829575bcfdaa70643744eb
 EBUILD at-3.1.10.2-r2.ebuild 2286 RMD160 4e0d87b5bef2e4f59f8049959324bc26f97538d6 SHA1 d279d7c14d67a45f9a14ab83f9ee75522b723307 SHA256 0fb1b8c3d1cf4e16fe4f5304c5e333067a944259c2efdb1f99adc3009e8398bd
+EBUILD at-3.1.13-r1.ebuild 2093 RMD160 510a65d2aaa87e14e80780cbd282988ae8b34c78 SHA1 79b55116a78cbf8ec842bcbc4967b4d1cba747ae SHA256 5f9204b85f32c3081b272ff704800eeef9a23104e5603bfbbd930c08274a89bb
 EBUILD at-3.1.13.ebuild 2085 RMD160 3a6236fe2e72b613194dcdd4001aa772c9f3adfd SHA1 69ce30a47ed0c31baeeb610f4043bc4b8ae7b5c1 SHA256 700c4e69ac372f3dc381889ab4bf5dfe158416f6a37266343c57ee5bf1da62d8
-MISC ChangeLog 8270 RMD160 0755049111239b96245818486408fe728d584635 SHA1 fc29ad137db300376d53d8b4a600b693d513b291 SHA256 e2ba06ef4b6a91d9610509e21ae8e4e09e043b492b4dfe272ec4ec75ad190658
+MISC ChangeLog 8462 RMD160 0fe6eb5ed2b244646bd85827329f4121d4195d6d SHA1 6f1ef52ed068780b762aca7535b9cbf2b1f08904 SHA256 ab186eff94cd9fc590933f33fedcc928fb8b76fe182161a1d6a3cb27cda0c6af
 MISC metadata.xml 158 RMD160 298878d8b5da225547b337739a1a48192546d7b8 SHA1 5a9f7a1c9f0f56d1b0e72ee9b67b5cc5771f6d7d SHA256 a262a73b2049a89ab6a4bdf51df27bea44c7f0aa0ee33176c59a9c63eb45e764
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOrfclAAoJEPiazRVxLXTFYP0P/jIkz/dDux0dNXgAeswnB4/S
-BFnw0Bi/uhdOtEg2Mgi/iv493CLHEWJkyFY15bj6fSLqo6m8kEqdlY0IWsUKk8Gp
-4+PmMya8mefN1HreLJ1ZmTdTYgxteZdMSWlRNrnxVMMETN6Hqvuz/rtm7WkyU0Fm
-TJAsqUj0wPojJE9CQedHSG+LyLZ46bp6aYxvt6B90OjK7y0Be9fY86+m+FhpFr/H
-z5Jryqn/C4webWUbgHzjdO7mTgpC+QWxcWXWIp9M2gdP6K2C2vwRnRLA8ZBeXog7
-cYyb/XdnxdKPxe+bBxTnAWWuxLNs6CT975Yl5mleFNi+n9DvSuVJqgZTC07xqyQV
-cMUFXjj54HAShCtOMV13eS+JtIehYlApu0FjXtL6edcf6LdzT3I+573TG0edBAAQ
-hOniZMyQKZiQ2ynr8hYmuN9WFd0l8M0A2Ecm1keQ3kZ8LLgYCds9fZgvB0SrGmDn
-13HW+1cp76LodKiI6sRdmN1xSmiXNaRIKXdD5N5Hpyh5DNGvJJc2M4NzGpLxsJbj
-htX2b12jCnRitkn4N+s2DH6TspfyJKF+I9jEgbabWZjdglGWSHkuAA17wHC3V0AJ
-lof9aAoeTc0gcLqQONi4msHeuX7G+Q+XQ3ym2hzJCLRc8n8k1eKsU3VA9zjOed7X
-1y0rQo6Th1sZbEldx/ry
-=j9T5
------END PGP SIGNATURE-----
diff --git a/sys-process/at/at-3.1.13-r1.ebuild b/sys-process/at/at-3.1.13-r1.ebuild
new file mode 100644
index 000000000000..68b2ef36dd97
--- /dev/null
+++ b/sys-process/at/at-3.1.13-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13-r1.ebuild,v 1.1 2012/01/10 02:19:12 robbat2 Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Queues jobs for later execution"
+HOMEPAGE="http://packages.qa.debian.org/a/at.html"
+SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+
+DEPEND="virtual/mta
+	>=sys-devel/autoconf-2.64
+	>=sys-devel/flex-2.5.4a
+	pam? ( virtual/pam )"
+RDEPEND="virtual/mta
+	virtual/logger"
+
+pkg_setup() {
+	enewgroup at 25
+	enewuser at 25 -1 /var/spool/at/atjobs at
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.1.8-more-deny.patch
+	epatch "${FILESDIR}"/${PN}-3.1.13-Makefile.patch
+	# fix parallel make issues, bug #244884
+	epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
+	epatch "${FILESDIR}"/${P}-configure.in-fix-PAM-automagick-dep.patch
+
+	eautoconf
+}
+
+src_configure() {
+	use pam || my_conf="--without-pam"
+	econf \
+		--sysconfdir=/etc/at \
+		--with-jobdir=/var/spool/at/atjobs \
+		--with-atspool=/var/spool/at/atspool \
+		--with-etcdir=/etc/at \
+		--with-daemon_username=at \
+		--with-daemon_groupname=at \
+		${my_conf}
+}
+
+src_install() {
+	make install IROOT="${D}" || die
+
+	newinitd "${FILESDIR}"/atd.rc6 atd
+	newconfd "${FILESDIR}"/atd.confd atd
+	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+
+	# Preserve existing .SEQ files (bug #386625)
+	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
+	if [ -f "${seq_file}" ] ; then
+		einfo "Preserving existing .SEQ file (bug #386625)."
+		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "Forcing correct permissions on /var/spool/at"
+	chown at:at "${ROOT}/var/spool/at/atjobs"
+	chmod 1770  "${ROOT}/var/spool/at/atjobs"
+	chown at:at "${ROOT}/var/spool/at/atjobs/.SEQ"
+	chmod 0600  "${ROOT}/var/spool/at/atjobs/.SEQ"
+	chown at:at "${ROOT}/var/spool/at/atspool"
+	chmod 1770  "${ROOT}/var/spool/at/atspool"
+}
diff --git a/sys-process/at/files/at.pamd-3.1.13-r1 b/sys-process/at/files/at.pamd-3.1.13-r1
new file mode 100644
index 000000000000..5c529c16180e
--- /dev/null
+++ b/sys-process/at/files/at.pamd-3.1.13-r1
@@ -0,0 +1,9 @@
+#
+# The PAM configuration file for the at daemon
+#
+
+auth    required        pam_env.so
+auth    include         system-services
+account include         system-services
+session include         system-services
+