Include an updated patch for bug #424557.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x64D4CF24

4 files changed, 178 insertions, 6 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index c19cb9975cb2..99b2fa870139 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.176 2012/11/07 16:04:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.177 2012/11/13 19:49:07 swegener Exp $
+
+*screen-4.0.3-r7 (13 Nov 2012)
+
+  13 Nov 2012; Sven Wegener <swegener@gentoo.org> +screen-4.0.3-r7.ebuild,
+  files/screen-4.0.3-cppflags.patch:
+  Include an updated patch for bug #424557.
 
 *screen-4.0.3-r6 (07 Nov 2012)
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 5f4c9b55b594..dc044892db9c 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -11,18 +11,19 @@ AUX 4.0.3-extend-d_termname-ng2.patch 5136 SHA256 e87caeab9c4dfc59816c0faf237f26
 AUX screen-4.0.1-int-overflow-fix.patch 930 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0 SHA512 cb678fb3b879ff61b79995f8a63aa7c84639c1daa4150abb527769c8e6f3dd993f3b0d126b71e60ecea1050bfa1bfc6d1c4756fc4f280ee01143ab8d6caa283b WHIRLPOOL ff0a6668b3531557584af3742a62179bdbb3e2adee1279761e9e4f4e2e6ec37c0107aec2279a679aacd3a6e745551124339611b0bd8202aab7e678e12c060491
 AUX screen-4.0.1-vsprintf.patch 480 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd SHA512 f221b84bb753538871000e545610f0b5d5bb221dfe4f963cea8f2ba195d90fc6d217d45bd82081247be2e5307b125225635bee27a618ae570bf2bc097e241871 WHIRLPOOL ed62e461f50bb8c0c14f5221a4beb525dd1fa8ae0cdc370e0a90cd82bb252b8f64d0ee6f617ced90063c70751bf69b9778200982276d16d7db50f586177ed29c
 AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 SHA256 71897394211d9e00e008f7c34b3a37bff0cfa54bcfa31a23e849c7021471ca2f SHA512 e08abcdd2f339012cb53f953b1963021614c2de0626f2b23deadc7335f8b0b76138a9f3aa259b86b4fdf740619bf4416cd17cd0e88b97f2578e1ec4b26f736f5 WHIRLPOOL c0aec99c177dad57d506b6cc1b23333313767fa74342a1f1e1949392c8ebdeb4f444eb9f5e75afdd399b10cfbf0c3c58eaf3737fff1eb4bbbef8418f508dcb5b
