Browse code

update screen

Hanno Böck authored on23/01/2021 14:49:38
Showing3 changed files
... ...
@@ -1,8 +1,6 @@
1 1
 AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155
2 2
 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c
3 3
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
4
-DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
5 4
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
6
-EBUILD screen-4.6.1.ebuild 4112 BLAKE2B f29b4bd4c38caca89c6137d9a355dce966bda306cc23117ffe3246a862eb5d1aaf317d4ef921073d0eff59466f5b25c3d7f90df77ae9bc4895d838bf62e4fa21 SHA512 d722c1c97dae37033f3e3ff24b2840a7cd04329936b4112a067765282fe384cec86f7616075d2605f60621376b66095685a2ac75a439815b35132df8b3f787be
7
-EBUILD screen-4.8.0.ebuild 4072 BLAKE2B acc81a0ed1b2857a92b9ea420661dcecce26e45419e5063316a2adde6220c92b9aea01a11e322f24fc80404643034cf7085c6c1c6ab107da5f758985c0294611 SHA512 ab3dca130902eafc1bb4629e327b4ed0d470116b46f8f03c7ec7186615b292c2aa946152af2a80a0aac71368295ea50990a00fdc62e9f2f96e943408f5bd25fb
5
+EBUILD screen-4.8.0-r1.ebuild 4072 BLAKE2B 4c1ac6d6807b377d5b648f453ab618195fd20871a4d1fe9bc77c5c64efea0b2548022c78ed079aa2582f1677f96dee7b502d3a6b7e406b0e1b0e1cb458db8b38 SHA512 5f2e18376474a2ab897958da5d7f9ebd09076889cfbf82f9e372c082c73790cc12eb9530d80a8f016861d431b8ce5cc4abe89544ef75cc8047338da6d25010d7
8 6
 MISC metadata.xml 1836 BLAKE2B 4625e11b8c3120b23e613e14d03ac88b505b412be97270159c881f56ebf674c78274a8dcf199d69ea91f6438d2661635ebbbf38fdc7ebebe8dd6e2ff88f4c6d7 SHA512 e327b61501e6b496045d552851db574b519a99f56c9203c3376b886808a422f8e4aab23b667bcab0d1388ba7ea781c9c9e9f1d07b1426f113119c60cd70d0bcf
