From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- app-misc/screen/Manifest | 3 +- app-misc/screen/screen-4.6.2-r1.ebuild | 157 +++++++++++++++++++++++++++++++++ app-misc/screen/screen-9999.ebuild | 49 +++++----- 3 files changed, 185 insertions(+), 24 deletions(-) create mode 100644 app-misc/screen/screen-4.6.2-r1.ebuild (limited to 'app-misc/screen') diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index e7d9b46759e0..c838628f2497 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -12,6 +12,7 @@ EBUILD screen-4.4.0.ebuild 3969 BLAKE2B 9777dcbd9eaadba0a16fc019e5af58740eb10181 EBUILD screen-4.5.1.ebuild 4116 BLAKE2B 46e39151346890b58663aa75b214a99b96bbfb06bdf9c03cf3c8f99aeea7cf38659fc14e8412bedbab3f32e2c2bdbf70a89cecd1f9708e451b904bfdfde7dc93 SHA512 5b674abdaf9001196c0190359254718f87902cc05b2170a51a3bcca2d5f7c654d78cd98945f3bf15e4374f8c32a4b800f971b3ed4079247d032e39d595c92cea EBUILD screen-4.6.0.ebuild 4064 BLAKE2B 6091efb4d2f52bd5c2e128623b86e9ba731afba4e850118225fa8b911814b1e68f3882464a6d29d26effc3067d2417a649db4b4791322e5b122ea26b50e230b0 SHA512 72ccce15b6b5c9407ae311ba6308b03f88eecba8b88b160a1b02430f45e4154754c1c9682e456afda2ed08ff204f60b74668f28db3c8eac33c0576d73c4630a0 EBUILD screen-4.6.1.ebuild 4051 BLAKE2B 2059f207ee7210b1d2429d1f77f6b6ddfc385a35677284d4b0b50e13b68c38898d9a9e88dfc83ce20b5281bbc212c36ec67aadc725b36e2a7cd6d6cb5b6df348 SHA512 19c7644857ae0144676659aaf92b6ad671f0b46c184ff63ec578fa2989c632bace893f00828f691348b8ef22a14203b088e4f82da43a4ac478a0cba12c181ec4 +EBUILD screen-4.6.2-r1.ebuild 4089 BLAKE2B cc84459814a932928b7fce199627381ebf927400089d58916957ea22206630b5f1818c2a53fc80019774a032ad15b950220e61c516f2733ac9556a04c9e899b2 SHA512 ecbf7c71987173e8f0ba2e45e9b32f5bdf3ea09bcbbc776584437ec687e942ebe266be0aacd671456225a748d43f5371978bc91a3748cada31b70c0de011a7e9 EBUILD screen-4.6.2.ebuild 4100 BLAKE2B 57800241f7bca48e44821110ee35dc58eab83801d6fe19de0a4c70f4a42820ed825c81fcf9317edd8ae741efc8aaf28325124643a3cb3454de541d8945c5abf8 SHA512 91fadd575ad2b9600377e877c9c032115669933026e9be16f679757699caabcf9c49217d53b6fb8f10347c021e1fd18022702955ec450984cd2c57b211807238 -EBUILD screen-9999.ebuild 3746 BLAKE2B c8bbcdc221e6e4e310aa161e4faad0a517579a1ee9d639957356eeac1cda6f437b33b7780877d87a2f25881a52b76f9e4e71d8760c55a92b2ef790c2af12aeb7 SHA512 07fee252dc398dc18edd4aceebc3ca9d0a86e4523593bb58983ff401fcb7cfffbb969d60563ec8e657e944b14952d462e1d9dc61e274ffff869421673a90f1ed +EBUILD screen-9999.ebuild 3986 BLAKE2B e40e9ca5125c3e788e9e8346bfbc124d94b28bc6a2f3cc13f2d12313efc883371c5e4bfe13ff77d0f4e2ff5c23a06d043501a8be35b8b40ea7972bc2d445bebc SHA512 e522598323cc369af7cd5e3876fbece8beb92c1d65a3075ced97753d951f30e4a4134e9e88a0d42bc7f32b1977f3fd08aaeab2b4b2d9bade370e8346181d17fa MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild new file mode 100644 index 000000000000..3d5650e31470 --- /dev/null +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user + +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" +HOMEPAGE="https://www.gnu.org/software/screen/" + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + S="${WORKDIR}"/${P}/src +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="debug nethack pam selinux multiuser" + +CDEPEND=" + >=sys-libs/ncurses-5.2:0= + pam? ( virtual/pam )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-screen )" +DEPEND="${CDEPEND} + sys-apps/texinfo" + +PATCHES=( + # Don't use utempter even if it is found on the system. + "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + "${FILESDIR}"/${P}-utmp-exit.patch +) + +pkg_setup() { + # Make sure utmp group exists, as it's used later on. + enewgroup utmp 406 +} + +src_prepare() { + default + + # 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}/tmp/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}/tmp/screen/S\\\-:g" \ + doc/screen.1 \ + || die + + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die + fi + + # reconfigure + eautoreconf +} + +src_configure() { + append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" + + if [[ ${CHOST} == *-solaris* ]] ; then + # enable msg_header by upping the feature standard compatible + # with c99 mode + append-cppflags -D_XOPEN_SOURCE=600 + fi + + use nethack || append-cppflags "-DNONETHACK" + use debug && append-cppflags "-DDEBUG" + + econf \ + --with-socket-dir="${EPREFIX}/tmp/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) +} + +src_compile() { + LC_ALL=POSIX emake comm.h term.h + emake osdef.h + + emake -C doc screen.info + default +} + +src_install() { + local DOCS=( + README ChangeLog INSTALL TODO NEWS* patchlevel.h + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} + ) + + emake DESTDIR="${D}" SCREEN=screen-${PV} install + + local tmpfiles_perms tmpfiles_group + + if use multiuser || use prefix + then + fperms 4755 /usr/bin/screen-${PV} + tmpfiles_perms="0755" + tmpfiles_group="root" + else + fowners root:utmp /usr/bin/screen-${PV} + fperms 2755 /usr/bin/screen-${PV} + tmpfiles_perms="0775" + tmpfiles_group="utmp" + fi + + newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" + + insinto /usr/share/screen + doins terminfo/{screencap,screeninfo.src} + + insinto /etc + doins "${FILESDIR}"/screenrc + + pamd_mimic_system screen auth + + dodoc "${DOCS[@]}" +} + +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 + + # Add /tmp/screen in case it doesn't exist yet. This should solve + # problems like bug #508634 where tmpfiles.d isn't in effect. + local rundir="${EROOT%/}/tmp/screen" + if [[ ! -d ${rundir} ]] ; then + if use multiuser || use prefix ; then + tmpfiles_group="root" + else + tmpfiles_group="utmp" + fi + mkdir -m 0775 "${rundir}" + chgrp ${tmpfiles_group} "${rundir}" + fi + + ewarn "This revision changes the screen socket location to ${rundir}" +} diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index c7c5f5638521..92a319ff1fa5 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -1,18 +1,25 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils flag-o-matic toolchain-funcs pam autotools user git-r3 +inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/" -EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git" -EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + +if [[ "${PV}" != 9999 ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +else + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on + S="${WORKDIR}"/${P}/src +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="debug nethack pam selinux multiuser utmp" CDEPEND=" @@ -29,7 +36,6 @@ DEPEND="${CDEPEND} sys-apps/texinfo" RESTRICT="test" -S="${WORKDIR}"/${P}/src pkg_setup() { # Make sure utmp group exists, as it's used later on. @@ -87,41 +93,38 @@ src_compile() { } src_install() { - local tmpfiles_perms tmpfiles_group + local DOCS=( + README ChangeLog INSTALL TODO NEWS* + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} + ) - dobin screen + emake DESTDIR="${D}" SCREEN=screen-${PV} install + + local tmpfiles_perms tmpfiles_group if use multiuser || use prefix then - fperms 4755 /usr/bin/screen + fperms 4755 /usr/bin/screen-${PV} tmpfiles_perms="0755" tmpfiles_group="root" else - fowners root:utmp /usr/bin/screen - fperms 2755 /usr/bin/screen + fowners root:utmp /usr/bin/screen-${PV} + fperms 2755 /usr/bin/screen-${PV} tmpfiles_perms="0775" tmpfiles_group="utmp" fi - dodir /etc/tmpfiles.d - echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \ - >"${ED}"/etc/tmpfiles.d/screen.conf + newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" 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* \ - doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} - - doman doc/screen.1 - doinfo doc/screen.info + dodoc "${DOCS[@]}" } pkg_postinst() { @@ -145,5 +148,5 @@ pkg_postinst() { chgrp ${tmpfiles_group} "${rundir}" fi - ewarn "This revision changes the screen socket location to /run/screen." + ewarn "This revision changes the screen socket location to ${rundir}" } -- cgit v1.2.3