From c8e1011dff41dca2e3092ccb3e3bb86c95b52ce7 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 23 Sep 2011 12:04:44 +0000 Subject: [PATCH] Version bump. Fixed warnings in init script (bug #382319) Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- sys-process/at/ChangeLog | 10 ++- sys-process/at/Manifest | 28 ++++++-- sys-process/at/at-3.1.13.ebuild | 72 +++++++++++++++++++ sys-process/at/files/at-3.1.13-Makefile.patch | 29 ++++++++ ...-configure.in-fix-PAM-automagick-dep.patch | 22 ++++++ sys-process/at/files/atd.rc6 | 4 +- 6 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 sys-process/at/at-3.1.13.ebuild create mode 100644 sys-process/at/files/at-3.1.13-Makefile.patch create mode 100644 sys-process/at/files/at-3.1.13-configure.in-fix-PAM-automagick-dep.patch diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog index 5ddfa8962cfb..854fb945565e 100644 --- a/sys-process/at/ChangeLog +++ b/sys-process/at/ChangeLog @@ -1,6 +1,14 @@ # 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.26 2011/04/17 22:46:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.27 2011/09/23 12:04:44 polynomial-c Exp $ + +*at-3.1.13 (23 Sep 2011) + + 23 Sep 2011; Lars Wendler +at-3.1.13.ebuild, + +files/at-3.1.13-Makefile.patch, + +files/at-3.1.13-configure.in-fix-PAM-automagick-dep.patch, files/atd.rc6: + non-maintainer commit: Version bump. Fixed warnings in init script (bug + #382319). *at-3.1.10.2-r2 (17 Apr 2011) diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest index eed5504919a8..ef16598cff29 100644 --- a/sys-process/at/Manifest +++ b/sys-process/at/Manifest @@ -1,22 +1,36 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +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 +AUX at-3.1.13-Makefile.patch 719 RMD160 f938b686638a0a37a78bc4c902775fc122dde009 SHA1 c98281a8488df0d2eeb1ee6e12a1988e30d79b11 SHA256 3d8b815e033354f361f18e562f1ff455256303dc9e178a8027f52fb72ed28651 +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 atd.confd 315 RMD160 55c9e4b07c9b58c130bfc7f9bd6078293f6ac837 SHA1 edb6f7b65f62d2c8229e4606640cabffed5f449f SHA256 92350108a385cc66dffab8c9fc9cc1c85ca1abf36d0ffb007a4e1e55291e0179 -AUX atd.rc6 518 RMD160 92880fa66f2b22ea29d226db530560cf2f59f5d8 SHA1 201ace95b5c0327debc71b12ed1487c0562d1aae SHA256 c2953e2e488bbdaa47063347b47cc212988ff70cb0bedbb1a41a5b595fbfe61a +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 1986 RMD160 136c8273d32067124acad9d858d067ab9f9f8258 SHA1 2370b4161163eaeafbe54ded0f3a87ae658cb4ea SHA256 14c1429bacfb0b480a0b85e98828c25d313db7c9143a799d8757b174fc718ea0 EBUILD at-3.1.10.2-r2.ebuild 2032 RMD160 b9e9c5878d70a1ee60453e8583c7d20ba17f71b5 SHA1 4cdb4b99ce073c787a856ebb9c5ddea7ae254cfb SHA256 7ea4e5ab53b7b90fdbd7a0ad7fd8975a877ac8cdb3bfe166917250194da54d98 -MISC ChangeLog 7230 RMD160 bde44e93c9fc9ee3ef98aa698668eb40f95581bd SHA1 b9a20222638076f7b41ad996f2d76e4a6587e913 SHA256 a5f8a513372da5eae80213618d4af32df2d69ad15fd70c06320daa0c30d85302 +EBUILD at-3.1.13.ebuild 1895 RMD160 fc0a49b277fddb5fc7764387e10923c26c24e851 SHA1 dfca5f6ea5f0377e3ecf7f36bf66e4287c36b285 SHA256 7ff49e06d2bf04e15dd99a5446fcdc17e20ed7aeebed6caaf3730b27220fe2bb +MISC ChangeLog 7537 RMD160 196b89e2745a337bc8363f7791fa87e38e49f797 SHA1 3100f7fee8d6bfce0ea4daf87790194b2d655c1a SHA256 680b4fed310f369cb640446f8f6fbebd54e1293fe7b65abee77b7f35777f3e7d MISC metadata.xml 158 RMD160 298878d8b5da225547b337739a1a48192546d7b8 SHA1 5a9f7a1c9f0f56d1b0e72ee9b67b5cc5771f6d7d SHA256 a262a73b2049a89ab6a4bdf51df27bea44c7f0aa0ee33176c59a9c63eb45e764 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk2rbdYACgkQVWmRsqeSphO0RgCfZ/BfBHiLTymVXr0FO7D/NiBN -9LEAn14l5qHOxEa/xfu+4QInwd+ao5aA -=a1cY +iQIcBAEBCgAGBQJOfHXhAAoJEPiazRVxLXTF67sQAM1lQYlp9sKDd4/L4ZWxcMYl +DwI0OC6xLJVgQGpo5ID3NRiQY/Tu5tvCpnAtJraDOkH7NXVMK5NmtF5eBC1wF5a0 +lki470t1hbzpYbPx8JUwmLqsbvDgng3WkUO/ZkWsXyOtZ24nj6PusTBSrWUCl80P +F2xLhR0ixUyKgRxpvelMSskDvAsTV7taehwx/KYxd/FaOzUCAyJVH0WvcVrIb0ox +nnOjYigLUW85bvhyD2URvhSgtHlPkun6jN9rXZiNNiYDJSLAGKj7Vy56vqS9dLSB +kAYYVuRQOEpPdcJcLCgLIAPv9lec5F7kpKHSlCS0qp40VhK0+FF9No//SYB9Ukd4 +XXa0sG+/5fZ9s/bnYqHOQnxc3b2HLvkCCbHBPiONvCs+PeF4e2kBMD4ZgQkd0ce9 +iAf/Yw49co5rt69T7eg3NZKhjSls+nV1eyehbA6fRiaC2yeP8xCxZm9ZdJtePmLZ +/nVioDOx8RfZBFgNkNHEFJldNWiHIOCzOeT0uAqOeXlFtHW4Vb1Th78E05KmKcRW +JaggEIi9ge4ER32SK18IRrpK0Mb+ly+LNYnslU/bDcyyj5EMgoOwa8icHxJOqVXL +v06VvdfImzVMhPGi/6lX4DcdcZsiZ3vCc+mssSfhK9Y94aUAyyrDeMQGx/zalPfw +3m6UrsD6FfBXqPZYotnd +=JVd+ -----END PGP SIGNATURE----- diff --git a/sys-process/at/at-3.1.13.ebuild b/sys-process/at/at-3.1.13.ebuild new file mode 100644 index 000000000000..9bdab77f1267 --- /dev/null +++ b/sys-process/at/at-3.1.13.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2011 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.ebuild,v 1.1 2011/09/23 12:04:44 polynomial-c Exp $ + +inherit eutils flag-o-matic autotools pam + +DESCRIPTION="Queues jobs for later execution" +HOMEPAGE="http://packages.qa.debian.org/a/at.html" +SRC_URI="mirror://debian/pool/main/a/at/at_${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/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_unpack() { + unpack ${A} + cd "${S}" + + 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_compile() { + 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} \ + || die "configure failed" + + emake || die "make failed" +} + +src_install() { + make install IROOT="${D}" || die + + newinitd "${FILESDIR}"/atd.rc6 atd + newconfd "${FILESDIR}"/atd.confd atd + newpamd "${FILESDIR}"/at.pamd atd + prepalldocs +} + +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-3.1.13-Makefile.patch b/sys-process/at/files/at-3.1.13-Makefile.patch new file mode 100644 index 000000000000..d9b1acf7da37 --- /dev/null +++ b/sys-process/at/files/at-3.1.13-Makefile.patch @@ -0,0 +1,29 @@ +# - install into Gentoo/FHS doc dir +# - respect Gentoo LDFLAGS +# - dont allow install to strip binaries + +--- at-3.1.13/Makefile.in ++++ at-3.1.13/Makefile.in +@@ -12,8 +12,11 @@ + man1dir = $(mandir)/man1 + man5dir = $(mandir)/man5 + man8dir = $(mandir)/man8 +-docdir = $(prefix)/doc +-atdocdir = $(docdir)/at ++ifndef PF ++PF = at-$(VERSION) ++endif ++docdir = $(prefix)/share/doc ++atdocdir = $(docdir)/$(PF) + etcdir = @ETCDIR@ + + DAEMON_USERNAME = @DAEMON_USERNAME@ +@@ -35,7 +38,7 @@ + -DDAEMON_USERNAME=\"$(DAEMON_USERNAME)\" \ + -DDAEMON_GROUPNAME=\"$(DAEMON_GROUPNAME)\" \ + -DLFILE=\"$(LFILE)\" -Wall +-LIBS = @LIBS@ ++LIBS = @LIBS@ @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + INSTALL = @INSTALL@ + PAMLIB = @PAMLIB@ diff --git a/sys-process/at/files/at-3.1.13-configure.in-fix-PAM-automagick-dep.patch b/sys-process/at/files/at-3.1.13-configure.in-fix-PAM-automagick-dep.patch new file mode 100644 index 000000000000..ee24b7f13147 --- /dev/null +++ b/sys-process/at/files/at-3.1.13-configure.in-fix-PAM-automagick-dep.patch @@ -0,0 +1,22 @@ +--- at-3.1.13/configure.ac ++++ at-3.1.13/configure.ac +@@ -82,10 +82,15 @@ + AC_FUNC_VPRINTF + AC_FUNC_GETLOADAVG + AC_CHECK_FUNCS(getcwd mktime strftime setreuid setresuid sigaction waitpid) +-AC_CHECK_HEADERS(security/pam_appl.h, [ +- PAMLIB="-lpam" +- AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support]) +-]) ++AC_ARG_WITH([pam], AS_HELP_STRING([--without-pam], ++ [Build without PAM support(default: enabled)])) ++ ++if test "x$with_pam" != "xno"; then ++ AC_CHECK_HEADERS(security/pam_appl.h, [ ++ PAMLIB="-lpam" ++ AC_DEFINE(HAVE_PAM, 1, [Define to 1 for PAM support]) ++ ]) ++fi + + dnl Checking for programs + diff --git a/sys-process/at/files/atd.rc6 b/sys-process/at/files/atd.rc6 index d0dc71045556..8c89ad5335e4 100755 --- a/sys-process/at/files/atd.rc6 +++ b/sys-process/at/files/atd.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.2 2011/04/17 22:46:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc6,v 1.3 2011/09/23 12:04:44 polynomial-c Exp $ depend() { need clock logger @@ -10,7 +10,7 @@ depend() { start() { ebegin "Starting atd" start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \ - --startas /usr/sbin/atd -- ${ATD_OPTS} + --exec /usr/sbin/atd -- ${ATD_OPTS} eend $? } -- 2.26.2