diff options
Diffstat (limited to 'app-misc/screen')
-rw-r--r-- | app-misc/screen/Manifest | 4 | ||||
-rw-r--r-- | app-misc/screen/files/screen-CVE-2021-26937.patch | 61 | ||||
-rw-r--r-- | app-misc/screen/screen-4.8.0-r3.ebuild | 149 | ||||
-rw-r--r-- | app-misc/screen/screen-4.9.0.ebuild | 145 |
4 files changed, 0 insertions, 359 deletions
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index f40337ed0d3a..361e4e504c11 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -2,12 +2,8 @@ AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c AUX screen-4.9.0-configure-implicit-function-decls.patch 16667 BLAKE2B 6079042dae21c51b81176aadf27314cf0502fcee995bd9668102bc114ac0c2fdb6587fe2c647cbd92d994cb9b6fdba9e259a1f0a6bd7cf7d7905c3f7e36e8aff SHA512 c9ff18fccba0a0ed19e64509ea128b91bbb6fac405e8395ce724435f1af2f2015f645342aa1fc1b4cb023927412db6e1c242c8060a81deab2a8c064523dedd4d AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2 -AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 -DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84 -EBUILD screen-4.8.0-r3.ebuild 3849 BLAKE2B 0f76a8163c66406bfbfbc677b8b5028a45b10379ae4f8f25ca73de35355feb1110c1d3cee74048781c1fdcf324c5e5ee2c490930c74a907e3185160af16eb1aa SHA512 693e79718dcbc75f7c0d390847a5cfa2d818ce79ca22b1c0cc15fe3c8b8c61855f09efa5662cf3f07da4da6a646b272352010580bc98e7e31da4a4925045598c EBUILD screen-4.9.0-r1.ebuild 3844 BLAKE2B f67c6e7bfc92895c9779d7eec02b93ce2a1972f08c4ed9815754dbc0ed89bfabde982b717d3902d8d3aee1dd11b5dca3818c07b967fd5555b14f94d154b5825b SHA512 7572fd371099225b3493097c9f2486c14ac37481a241bc1f60297fd75799e5279ccf944be0f341b13ebbaca52bb1bd92d393cd50f0760f74bf1af2ce0c387f45 -EBUILD screen-4.9.0.ebuild 3777 BLAKE2B 0121296dec6aee6e152eaa7ea8b3ec87e1900930ced1564dcfb002797b081e4049c5a472d350975aa9d9c52fa9ba5353341e0c21d3fb914d9dcb044e7758c2b7 SHA512 ba2a51b3b00c6cd85e4a20b489d94ccb48b5f55cc14d8769c2ffe5d771258456fd398dce04d4f64ba191bab1c47dbe8ba1a23ac978abbb24af1e05866c4d51d7 EBUILD screen-9999.ebuild 3782 BLAKE2B 2606ed8495e3531a41bf65489b2dc5af681ff9c5893b12c1de22da9bc246f1d4cb5b1213ce05d8d0fc29878b7bba67e57cf6f9013afc8e9c19141e11755ac01f SHA512 f1d7fb1eca56373b91da540f8097be1b499a8be13315ad980c05c87dbd026bf19865eccf1fb9aa5ebd60c0362db8dc033cebede55c9067b6b63b02cc8936421e MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca diff --git a/app-misc/screen/files/screen-CVE-2021-26937.patch b/app-misc/screen/files/screen-CVE-2021-26937.patch deleted file mode 100644 index 9556278274e8..000000000000 --- a/app-misc/screen/files/screen-CVE-2021-26937.patch +++ /dev/null @@ -1,61 +0,0 @@ - encoding.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git i/encoding.c w/encoding.c -index e5db3e7..79f5d14 100644 ---- i/encoding.c -+++ w/encoding.c -@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *)); - # ifdef UTF8 - static int recode_char __P((int, int, int)); - static int recode_char_to_encoding __P((int, int)); --static void comb_tofront __P((int, int)); -+static void comb_tofront __P((int)); - # ifdef DW_CHARS - static int recode_char_dw __P((int, int *, int, int)); - static int recode_char_dw_to_encoding __P((int, int *, int)); -@@ -1263,6 +1263,8 @@ int c; - {0x30000, 0x3FFFD}, - }; - -+ if (c >= 0xdf00 && c <= 0xdfff) -+ return 1; /* dw combining sequence */ - return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || - (cjkwidth && - bisearch(c, ambiguous, -@@ -1330,11 +1332,12 @@ int c; - } - - static void --comb_tofront(root, i) --int root, i; -+comb_tofront(i) -+int i; - { - for (;;) - { -+ int root = i >= 0x700 ? 0x801 : 0x800; - debug1("bring to front: %x\n", i); - combchars[combchars[i]->prev]->next = combchars[i]->next; - combchars[combchars[i]->next]->prev = combchars[i]->prev; -@@ -1396,9 +1399,9 @@ struct mchar *mc; - { - /* full, recycle old entry */ - if (c1 >= 0xd800 && c1 < 0xe000) -- comb_tofront(root, c1 - 0xd800); -+ comb_tofront(c1 - 0xd800); - i = combchars[root]->prev; -- if (c1 == i + 0xd800) -+ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) - { - /* completely full, can't recycle */ - debug("utf8_handle_comp: completely full!\n"); -@@ -1422,7 +1425,7 @@ struct mchar *mc; - mc->font = (i >> 8) + 0xd8; - mc->fontx = 0; - debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); -- comb_tofront(root, i); -+ comb_tofront(i); - } - - #else /* !UTF8 */ diff --git a/app-misc/screen/screen-4.8.0-r3.ebuild b/app-misc/screen/screen-4.8.0-r3.ebuild deleted file mode 100644 index 6807a8d7e80a..000000000000 --- a/app-misc/screen/screen-4.8.0-r3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-3+" -SLOT="0" -IUSE="debug nethack pam selinux multiuser" - -CDEPEND=" - >=sys-libs/ncurses-5.2:0= - virtual/libcrypt:= - pam? ( sys-libs/pam )" -RDEPEND="${CDEPEND} - acct-group/utmp - 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.6.2-utmp-exit.patch - "${FILESDIR}"/${PN}-CVE-2021-26937.patch -) - -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* ]] || 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 -} - -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" - - 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() { - 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="${P}" install - - local tmpfiles_perms tmpfiles_group - - if use multiuser || use prefix ; then - fperms 4755 /usr/bin/${P} - tmpfiles_perms="0755" - tmpfiles_group="root" - else - 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/${PN} - doins terminfo/{screencap,screeninfo.src} - - insinto /etc - doins "${FILESDIR}"/screenrc - - if use pam; then - pamd_mimic_system screen auth - fi - - 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 - - tmpfiles_process screen.conf - - ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}" -} diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild deleted file mode 100644 index ea3531d913a6..000000000000 --- a/app-misc/screen/screen-4.9.0.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic pam tmpfiles - -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-3+" -SLOT="0" -IUSE="debug nethack pam selinux multiuser" - -DEPEND=">=sys-libs/ncurses-5.2:= - virtual/libcrypt:= - pam? ( sys-libs/pam )" -RDEPEND="${DEPEND} - acct-group/utmp - selinux? ( sec-policy/selinux-screen )" -BDEPEND="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.6.2-utmp-exit.patch -) - -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* ]] || 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 -} - -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" - - 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() { - 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="${P}" install - - local tmpfiles_perms tmpfiles_group - - if use multiuser || use prefix ; then - fperms 4755 /usr/bin/${P} - tmpfiles_perms="0755" - tmpfiles_group="root" - else - 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/${PN} - doins terminfo/{screencap,screeninfo.src} - - insinto /etc - doins "${FILESDIR}"/screenrc - - if use pam; then - pamd_mimic_system screen auth - fi - - 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 - - tmpfiles_process screen.conf - - ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}" -} |