9 7
deleted file mode 100644
... ...
@@ -1,160 +0,0 @@
1
-# Copyright 1999-2019 Gentoo Authors
2
-# Distributed under the terms of the GNU General Public License v2
3
-
4
-EAPI=6
5
-
6
-SCM=""
7
-[[ "${PV}" = 9999 ]] && SCM="git-r3"
8
-inherit autotools eutils flag-o-matic pam toolchain-funcs user ${SCM}
9
-unset SCM
10
-
11
-DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
12
-HOMEPAGE="https://www.gnu.org/software/screen/"
13
-
14
-if [[ "${PV}" != 9999 ]] ; then
15
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
16
-	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"
17
-else
18
-	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
19
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
20
-	S="${WORKDIR}"/${P}/src
21
-fi
22
-
23
-LICENSE="GPL-2"
24
-SLOT="0"
25
-IUSE="debug nethack pam selinux multiuser"
26
-
27
-CDEPEND="
28
-	>=sys-libs/ncurses-5.2:0=
29
-	pam? ( sys-libs/pam )"
30
-RDEPEND="${CDEPEND}
31
-	selinux? ( sec-policy/selinux-screen )"
32
-DEPEND="${CDEPEND}
33
-	sys-apps/texinfo"
34
-
35
-PATCHES=(
36
-	# Don't use utempter even if it is found on the system.
37
-	"${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
38
-)
39
-
40
-pkg_setup() {
41
-	# Make sure utmp group exists, as it's used later on.
42
-	enewgroup utmp 406
43
-}
44
-
45
-src_prepare() {
46
-	default
47
-
48
-	# sched.h is a system header and causes problems with some C libraries
49
-	mv sched.h _sched.h || die
50
-	sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
51
-
52
-	# Fix manpage.
53
-	sed -i \
54
-		-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
55
-		-e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
56
-		-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
57
-		-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
58
-		-e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
59
-		doc/screen.1 \
60
-		|| die
61
-
62
-	if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
63
-		sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
64
-	fi
65
-
66
-	# disable musl dummy headers for utmp[x]
67
-	use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
68
-
69
-	# reconfigure
70
-	eautoreconf
71
-}
72
-
73
-src_configure() {
74
-	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
75
-
76
-	if [[ ${CHOST} == *-solaris* ]] ; then
77
-		# enable msg_header by upping the feature standard compatible
78
-		# with c99 mode
79
-		append-cppflags -D_XOPEN_SOURCE=600
80
-	fi
81
-
82
-	use nethack || append-cppflags "-DNONETHACK"
83
-	use debug && append-cppflags "-DDEBUG"
84
-
85
-	econf \
86
-		--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
87
-		--with-pty-mode=0620 \
88
-		--with-pty-group=5 \
89
-		--enable-rxvt_osc \
90
-		--enable-telnet \
91
-		--enable-colors256 \
92
-		$(use_enable pam)
93
-}
94
-
95
-src_compile() {
96
-	LC_ALL=POSIX emake comm.h term.h
97
-	emake osdef.h
98
-
99
-	emake -C doc screen.info
100
-	default
101
-}
102
-
103
-src_install() {
104
-	local DOCS=(
105
-		README ChangeLog INSTALL TODO NEWS* patchlevel.h
106
-		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
107
-	)
108
-
109
-	default
110
-
111
-	local tmpfiles_perms tmpfiles_group
112
-
113
-	if use multiuser || use prefix
114
-	then
115
-		fperms 4755 /usr/bin/screen-${PV}
116
-		tmpfiles_perms="0755"
117
-		tmpfiles_group="root"
118
-	else
119
-		fowners root:utmp /usr/bin/screen-${PV}
120
-		fperms 2755 /usr/bin/screen-${PV}
121
-		tmpfiles_perms="0775"
122
-		tmpfiles_group="utmp"
123
-	fi
124
-
125
-	dodir /etc/tmpfiles.d
126
-	echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
127
-		> "${ED}"/etc/tmpfiles.d/screen.conf
128
-
129
-	insinto /usr/share/screen
130
-	doins terminfo/{screencap,screeninfo.src}
131
-
132
-	insinto /etc
133
-	doins "${FILESDIR}"/screenrc
134
-
135
-	pamd_mimic_system screen auth
136
-}
137
-
138
-pkg_postinst() {
139
-	if [[ -z ${REPLACING_VERSIONS} ]]
140
-	then
141
-		elog "Some dangerous key bindings have been removed or changed to more safe values."
142
-		elog "We enable some xterm hacks in our default screenrc, which might break some"
143
-		elog "applications. Please check /etc/screenrc for information on these changes."
144
-	fi
145
-
146
-	# Add /tmp/screen in case it doesn't exist yet. This should solve
147
-	# problems like bug #508634 where tmpfiles.d isn't in effect.
148
-	local rundir="${EROOT%/}/tmp/screen"
149
-	if [[ ! -d ${rundir} ]] ; then
150
-		if use multiuser || use prefix ; then
151
-			tmpfiles_group="root"
152
-		else
153
-			tmpfiles_group="utmp"
154
-		fi
155
-		mkdir -m 0775 "${rundir}"
156
-		chgrp ${tmpfiles_group} "${rundir}"
157
-	fi
158
-
159
-	ewarn "This revision changes the screen socket location to ${rundir}"
160
-}
161 0
similarity index 93%
162 1
rename from app-misc/screen/screen-4.8.0.ebuild
163 2
rename to app-misc/screen/screen-4.8.0-r1.ebuild
... ...
@@ -1,4 +1,4 @@
1
-# Copyright 1999-2020 Gentoo Authors
1
+# Copyright 1999-2021 Gentoo Authors
2 2
 # Distributed under the terms of the GNU General Public License v2
3 3
 
4 4
 EAPI=7
... ...
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
10 10
 
11 11
 if [[ "${PV}" != 9999 ]] ; then
12 12
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
13
-	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"
13
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
14 14
 else
15 15
 	inherit git-r3
16 16
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
... ...
@@ -125,7 +125,9 @@ src_install() {
125 125
 	insinto /etc
126 126
 	doins "${FILESDIR}"/screenrc
127 127
 
128
-	pamd_mimic_system screen auth
128
+	if use pam; then
129
+		pamd_mimic_system screen auth
130
+	fi
129 131
 
130 132
 	dodoc "${DOCS[@]}"
131 133
 }