Revision bump, with some code refactoring. Raise the number of possible windows, bug #99171. Print information on xterm tweaks which might break some applications, bug #99524. Include patch by Michael Hanselmann to open the tty in nonblocking mode. Add multiuser USE flag which adjusts the permissions.

(Portage version: 2.1_pre7-r4)

6 files changed, 190 insertions, 14 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 99ad7f63cb24..89ef779e469a 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.107 2006/03/30 18:30:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.108 2006/04/06 22:17:18 swegener Exp $
+
+*screen-4.0.2-r5 (07 Apr 2006)
+
+  07 Apr 2006; Sven Wegener <swegener@gentoo.org>
+  +files/4.0.2-nonblock.patch, +screen-4.0.2-r5.ebuild:
+  Revision bump, with some code refactoring. Raise the number of possible
+  windows, bug #99171. Print information on xterm tweaks which might break
+  some applications, bug #99524. Include patch by Michael Hanselmann to open
+  the tty in nonblocking mode. Add multiuser USE flag which adjusts the
+  permissions.
 
   30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> screen-4.0.2-r4.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index b2c5b6a2ded1..5bc4054e97da 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,6 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 1e682bb8ec1284d510bffc635192aa0d .screen-4.0.2-r5.ebuild.swp 20480
+RMD160 8c593fe0f270a0ddbe5e62d20e0eb304d8a05188 .screen-4.0.2-r5.ebuild.swp 20480
+SHA256 b11c3c2d82ac56e6dd01a9bcf495ad4216c2d697dcb0ca31a967eca3814207cb .screen-4.0.2-r5.ebuild.swp 20480
 MD5 f4d30c27f1e4bd62fe993062bf3c96d7 ChangeLog 15486
 RMD160 6682bc12d78af35f382cf7183ce94971ddd89758 ChangeLog 15486
 SHA256 13df27e8c2b9702cff16cf053467e76c5ff797b1fce731158cc1fad4b08173c7 ChangeLog 15486
@@ -16,12 +16,18 @@ SHA256 edc29bc7b7bea89c2f937ca9c95f2ce51b437e4ea042741d9f4ac6d7954178d5 files/4.
 MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
 RMD160 3e0ee3492e5ae84bf05716a1787dee495362bc39 files/4.0.2-no-utempter.patch 440
 SHA256 cc0178fb86971c0975e3d6d60677f2ad3a393ea126790dc5d56f566c42ebe384 files/4.0.2-no-utempter.patch 440
+MD5 331a6de04eeb286d69490d2cc9b37376 files/4.0.2-nonblock.patch 423
+RMD160 30a75e2b89542ec8a878855cf633ac3c04f799fd files/4.0.2-nonblock.patch 423
+SHA256 4a5f1666d7f680a9a8157969318b525bc08885ef673000e902c8ffc23ef49159 files/4.0.2-nonblock.patch 423
 MD5 8ce727e277e4edaa4dc7e696781918d9 files/4.0.2-windowlist-multiuser-fix.patch 491
 RMD160 7e28be8f2bc71705b4ff0d8028adb4ad4cd22cd5 files/4.0.2-windowlist-multiuser-fix.patch 491
 SHA256 edec52981859cfad0a2d780352405dc7575ad7901bc101d25e95baccf1060cc7 files/4.0.2-windowlist-multiuser-fix.patch 491
-MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r4 64
-RMD160 db70e89fb95b22d0cf15ae82a7cccb5ea573b6b9 files/digest-screen-4.0.2-r4 64
-SHA256 3eda10c6bbca311e1a61c35329b496de4298d79bc54d665e76158bc552b4604e files/digest-screen-4.0.2-r4 64
+MD5 05937e4e3403cfb8a7a270aa544aa0cc files/digest-screen-4.0.2-r4 238
+RMD160 015e02d012127c31fb21b8d73c8c745d45ec8f5f files/digest-screen-4.0.2-r4 238
+SHA256 95fa7d46fca3cb7e88ea121b3baf33aad6ba7eb9070385774f0779f2399b4f77 files/digest-screen-4.0.2-r4 238
+MD5 05937e4e3403cfb8a7a270aa544aa0cc files/digest-screen-4.0.2-r5 238
+RMD160 015e02d012127c31fb21b8d73c8c745d45ec8f5f files/digest-screen-4.0.2-r5 238
+SHA256 95fa7d46fca3cb7e88ea121b3baf33aad6ba7eb9070385774f0779f2399b4f77 files/digest-screen-4.0.2-r5 238
 MD5 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
 RMD160 b82fe493ccdc75bcfa97bf36e86f37ff5056565e files/screen-4.0.1-int-overflow-fix.patch 930
 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0 files/screen-4.0.1-int-overflow-fix.patch 930
