Import FreeBSD fixes and redo uClibc fixes to be more generic #92370 by Diego Pettenò.

Package-Manager: portage-2.0.51.21-r1

4 files changed, 134 insertions, 18 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index a58c23aed635..aba2c77e9a5c 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/screen
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.82 2005/01/01 15:22:58 eradicator Exp $
+# 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 $
+
+*screen-4.0.2-r1 (13 May 2005)
+
+  13 May 2005; Mike Frysinger <vapier@gentoo.org> +screen-4.0.2-r2.ebuild:
+  Import FreeBSD fixes and redo uClibc fixes to be more generic #92370 by
+  Diego Pettenò.
 
   31 Dec 2004; Sven Wegener <swegener@gentoo.org> files/screenrc:
   Do not use xterm's alternative window buffer by default, it breaks
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index c86e2925de36..22cca0700f05 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f2d3b94adb425d8131ce1dbeb59e5e25 screen-4.0.2-r1.ebuild 3537
-MD5 3438ed52e5334842ae084337db5043fb ChangeLog 11850
+MD5 6665686656ffe069069dc347b298fb56 ChangeLog 12045
 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 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 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 23cfd7dd1968780724e7b9a3cb406cc8 files/screen-4.0.1-int-overflow-fix.patch 930
-MD5 bebe7dbe3fee13c1251a9bd30535b245 files/4.0.2-no-pty.patch 392
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB3VodI1lqEGTUzyQRAsTLAKCE3IzlpiDu4ZVxHdllPGGeI5HpdgCeKIjS
-ne4NMsCT/ZXzMHfnHHEL3N4=
-=8wCE
------END PGP SIGNATURE-----
+MD5 7f5ab1c54d87ad24f0a8bafbbcf24844 files/4.0.2-no-utempter.patch 440
+MD5 35961ab00c29256e3f6d7a374387e327 files/digest-screen-4.0.2-r2 64
diff --git a/app-misc/screen/files/digest-screen-4.0.2-r2 b/app-misc/screen/files/digest-screen-4.0.2-r2
new file mode 100644
index 000000000000..7891ec0c1518
--- /dev/null
+++ b/app-misc/screen/files/digest-screen-4.0.2-r2
@@ -0,0 +1 @@
+MD5 ed68ea9b43d9fba0972cb017a24940a1 screen-4.0.2.tar.gz 840519
diff --git a/app-misc/screen/screen-4.0.2-r2.ebuild b/app-misc/screen/screen-4.0.2-r2.ebuild
new file mode 100644
index 000000000000..c772fe8add2d
--- /dev/null
+++ b/app-misc/screen/screen-4.0.2-r2.ebuild
@@ -0,0 +1,117 @@
+# 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 $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+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 ~sparc ~x86"
+IUSE="pam nethack"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+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
+
+	# 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 autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	addpredict "`tty`"
+	addpredict "${SSH_TTY}"
+
+	# check config.h for other settings such as the
+	# max-number of windows allowed by screen.
+	append-flags "-DPTYMODE=0620 -DPTYGROUP=5"
+	append-ldflags -Wl,-z,now
+
+	use pam && append-flags "-DUSE_PAM"
+	use nethack || append-flags "-DNONETHACK"
+
+	econf \
+		$(use_enable pam) \
+		--with-socket-dir=/var/run/screen \
+		--with-sys-screenrc=/etc/screenrc \
+		--enable-rxvt_osc \
+		|| 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"
+	fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed"
+	fperms 2755 /usr/bin/screen || die "fperms failed"
+
+	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"
+
+	newpamd "${FILESDIR}"/screen.pam.system-auth screen || die "newpamd 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() {
+	chmod 0775 "${ROOT}"/var/run/screen
+
+	einfo "Some dangerous key bindings have been removed or changed to more safe values."
+	einfo "For more info, please check /etc/screenrc"
+	einfo
+	einfo "screen is not installed as setuid root, which effectively disables multi-user"
+	einfo "mode. To enable it, run:"
+	einfo ""
+	einfo "\tchmod u+s /usr/bin/screen"
+	einfo "\tchmod go-w /var/run/screen"
+}