Clean up ebuild and move the at user/group from baselayout.

(Portage version: 2.0.51.22-r2)

7 files changed, 140 insertions, 5 deletions

diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog
index 1cf03b58823e..a57492584fe3 100644
--- a/sys-process/at/ChangeLog
+++ b/sys-process/at/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/at
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.2 2005/03/03 19:45:56 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.3 2005/09/04 07:28:29 vapier Exp $
+
+*at-3.1.8-r12 (04 Sep 2005)
+
+  04 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  files/at-3.1.8-longuser.patch, +files/at-3.1.8-makefile.patch,
+  +files/at-3.1.8-more-deny.patch, at-3.1.8-r11.ebuild,
+  +at-3.1.8-r12.ebuild:
+  Clean up ebuild and move the at user/group from baselayout.
 
 *at-3.1.8-r11 (03 Mar 2005)
 
diff --git a/sys-process/at/at-3.1.8-r11.ebuild b/sys-process/at/at-3.1.8-r11.ebuild
index 87c0fa709424..caad74a5e85e 100644
--- a/sys-process/at/at-3.1.8-r11.ebuild
+++ b/sys-process/at/at-3.1.8-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.8-r11.ebuild,v 1.1 2005/03/03 17:40:23 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.8-r11.ebuild,v 1.2 2005/09/04 07:28:29 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,6 +19,11 @@ DEPEND="virtual/libc
 RDEPEND="virtual/libc
 	virtual/mta"
 
+pkg_setup() {
+	enewgroup at 25
+	enewuser at 25 -1 /var/spool/cron/atjobs at
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/sys-process/at/at-3.1.8-r12.ebuild b/sys-process/at/at-3.1.8-r12.ebuild
new file mode 100644
index 000000000000..e2ab8e24bf96
--- /dev/null
+++ b/sys-process/at/at-3.1.8-r12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.8-r12.ebuild,v 1.1 2005/09/04 07:28:29 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Queues jobs for later execution"
+HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
+SRC_URI="http://ftp.debian.org/debian/pool/main/a/at/at_${PV}-11.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-devel/flex-2.5.4a
+	>=sys-apps/portage-2.0.51"
+RDEPEND="virtual/mta"
+
+pkg_setup() {
+	enewgroup at 25
+	enewuser at 25 -1 /var/spool/cron/atjobs at
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-more-deny.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-longuser.patch
+}
+
+src_compile() {
+	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 \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make install IROOT="${D}" || die
+	touch "${D}"/var/spool/at/at{jobs,spool}/.SEQ
+
+	newinitd "${FILESDIR}"/atd.rc6 atd
+	prepalldocs
+}
diff --git a/sys-process/at/files/at-3.1.8-longuser.patch b/sys-process/at/files/at-3.1.8-longuser.patch
index 0f2ebb585f7e..722587fcbb1e 100644
--- a/sys-process/at/files/at-3.1.8-longuser.patch
+++ b/sys-process/at/files/at-3.1.8-longuser.patch
@@ -1,5 +1,7 @@
---- at-3.1.8/atd.c.old	2002-01-17 23:15:27.000000000 -0500
-+++ at-3.1.8/atd.c	2004-04-06 15:27:00.000000000 -0400
+	# Fix bug 33696 by allowing usernames longer than 8 chars,
+	# thanks to Yuval Kogman for the patch
+--- at-3.1.8/atd.c
++++ at-3.1.8/atd.c
 @@ -196,7 +196,7 @@
   */
      pid_t pid;
diff --git a/sys-process/at/files/at-3.1.8-makefile.patch b/sys-process/at/files/at-3.1.8-makefile.patch
new file mode 100644
index 000000000000..30ceb079ee3c
--- /dev/null
+++ b/sys-process/at/files/at-3.1.8-makefile.patch
@@ -0,0 +1,47 @@
+- install into Gentoo/FHS doc dir
+- respect Gentoo LDFLAGS
+- at is setuid, link with bind now
+- dont allow install to strip binaries
+
+--- Makefile.in
++++ Makefile.in
+@@ -15,6 +15,9 @@
+ 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@
+ 
+@@ -38,5 +41,5 @@
+ 		-DDAEMON_GROUPNAME=\"$(DAEMON_GROUPNAME)\" \
+ 		-DLFILE=\"$(LFILE)\" -Wall
+-LIBS		= @LIBS@
++LIBS		= @LIBS@ @LDFLAGS@
+ LIBOBJS		= @LIBOBJS@
+ INSTALL		= @INSTALL@
+@@ -67,5 +70,5 @@
+ 
+ at: $(ATOBJECTS)
+-	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)
++	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) -Wl,-z,now
+ 	rm -f $(CLONES)
+ 	$(LN_S) -f at atq
+@@ -101,5 +104,5 @@
+ 	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
+ 	test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -m 600 at.deny $(IROOT)$(etcdir)/
+-	$(INSTALL) -g root -o root -m 4755 -s at $(IROOT)$(bindir)
++	$(INSTALL) -g root -o root -m 4711 at $(IROOT)$(bindir)
+ 	$(LN_S) -f at $(IROOT)$(bindir)/atq
+ 	$(LN_S) -f at $(IROOT)$(bindir)/atrm
+@@ -108,5 +111,5 @@
+ 	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
+ 	$(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
+-	$(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
++	$(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
+ 	$(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
+ 	$(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
diff --git a/sys-process/at/files/at-3.1.8-more-deny.patch b/sys-process/at/files/at-3.1.8-more-deny.patch
new file mode 100644
index 000000000000..006713b97269
--- /dev/null
+++ b/sys-process/at/files/at-3.1.8-more-deny.patch
@@ -0,0 +1,20 @@
+--- at.deny
++++ at.deny
+@@ -10,6 +10,8 @@
+ lp
+ mail
+ man
++mysql
++news
+ nobody
+ operator
+ proxy
+@@ -19,6 +21,8 @@
+ qmailq
+ qmailr
+ qmails
++squid
+ sync
+ sys
++uucp
+ www-data
diff --git a/sys-process/at/files/digest-at-3.1.8-r12 b/sys-process/at/files/digest-at-3.1.8-r12
new file mode 100644
index 000000000000..0d6e63d22fd0
--- /dev/null
+++ b/sys-process/at/files/digest-at-3.1.8-r12
@@ -0,0 +1 @@
+MD5 81dbae5162aaa8a398a81424d6631c77 at_3.1.8-11.tar.gz 108827