@@ -37,10 +43,6 @@ SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000 metadata
 MD5 44a0dee86e6dc7b10734d3a7c4e4268a screen-4.0.2-r4.ebuild 4150
 RMD160 2e2dcc57423631d29bb8e5aff3edc2e9d9f9997c screen-4.0.2-r4.ebuild 4150
 SHA256 bc659c5fb0695bcc759892f627407816cb514c5d05c818a67f9b54b2a9e1127f screen-4.0.2-r4.ebuild 4150
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFELCPkAiZjviIA2XgRAt7kAKCZf10vsREVuSY5uEnGIlXkGWgJ7ACfXkvC
-rV4jZOqTEx0ubsMfyth6o8U=
-=2nfT
------END PGP SIGNATURE-----
+MD5 3d550cc7d42d1d255249183a0b0dd228 screen-4.0.2-r5.ebuild 4313
+RMD160 79aede2e46ac8f60d674d6288a807c2dd8ee06e4 screen-4.0.2-r5.ebuild 4313
+SHA256 589e4a1374be03edbdff7f1ed230d4f5d27876389ae8f56edcc323b83815e820 screen-4.0.2-r5.ebuild 4313
diff --git a/app-misc/screen/files/4.0.2-nonblock.patch b/app-misc/screen/files/4.0.2-nonblock.patch
new file mode 100644
index 000000000000..f27c903a8dd9
--- /dev/null
+++ b/app-misc/screen/files/4.0.2-nonblock.patch
@@ -0,0 +1,11 @@
+--- screen.c.orig	2006-04-02 17:05:28.000000000 +0200
++++ screen.c	2006-04-02 17:05:39.000000000 +0200
+@@ -1197,7 +1197,7 @@ char **av;
+   if (!detached)
+     {
+       /* reopen tty. must do this, because fd 0 may be RDONLY */
+-      if ((n = secopen(attach_tty, O_RDWR, 0)) < 0)
++      if ((n = secopen(attach_tty, O_RDWR | O_NONBLOCK, 0)) < 0)
+ 	Panic(0, "Cannot reopen '%s' - please check.", attach_tty);
+     }
+   else
diff --git a/app-misc/screen/files/digest-screen-4.0.2-r4 b/app-misc/screen/files/digest-screen-4.0.2-r4
index 7891ec0c1518..76fd94007aa6 100644
--- a/app-misc/screen/files/digest-screen-4.0.2-r4
+++ b/app-misc/screen/files/digest-screen-4.0.2-r4
@@ -1 +1,3 @@
 MD5 ed68ea9b43d9fba0972cb017a24940a1 screen-4.0.2.tar.gz 840519