-AUX screen-4.0.3-cppflags.patch 406 SHA256 6590ef0afeb1bcfddc40efeceef48086196d8a223cc1536427f9c41c782d918a SHA512 94297e7dcf2d430aaab4afd4654a723493b84f3a7770a597dee321329e66f65181cbc3eed950161b48d3c407d0c10a83d288bd1e666110b4bae22bc3a9e33082 WHIRLPOOL 0ab5e94695362a19034863b16f94f4e223fbe641439b3a2f0ba17624f9b9c145b29229c9b361287fdf985e2294169e02a92aa552f0e5554ebf48fbc4a6f0ed65
+AUX screen-4.0.3-cppflags.patch 752 SHA256 40f4c4321170096984466665e3af9aead03490de521205da61a8d31d04cf718d SHA512 92c42ed8d9c2a9ee539784b2fb43119968bdce5b6cd371d82bcf21d9c12f9fd1353ae9630ee1bce3ed73c1528d7bdee64abd4fd1919aaf5ecd412c895ce4a3b4 WHIRLPOOL 8e7c2ef2b4d019cd8820a72660cee8614d0490c65c6ffa85a7c161753cae6f13ebf053623db33685d4cf15af53fbd894dfd224b0a5896d823f6ac165eb20e085
 AUX screen-4.0.3-crosscompile.patch 18900 SHA256 7e4109cd3f6d58ea799fe069472a58f16ea75c2397392c15f58bfcb7cbb354f9 SHA512 9d34d6245d50f0ea84735cad7148b2c6af70709efc788fe9113752081a05138172acc4d6dc33c87ac71739dead1338000b9bd64978c0edf3c44d9ead92487afb WHIRLPOOL 037ec13508ec669791fda248d4a056abb54c1d9aa6893ddcb8aa4785365231b8c4aea46e07cd5367853039c0876cc8e1ee18df4952d9aa3168806eea9f994846
 AUX screen-4.0.3-setenv_autoconf.patch 2485 SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75 SHA512 72dcfd9180d05edf85ce9f459e69ccd709a6c0a4593802d0f4e88ffe2daf56215ce8049a641701693dafeab3cc8a0df796338d92338ee0d39c51d46ed718af7b WHIRLPOOL fa7645c3488f75c8acdb2305864459e3eada89e7a29e39a6048cdda7459c707b090c68ce93023a53c57a7beabb3c66f9f9f26237126e68d00cc888a7581b867c
 AUX screenrc 10409 SHA256 f2fbb2de649df9d6b0afbb913d002eb7fdabec5525930515452c286dffcde072 SHA512 32783353cadb403999041e184c7c69570869d45793df4aff35c341f222903dab23d7872e24a78dcf84d82d636890950ad2719614c5475d7084f58769a24e8e71 WHIRLPOOL 3d1a75bcaad7870637dee9c4549062ffcddfd6be614e73e786d166b45f82b35a7f5311d9a60060a7d38afa96264b8eed3719f23244fc3799b7f8fe6ca774a754
 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
 EBUILD screen-4.0.3-r6.ebuild 4655 SHA256 45c9d3baf87ec1db41f05de7c70ab8e74d62fae55479685cdef917f384d5265b SHA512 736ab86ef010969968def6533e4f64a0ae93290fefc947bd3feff41e1ee15a602cd4c743e5e2a014f13ab4d0c0fa8840965dc8c8e83508305865378ee76692cb WHIRLPOOL 8cbc553c21a51a4cdfeaadd3b0af18681f9ab49e027c87b02a93bc29fb1ccd29dbd6eae553792433a7e2e685a5824e0389afd682819343926744806ad7573856
-MISC ChangeLog 24828 SHA256 72253d5c17099528c3c52d651880426dcc864874a8d07b7e29b565001d6530f3 SHA512 13e4b9145d23b162cc58b86d153d7dbef3fc35c9af7ed6b06cdfdc1d6c70ad5eedc1d1d0d3ff8a1110c24ad88cd3936d2a9e5e7f4177d123744004421afe435a WHIRLPOOL 94b487fbdd2be65e49407b24cf824141aab551b379bda8f211d80b59c0622d213a508db0c9a4e795245ee72bb9eec81c0cd0472056200e84fb21d3f35afe8b9d
+EBUILD screen-4.0.3-r7.ebuild 4743 SHA256 44526028ba00ddf1ddf6d25793c82edbad012ef6ef83540a7aa309cacd5b24d5 SHA512 f276682507874891a9cf71f94fdcfead6c72828ae7526339483cbc496959492a65582ebd9e09418525470641710d5e89c7afd65112dc8f249ff98c1abd403ee8 WHIRLPOOL 5c1927e58d71974c57edd0a3f5921fad0665618e042d3c362cc35c63d455c27fd7dad4b685f3ae2e395edbde0004005134cd0e2fb040d6be7a937b0794a4d464
+MISC ChangeLog 25021 SHA256 46faa4b0a4e65f6760b6634462554b0e47a7afdc1e5dfd5f35eb40ec9504778d SHA512 d60c9eb70ebaf7205fb59f54e8dcb35460cd63823b7818cf0f4e63d65054cda41faea7ce8a1f3056c515507e4072320a81227eaa839e95a7889059f94acfe2a0 WHIRLPOOL e69af686cbe20ef34a9e6cf96d9801558a73c053a0d3cdfef5e60f4cc269d71a825f0e2e5854128427e4646f50597f0deb3161d46dfe9309d9377d0a42ca072c
 MISC metadata.xml 1703 SHA256 f730fdee708602205eac134d406226c041480a730800b270fddc0f29b0663782 SHA512 2458aebc3c3a1852e0c251d3650846401f9a634a7d5fb722ad47a0b966705fa93de77b2fef1858d81e7dca29bc8b5ec46c22de993e385fbcc117244dedc9e46d WHIRLPOOL 4862c8c314207cde5eca001b985efa691a7ad02335f208d916c903bf6fa2acfd5100514a0704adcfee0f32d75d29a978b49ae104e9f0f60a8eaf54e07a963098
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCahpoACgkQgAnW8HDreRZ81gCghEkEsKWrmJFMatT5HtAQ7HMd
-JQsAoKPODn2AkexBq0VCZDCl175z5D7n
-=noNJ
+iEYEAREIAAYFAlCipDYACgkQI1lqEGTUzyRcUACg3CgmCgJtnLyqcrp4HkpMSYRd
+HYYAnRQlaXGZdpI+Z1Xu7E2oYNAFa8qR
+=uhwI
 -----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/screen-4.0.3-cppflags.patch b/app-misc/screen/files/screen-4.0.3-cppflags.patch
