diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-11-17 14:51:18 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-11-17 14:51:18 +0000 |
commit | 03023bca0a266e71c95f04e88101a00104588188 (patch) | |
tree | 141ca8b596253628598d0151c47f083b2b83c501 /app-misc/screen | |
parent | Old. (diff) | |
download | historical-03023bca0a266e71c95f04e88101a00104588188.tar.gz historical-03023bca0a266e71c95f04e88101a00104588188.tar.bz2 historical-03023bca0a266e71c95f04e88101a00104588188.zip |
Fix for long names in TERM, thanks Stelian Ionescu #345863
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'app-misc/screen')
-rw-r--r-- | app-misc/screen/ChangeLog | 9 | ||||
-rw-r--r-- | app-misc/screen/Manifest | 12 | ||||
-rw-r--r-- | app-misc/screen/files/4.0.3-extend-d_termname.patch | 29 | ||||
-rw-r--r-- | app-misc/screen/screen-4.0.3-r2.ebuild | 168 | ||||
-rw-r--r-- | app-misc/screen/screen-4.0.3.ebuild | 4 |
5 files changed, 214 insertions, 8 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index d841eb25b5b0..f0b78a946689 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/screen # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.149 2010/11/08 22:58:14 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.150 2010/11/17 14:51:18 jlec Exp $ + +*screen-4.0.3-r2 (17 Nov 2010) + + 17 Nov 2010; Justin Lecher <jlec@gentoo.org> + +files/4.0.3-extend-d_termname.patch, screen-4.0.3.ebuild, + +screen-4.0.3-r2.ebuild: + Fix for long names in TERM, thanks Stelian Ionescu #345863 08 Nov 2010; Sven Wegener <swegener@gentoo.org> -files/screen-4.0.3_p20070403-map.patch: diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 31aa412637e4..d570ff9818d9 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -7,6 +7,7 @@ AUX 4.0.2-no-pty.patch 392 RMD160 d29aec55c6b76f66a8340096f627afe2e4dca3e8 SHA1 AUX 4.0.2-no-utempter.patch 440 RMD160 3e0ee3492e5ae84bf05716a1787dee495362bc39 SHA1 f0f810a969790c7d2f6ecd6787909371bab79879 SHA256 cc0178fb86971c0975e3d6d60677f2ad3a393ea126790dc5d56f566c42ebe384 AUX 4.0.2-nonblock.patch 423 RMD160 30a75e2b89542ec8a878855cf633ac3c04f799fd SHA1 b42195100bf5d4b54dff2120e66ba533c3a9a3a3 SHA256 4a5f1666d7f680a9a8157969318b525bc08885ef673000e902c8ffc23ef49159 AUX 4.0.2-windowlist-multiuser-fix.patch 491 RMD160 7e28be8f2bc71705b4ff0d8028adb4ad4cd22cd5 SHA1 2d7b190b933900e1b0c302b37d526fafb373de31 SHA256 edec52981859cfad0a2d780352405dc7575ad7901bc101d25e95baccf1060cc7 +AUX 4.0.3-extend-d_termname.patch 912 RMD160 da763a1031c3ef6325fcda867e42e172e6e2bc0b SHA1 674f35167f48e04b5cb644a44f2c278df8dcc255 SHA256 172aa1f225037d7a6f3a07e61d32227afebccb82c0b4a384fe9636e16b0236a6 AUX screen-4.0.1-int-overflow-fix.patch 930 RMD160 b82fe493ccdc75bcfa97bf36e86f37ff5056565e SHA1 e516e056515a5e10cd470a8f951a94c512827515 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0 AUX screen-4.0.1-vsprintf.patch 480 RMD160 cc80e7353e19d7d82dc506ae3a5eaaedba4db1ca SHA1 b1bf4b8f45236dc63de748699671679ce7237a59 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 RMD160 b83b905014431c5671d8624f5b471414e8738d8f SHA1 7335c01e9f12bb2414a4e023bcb739453375f493 SHA256 71897394211d9e00e008f7c34b3a37bff0cfa54bcfa31a23e849c7021471ca2f @@ -15,13 +16,14 @@ AUX screen-4.0.3-setenv_autoconf.patch 2485 RMD160 232a7c531f2382ac4a0c618948b13 AUX screenrc 10397 RMD160 e80d0c2ee7b225d041b75ae4fe080aa2ad8b134a SHA1 15dee4a41ef55d156797333e9279043597cc5682 SHA256 c4ad4932fc65ebfd047134ae8c5bc1e37096a0dd5c3c6e74b3462a8562ff39f8 DIST screen-4.0.3.tar.gz 840602 RMD160 8c3903c1642ae30fd9d5706298919428552f7754 SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 EBUILD screen-4.0.3-r1.ebuild 5152 RMD160 2181c15ee53460967b5ec51a6424dd69ce9dbc7a SHA1 c55036daf2327a35f3304189c0d63755a7a64c53 SHA256 6d58b09ee4588f4685038c41521ce4a1329f52f614ff41b9fd87bbc51d795bbd -EBUILD screen-4.0.3.ebuild 4672 RMD160 bdc6a326600cff9ae94cc3ca97a48034ed0a5ae2 SHA1 d61f1ec1b6908cb8cca1b152699fb9453035e0b4 SHA256 19bb4da2c6aa057a43773a378c54aa09697b3bc16fd9d990e803284b998ed71b -MISC ChangeLog 21016 RMD160 d2b0264a6395cacef281348154905634a91fa583 SHA1 78d31be65e0e561fce8d7dd8add3b9d25dc14f03 SHA256 69eab313ad19f2d0b2f486cf4de633c47f858e87b8059fb8b10902718b25cea5 +EBUILD screen-4.0.3-r2.ebuild 5262 RMD160 5d20b59c74b71e8b0e4115ad2ae1d8e0bd9dfe37 SHA1 1fc490866ba2b2beb46269bc0d50ac83b196df24 SHA256 399beae9f9c74f4db8df2689692e7ffe02dec39dcac2f09e7d06e8f0a04ffbac +EBUILD screen-4.0.3.ebuild 4661 RMD160 62e154b2f975bf270e49f3d560dbe10df345babf SHA1 1e013d4ddf049a3ad06dada24e44140aad453189 SHA256 300d4bfa0a72b80f0f26b5e845cd6057d081ebedf5ebb69d1a3653a07bad37b5 +MISC ChangeLog 21241 RMD160 5b768a98dd1e149351504085534712f82e9c0d8b SHA1 8c977eda45641535c345b71ba4ddb0749da452d9 SHA256 7f923a20065b77e95bb4414a0f5103f84f34997a05f9265b311c852a7eddb0d4 MISC metadata.xml 1697 RMD160 e3f187509d13f8e939814733c9876407006ca0ab SHA1 53a6d55362e68c62329b6a644b5b3f74c436f272 SHA256 58279e41070c88041df5acd625067c947b9df46ca68fb3ae3cd72c268ae30c81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzYgJQACgkQI1lqEGTUzyTHMACg075FGOLmxPxsgLxWilBafjgK -apsAnjj+dUPkXHu0mMJ/NjgqrR950Fht -=UIiI +iEYEARECAAYFAkzj6+wACgkQgAnW8HDreRbn/gCgugCEgzdoVB2soA0cCTTD3Dj5 +9JoAnjZSQlyx0N75Dr8hIS+k87MnQv3Z +=GkqC -----END PGP SIGNATURE----- diff --git a/app-misc/screen/files/4.0.3-extend-d_termname.patch b/app-misc/screen/files/4.0.3-extend-d_termname.patch new file mode 100644 index 000000000000..1849bf1ebbbb --- /dev/null +++ b/app-misc/screen/files/4.0.3-extend-d_termname.patch @@ -0,0 +1,29 @@ +diff -ur screen-4.0.3.orig//display.h screen-4.0.3/display.h +--- screen-4.0.3.orig//display.h 2003-07-01 16:01:42.000000000 +0200 ++++ screen-4.0.3/display.h 2010-11-17 13:18:13.182984179 +0100 +@@ -22,6 +22,16 @@ + * $Id: 4.0.3-extend-d_termname.patch,v 1.1 2010/11/17 14:51:18 jlec Exp $ FAU + */ + ++#include <limits.h> ++ ++#ifndef NAME_MAX ++# ifndef MAXNAMELEN ++# define NAME_MAX 255 ++# else ++# define NAME_MAX MAXNAMELEN ++# endif ++#endif ++ + #ifdef MAPKEYS + + #define KMAP_KEYS (T_OCAPS-T_CAPS) +@@ -85,7 +95,7 @@ + struct win *d_other; /* pointer to other window */ + int d_nonblock; /* -1 don't block if obufmax reached */ + /* >0: block after nonblock secs */ +- char d_termname[20 + 1]; /* $TERM */ ++ char d_termname[NAME_MAX + 1]; /* $TERM */ + char *d_tentry; /* buffer for tgetstr */ + char d_tcinited; /* termcap inited flag */ + int d_width, d_height; /* width/height of the screen */ diff --git a/app-misc/screen/screen-4.0.3-r2.ebuild b/app-misc/screen/screen-4.0.3-r2.ebuild new file mode 100644 index 000000000000..efba5f21a3dc --- /dev/null +++ b/app-misc/screen/screen-4.0.3-r2.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2010 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-r2.ebuild,v 1.1 2010/11/17 14:51:18 jlec Exp $ + +EAPI="3" + +WANT_AUTOCONF="2.5" + +inherit eutils flag-o-matic toolchain-funcs pam autotools + +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 + epatch "${FILESDIR}"/${PV}-extend-d_termname.patch + + # reconfigure + eautoconf +} + +src_configure() { + append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" + + [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl + + use nethack || append-flags "-DNONETHACK" + use debug && append-flags "-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) \ + || 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" +} + +src_install() { + dobin screen || die "dobin failed" + keepdir /var/run/screen || die "keepdir failed" + + if use multiuser || use prefix + then + fperms 4755 /usr/bin/screen || die "fperms failed" + else + fowners root:utmp /{usr/bin,var/run}/screen \ + || die "fowners failed, use multiuser USE-flag instead" + fperms 2755 /usr/bin/screen || die "fperms failed" + fi + + insinto /usr/share/screen + doins terminfo/{screencap,screeninfo.src} || 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 || use prefix + then + use prefix || chown root:0 "${EROOT}"/var/run/screen + if use prefix; then + chmod 0777 "${EROOT}"/var/run/screen + else + chmod 0755 "${EROOT}"/var/run/screen + fi + else + chown root:utmp "${EROOT}"/var/run/screen + chmod 0775 "${EROOT}"/var/run/screen + fi + + 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." +} diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild index df4d89df4b21..3a83de5b8ed1 100644 --- a/app-misc/screen/screen-4.0.3.ebuild +++ b/app-misc/screen/screen-4.0.3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2010 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.ebuild,v 1.22 2010/10/19 06:22:06 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.23 2010/11/17 14:51:18 jlec Exp $ WANT_AUTOCONF="2.5" inherit eutils flag-o-matic toolchain-funcs pam autotools -DESCRIPTION="Screen - A full-screen window manager that multiplexes physical terminals between several processes" +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" |