From 8c65d619dadca8564b777f5282b2030e8518f706 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 18 Oct 2011 19:25:31 +0000 Subject: [PATCH] Old. Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64 --- app-misc/screen/ChangeLog | 7 +- app-misc/screen/Manifest | 13 +- .../files/4.0.3-extend-d_termname-ng.patch | 111 ------------ .../files/4.0.3-extend-d_termname.patch | 29 ---- app-misc/screen/screen-4.0.3.ebuild | 158 ------------------ 5 files changed, 10 insertions(+), 308 deletions(-) delete mode 100644 app-misc/screen/files/4.0.3-extend-d_termname-ng.patch delete mode 100644 app-misc/screen/files/4.0.3-extend-d_termname.patch delete mode 100644 app-misc/screen/screen-4.0.3.ebuild diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index b6dc54fcb010..18974c0ead53 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/screen # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.162 2011/07/15 14:31:00 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.163 2011/10/18 19:25:31 jer Exp $ + + 18 Oct 2011; Jeroen Roovers + -files/4.0.3-extend-d_termname.patch, + -files/4.0.3-extend-d_termname-ng.patch, -screen-4.0.3.ebuild: + ^ 15 Jul 2011; Kacper Kowalik screen-4.0.3-r4.ebuild: ppc64 stable wrt #361823 diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index bdf96f9558d3..308dc14bdc77 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -7,9 +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-ng.patch 2680 RMD160 ffe6d09b9d0eefbb4ff2b87bdc7e2fc53bf15826 SHA1 f0274cb760b92dcc6159f7fa73930dea2cf81261 SHA256 963277f5f16565e041a58c187b7f1de7349d6de8a79cd401e1143b31c31a950c AUX 4.0.3-extend-d_termname-ng2.patch 5136 RMD160 11bdce15acebc9ab7fda47e4032d39e8958a3616 SHA1 d8c7b4e0f884b8ba1c340a378bdfaa6eab1cecc3 SHA256 e87caeab9c4dfc59816c0faf237f26704e63079f8576b93f26029a9e7b550102 -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 @@ -18,15 +16,12 @@ AUX screen-4.0.3-setenv_autoconf.patch 2485 RMD160 232a7c531f2382ac4a0c618948b13 AUX screenrc 10409 RMD160 198c26126bce3f51352166d83d124606a922b396 SHA1 f0f34eb17abffb0bc0435cd33f17c2ea91b8d04f SHA256 f2fbb2de649df9d6b0afbb913d002eb7fdabec5525930515452c286dffcde072 DIST screen-4.0.3.tar.gz 840602 RMD160 8c3903c1642ae30fd9d5706298919428552f7754 SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 EBUILD screen-4.0.3-r4.ebuild 5253 RMD160 6fdc9f46cf7cb88cd38244fda03fe7d10492b19c SHA1 019f81a7ed4240a15e73e4edfa7521329e572aef SHA256 18dcaa3f241a96a3347f41db7e27ce97c5321f29e0c483910b323d19c594cab5 -EBUILD screen-4.0.3.ebuild 4661 RMD160 62e154b2f975bf270e49f3d560dbe10df345babf SHA1 1e013d4ddf049a3ad06dada24e44140aad453189 SHA256 300d4bfa0a72b80f0f26b5e845cd6057d081ebedf5ebb69d1a3653a07bad37b5 -MISC ChangeLog 22845 RMD160 2a27f3427afd6703b2ff54a949d7b6afaa6cf717 SHA1 9a226597a63471aa733ca3383e8391846f397f4a SHA256 307744fd23085e351e44daf995d806904319764147df7e2f6a06ff48d73fb6a1 +MISC ChangeLog 22995 RMD160 f14154fb9ebbd95287253cecb73a4a5ad6a8d2a4 SHA1 fdfdd94663730ea00cedf17a0018d1694369fbf5 SHA256 ef1246e83cf9e927de8e4f6b0914d18707ec929359c0d9f9ee74c38512037dac MISC metadata.xml 1697 RMD160 e3f187509d13f8e939814733c9876407006ca0ab SHA1 53a6d55362e68c62329b6a644b5b3f74c436f272 SHA256 58279e41070c88041df5acd625067c947b9df46ca68fb3ae3cd72c268ae30c81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQECAAYFAk4gTyoACgkQIiMqcbOVdxQ9GwP/Q0sMR8DbKoZ3A9ko9Dw+Oi59 -7L8/CLjKMjYPt9IaiReiU1fkEm4gXPWybB6/TtpEEKdu9PAl92Pk2+A1Ngo0IwHe -baJUoFm7jjtjxtZArdsySkXBsxsF86+5ugRgdk8E5gFT2Q9P7KS1+1/GUUAuq1kz -SsOGWVaGp76WAs0Hgrw= -=uS3p +iEYEARECAAYFAk6d0rUACgkQVWmRsqeSphPrEQCffxqNIdHFGcE3Qurg3N3cyAm1 +fJ4AnRAefE29n1aAY0rRC9CI2OkK1BAV +=jUMP -----END PGP SIGNATURE----- diff --git a/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch b/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch deleted file mode 100644 index 497cb8f2f912..000000000000 --- a/app-misc/screen/files/4.0.3-extend-d_termname-ng.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/display.h b/display.h -index ef99954..563fcd0 100644 ---- a/display.h -+++ b/display.h -@@ -22,6 +22,16 @@ - * $Id: 4.0.3-extend-d_termname-ng.patch,v 1.1 2010/11/17 16:42:00 jlec Exp $ FAU - */ - -+#include -+ -+#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 display - 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/screen.h b/screen.h -index 4f9f354..bcaaaf6 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,6 +43,15 @@ - #include "comm.h" - #include "layer.h" - #include "term.h" -+#include -+ -+#ifndef NAME_MAX -+# ifndef MAXNAMELEN -+# define NAME_MAX 255 -+# else -+# define NAME_MAX MAXNAMELEN -+# endif -+#endif - - - #ifdef DEBUG -@@ -195,26 +204,26 @@ struct msg - create; - struct - { -- char auser[20 + 1]; /* username */ -+ char auser[NAME_MAX + 1]; /* username */ - int apid; /* pid of frontend */ - int adaptflag; /* adapt window size? */ - int lines, columns; /* display size */ - char preselect[20]; - int esc; /* his new escape character unless -1 */ - int meta_esc; /* his new meta esc character unless -1 */ -- char envterm[20 + 1]; /* terminal type */ -+ char envterm[NAME_MAX + 1]; /* terminal type */ - int encoding; /* encoding of display */ - } - attach; - struct - { -- char duser[20 + 1]; /* username */ -+ char duser[NAME_MAX + 1]; /* username */ - int dpid; /* pid of frontend */ - } - detach; - struct - { -- char auser[20 + 1]; /* username */ -+ char auser[NAME_MAX + 1]; /* username */ - int nargs; - char cmd[MAXPATHLEN]; /* command */ - int apid; /* pid of frontend */ -diff --git a/socket.c b/socket.c -index 62a73af..1cc9c27 100644 ---- a/socket.c -+++ b/socket.c -@@ -45,6 +45,16 @@ - - #include "extern.h" - -+#include -+ -+#ifndef NAME_MAX -+# ifndef MAXNAMELEN -+# define NAME_MAX 255 -+# else -+# define NAME_MAX MAXNAMELEN -+# endif -+#endif -+ - static int CheckPid __P((int)); - static void ExecCreate __P((struct msg *)); - static void DoCommandMsg __P((struct msg *)); -@@ -1248,7 +1258,7 @@ static void PasswordProcessInput __P((char *, int)); - - struct pwdata { - int l; -- char buf[20 + 1]; -+ char buf[NAME_MAX + 1]; - struct msg m; - }; - 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 deleted file mode 100644 index 1849bf1ebbbb..000000000000 --- a/app-misc/screen/files/4.0.3-extend-d_termname.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 -+ -+#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.ebuild b/app-misc/screen/screen-4.0.3.ebuild deleted file mode 100644 index 3a83de5b8ed1..000000000000 --- a/app-misc/screen/screen-4.0.3.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# 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.23 2010/11/17 14:51:18 jlec Exp $ - -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" -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_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 ' | $(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:/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" - - # reconfigure - eautoconf -} - -src_compile() { - append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" - - 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/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 - 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 - - 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." -} -- 2.26.2