Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
Date: Thu, 27 Feb 2020 08:59:49
Message-Id: 1582793975.c7652c1f375a096d86e4d13b17ae97327e7d3af6.polynomial-c@gentoo
1 commit: c7652c1f375a096d86e4d13b17ae97327e7d3af6
2 Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
3 AuthorDate: Sat Feb 8 03:43:38 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 27 08:59:35 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7652c1f
7
8 app-misc/screen: version bump (security fix); GLEP 81
9
10 Upstream released a fix for a memory overwrite; no CVE,
11 but see referenced bug and
12 https://lists.gnu.org/archive/html/screen-devel/2020-02/msg00007.html
13 Also updated for GLEP 81.
14 Changed ${EROOT%/} to ${EROOT}, because CI complained.
15
16 Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
17 Bug: https://bugs.gentoo.org/708460
18 Package-Manager: Portage-2.3.84, Repoman-2.3.20
19 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
20
21 app-misc/screen/Manifest | 1 +
22 app-misc/screen/screen-4.8.0.ebuild | 156 ++++++++++++++++++++++++++++++++++++
23 2 files changed, 157 insertions(+)
24
25 diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
26 index f9d35a5e7c2..f850d85971b 100644
27 --- a/app-misc/screen/Manifest
28 +++ b/app-misc/screen/Manifest
29 @@ -4,3 +4,4 @@ DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e
30 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
31 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
32 DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
33 +DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
34
35 diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild
36 new file mode 100644
37 index 00000000000..fcb1f1674b9
38 --- /dev/null
39 +++ b/app-misc/screen/screen-4.8.0.ebuild
40 @@ -0,0 +1,156 @@
41 +# Copyright 1999-2020 Gentoo Authors
42 +# Distributed under the terms of the GNU General Public License v2
43 +
44 +EAPI=7
45 +
46 +inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
47 +
48 +DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
49 +HOMEPAGE="https://www.gnu.org/software/screen/"
50 +
51 +if [[ "${PV}" != 9999 ]] ; then
52 + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
53 + 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"
54 +else
55 + inherit git-r3
56 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
57 + EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
58 + S="${WORKDIR}"/${P}/src
59 +fi
60 +
61 +LICENSE="GPL-2"
62 +SLOT="0"
63 +IUSE="debug nethack pam selinux multiuser"
64 +
65 +CDEPEND="
66 + >=sys-libs/ncurses-5.2:0=
67 + pam? ( sys-libs/pam )"
68 +RDEPEND="${CDEPEND}
69 + selinux? ( sec-policy/selinux-screen )"
70 +DEPEND="${CDEPEND}
71 + acct-group/utmp
72 + sys-apps/texinfo"
73 +
74 +PATCHES=(
75 + # Don't use utempter even if it is found on the system.
76 + "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
77 + "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
78 +)
79 +
80 +src_prepare() {
81 + default
82 +
83 + # sched.h is a system header and causes problems with some C libraries
84 + mv sched.h _sched.h || die
85 + sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
86 +
87 + # Fix manpage.
88 + sed -i \
89 + -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
90 + -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
91 + -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
92 + -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
93 + -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
94 + doc/screen.1 \
95 + || die
96 +
97 + if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
98 + sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
99 + fi
100 +
101 + # disable musl dummy headers for utmp[x]
102 + use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
103 +
104 + # reconfigure
105 + eautoreconf
106 +}
107 +
108 +src_configure() {
109 + append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
110 +
111 + if [[ ${CHOST} == *-solaris* ]] ; then
112 + # enable msg_header by upping the feature standard compatible
113 + # with c99 mode
114 + append-cppflags -D_XOPEN_SOURCE=600
115 + fi
116 +
117 + use nethack || append-cppflags "-DNONETHACK"
118 + use debug && append-cppflags "-DDEBUG"
119 +
120 + econf \
121 + --with-socket-dir="${EPREFIX}/tmp/screen" \
122 + --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
123 + --with-pty-mode=0620 \
124 + --with-pty-group=5 \
125 + --enable-rxvt_osc \
126 + --enable-telnet \
127 + --enable-colors256 \
128 + $(use_enable pam)
129 +}
130 +
131 +src_compile() {
132 + LC_ALL=POSIX emake comm.h term.h
133 + emake osdef.h
134 +
135 + emake -C doc screen.info
136 + default
137 +}
138 +
139 +src_install() {
140 + local DOCS=(
141 + README ChangeLog INSTALL TODO NEWS* patchlevel.h
142 + doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
143 + )
144 +
145 + emake DESTDIR="${D}" SCREEN=screen-${PV} install
146 +
147 + local tmpfiles_perms tmpfiles_group
148 +
149 + if use multiuser || use prefix
150 + then
151 + fperms 4755 /usr/bin/screen-${PV}
152 + tmpfiles_perms="0755"
153 + tmpfiles_group="root"
154 + else
155 + fowners root:utmp /usr/bin/screen-${PV}
156 + fperms 2755 /usr/bin/screen-${PV}
157 + tmpfiles_perms="0775"
158 + tmpfiles_group="utmp"
159 + fi
160 +
161 + newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
162 +
163 + insinto /usr/share/screen
164 + doins terminfo/{screencap,screeninfo.src}
165 +
166 + insinto /etc
167 + doins "${FILESDIR}"/screenrc
168 +
169 + pamd_mimic_system screen auth
170 +
171 + dodoc "${DOCS[@]}"
172 +}
173 +
174 +pkg_postinst() {
175 + if [[ -z ${REPLACING_VERSIONS} ]]
176 + then
177 + elog "Some dangerous key bindings have been removed or changed to more safe values."
178 + elog "We enable some xterm hacks in our default screenrc, which might break some"
179 + elog "applications. Please check /etc/screenrc for information on these changes."
180 + fi
181 +
182 + # Add /tmp/screen in case it doesn't exist yet. This should solve
183 + # problems like bug #508634 where tmpfiles.d isn't in effect.
184 + local rundir="${EROOT}/tmp/screen"
185 + if [[ ! -d ${rundir} ]] ; then
186 + if use multiuser || use prefix ; then
187 + tmpfiles_group="root"
188 + else
189 + tmpfiles_group="utmp"
190 + fi
191 + mkdir -m 0775 "${rundir}"
192 + chgrp ${tmpfiles_group} "${rundir}"
193 + fi
194 +
195 + ewarn "This revision changes the screen socket location to ${rundir}"
196 +}