+RMD160 42aea3d27ed25104f2a48606ea73234b715e480f screen-4.0.2.tar.gz 840519
+SHA256 05d087656d232b38c82379dfc66bf526d08e75e1f4c626acea4a2dda1ebcc845 screen-4.0.2.tar.gz 840519
diff --git a/app-misc/screen/files/digest-screen-4.0.2-r5 b/app-misc/screen/files/digest-screen-4.0.2-r5
new file mode 100644
index 000000000000..76fd94007aa6
--- /dev/null
+++ b/app-misc/screen/files/digest-screen-4.0.2-r5
@@ -0,0 +1,3 @@
+MD5 ed68ea9b43d9fba0972cb017a24940a1 screen-4.0.2.tar.gz 840519
+RMD160 42aea3d27ed25104f2a48606ea73234b715e480f screen-4.0.2.tar.gz 840519
+SHA256 05d087656d232b38c82379dfc66bf526d08e75e1f4c626acea4a2dda1ebcc845 screen-4.0.2.tar.gz 840519
diff --git a/app-misc/screen/screen-4.0.2-r5.ebuild b/app-misc/screen/screen-4.0.2-r5.ebuild
new file mode 100644
index 000000000000..b04c7edca055
--- /dev/null
+++ b/app-misc/screen/screen-4.0.2-r5.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2006 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-r5.ebuild,v 1.1 2006/04/06 22:17:18 swegener Exp $
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools
+
+DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="mirror://gnu/screen/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? (
+		sec-policy/selinux-screen
+		>=sec-policy/selinux-base-policy-20050821
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug 34599: integer overflow in 4.0.1
+	# (Nov 29 2003 -solar)
+	epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
+
+	# Bug 31070: configure problem which affects alpha
+	# (13 Jan 2004 agriffis)
+	epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
+
+	# uclibc doesnt have sys/stropts.h
+	if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
+		epatch "${FILESDIR}"/${PV}-no-pty.patch
+	fi
+
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/${PV}-no-utempter.patch
+
+	# Don't link against libelf even if it is found on the system
+	epatch "${FILESDIR}"/${PV}-no-libelf.patch
+
+	# Patch for time function on 64bit systems
+	epatch "${FILESDIR}"/${PV}-64bit-time.patch
+
+	# Patch that makes %u work for windowlist -b formats
+	epatch "${FILESDIR}"/${PV}-windowlist-multiuser-fix.patch
+
+	# Open tty in non-blocking mode
+	epatch "${FILESDIR}"/${PV}-nonblock.patch
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
+		-e "s:/usr/local/screens:/var/run/screen:g" \
+		-e "s:/local/etc/screenrc:/etc/screenrc:g" \
+		-e "s:/etc/utmp:/var/run/utmp:g" \
+		-e "s:/local/screens/S-:/var/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	# configure as delivered with screen is made with autoconf-2.5
+	WANT_AUTOCONF=2.5 eautoconf
+}
+
+src_compile() {
+	addpredict "$(tty)"
+	addpredict "${SSH_TTY}"
+
+	append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+	append-ldflags $(bindnow-flags)
+
+	use nethack || append-flags "-DNONETHACK"
+	use debug && append-flags "-DDEBUG"
+
+	econf \
+		--with-socket-dir=/var/run/screen \
+		--with-sys-screenrc=/etc/screenrc \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--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
+	# The last try seemed to break screen at run-time.
+	# (16 Jan 2003 agriffis)
+	LC_ALL=POSIX make term.h || die "Failed making term.h"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin screen || die "dobin failed"
+	keepdir /var/run/screen || die "keepdir failed"
+
+	if use multiuser
+	then
+		fperms 4755 /usr/bin/screen || die "fperms failed"
+	else
+		fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed"
+		fperms 2755 /usr/bin/screen || die "fperms failed"
+	fi
+
+	insinto /usr/share/terminfo
+	doins terminfo/screencap || die "doins failed"
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/?? || die "doins failed"
+	insinto /etc
+	doins "${FILESDIR}"/screenrc || die "doins failed"
+
+	pamd_mimic_system screen auth || die "pamd_mimic_system failed"
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \
+		|| die "dodoc failed"
+
+	doman doc/screen.1 || die "doman failed"
+	doinfo doc/screen.info* || die "doinfo failed"
+}
+
+pkg_postinst() {
+	if use multiuser
+	then
+		chown root:0 "${ROOT}"/var/run/screen
+		chmod 0755 "${ROOT}"/var/run/screen
+	else
+		chown root:utmp "${ROOT}"/var/run/screen
+		chmod 0775 "${ROOT}"/var/run/screen
+	fi
+
+	einfo "Some dangerous key bindings have been removed or changed to more safe values."
+	einfo "We enable some xterm hacks in our default screenrc, which might break some"
+	einfo "applications. Please check /etc/screenrc for information on these changes."
+}