Fix bug 33696 by allowing long usernames in atd, thanks to Yuval Kogman for the patch

5 files changed, 61 insertions, 31 deletions

diff --git a/sys-apps/at/ChangeLog b/sys-apps/at/ChangeLog
index 1004625cec1e..ec038dcaf202 100644
--- a/sys-apps/at/ChangeLog
+++ b/sys-apps/at/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/at
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/ChangeLog,v 1.13 2004/01/25 23:18:27 vapier Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/ChangeLog,v 1.14 2004/04/06 21:31:09 agriffis Exp $
+
+  06 Apr 2004; Aron Griffis <agriffis@gentoo.org> at-3.1.8-r10.ebuild,
+  files/at-3.1.8-longuser.patch:
+  Fix bug 33696 by allowing long usernames in atd, thanks to Yuval Kogman for
+  the patch
 
 *at-3.1.8-r10 (25 Jan 2004)
 
diff --git a/sys-apps/at/Manifest b/sys-apps/at/Manifest
index 8e5fa22ee838..43b174fa29c8 100644
--- a/sys-apps/at/Manifest
+++ b/sys-apps/at/Manifest
@@ -1,8 +1,9 @@
-MD5 342e834e06fdf58c877f1fc237f984de files/at.deny 121
-MD5 4c65045198a1019eed47ac81268ed007 files/atd.rc6 513
-MD5 b1f01b7f45cd50b24b40694c623ecc53 files/digest-at-3.1.8-r10 63
-MD5 b1f01b7f45cd50b24b40694c623ecc53 files/digest-at-3.1.8-r9 63
 MD5 3fe72794c288046b35c41ef271291143 ChangeLog 2144
-MD5 5603516e3075c55834403d28c7251a20 at-3.1.8-r10.ebuild 1448
-MD5 fdef0fd5799d474d9efe8f7c512fa9d8 at-3.1.8-r9.ebuild 1376
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 fdef0fd5799d474d9efe8f7c512fa9d8 at-3.1.8-r9.ebuild 1376
+MD5 64dd46c6afd1fe81bd55b1699c3b0796 at-3.1.8-r10.ebuild 1604
+MD5 b1f01b7f45cd50b24b40694c623ecc53 files/digest-at-3.1.8-r9 63
+MD5 b1f01b7f45cd50b24b40694c623ecc53 files/digest-at-3.1.8-r10 63
+MD5 342e834e06fdf58c877f1fc237f984de files/at.deny 121
+MD5 4c65045198a1019eed47ac81268ed007 files/atd.rc6 513
+MD5 f189f039555f37eb1a0792837d33ea04 files/at-3.1.8-longuser.patch 723
diff --git a/sys-apps/at/at-3.1.8-r10.ebuild b/sys-apps/at/at-3.1.8-r10.ebuild
index d67ddb86123a..3721ed31b58c 100644
--- a/sys-apps/at/at-3.1.8-r10.ebuild
+++ b/sys-apps/at/at-3.1.8-r10.ebuild
@@ -1,26 +1,32 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r10.ebuild,v 1.1 2004/01/25 23:18:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r10.ebuild,v 1.2 2004/04/06 21:31:09 agriffis Exp $
 
+inherit eutils
+
+S=${WORKDIR}/${P}
 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"
+HOMEPAGE="ftp://jurix.jura.uni-sb.de/pub/jurix/source/chroot/appl/at/"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~ia64 ~ppc64"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64 ~ppc64"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc >=sys-devel/flex-2.5.4a"
+RDEPEND="virtual/glibc virtual/mta"
 
-DEPEND="virtual/glibc
-	>=sys-devel/flex-2.5.4a"
-RDEPEND="virtual/glibc
-	virtual/mta"
+src_unpack() {
+	unpack ${A} && cd ${S} || die "error unpacking"
+
+	# Fix bug 33696 by allowing usernames longer than 8 chars,
+	# thanks to Yuval Kogman for the patch
+	epatch ${FILESDIR}/at-3.1.8-longuser.patch
+}
 
 src_compile() {
-	./configure \
-		--host=${CHOST/-pc/} \
-		--sysconfdir=/etc/at \
-		--with-jobdir=/var/spool/at/atjobs \
-		--with-atspool=/var/spool/at/atspool \
+	./configure --host=${CHOST/-pc/} --sysconfdir=/etc/at \
+		--with-jobdir=/var/cron/atjobs \
+		--with-atspool=/var/cron/atspool \
 		--with-etcdir=/etc/at \
 		--with-daemon_username=at \
 		--with-daemon_groupname=at || die
@@ -37,14 +43,12 @@ src_install() {
 	dosym at /usr/bin/atq
 	dosbin atd atrun
 
-	dodir /var/spool/at
-	fowners at:at /var/spool/at
 	for i in atjobs atspool
 	do
-		dodir /var/spool/at/${i}
-		fowners at:at /var/spool/at/${i}
-		fperms 700 /var/spool/at/${i}
-		touch ${D}/var/spool/at/${i}/.SEQ
+		dodir /var/cron/${i}
+		fowners at:at /var/cron/${i}
+		fperms 700 /var/cron/${i}
+		touch ${D}/var/cron/${i}/.SEQ
 	done
 
 	exeinto /etc/init.d
diff --git a/sys-apps/at/at-3.1.8-r9.ebuild b/sys-apps/at/at-3.1.8-r9.ebuild
index 4977fb939408..474e792700e8 100644
--- a/sys-apps/at/at-3.1.8-r9.ebuild
+++ b/sys-apps/at/at-3.1.8-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r9.ebuild,v 1.2 2003/12/17 03:48:01 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/at/at-3.1.8-r9.ebuild,v 1.3 2004/04/06 21:31:09 agriffis Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Queues jobs for later execution"
diff --git a/sys-apps/at/files/at-3.1.8-longuser.patch b/sys-apps/at/files/at-3.1.8-longuser.patch
new file mode 100644
index 000000000000..0f2ebb585f7e
--- /dev/null
+++ b/sys-apps/at/files/at-3.1.8-longuser.patch
@@ -0,0 +1,20 @@
+--- 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
+@@ -196,7 +196,7 @@
+  */
+     pid_t pid;
+     int fd_out, fd_in;
+-    char mailbuf[9], jobbuf[9];
++    char mailbuf[256], jobbuf[9];
+     char *mailname = NULL;
+     char *newname;
+     FILE *stream;
+@@ -299,7 +299,7 @@
+      * NFS and works with local file systems.  It's not clear where
+      * the bug is located.  -Joey
+      */
+-    if (fscanf(stream, "#!/bin/sh\n# atrun uid=%d gid=%d\n# mail %8s %d",
++    if (fscanf(stream, "#!/bin/sh\n# atrun uid=%d gid=%d\n# mail %255s %d",
+ 	       &nuid, &ngid, mailbuf, &send_mail) != 4)
+ 	pabort("File %.500s is in wrong format - aborting",
+ 	       filename);