summaryrefslogtreecommitdiff
path: root/app-misc/screen
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc/screen')
-rw-r--r--app-misc/screen/Manifest15
-rw-r--r--app-misc/screen/files/screen-4.4.0-utmp-musl.patch62
-rw-r--r--app-misc/screen/files/screen-4.5.1-texinfo.patch13
-rw-r--r--app-misc/screen/metadata.xml4
-rw-r--r--app-misc/screen/screen-4.4.0.ebuild154
-rw-r--r--app-misc/screen/screen-4.5.1.ebuild160
-rw-r--r--app-misc/screen/screen-4.6.0.ebuild158
-rw-r--r--app-misc/screen/screen-4.8.0.ebuild (renamed from app-misc/screen/screen-4.6.2.ebuild)64
-rw-r--r--app-misc/screen/screen-9999.ebuild93
9 files changed, 84 insertions, 639 deletions
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index c4602138fa2c..ed791d994818 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,20 +1,13 @@
AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
-AUX screen-4.4.0-utmp-musl.patch 1762 BLAKE2B 10244e1f2a13a3ffa9833ae16b9d58508bbc6cce62b1971b2b0f967e9642fe12fcf96b48cf79e20db186d92cf0b41c2870640f90f25a62d71e4e9fc7e3b390e3 SHA512 9720128e1c4849330b3e7ae8163beb0bf5b4c17e9c8d003a142db59d22dcce2bff0dd437afa209b3b1538c0f28f9d4521f54134d4e28104ee74ba73d57dc2314
-AUX screen-4.5.1-texinfo.patch 436 BLAKE2B bba167b64c504219a8ef893c4e2761b7fba607ce4801bf751ee900abf9be3884d2e6df753979762043faca03af2e590edd4d851b792b99c58fabe3a3836113bb SHA512 78b6e831414ef8cfc1f747f7eb9232ae907db4fa507967fb4b43b0266d045461f799ae37e71f8d93fed78e72bc0e7d90b93d131c9e24e47892468e96b880b0c4
AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
-DIST screen-4.4.0.tar.gz 846010 BLAKE2B 7c7d37b22c1993420dbd8d4083bee0a748f28ace434963b822607747879bda60c1f2f435814e9d07ea88e4bbc1b43b6f600fce204fda7fde4a52a6314a27494a SHA512 6e43f85c419f778822ec85e4340c95769e981a3d51abdeb5f26c6ebb840da9ab11b351ecc7f380ceea39bcfaa87f1124cfebd6af4ecb62b886eb189e7b79981b
-DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f225d34394170572e79ab9a8b49beac6c054021db367a01b6da91deaa726284a25c86eb57e11dcd09ad5dc44cb4 SHA512 ca53477ad38264be38efb1d10a1337b647dd061127162c77533b17a30d046cd0caabe38e4a9e5389aac30d5dc62eb53e7877411e69adae36d0ca869bd0a82804
-DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e9d1c27490ff31cfc88b4bd9dfb11101dd0e4508f3b37b023b9f9b987dfaff4c6cc930e994d22fcb024cf341d SHA512 2ee7cc51c62a478e72eda0647f3f347e63f40384e19bc11b074158bd94cdb628c6425b1dd7a472496d56bff11a30a9dc58859c2e7e539fae2a8718ed9b0f96d7
DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
-EBUILD screen-4.4.0.ebuild 3958 BLAKE2B 19e3599d59d4260191d46f6ee1be6a7447605d1c4b13addc7e437b6fb9661fb21c2732cd806a63c35e96fa32b8e64c40affd912375948676fc057f03103b4ad6 SHA512 4bf33c8a9dee06501b1f502297a8930e483fee203e6b25e06e9386596c3b6b13217c160d369d6ff86c326410d0db250cc53a9bba96cf2286df01151e806d855a
-EBUILD screen-4.5.1.ebuild 4104 BLAKE2B 7315316224044a673dcf0d6c9d467e62d1cf2f729c5fbcea612f3a50096112141546506b020537e3a96ab766550d7cc65e73ad08cb6cb68d3a6064add9f65f9c SHA512 08f1eea6126c4f9b818a60e28139df7a7d16aa7fad52019d08e8e48be2c5d8ffc4a1e43347fe1881fa9953176f59ab95d510fafe94ffaf32385306b0abab2249
-EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c647444a724f99040f6730278fad5e86eadb7b79b6b1af7a9e4ab414e213525c59ba76d303238b170b370ed29a3d98 SHA512 d04600a469600dcfa8eb5f7bd4ddb6f0847bd84e3221743e36af22bb1d60246fecd51b74f06929442d47d28895260543a7fb6efca420ff1c22f95ea23eac0ef7
+DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
EBUILD screen-4.6.1.ebuild 4159 BLAKE2B d90781ff6d2ecf5091a771d8667901fb39dc1b747c278a8e1c41981de7f7ea7ddfdeeb96d5c793bc5ee1f573d5a1de4159c393314ea9bc7bd1a6480f57ee51cd SHA512 724cfb1f3ae5e355384983d21566f594853af99fda7ab5d8e357af96bcd9f886985a35df4e95a574827a457e9d04124b1b189837f8c3887e928aca2411bbc0c3
EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
-EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
EBUILD screen-4.7.0.ebuild 4204 BLAKE2B 8de1201b0885d0a4e83230d4b6d0d695f0c28f511e69ba926beb48f3599644ecd47416a463042bd751ad28f15049722eee7adbb2ccbc00d22684a3d5f3df335c SHA512 395d0188d6257d6531a3ea5740f2b9fb84f41a1f96e35ec32428e3cedd4f7045283c3216d54dae1c53a07851da88b41858a7d879ebb94d148e9c8820f6153028
-EBUILD screen-9999.ebuild 3984 BLAKE2B 6f68715e21470703626383ba4eee1871584b6dde2fa5dfa3e9cfae86ba8c7e3ce0496eecc2ecf4a091c53f19e1ea026547269a78b0e223805933d35ea7a692a4 SHA512 99f171c2963978b3a20a3c0637959a7fd0949163dcaf5a8693d8b9bd1a02a588d1d5c9ca16edf97724c2a2cbb6875caeaa8cd40c3988978dcf241f8c7a8ede87
-MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
+EBUILD screen-4.8.0.ebuild 4116 BLAKE2B 9d3d56bbd086abb59800a1689a3e28eee4a0680d0d71000394861f14c22cf190cde4cb384a081391f133c6a72ea182278db038411bf050a1b81a522889e1cb5d SHA512 dd5c6aa516fd76f79bb8cb48a2dd3d79365c5276ac77262a9e56c8e48ae924ecd96e808548a149a143a2d5535b88ff75c8789fac8cb9aaf7d65ef6b63d486199
+EBUILD screen-9999.ebuild 4213 BLAKE2B bf7a89626438437018f9422eb04fcd6a89fe1e9d03a3b441289caf37bf1542e39283339c8ff42c0732fc438a58a055875981a582e9e59b2cee3a4e1e18601b0c SHA512 51e1830220b543ced9844f3d79223f753ab9f3175583bef83e96e6b3520a71657087ebd6680b1c5d858a3d8f835b30d01eb806f80dd3ddef87dbd4cef23bc8e0
+MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
deleted file mode 100644
index 990c73042cd0..000000000000
--- a/app-misc/screen/files/screen-4.4.0-utmp-musl.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Sat, 13 Jun 2015 17:52:46 +0200
-Subject: [PATCH] change checks for utmp/utmpx in header
-
-linuxes should've working utmpx, so this check was bit weird
-commit 2b1bdf96 mentions some "linux workaround", but nothing specific
-
-fixes build with musl libc
----
- os.h | 7 ++++---
- utmp.c | 4 ++--
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/os.h b/os.h
-index 55de249..e827ac9 100644
---- a/os.h
-+++ b/os.h
-@@ -250,9 +250,11 @@ extern int errno;
- #endif
-
- #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
--# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
-+# if defined(SVR4) && !defined(DGUX) && !defined(__hpux)
- # include <utmpx.h>
--# define UTMPFILE UTMPX_FILE
-+# ifdef UTMPX_FILE /* GNU extension */
-+# define UTMPFILE UTMPX_FILE
-+# endif
- # define utmp utmpx
- # define getutent getutxent
- # define getutid getutxid
-@@ -260,7 +262,6 @@ extern int errno;
- # define pututline pututxline
- # define setutent setutxent
- # define endutent endutxent
--# define ut_time ut_xtime
- # else /* SVR4 */
- # include <utmp.h>
- # endif /* SVR4 */
-diff --git a/utmp.c b/utmp.c
-index fa8b87b..f5d7db8 100644
---- a/utmp.c
-+++ b/utmp.c
-@@ -631,7 +631,7 @@ int pid;
- /* must use temp variable because of NetBSD/sparc64, where
- * ut_xtime is long(64) but time_t is int(32) */
- (void)time(&now);
-- u->ut_time = now;
-+ u->ut_tv.tv_sec = now;
- }
-
- static slot_t
-@@ -743,7 +743,7 @@ int pid;
- strncpy(u->ut_line, line, sizeof(u->ut_line));
- strncpy(u->ut_name, user, sizeof(u->ut_name));
- (void)time(&now);
-- u->ut_time = now;
-+ u->ut_tv.tv_sec = now;
- }
-
- static slot_t
diff --git a/app-misc/screen/files/screen-4.5.1-texinfo.patch b/app-misc/screen/files/screen-4.5.1-texinfo.patch
deleted file mode 100644
index 8d7a5e527175..000000000000
--- a/app-misc/screen/files/screen-4.5.1-texinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/doc/screen.texinfo
-+++ b/doc/screen.texinfo
-@@ -5796,8 +5796,8 @@
- ============
-
- @example
-- Thomas Renninger <treen@suse.com>,
-- Axel Beckert <abe@deuxchevaux.org>,
-+ Thomas Renninger <treen@@suse.com>,
-+ Axel Beckert <abe@@deuxchevaux.org>,
- Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
- Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
- Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index 85dc556e636e..b10032bfdd9d 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/metadata.xml
@@ -27,9 +27,7 @@ run when their window is currently not visible and even when the whole screen
session is detached from the users terminal.
</longdescription>
<use>
- <flag name="multiuser">Enable multiuser support (by setting correct
- permissions)</flag>
+ <flag name="multiuser">Enable multiuser support (by setting correct permissions)</flag>
<flag name="nethack">Express error messages in nethack style</flag>
- <flag name="utmp">Include utmp support</flag>
</use>
</pkgmetadata>
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
deleted file mode 100644
index 4dd24d59cee1..000000000000
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
- >=sys-libs/ncurses-5.2:0=
- pam? ( sys-libs/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.
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
- "${FILESDIR}"/${P}-utmp-musl.patch
-)
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Apply patches.
- epatch "${PATCHES[@]}"
-
- # 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 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 /tmp/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
-
- # 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-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild
deleted file mode 100644
index f5c5c519dea8..000000000000
--- a/app-misc/screen/screen-4.5.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- EGIT_REPO_URI="git://git.savannah.gnu.org/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? ( sys-libs/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}"/${PN}-4.5.1-texinfo.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}
- )
-
- default
-
- 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
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
-
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-}
-
-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-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild
deleted file mode 100644
index 3e1c3a55ab8c..000000000000
--- a/app-misc/screen/screen-4.6.0.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
-
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-else
- EGIT_REPO_URI="git://git.savannah.gnu.org/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? ( sys-libs/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
-)
-
-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}
- )
-
- default
-
- 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
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
-
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-}
-
-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-4.6.2.ebuild b/app-misc/screen/screen-4.8.0.ebuild
index 245a4135f542..84d601a1f28e 100644
--- a/app-misc/screen/screen-4.6.2.ebuild
+++ b/app-misc/screen/screen-4.8.0.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-SCM=""
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
-unset SCM
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
else
- EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
+ 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
@@ -28,6 +26,7 @@ CDEPEND="
>=sys-libs/ncurses-5.2:0=
pam? ( sys-libs/pam )"
RDEPEND="${CDEPEND}
+ acct-group/utmp
selinux? ( sec-policy/selinux-screen )"
DEPEND="${CDEPEND}
sys-apps/texinfo"
@@ -35,14 +34,9 @@ DEPEND="${CDEPEND}
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
+ "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
)
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
src_prepare() {
default
@@ -57,8 +51,7 @@ src_prepare() {
-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
+ doc/screen.1 || die
if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
@@ -83,15 +76,17 @@ src_configure() {
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 \
+ local myeconfargs=(
+ --with-socket-dir="${EPREFIX}/tmp/${PN}"
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc"
+ --with-pty-mode=0620
+ --with-pty-group=5
+ --enable-rxvt_osc
+ --enable-telnet
+ --enable-colors256
$(use_enable pam)
+ )
+ econf "${myeconfargs[@]}"
}
src_compile() {
@@ -108,33 +103,32 @@ src_install() {
doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
)
- default
+ emake DESTDIR="${D}" SCREEN="${P}" install
local tmpfiles_perms tmpfiles_group
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen-${PV}
+ if use multiuser || use prefix ; then
+ fperms 4755 /usr/bin/${P}
tmpfiles_perms="0755"
tmpfiles_group="root"
else
- fowners root:utmp /usr/bin/screen-${PV}
- fperms 2755 /usr/bin/screen-${PV}
+ fowners root:utmp /usr/bin/${P}
+ fperms 2755 /usr/bin/${P}
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
+ insinto /usr/share/${PN}
doins terminfo/{screencap,screeninfo.src}
insinto /etc
doins "${FILESDIR}"/screenrc
pamd_mimic_system screen auth
+
+ dodoc "${DOCS[@]}"
}
pkg_postinst() {
@@ -147,7 +141,7 @@ pkg_postinst() {
# 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"
+ local rundir="${EROOT}/tmp/${PN}"
if [[ ! -d ${rundir} ]] ; then
if use multiuser || use prefix ; then
tmpfiles_group="root"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 29951514a764..aa12bdddbbb4 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils flag-o-matic pam tmpfiles toolchain-funcs user
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
HOMEPAGE="https://www.gnu.org/software/screen/"
@@ -15,42 +15,40 @@ 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
+ S="${WORKDIR}/${P}/src"
fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug nethack pam selinux multiuser utmp"
+IUSE="debug nethack pam selinux multiuser"
CDEPEND="
>=sys-libs/ncurses-5.2:0=
pam? ( sys-libs/pam )"
RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )
- utmp? (
- kernel_linux? ( sys-libs/libutempter )
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
- )
-"
+ acct-group/utmp
+ selinux? ( sec-policy/selinux-screen )"
DEPEND="${CDEPEND}
sys-apps/texinfo"
-RESTRICT="test"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+)
src_prepare() {
- default
+ if [[ "${PV}" != *9999 ]] ; then
+ default
+ else
+ eapply_user
+ fi
# sched.h is a system header and causes problems with some C libraries
mv sched.h _sched.h || die
- sed -i \
- -e '/include/ s:sched.h:_sched.h:' \
- screen.h winmsg.c canvas.h sched.c || die
- sed -i -e 's:sched.h:_sched.h:g' Makefile.in || die
+ sed -i '/include/ s:sched\.h:_sched.h:' \
+ screen.h winmsg.c window.h sched.c canvas.h || die
+ sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die
# Fix manpage.
sed -i \
@@ -58,10 +56,15 @@ src_prepare() {
-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' \
- -e 's:/usr/tmp/screens/:'"${EPREFIX}"'/tmp/screen/:g' \
- doc/screen.1 \
- || die
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 || die
+
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # disable musl dummy headers for utmp[x]
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
# reconfigure
eautoreconf
@@ -70,19 +73,24 @@ src_prepare() {
src_configure() {
append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
+ 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 \
- --enable-socket-dir="${EPREFIX}/tmp/screen" \
- --with-system_screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-telnet \
- $(use_enable pam) \
- $(use_enable utmp)
+ local myeconfargs=(
+ --enable-socket-dir="${EPREFIX}/tmp/${PN}"
+ --with-system_screenrc="${EPREFIX}/etc/screenrc"
+ --with-pty-mode=0620
+ --with-pty-group=5
+ --enable-telnet
+ $(use_enable pam)
+ )
+ econf "${myeconfargs[@]}"
}
src_compile() {
@@ -98,25 +106,24 @@ src_install() {
doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
)
- emake DESTDIR="${D}" SCREEN=screen-${PV} install
+ emake DESTDIR="${D}" SCREEN="${P}" install
local tmpfiles_perms tmpfiles_group
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen-${PV}
+ if use multiuser || use prefix ; then
+ fperms 4755 /usr/bin/${P}
tmpfiles_perms="0755"
tmpfiles_group="root"
else
- fowners root:utmp /usr/bin/screen-${PV}
- fperms 2755 /usr/bin/screen-${PV}
+ fowners root:utmp /usr/bin/${P}
+ fperms 2755 /usr/bin/${P}
tmpfiles_perms="0775"
tmpfiles_group="utmp"
fi
newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
- insinto /usr/share/screen
+ insinto /usr/share/${PN}
doins terminfo/{screencap,screeninfo.src}
insinto /etc
@@ -137,7 +144,7 @@ pkg_postinst() {
# 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"
+ local rundir="${EROOT}/tmp/${PN}"
if [[ ! -d ${rundir} ]] ; then
if use multiuser || use prefix ; then
tmpfiles_group="root"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 05:53:11 +0000