Revision bump to include several fixes and feature enhancements. Install the correct pam.d file for bug #92370. Enable the built-in telnet client, bug #82773. Fix time bug for 64bit systems, bug #71207. Also enable the 256 colors support, requested via email by Emanuele Giaquinta.

Package-Manager: portage-2.0.51.21-r1

6 files changed, 55 insertions, 13 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index aba2c77e9a5c..bcfcd35a9a1b 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.83 2005/05/13 02:46:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.84 2005/05/14 22:08:38 swegener Exp $
+
+*screen-4.0.2-r3 (14 May 2005)
+
+  14 May 2005; Sven Wegener <swegener@gentoo.org>
+  +files/4.0.2-64bit-time.patch, +files/screen.pam, -screen-4.0.2-r2.ebuild,
+  +screen-4.0.2-r3.ebuild:
+  Revision bump to include several fixes and feature enhancements. Install the
+  correct pam.d file for bug #92370. Enable the built-in telnet client, bug
+  #82773. Fix time bug for 64bit systems, bug #71207. Also enable the 256
+  colors support, requested via email by Emanuele Giaquinta.
 
 *screen-4.0.2-r1 (13 May 2005)
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 22cca0700f05..053b604e8f19 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,12 +1,24 @@
-MD5 6665686656ffe069069dc347b298fb56 ChangeLog 12045
-MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f2d3b94adb425d8131ce1dbeb59e5e25 screen-4.0.2-r1.ebuild 3537
-MD5 e46c6cdaf0d44b1c4d67cb78e85a23d0 screen-4.0.2-r2.ebuild 3567
-MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
-MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
+MD5 017933639b1efe4c3a5566a6f03c9fcf screen-4.0.2-r3.ebuild 3691
+MD5 1c2518d1a5626a9b9ed7a2dccd4aeee4 ChangeLog 12524
+MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
+MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
+MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r1 64
+MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r3 64
 MD5 839ac3a5c896513a3e3c6353a6242f53 files/screen.pam.system-auth 113
 MD5 1d675e8a000851f610b79049ce863ff8 files/screenrc 10433
-MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r1 64
 MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
-MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
-MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r2 64
+MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
+MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
+MD5 8e301d8903a0452bb45a22ccf0c2b3ee files/screen.pam 84
+MD5 a7f6e6bfb5647c6e69a797eaa16acf3d files/4.0.2-64bit-time.patch 298
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFChnbvI1lqEGTUzyQRAv+vAJ9nukwoTUBAuS31jkbVdMkN4H/cFgCgqqMf
+CVePazz87lckp3qX8A+Y9k4=
+=1JN+
+-----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/4.0.2-64bit-time.patch b/app-misc/screen/files/4.0.2-64bit-time.patch
new file mode 100644
index 000000000000..645b37f9b098
--- /dev/null
+++ b/app-misc/screen/files/4.0.2-64bit-time.patch
@@ -0,0 +1,11 @@
+--- utmp.c.orig 2004-11-14 23:15:28.000000000 +0100
++++ utmp.c      2004-11-14 23:15:39.000000000 +0100
+@@ -618,7 +618,7 @@
+ #endif /* sgi */
+   strncpy(u->ut_line, line, sizeof(u->ut_line));
+   u->ut_pid = pid;
+-  (void)time((time_t *)&u->ut_time);
++  u->ut_time = time(NULL);
+ }
+ 
+ static slot_t
diff --git a/app-misc/screen/files/digest-screen-4.0.2-r2 b/app-misc/screen/files/digest-screen-4.0.2-r3
index 7891ec0c1518..7891ec0c1518 100644
--- a/app-misc/screen/files/digest-screen-4.0.2-r2
+++ b/app-misc/screen/files/digest-screen-4.0.2-r3
diff --git a/app-misc/screen/files/screen.pam b/app-misc/screen/files/screen.pam
new file mode 100644
index 000000000000..2b20dea9586c
--- /dev/null
+++ b/app-misc/screen/files/screen.pam
@@ -0,0 +1,4 @@
+#
+# This is the PAM configuration file for screen(1)
+#
+auth    include		system-auth
diff --git a/app-misc/screen/screen-4.0.2-r2.ebuild b/app-misc/screen/screen-4.0.2-r3.ebuild
index c772fe8add2d..2514aa841981 100644
--- a/app-misc/screen/screen-4.0.2-r2.ebuild
+++ b/app-misc/screen/screen-4.0.2-r3.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/app-misc/screen/screen-4.0.2-r2.ebuild,v 1.1 2005/05/13 02:46:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.2-r3.ebuild,v 1.1 2005/05/14 22:08:38 swegener Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -38,6 +38,9 @@ src_unpack() {
 	# Don't use utempter even if it is found on the system
 	epatch "${FILESDIR}"/${PV}-no-utempter.patch
 
+	# Patch for time function on 64bit systems
+	epatch "${FILESDIR}"/${PV}-64bit-time.patch
+
 	# Fix manpage.
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
@@ -53,7 +56,7 @@ src_unpack() {
 }
 
 src_compile() {
-	addpredict "`tty`"
+	addpredict "$(tty)"
 	addpredict "${SSH_TTY}"
 
 	# check config.h for other settings such as the
@@ -65,10 +68,12 @@ src_compile() {
 	use nethack || append-flags "-DNONETHACK"
 
 	econf \
-		$(use_enable pam) \
 		--with-socket-dir=/var/run/screen \
 		--with-sys-screenrc=/etc/screenrc \
 		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam) \
 		|| die "econf failed"
 
 	# Second try to fix bug 12683, this time without changing term.h
@@ -92,7 +97,7 @@ src_install() {
 	insinto /etc
 	doins "${FILESDIR}"/screenrc || die "doins failed"
 
-	newpamd "${FILESDIR}"/screen.pam.system-auth screen || die "newpamd failed"
+	newpamd "${FILESDIR}"/screen.pam screen || die "newpamd failed"
 
 	dodoc \
 		README ChangeLog INSTALL TODO NEWS* patchlevel.h \