index aebf35119c6e..ee3455ff92f6 100644
--- a/app-misc/screen/files/screen-4.0.3-cppflags.patch
+++ b/app-misc/screen/files/screen-4.0.3-cppflags.patch
@@ -9,3 +9,12 @@
  
  install_bin: .version screen
  	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+@@ -122,7 +122,7 @@
+ 	sh $(srcdir)/tty.sh tty.c
+ 
+ comm.h: comm.c comm.sh config.h
+-	AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
++	AWK=$(AWK) CC="$(CC) $(CFLAGS) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
+ 
+ osdef.h: osdef.sh config.h osdef.h.in
+ 	CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
diff --git a/app-misc/screen/screen-4.0.3-r7.ebuild b/app-misc/screen/screen-4.0.3-r7.ebuild
new file mode 100644
index 000000000000..d32abb605a08
--- /dev/null
+++ b/app-misc/screen/screen-4.0.3-r7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r7.ebuild,v 1.1 2012/11/13 19:49:07 swegener Exp $
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools user
+
+DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? ( sec-policy/selinux-screen )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_prepare() {
+	# 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}"/4.0.2-no-pty.patch
+	fi
+
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+
+	# Don't link against libelf even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-libelf.patch
+
+	# Patch for time function on 64bit systems
+	epatch "${FILESDIR}"/4.0.2-64bit-time.patch
+
+	# Patch that makes %u work for windowlist -b formats
+	epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
+
+	# Open tty in non-blocking mode
+	epatch "${FILESDIR}"/4.0.2-nonblock.patch
+
+	# compability for sys-devel/autoconf-2.62
+	epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
+
+	# crosscompile patch
+	epatch "${FILESDIR}"/"${P}"-crosscompile.patch
+
+	# sched.h is a system header and causes problems with some C libraries
+	mv sched.h _sched.h || die
+	sed -i '/include/s:sched.h:_sched.h:' screen.h || die
+
+	# Allow for more rendition (color/attribute) changes in status bars
+	sed -i \
+		-e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
+		screen.c \
+		|| die "sed screen.c failed"
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
+		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+		-e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	# proper setenv detection for Solaris
+	epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
+
+	# Allow TERM string large enough to use with rxvt-unicode-256color
+	# Allow usernames up to 32 chars
+	epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
+
+	# support CPPFLAGS
+	epatch "${FILESDIR}"/${P}-cppflags.patch
+
+	# reconfigure
+	eautoconf
+}
+
+src_configure() {
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	econf \
+		--with-socket-dir="${EPREFIX}/var/run/screen" \
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam) \
+		$(use multiuser || echo --disable-socket-dir)
+
+	# 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"
+}
+
+src_install() {
+	dobin screen
+
+	if use multiuser || use prefix
+	then
+		fperms 4755 /usr/bin/screen
+	else
+		fowners root:utmp /usr/bin/screen
+		fperms 2755 /usr/bin/screen
+	fi
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src}
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/??
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	pamd_mimic_system screen auth
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+
+	doman doc/screen.1
+	doinfo doc/screen.info*
+}
+
+pkg_postinst() {
+	elog "Some dangerous key bindings have been removed or changed to more safe values."
+	elog "We enable some xterm hacks in our default screenrc, which might break some"
+	elog "applications. Please check /etc/screenrc for information on these changes."
+}