From 972120ebd22334b617701ba266acdc3a89c1f708 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 28 Apr 2014 06:04:54 +0000 Subject: Version bump. Removed old (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) --- app-misc/screen/ChangeLog | 12 +- .../files/screen-4.2.0-check_for_altscreen.patch | 38 ------ .../files/screen-4.2.0-incompatible-protocol.patch | 23 ---- .../files/screen-4.2.0-long_terminal_names.patch | 69 ----------- .../screen-4.2.0-nonethack_segfault_fix.patch | 43 ------- app-misc/screen/files/screen-4.2.0-tgetent.patch | 31 ----- app-misc/screen/screen-4.2.0-r1.ebuild | 132 --------------------- app-misc/screen/screen-4.2.1.ebuild | 123 +++++++++++++++++++ 8 files changed, 134 insertions(+), 337 deletions(-) delete mode 100644 app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch delete mode 100644 app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch delete mode 100644 app-misc/screen/files/screen-4.2.0-long_terminal_names.patch delete mode 100644 app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch delete mode 100644 app-misc/screen/files/screen-4.2.0-tgetent.patch delete mode 100644 app-misc/screen/screen-4.2.0-r1.ebuild create mode 100644 app-misc/screen/screen-4.2.1.ebuild (limited to 'app-misc/screen') diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 9fbf2991ce26..77d7ee11e69a 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-misc/screen # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.192 2014/04/20 18:37:01 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.193 2014/04/28 06:04:54 polynomial-c Exp $ + +*screen-4.2.1 (28 Apr 2014) + + 28 Apr 2014; Lars Wendler -screen-4.2.0-r1.ebuild, + +screen-4.2.1.ebuild, -files/screen-4.2.0-check_for_altscreen.patch, + -files/screen-4.2.0-incompatible-protocol.patch, + -files/screen-4.2.0-long_terminal_names.patch, + -files/screen-4.2.0-nonethack_segfault_fix.patch, + -files/screen-4.2.0-tgetent.patch: + Version bump. Removed old. 20 Apr 2014; Lars Wendler -files/4.2.0-tinfo.patch: Removed unused patch. diff --git a/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch b/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch deleted file mode 100644 index cb7ca5b0b0ab..000000000000 --- a/app-misc/screen/files/screen-4.2.0-check_for_altscreen.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 049a3bfdfc59590a24dfeefa707abb64b74ae17b Mon Sep 17 00:00:00 2001 -From: Amadeusz Sławiński -Date: Fri, 18 Apr 2014 18:28:39 +0000 -Subject: do proper checks if we are on altscreen or not - -fixes screen segfaults with `altscreen on` when using applications making -use of altscreen like mc when resizing screen window - -Signed-off-by: Amadeusz Sławiński ---- -diff --git a/src/ansi.c b/src/ansi.c -index 04c9012..e76eef4 100644 ---- a/src/ansi.c -+++ b/src/ansi.c -@@ -1436,14 +1436,17 @@ int c, intermediate; - { - if (i) - { -- if (!curr->w_alt.on) -+ if (!curr->w_alt.on) { - SaveCursor(&curr->w_alt.cursor); -- EnterAltScreen(curr); -+ EnterAltScreen(curr); -+ } - } - else - { -- LeaveAltScreen(curr); -- RestoreCursor(&curr->w_alt.cursor); -+ if (curr->w_alt.on) { -+ LeaveAltScreen(curr); -+ RestoreCursor(&curr->w_alt.cursor); -+ } - } - if (a1 == 47 && !i) - curr->w_saved.on = 0; --- -cgit v0.9.0.2 diff --git a/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch b/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch deleted file mode 100644 index 582be4c8a10a..000000000000 --- a/app-misc/screen/files/screen-4.2.0-incompatible-protocol.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 14f23ca838b3d6daafbc23d14fa6aec13c382601 Mon Sep 17 00:00:00 2001 -From: Jürgen Weigert -Date: Fri, 18 Apr 2014 13:45:21 +0000 -Subject: incompatible protocol - ---- -diff --git a/src/screen.h b/src/screen.h -index 5c93f32..e74d711 100644 ---- a/src/screen.h -+++ b/src/screen.h -@@ -182,8 +182,9 @@ struct mode - * A few revisions after 8147d08 incorrectly - * carried version 1, but should have carried 2. - * 2: screen version 4.1.0devel (revisions 8b46d8a upto YYYYYYY) -+ * 3: screen version 4.2.0 (was incorrectly originally. Patched here) - */ --#define MSG_VERSION 2 -+#define MSG_VERSION 3 - - #define MSG_REVISION (('m'<<24) | ('s'<<16) | ('g'<<8) | MSG_VERSION) - struct msg --- -cgit v0.9.0.2 diff --git a/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch b/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch deleted file mode 100644 index 2252fef17eb1..000000000000 --- a/app-misc/screen/files/screen-4.2.0-long_terminal_names.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 44020241d033555e8e90fad3c88617dce1aed0bb Mon Sep 17 00:00:00 2001 -From: Amadeusz Sławiński -Date: Fri, 18 Apr 2014 14:01:21 +0000 -Subject: fix screen to run on terminals with long $TERM - -According to tic man page: -Terminal names exceeding the maximum alias length -(32 characters on systems with long filenames, 14 characters otherwise) -will be truncated to the maximum alias length and a warning message -will be printed. - -Signed-off-by: Amadeusz Sławiński ---- -diff --git a/src/display.h b/src/display.h -index e8b3b80..a433e6d 100644 ---- a/src/display.h -+++ b/src/display.h -@@ -73,7 +73,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[MAXTERMLEN + 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/src/os.h b/src/os.h -index 5c17c83..f1d849c 100644 ---- a/src/os.h -+++ b/src/os.h -@@ -45,6 +45,14 @@ - #define NAME_MAX 14 - #endif - -+#if !defined(MAXTERMLEN) -+# if !defined(HAVE_LONG_FILE_NAMES) -+# define MAXTERMLEN 14 -+# else -+# define MAXTERMLEN 32 -+# endif -+#endif -+ - #ifdef ISC - # ifdef ENAMETOOLONG - # undef ENAMETOOLONG -diff --git a/src/screen.h b/src/screen.h -index e74d711..01d678a 100644 ---- a/src/screen.h -+++ b/src/screen.h -@@ -203,7 +203,7 @@ struct msg - int nargs; - char line[MAXPATHLEN]; - char dir[MAXPATHLEN]; -- char screenterm[20]; /* is screen really "screen" ? */ -+ char screenterm[MAXTERMLEN]; /* is screen really "screen" ? */ - } - create; - struct -@@ -215,7 +215,7 @@ struct msg - 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[MAXTERMLEN + 1]; /* terminal type */ - int encoding; /* encoding of display */ - int detachfirst; /* whether to detach remote sessions first */ - } --- -cgit v0.9.0.2 diff --git a/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch b/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch deleted file mode 100644 index 710781dc2990..000000000000 --- a/app-misc/screen/files/screen-4.2.0-nonethack_segfault_fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 5b2ba5b3d48cb62894841f85a8c18db691491c8a Mon Sep 17 00:00:00 2001 -From: Amadeusz Sławiński -Date: Fri, 18 Apr 2014 16:44:52 +0000 -Subject: Fix bug when building without nethack commands - -When building with -DNONETHACK all commands were off by 1 because of -missing nethack command in table. - -Provide dummy command with info message. - -Signed-off-by: Amadeusz Sławiński ---- -diff --git a/src/comm.c b/src/comm.c -index 5f4af8a..daad0a6 100644 ---- a/src/comm.c -+++ b/src/comm.c -@@ -241,9 +241,7 @@ struct comm comms[RC_LAST + 1] = - #ifdef MULTIUSER - { "multiuser", ARGS_1 }, - #endif --#ifdef NETHACK - { "nethack", ARGS_1 }, --#endif - { "next", ARGS_0 }, - #ifdef MULTI - { "nonblock", NEED_DISPLAY|ARGS_01 }, -diff --git a/src/process.c b/src/process.c -index 30497a3..d9dfc17 100644 ---- a/src/process.c -+++ b/src/process.c -@@ -3185,6 +3185,10 @@ int key; - case RC_NETHACK: - (void)ParseOnOff(act, &nethackflag); - break; -+#else -+ case RC_NETHACK: -+ Msg(0, "nethack disabled at build time"); -+ break; - #endif - case RC_HARDCOPY_APPEND: - (void)ParseOnOff(act, &hardcopy_append); --- -cgit v0.9.0.2 diff --git a/app-misc/screen/files/screen-4.2.0-tgetent.patch b/app-misc/screen/files/screen-4.2.0-tgetent.patch deleted file mode 100644 index ad13cd4984f7..000000000000 --- a/app-misc/screen/files/screen-4.2.0-tgetent.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 937fcec34ba0d7ebfe0fb654c4106cc9c496f106 Mon Sep 17 00:00:00 2001 -From: Amadeusz Sławiński -Date: Fri, 18 Apr 2014 14:05:56 +0000 -Subject: test more libraries for tgetent - -Signed-off-by: Amadeusz Sławiński ---- -diff --git a/src/configure.in b/src/configure.in -index e9ca223..139bba1 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -674,10 +674,16 @@ AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, - LIBS="-lncursesw $olibs" - AC_CHECKING(libncursesw) - AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, -+LIBS="-ltinfow $olibs" -+AC_CHECKING(libtinfow) -+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, - LIBS="-lncurses $olibs" - AC_CHECKING(libncurses) - AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, --AC_MSG_ERROR(!!! no tgetent - no screen))))))) -+LIBS="-ltinfo $olibs" -+AC_CHECKING(libtinfo) -+AC_TRY_LINK(,tgetent((char *)0, (char *)0);,, -+AC_MSG_ERROR(!!! no tgetent - no screen))))))))) - - AC_TRY_RUN([ - main() --- -cgit v0.9.0.2 diff --git a/app-misc/screen/screen-4.2.0-r1.ebuild b/app-misc/screen/screen-4.2.0-r1.ebuild deleted file mode 100644 index 838e2e94f757..000000000000 --- a/app-misc/screen/screen-4.2.0-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.0-r1.ebuild,v 1.1 2014/04/20 18:32:47 polynomial-c Exp $ - -EAPI=5 - -inherit autotools eutils flag-o-matic pam toolchain-funcs user - -DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes" -HOMEPAGE="http://www.gnu.org/software/screen/" -SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="debug nethack pam selinux multiuser" - -RDEPEND=">=sys-libs/ncurses-5.2 - pam? ( virtual/pam ) - selinux? ( sec-policy/selinux-screen )" -DEPEND="${RDEPEND} - sys-apps/texinfo" -RDEPEND="${RDEPEND} - >=sys-apps/openrc-0.11.6" - -pkg_setup() { - # Make sure utmp group exists, as it's used later on. - enewgroup utmp 406 -} - -src_prepare() { - # Don't use utempter even if it is found on the system - epatch "${FILESDIR}"/4.0.2-no-utempter.patch - - epatch "${FILESDIR}"/${P}-incompatible-protocol.patch \ - "${FILESDIR}"/${P}-long_terminal_names.patch \ - "${FILESDIR}"/${P}-tgetent.patch - - # Fix segfault when being built without nethack support (bug #507916) - epatch "${FILESDIR}"/${P}-nonethack_segfault_fix.patch - - epatch "${FILESDIR}"/${P}-check_for_altscreen.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 - - # Fix manpage. - sed -i \ - -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ - -e "s:/usr/local/screens:${EPREFIX}/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}/run/screen/S-:g" \ - doc/screen.1 \ - || die "sed doc/screen.1 failed" - - # reconfigure - eautoreconf -} - -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}/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) - - LC_ALL=POSIX emake term.h - emake osdef.h - - emake -C doc screen.info -} - -src_install() { - local tmpfiles_perms tmpfiles_group - - dobin screen - - if use multiuser || use prefix - then - fperms 4755 /usr/bin/screen - tmpfiles_perms="0755" - tmpfiles_group="root" - else - fowners root:utmp /usr/bin/screen - fperms 2755 /usr/bin/screen - tmpfiles_perms="0775" - tmpfiles_group="utmp" - fi - - dodir /etc/tmpfiles.d - echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf - - 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() { - if [[ -z ${REPLACING_VERSIONS} ]] - then - 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." - fi - - ewarn "This revision changes the screen socket location to /run/screen." -} diff --git a/app-misc/screen/screen-4.2.1.ebuild b/app-misc/screen/screen-4.2.1.ebuild new file mode 100644 index 000000000000..6e440da1a7c6 --- /dev/null +++ b/app-misc/screen/screen-4.2.1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1.ebuild,v 1.1 2014/04/28 06:04:54 polynomial-c Exp $ + +EAPI=5 + +inherit autotools eutils flag-o-matic pam toolchain-funcs user + +DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes" +HOMEPAGE="http://www.gnu.org/software/screen/" +SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="debug nethack pam selinux multiuser" + +RDEPEND=">=sys-libs/ncurses-5.2 + pam? ( virtual/pam ) + selinux? ( sec-policy/selinux-screen )" +DEPEND="${RDEPEND} + sys-apps/texinfo" +RDEPEND="${RDEPEND} + >=sys-apps/openrc-0.11.6" + +pkg_setup() { + # Make sure utmp group exists, as it's used later on. + enewgroup utmp 406 +} + +src_prepare() { + # Don't use utempter even if it is found on the system + epatch "${FILESDIR}"/4.0.2-no-utempter.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 + + # Fix manpage. + sed -i \ + -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ + -e "s:/usr/local/screens:${EPREFIX}/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}/run/screen/S-:g" \ + doc/screen.1 \ + || die "sed doc/screen.1 failed" + + # reconfigure + eautoreconf +} + +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}/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) + + LC_ALL=POSIX emake term.h + emake osdef.h + + emake -C doc screen.info +} + +src_install() { + local tmpfiles_perms tmpfiles_group + + dobin screen + + if use multiuser || use prefix + then + fperms 4755 /usr/bin/screen + tmpfiles_perms="0755" + tmpfiles_group="root" + else + fowners root:utmp /usr/bin/screen + fperms 2755 /usr/bin/screen + tmpfiles_perms="0775" + tmpfiles_group="utmp" + fi + + dodir /etc/tmpfiles.d + echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf + + 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() { + if [[ -z ${REPLACING_VERSIONS} ]] + then + 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." + fi + + ewarn "This revision changes the screen socket location to /run/screen." +} -- cgit v1.2.3-65-gdbad