From 7920d8ba061c6454b027fa8ed7e7bd2b6d13f1da Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 31 Jan 2014 12:00:41 +0000 Subject: Version bump. Removed old. Fixed pidfile location in init script and systemd service file (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- sys-process/at/ChangeLog | 13 ++++- sys-process/at/at-3.1.13-r1.ebuild | 80 -------------------------- sys-process/at/at-3.1.14.ebuild | 83 +++++++++++++++++++++++++++ sys-process/at/files/at-3.1.13-Makefile.patch | 1 - sys-process/at/files/at-3.1.14-Makefile.patch | 18 ++++++ sys-process/at/files/atd.rc6 | 21 ------- sys-process/at/files/atd.rc7 | 6 +- sys-process/at/files/atd.service | 2 +- 8 files changed, 116 insertions(+), 108 deletions(-) delete mode 100644 sys-process/at/at-3.1.13-r1.ebuild create mode 100644 sys-process/at/at-3.1.14.ebuild create mode 100644 sys-process/at/files/at-3.1.14-Makefile.patch delete mode 100755 sys-process/at/files/atd.rc6 (limited to 'sys-process') diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog index b3484ba9d867..ae0c94d8e95a 100644 --- a/sys-process/at/ChangeLog +++ b/sys-process/at/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-process/at -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.54 2013/09/14 10:56:55 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.55 2014/01/31 12:00:41 polynomial-c Exp $ + + 31 Jan 2014; Lars Wendler -at-3.1.13-r1.ebuild, + +at-3.1.14.ebuild, files/at-3.1.13-Makefile.patch, + +files/at-3.1.14-Makefile.patch, -files/atd.rc6, files/atd.rc7, + files/atd.service: + Version bump. Removed old. Fixed pidfile location in init script and systemd + service file. + +*at-3.1.14 (31 Jan 2014) 14 Sep 2013; Agostino Sarubbo at-3.1.13-r2.ebuild: Stable for alpha, wrt bug #480116 diff --git a/sys-process/at/at-3.1.13-r1.ebuild b/sys-process/at/at-3.1.13-r1.ebuild deleted file mode 100644 index 8b228199eb76..000000000000 --- a/sys-process/at/at-3.1.13-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2013 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.13 2013/02/27 13:06:29 polynomial-c Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic pam user - -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 ~mips ppc ppc64 sparc x86" -IUSE="pam selinux" - -DEPEND="virtual/mta - >=sys-devel/autoconf-2.64 - sys-devel/bison - >=sys-devel/flex-2.5.4a - pam? ( virtual/pam ) - selinux? ( sec-policy/selinux-at )" -RDEPEND="virtual/mta - virtual/logger - selinux? ( sec-policy/selinux-at )" - -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 - # Fix parallel make issue (bug #408375) - epatch "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.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() { - emake 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/at-3.1.14.ebuild b/sys-process/at/at-3.1.14.ebuild new file mode 100644 index 000000000000..14006bbd1d3f --- /dev/null +++ b/sys-process/at/at-3.1.14.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.14.ebuild,v 1.1 2014/01/31 12:00:41 polynomial-c Exp $ + +EAPI=5 + +inherit autotools eutils flag-o-matic pam user systemd + +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 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="pam selinux" + +DEPEND="virtual/mta + >=sys-devel/autoconf-2.64 + sys-devel/bison + >=sys-devel/flex-2.5.4a + pam? ( virtual/pam ) + selinux? ( sec-policy/selinux-at )" +RDEPEND="virtual/mta + virtual/logger + selinux? ( sec-policy/selinux-at )" + +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.14-Makefile.patch + # fix parallel make issues, bug #244884 + epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch + epatch "${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch + # Fix parallel make issue (bug #408375) + epatch "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch + epatch "${FILESDIR}"/${PN}-3.1.13-getloadavg.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() { + emake install IROOT="${D}" + + newinitd "${FILESDIR}"/atd.rc7 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 + + systemd_dounit "${FILESDIR}/atd.service" +} + +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 index d9b1acf7da37..43c6d073d08e 100644 --- a/sys-process/at/files/at-3.1.13-Makefile.patch +++ b/sys-process/at/files/at-3.1.13-Makefile.patch @@ -1,6 +1,5 @@ # - 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 diff --git a/sys-process/at/files/at-3.1.14-Makefile.patch b/sys-process/at/files/at-3.1.14-Makefile.patch new file mode 100644 index 000000000000..1e28619d9a82 --- /dev/null +++ b/sys-process/at/files/at-3.1.14-Makefile.patch @@ -0,0 +1,18 @@ +# - install into Gentoo/FHS doc dir + +--- at-3.1.14/Makefile.in ++++ at-3.1.14/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@ + systemdsystemunitdir = @systemdsystemunitdir@ + diff --git a/sys-process/at/files/atd.rc6 b/sys-process/at/files/atd.rc6 deleted file mode 100755 index 8c89ad5335e4..000000000000 --- a/sys-process/at/files/atd.rc6 +++ /dev/null @@ -1,21 +0,0 @@ -#!/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.3 2011/09/23 12:04:44 polynomial-c Exp $ - -depend() { - need clock logger -} - -start() { - ebegin "Starting atd" - start-stop-daemon --start --quiet --pidfile /var/run/atd.pid \ - --exec /usr/sbin/atd -- ${ATD_OPTS} - eend $? -} - -stop() { - ebegin "Shutting down atd" - start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid - eend $? -} diff --git a/sys-process/at/files/atd.rc7 b/sys-process/at/files/atd.rc7 index 4d70ae50fed9..3fc0e711c635 100755 --- a/sys-process/at/files/atd.rc7 +++ b/sys-process/at/files/atd.rc7 @@ -1,9 +1,9 @@ #!/sbin/runscript -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc7,v 1.1 2013/02/27 13:06:29 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc7,v 1.2 2014/01/31 12:00:40 polynomial-c Exp $ -pidfile="/var/run/atd.pid" +pidfile="/run/atd.pid" command="/usr/sbin/atd" command_args="${ATD_OPTS}" start_stop_daemon_args="--pidfile ${pidfile}" diff --git a/sys-process/at/files/atd.service b/sys-process/at/files/atd.service index 2910c7e4a4aa..164fc2c0cb74 100644 --- a/sys-process/at/files/atd.service +++ b/sys-process/at/files/atd.service @@ -5,7 +5,7 @@ After=networking.target [Service] Type=forking ExecStart=/usr/sbin/atd -PIDFile=/var/run/atd.pid +PIDFile=/run/atd.pid StandardOutput=syslog StandardError=syslog -- cgit v1.2.3-65-gdbad