[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 65272a294aaffee23d2ff13262ecbb171678efd6 Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:32:54 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:32:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65272a29 app-misc/screen: Stabilize 4.9.1-r1 ppc64, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index f056ac5e2956..c0f7b34c213f 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 8ea3daa811f94d0b015d700c6e1343ea3c0c3802 Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:28:55 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:28:55 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea3daa8 app-misc/screen: Stabilize 4.9.1-r1 ppc, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index 45790d1affc1..f056ac5e2956 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 4bcad919178f0d848a0034f429640ec1a2915d9e Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:20:07 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:20:07 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bcad919 app-misc/screen: Stabilize 4.9.1-r1 amd64, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index 74d2ded598db..378dd05cce38 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ba26c5c69c5ca153f3802ba77249561c1a82ba10 Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:20:09 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:20:09 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba26c5c6 app-misc/screen: Stabilize 4.9.1-r1 arm64, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index 378dd05cce38..45790d1affc1 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 55c1eff1144763325e5d81ec171800d81f791eac Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:20:02 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:20:02 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c1eff1 app-misc/screen: Stabilize 4.9.1-r1 sparc, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index 30f16f08c059..f6b03c78439b 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: efad6a19775b8a0058673d524f3daf73de0ef752 Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:20:04 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:20:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efad6a19 app-misc/screen: Stabilize 4.9.1-r1 arm, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index f6b03c78439b..0de9d86cbb6a 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 30bfd1dd6369a4d0fe13e317f69b430e1435e036 Author: Sam James gentoo org> AuthorDate: Tue Apr 30 06:20:06 2024 + Commit: Sam James gentoo org> CommitDate: Tue Apr 30 06:20:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30bfd1dd app-misc/screen: Stabilize 4.9.1-r1 x86, #930959 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild index 0de9d86cbb6a..74d2ded598db 100644 --- a/app-misc/screen/screen-4.9.1-r1.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: f2e887f05c149533b700df7644c4f65640d20969 Author: Matt Turner gentoo org> AuthorDate: Fri Feb 16 18:44:15 2024 + Commit: Matt Turner gentoo org> CommitDate: Fri Feb 23 22:22:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e887f0 app-misc/screen: Add append-lfs-flags Adding AC_SYS_LARGEFILE to configure.ac is insufficient because many source files in screen include config.h after system headers. Signed-off-by: Matt Turner gentoo.org> .../{screen-.ebuild => screen-4.9.1-r1.ebuild} | 24 -- app-misc/screen/screen-.ebuild | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild similarity index 84% copy from app-misc/screen/screen-.ebuild copy to app-misc/screen/screen-4.9.1-r1.ebuild index 45e4dc36300a..30f16f08c059 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-4.9.1-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic pam tmpfiles @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git; @@ -32,7 +32,8 @@ BDEPEND="sys-apps/texinfo" PATCHES=( # Don't use utempter even if it is found on the system. - "${FILESDIR}"/${P}-no-utempter.patch + "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch + "${FILESDIR}"/${PN}-4.9.1-utmp-exit.patch ) src_prepare() { @@ -40,9 +41,7 @@ src_prepare() { # 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 winmsg.c window.h sched.c canvas.h || die - sed -i 's@[[:space:]]sched\.h@ _sched.h@' Makefile.in || die + sed -i '/include/ s:sched.h:_sched.h:' screen.h || die # Fix manpage sed -i \ @@ -65,6 +64,7 @@ src_prepare() { } src_configure() { + append-lfs-flags append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" if [[ ${CHOST} == *-solaris* ]]; then @@ -77,12 +77,13 @@ src_configure() { use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --enable-socket-dir="${EPREFIX}/tmp/${PN}" - --with-system_screenrc="${EPREFIX}/etc/screenrc" + --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-utmp + --enable-colors256 $(use_enable pam) ) econf "${myeconfargs[@]}" @@ -90,6 +91,7 @@ src_configure() { src_compile() { LC_ALL=POSIX emake comm.h term.h + emake osdef.h emake -C doc screen.info default @@ -97,7 +99,7 @@ src_compile() { src_install() { local DOCS=( - README ChangeLog INSTALL TODO NEWS* + README ChangeLog INSTALL TODO NEWS* patchlevel.h doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} ) diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 45e4dc36300a..f7b2fb9bb6fc 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -65,6 +65,7 @@ src_prepare() { } src_configure() { + append-lfs-flags append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" if [[ ${CHOST} == *-solaris* ]]; then
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: fb3aed112b7a8e39af8e44e6716cd7a8ce3797c7 Author: Matt Turner gentoo org> AuthorDate: Fri Feb 16 18:46:29 2024 + Commit: Matt Turner gentoo org> CommitDate: Fri Feb 23 22:22:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb3aed11 app-misc/screen: Add CPE to metadata.xml Signed-off-by: Matt Turner gentoo.org> app-misc/screen/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml index 943545f83e52..ff53fc5f118c 100644 --- a/app-misc/screen/metadata.xml +++ b/app-misc/screen/metadata.xml @@ -31,6 +31,7 @@ Express error messages in nethack style +cpe:/a:gnu:screen screen
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1c6abaca1050d41908609393d068f9fef73678eb Author: Sam James gentoo org> AuthorDate: Thu Dec 28 06:14:20 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 14:57:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6abaca app-misc/screen: drop 4.9.0-r1, 4.9.0-r2 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r1.ebuild | 146 app-misc/screen/screen-4.9.0-r2.ebuild | 147 - 2 files changed, 293 deletions(-) diff --git a/app-misc/screen/screen-4.9.0-r1.ebuild b/app-misc/screen/screen-4.9.0-r1.ebuild deleted file mode 100644 index c84a04bf2355.. --- a/app-misc/screen/screen-4.9.0-r1.ebuild +++ /dev/null @@ -1,146 +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} != ]] ; 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 ~x64-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 - "${FILESDIR}"/${PN}-4.9.0-configure-implicit-function-decls.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() { -
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: bf665848c1dbdd4575209e398c0db4312a864652 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Dec 16 07:05:31 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Dec 16 07:05:31 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf665848 app-misc/screen: Stabilize 4.9.1 x86, #920087 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 57ef4c4de26b..feb78aab2962 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ff7951bac58795e62ff78350c420a32a335ee11a Author: Sam James gentoo org> AuthorDate: Sat Dec 16 04:12:13 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 04:12:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7951ba app-misc/screen: Stabilize 4.9.1 amd64, #920087 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 2c1781cca41f..57ef4c4de26b 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ebc4582eccf0220af69ff2e81375f5ba9f2b10f8 Author: Sam James gentoo org> AuthorDate: Sat Dec 16 02:36:23 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 02:36:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc4582e app-misc/screen: Stabilize 4.9.1 arm64, #920087 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 8eab76ed6d69..2c1781cca41f 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 71321bb8414ffb215b934234381e823f095f279f Author: Sam James gentoo org> AuthorDate: Sat Dec 16 02:36:22 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 02:36:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71321bb8 app-misc/screen: Stabilize 4.9.1 arm, #920087 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 7ebf231bb73b..8eab76ed6d69 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: f10782571cd7d2a909ae0ba17338be6d599407ca Author: Sam James gentoo org> AuthorDate: Sat Dec 16 01:28:48 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 01:28:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1078257 app-misc/screen: Stabilize 4.9.1 hppa, #920087 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 624f07af1223..7ebf231bb73b 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 2323d2d6009a8fa9867e9e473fd78a82832d073e Author: Sam James gentoo org> AuthorDate: Sat Dec 16 01:28:47 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 16 01:28:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2323d2d6 app-misc/screen: Stabilize 4.9.1 sparc, #920087 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild index 06145f1ca8e8..624f07af1223 100644 --- a/app-misc/screen/screen-4.9.1.ebuild +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 66eb3a0a2c6d3afb393f3c0fd5ebf07dc08ed573 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 29 12:03:35 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 29 12:03:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66eb3a0a app-misc/screen: Stabilize 4.9.0-r3 ppc, #914818 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index cc49fcec0d9e..4bb3440413fa 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 7825386fe4afd569cac3c27fe0bf72b9b55f2bc1 Author: Sam James gentoo org> AuthorDate: Mon Oct 16 06:49:00 2023 + Commit: Sam James gentoo org> CommitDate: Mon Oct 16 06:49:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7825386f app-misc/screen: add 4.9.1 Signed-off-by: Sam James gentoo.org> app-misc/screen/Manifest | 1 + app-misc/screen/files/screen-4.9.1-utmp-exit.patch | 43 ++ app-misc/screen/screen-4.9.1.ebuild| 145 + 3 files changed, 189 insertions(+) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 5afb91c4b64a..9412dc3ffb01 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1 +1,2 @@ DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84 +DIST screen-4.9.1.tar.gz 1040785 BLAKE2B 27d9c100bc1f747e39e109a4957702388d943c7d3b75b4c59dfc3894456d5249257742106fb24cf6f07a36764db0a1c5f7e0a44123edda1c570d771d7f46c638 SHA512 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126 diff --git a/app-misc/screen/files/screen-4.9.1-utmp-exit.patch b/app-misc/screen/files/screen-4.9.1-utmp-exit.patch new file mode 100644 index ..71c726b352db --- /dev/null +++ b/app-misc/screen/files/screen-4.9.1-utmp-exit.patch @@ -0,0 +1,43 @@ +From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= +Date: Tue, 5 Apr 2016 12:47:08 +0200 +Subject: [PATCH] check if we have ut_exit in utmpx struct + +--- a/acconfig.h b/acconfig.h +@@ -430,6 +430,11 @@ + */ + #undef BUGGYGETLOGIN + ++/* ++ * Define if your utmpx has ut_exit struct ++ */ ++#undef HAVE_UT_EXIT ++ + /* + * If your system has the calls setreuid() and setregid(), + * define HAVE_SETREUID. Otherwise screen will use a forked process to +--- a/configure.ac b/configure.ac +@@ -438,6 +438,10 @@ AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1, + AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok)) + rm -f /tmp/conftest* + fi ++AC_CHECKING(ut_exit) ++AC_TRY_COMPILE([ ++#include ++],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT)) + + dnl + dnl SOCKET tests +--- a/utmp.c b/utmp.c +@@ -607,7 +607,7 @@ makedead(u) + struct utmp *u; + { + u->ut_type = DEAD_PROCESS; +-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) ++#if defined(HAVE_UT_EXIT) + u->ut_exit.e_termination = 0; + u->ut_exit.e_exit = 0; + #endif diff --git a/app-misc/screen/screen-4.9.1.ebuild b/app-misc/screen/screen-4.9.1.ebuild new file mode 100644 index ..06145f1ca8e8 --- /dev/null +++ b/app-misc/screen/screen-4.9.1.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic pam tmpfiles + +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" +HOMEPAGE="https://www.gnu.org/software/screen/; + +if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-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.9.1-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 [[
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ccc08d5f83dbaa618204cc761028189e46071ee8 Author: Sam James gentoo org> AuthorDate: Thu Sep 28 08:10:23 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 28 08:10:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc08d5f app-misc/screen: Stabilize 4.9.0-r3 hppa, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 389e0623a266..cc49fcec0d9e 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: b5c946bd3a695222a097dc7677dfc41971f15db3 Author: Sam James gentoo org> AuthorDate: Thu Sep 28 06:16:57 2023 + Commit: Sam James gentoo org> CommitDate: Thu Sep 28 06:16:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5c946bd app-misc/screen: Stabilize 4.9.0-r3 sparc, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 740f2d8205f2..389e0623a266 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 7ed08768cf09c7cefdb43ed090d2cec4bbaa1909 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Sep 27 13:28:00 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Sep 27 13:28:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed08768 app-misc/screen: Stabilize 4.9.0-r3 amd64, #914818 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 83cf3fb22926..740f2d8205f2 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 947797cdaf35237b4bdd813de7830073d3a919cb Author: Sam James gentoo org> AuthorDate: Wed Sep 27 08:36:17 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 08:36:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=947797cd app-misc/screen: Stabilize 4.9.0-r3 ppc64, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 0ed3f0905056..83cf3fb22926 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 42f45d65444d8376b5ae46380703c88e58caee83 Author: Sam James gentoo org> AuthorDate: Wed Sep 27 05:46:30 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 05:46:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f45d65 app-misc/screen: Stabilize 4.9.0-r3 x86, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index f14a4bfcc7f3..0ed3f0905056 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: d94bb0958ebe0afce5b01a2f3c367fc2ddb2a046 Author: Sam James gentoo org> AuthorDate: Wed Sep 27 05:02:49 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 05:02:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94bb095 app-misc/screen: Stabilize 4.9.0-r3 arm64, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 7cb35c8e2799..f14a4bfcc7f3 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 346fa3c7234f301051a8ff50649056f902b2a051 Author: Sam James gentoo org> AuthorDate: Wed Sep 27 04:58:05 2023 + Commit: Sam James gentoo org> CommitDate: Wed Sep 27 04:58:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346fa3c7 app-misc/screen: Stabilize 4.9.0-r3 arm, #914818 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild index 450045b6755b..7cb35c8e2799 100644 --- a/app-misc/screen/screen-4.9.0-r3.ebuild +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/, app-misc/screen/files/
commit: 0e9f132e4ae77a13b49113722c90fd2fb68a9183 Author: Brahmajit Das gmail com> AuthorDate: Tue Aug 8 05:42:47 2023 + Commit: Sam James gentoo org> CommitDate: Tue Aug 8 05:44:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9f132e app-misc/screen: Fix call to undeclared function chmod Closes: https://bugs.gentoo.org/894562 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32184 Signed-off-by: Sam James gentoo.org> .../screen/files/screen-4.9.0-clang16-chmod.patch | 12 ++ app-misc/screen/screen-4.9.0-r3.ebuild | 148 + 2 files changed, 160 insertions(+) diff --git a/app-misc/screen/files/screen-4.9.0-clang16-chmod.patch b/app-misc/screen/files/screen-4.9.0-clang16-chmod.patch new file mode 100644 index ..63872219a23f --- /dev/null +++ b/app-misc/screen/files/screen-4.9.0-clang16-chmod.patch @@ -0,0 +1,12 @@ +Bug: https://bugs.gentoo.org/894562 +Taken from: https://git.savannah.gnu.org/cgit/screen.git/commit/?id=7f320d3a643ec95682a7213b7e991e27038d8a57 +--- a/display.c b/display.c +@@ -27,6 +27,7 @@ + */ + + #include ++#include + #include + #include + #ifndef sun diff --git a/app-misc/screen/screen-4.9.0-r3.ebuild b/app-misc/screen/screen-4.9.0-r3.ebuild new file mode 100644 index ..450045b6755b --- /dev/null +++ b/app-misc/screen/screen-4.9.0-r3.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic pam tmpfiles + +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" +HOMEPAGE="https://www.gnu.org/software/screen/; + +if [[ ${PV} != ]] ; 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 ~arm64-macos ~ppc-macos ~x64-macos ~x64-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 + "${FILESDIR}"/${PN}-4.9.0-configure-implicit-function-decls.patch + "${FILESDIR}"/${P}-CVE-2023-24626.patch + "${FILESDIR}"/${PN}-4.9.0-clang16-chmod.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}"
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: f1112e9cb10ebb58737dfdea55f52596ae5e7184 Author: Sam James gentoo org> AuthorDate: Thu May 11 01:38:10 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:38:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1112e9c app-misc/screen: Stabilize 4.9.0-r2 hppa, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index c6625fa6b2b6..94699203950c 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: d88984b96b95d829d30142657f636a558cc68b6d Author: Sam James gentoo org> AuthorDate: Thu May 11 01:32:25 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:32:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88984b9 app-misc/screen: Stabilize 4.9.0-r2 sparc, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index 31e40b1ff79d..054e310a05a8 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 3e08fa5cc0e6099c760e2007d2d2ae1f40c7782e Author: Sam James gentoo org> AuthorDate: Thu May 11 01:32:26 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:32:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e08fa5c app-misc/screen: Stabilize 4.9.0-r2 ppc64, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index 054e310a05a8..c6625fa6b2b6 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 9ff173d740bdc307f255d8f9889649a981cc1ade Author: Sam James gentoo org> AuthorDate: Thu May 11 01:32:21 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:32:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff173d7 app-misc/screen: Stabilize 4.9.0-r2 x86, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index edca7fab1e68..e21b7d582b2d 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 75f244971aa4f214cb49248a76ab2c64936ee195 Author: Sam James gentoo org> AuthorDate: Thu May 11 01:32:22 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:32:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75f24497 app-misc/screen: Stabilize 4.9.0-r2 ppc, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index e21b7d582b2d..882ecebfe4b6 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1ee3524999c2eda8e2843ac12a02f413212dc3ca Author: Sam James gentoo org> AuthorDate: Thu May 11 01:32:24 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:32:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee35249 app-misc/screen: Stabilize 4.9.0-r2 amd64, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index 882ecebfe4b6..31e40b1ff79d 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1c947350553ae8dc73a8ea7601030c2dfbc9df2f Author: Sam James gentoo org> AuthorDate: Thu May 11 01:28:52 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:28:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c947350 app-misc/screen: Stabilize 4.9.0-r2 arm, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index 1769a7dc50a5..edca7fab1e68 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1d3a6c051db0ec17efa16d6298e13d8f9d534f69 Author: Sam James gentoo org> AuthorDate: Thu May 11 01:28:51 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 11 01:28:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3a6c05 app-misc/screen: Stabilize 4.9.0-r2 arm64, #906098 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild index bd3ba7101992..1769a7dc50a5 100644 --- a/app-misc/screen/screen-4.9.0-r2.ebuild +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 5020a4047f9bf00b7cc9423e86ababb049511069 Author: Sven Wegener gentoo org> AuthorDate: Mon Apr 10 19:25:32 2023 + Commit: Sven Wegener gentoo org> CommitDate: Mon Apr 10 19:57:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5020a404 app-misc/screen: revbump, security bug #904039 (CVE-2023-24626) Bug: https://bugs.gentoo.org/904039 Signed-off-by: Sven Wegener gentoo.org> .../screen/files/screen-4.9.0-CVE-2023-24626.patch | 33 + app-misc/screen/screen-4.9.0-r2.ebuild | 147 + 2 files changed, 180 insertions(+) diff --git a/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch b/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch new file mode 100644 index ..07dec8ecdd28 --- /dev/null +++ b/app-misc/screen/files/screen-4.9.0-CVE-2023-24626.patch @@ -0,0 +1,33 @@ +From e9ad41bfedb4537a6f0de20f00b27c7739f168f7 Mon Sep 17 00:00:00 2001 +From: Alexander Naumov +Date: Mon, 30 Jan 2023 17:22:25 +0200 +Subject: fix: missing signal sending permission check on failed query messages + +Signed-off-by: Alexander Naumov +--- + socket.c | 9 +++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/socket.c b/socket.c +index 147dc54..54d8cb8 100644 +--- a/socket.c b/socket.c +@@ -1285,11 +1285,16 @@ ReceiveMsg() + else + queryflag = -1; + +- Kill(m.m.command.apid, ++ if (CheckPid(m.m.command.apid)) { ++Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); ++ } ++ else { ++Kill(m.m.command.apid, +(queryflag >= 0) +? SIGCONT +: SIG_BYE); /* Send SIG_BYE if an error happened */ +- queryflag = -1; ++queryflag = -1; ++ } + } + break; + case MSG_COMMAND: diff --git a/app-misc/screen/screen-4.9.0-r2.ebuild b/app-misc/screen/screen-4.9.0-r2.ebuild new file mode 100644 index ..bd3ba7101992 --- /dev/null +++ b/app-misc/screen/screen-4.9.0-r2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic pam tmpfiles + +DESCRIPTION="screen manager with VT100/ANSI terminal emulation" +HOMEPAGE="https://www.gnu.org/software/screen/; + +if [[ ${PV} != ]] ; 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 + "${FILESDIR}"/${PN}-4.9.0-configure-implicit-function-decls.patch + "${FILESDIR}"/${P}-CVE-2023-24626.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}" +
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: b878ac639d99cb7aff79304e3fbac58bd74ee652 Author: Sam James gentoo org> AuthorDate: Wed Dec 21 22:20:43 2022 + Commit: Sam James gentoo org> CommitDate: Wed Dec 21 22:25:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b878ac63 app-misc/screen: drop 4.8.0-r3, 4.9.0 Bug: https://bugs.gentoo.org/886967 Signed-off-by: Sam James gentoo.org> app-misc/screen/Manifest | 1 - app-misc/screen/files/screen-CVE-2021-26937.patch | 61 - app-misc/screen/screen-4.8.0-r3.ebuild| 149 -- app-misc/screen/screen-4.9.0.ebuild | 145 - 4 files changed, 356 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index b9fe20e2f00b..5afb91c4b64a 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,2 +1 @@ -DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84 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.. --- 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; - {0x3, 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.. --- 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}" != ]] ; 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? (
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 3dccd5789aa5b64a1c1aed31423fb71068b4489c Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 18 21:30:25 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 18 21:30:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dccd578 app-misc/screen: Stabilize 4.9.0-r1 sparc, #886967 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r1.ebuild b/app-misc/screen/screen-4.9.0-r1.ebuild index d5d4576036eb..474a6b6093c5 100644 --- a/app-misc/screen/screen-4.9.0-r1.ebuild +++ b/app-misc/screen/screen-4.9.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 5fd07f57f61bf7d1cad2f75d2b026d5391f44f19 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 12:16:17 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 12:16:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd07f57 app-misc/screen: Stabilize 4.9.0-r1 arm, #886967 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r1.ebuild b/app-misc/screen/screen-4.9.0-r1.ebuild index c6c8f582891e..a4e0aed8807b 100644 --- a/app-misc/screen/screen-4.9.0-r1.ebuild +++ b/app-misc/screen/screen-4.9.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: e9070e5c3426ab98988fe6c55e2d00120726ebf7 Author: Sam James gentoo org> AuthorDate: Sun Dec 18 12:15:10 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 18 12:15:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9070e5c app-misc/screen: Stabilize 4.9.0-r1 arm64, #886967 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0-r1.ebuild b/app-misc/screen/screen-4.9.0-r1.ebuild index 383e367b1df6..c6c8f582891e 100644 --- a/app-misc/screen/screen-4.9.0-r1.ebuild +++ b/app-misc/screen/screen-4.9.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 8f73930c04b9d1778fbdfbd9f603fab618e2289d Author: Sam James gentoo org> AuthorDate: Tue Nov 8 06:03:06 2022 + Commit: Sam James gentoo org> CommitDate: Tue Nov 8 06:03:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f73930c app-misc/screen: fix LICENSE Closes: https://bugs.gentoo.org/880139 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.8.0-r3.ebuild | 4 ++-- app-misc/screen/screen-4.9.0-r1.ebuild | 2 +- app-misc/screen/screen-4.9.0.ebuild| 2 +- app-misc/screen/screen-.ebuild | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app-misc/screen/screen-4.8.0-r3.ebuild b/app-misc/screen/screen-4.8.0-r3.ebuild index dd1d7780d693..6807a8d7e80a 100644 --- a/app-misc/screen/screen-4.8.0-r3.ebuild +++ b/app-misc/screen/screen-4.8.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ else S="${WORKDIR}"/${P}/src fi -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux multiuser" diff --git a/app-misc/screen/screen-4.9.0-r1.ebuild b/app-misc/screen/screen-4.9.0-r1.ebuild index 44eb81d05d0d..383e367b1df6 100644 --- a/app-misc/screen/screen-4.9.0-r1.ebuild +++ b/app-misc/screen/screen-4.9.0-r1.ebuild @@ -18,7 +18,7 @@ else S="${WORKDIR}"/${P}/src fi -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux multiuser" diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index e4a41a3178a0..ea3531d913a6 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -18,7 +18,7 @@ else S="${WORKDIR}"/${P}/src fi -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux multiuser" diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index abdf2c2458a2..c7f756bc32b3 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -18,7 +18,7 @@ else S="${WORKDIR}"/${P}/src fi -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux multiuser"
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/
commit: 7c5ae2c2b6b69bdca5086db25622111e20c51096 Author: Sam James gentoo org> AuthorDate: Sat Sep 10 13:19:15 2022 + Commit: Sam James gentoo org> CommitDate: Sat Sep 10 13:29:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5ae2c2 app-misc/screen: add link to upstream variant of patch Bug: https://bugs.gentoo.org/869371 Signed-off-by: Sam James gentoo.org> .../screen/files/screen-4.9.0-configure-implicit-function-decls.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch b/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch index e9db7ba786aa..e3990b2acf88 100644 --- a/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch +++ b/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch @@ -1,4 +1,6 @@ https://bugs.gentoo.org/869371 + +Upstream variant: https://lists.gnu.org/archive/html/screen-devel/2022-08/msg0.html --- a/configure.ac +++ b/configure.ac @@ -157,10 +157,11 @@ if test -n "$ULTRIX"; then
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 34e05020127fbb74568a573fdec83a60fba0d7c5 Author: Sam James gentoo org> AuthorDate: Sat Sep 10 01:50:59 2022 + Commit: Sam James gentoo org> CommitDate: Sat Sep 10 01:57:16 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34e05020 app-misc/screen: fix build w/ Clang 15 (fix configure tests) Closes: https://bugs.gentoo.org/869371 Thanks-to: Nicholas Vinson gmail.com> Signed-off-by: Sam James gentoo.org> ...n-4.9.0-configure-implicit-function-decls.patch | 745 + app-misc/screen/screen-4.9.0-r1.ebuild | 146 2 files changed, 891 insertions(+) diff --git a/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch b/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch new file mode 100644 index ..e9db7ba786aa --- /dev/null +++ b/app-misc/screen/files/screen-4.9.0-configure-implicit-function-decls.patch @@ -0,0 +1,745 @@ +https://bugs.gentoo.org/869371 +--- a/configure.ac b/configure.ac +@@ -157,10 +157,11 @@ if test -n "$ULTRIX"; then + fi + AC_CHECKING(for POSIX.1) + AC_EGREP_CPP(YES_IS_DEFINED, + [#include + #include ++int + main () { + #ifdef _POSIX_VERSION + YES_IS_DEFINED; + #endif + ], AC_NOTE(- you have a POSIX system) AC_DEFINE(POSIX) posix=1) +@@ -231,10 +232,11 @@ dnl + + AC_CHECKING(BSD job jontrol) + AC_TRY_LINK( + [#include + #include ++#include + ], [ + #ifdef POSIX + tcsetpgrp(0, 0); + #else + int x = TIOCSPGRP; +@@ -248,48 +250,64 @@ int y = TIOCNOTTY; + + dnl + dnl setresuid(), setreuid(), seteuid() + dnl + AC_CHECKING(setresuid) +-AC_TRY_LINK(,[ ++AC_TRY_LINK( ++[#include ++], [ + setresuid(0, 0, 0); + ], AC_DEFINE(HAVE_SETRESUID)) + AC_CHECKING(setreuid) +-AC_TRY_LINK(,[ ++AC_TRY_LINK( ++[#include ++], [ + setreuid(0, 0); + ], AC_DEFINE(HAVE_SETREUID)) + dnl + dnl seteuid() check: + dnl linux seteuid was broken before V1.1.11 + dnl NeXT, AUX, ISC, and ultrix are still broken (no saved uid support) + dnl Solaris seteuid doesn't change the saved uid, bad for + dnl multiuser screen sessions + AC_CHECKING(seteuid) +-AC_TRY_LINK(,[ ++AC_TRY_LINK( ++[#include ++],[ + #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news) +-seteuid_is_broken(0); ++int seteuid_is_broken(int); seteuid_is_broken(0); + #else + seteuid(0); + #endif + ], AC_DEFINE(HAVE_SETEUID)) + + dnl execvpe + AC_CHECKING(execvpe) +-AC_TRY_LINK(,[ ++AC_TRY_LINK( ++[#include ++],[ + execvpe(0, 0, 0); + ], AC_DEFINE(HAVE_EXECVPE) + CFLAGS="$CFLAGS -D_GNU_SOURCE") + + dnl + dnl select() + dnl + + AC_CHECKING(select) +-AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, ++AC_TRY_LINK( ++[#include ++],[ ++select(0, 0, 0, 0, 0); ++],, + LIBS="$LIBS -lnet -lnsl" + AC_CHECKING(select with $LIBS) +-AC_TRY_LINK(,[select(0, 0, 0, 0, 0);],, ++AC_TRY_LINK( ++[#include ++],[ ++select(0, 0, 0, 0, 0); ++],, + AC_MSG_ERROR(!!! no select - no screen)) + ) + dnl + dnl FIFO tests + dnl +@@ -314,11 +332,11 @@ AC_TRY_RUN([ + #define S_IFIFO 001 + #endif + + char *fin = "/tmp/conftest$$"; + +-main() ++int main() + { + struct stat stb; + fd_set f; + + (void)alarm(5); +@@ -326,40 +344,40 @@ main() + #ifdef POSIX + if (mkfifo(fin, 0777)) + #else + if (mknod(fin, S_IFIFO|0777, 0)) + #endif +-exit(1); ++return 1; + if (stat(fin, ) || (stb.st_mode & S_IFIFO) != S_IFIFO) +-exit(1); ++return 1; + close(0); + #ifdef __386BSD__ + /* +* The next test fails under 386BSD, but screen works using fifos. +* Fifos in O_RDWR mode are only used for the BROKEN_PIPE case and for +* the select() configuration test. +*/ +- exit(0); ++ return 0; + #endif + if (open(fin, O_RDONLY | O_NONBLOCK)) +-exit(1); ++return 1; + if (fork() == 0) + { + close(0); + if (open(fin, O_WRONLY | O_NONBLOCK)) +- exit(1); ++return 1; + close(0); + if (open(fin, O_WRONLY | O_NONBLOCK)) +- exit(1); ++return 1; + if (write(0, "TEST", 4) == -1) +- exit(1); +- exit(0); ++return 1; ++ return 0; + } + FD_SET(0, ); + if (select(1, , 0, 0, 0) == -1) +-exit(1); +- exit(0); ++return 1; ++ return 0; + } + ], AC_NOTE(- your fifos are usable) fifo=1, + AC_NOTE(- your fifos are not usable), + AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1) + rm -f /tmp/conftest* +@@ -385,30 +403,31 @@ AC_TRY_RUN([ + #define S_IFIFO 001 + #endif + + char *fin = "/tmp/conftest$$"; + ++int + main() + { + struct timeval tv; + fd_set f; + + #ifdef POSIX + if (mkfifo(fin, 0600)) + #else + if (mknod(fin, S_IFIFO|0600, 0)) + #endif +-exit(1); ++return 1; + close(0); + if (open(fin, O_RDONLY|O_NONBLOCK)) +-exit(1); ++return 1; + FD_SET(0, ); +
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: d67189d2280fad0bb0dee7cae5ca431d3d7a341e Author: WANG Xuerui gentoo org> AuthorDate: Thu May 19 07:27:27 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Thu May 19 07:28:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67189d2 app-misc/screen: keyword 4.9.0 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index a06b97c1aed1..e4a41a3178a0 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: d17eff3ec6a90e87dda7d1431e7a3f18e2ea21de Author: Arthur Zamarin gentoo org> AuthorDate: Sun Apr 24 18:02:35 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Apr 24 18:02:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17eff3e app-misc/screen: Stabilize 4.9.0 ppc64, #836867 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index d366aca856a7..a06b97c1aed1 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 0de191ee6d88b57bed2b0f421870c8795032f959 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Apr 24 18:02:31 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Apr 24 18:02:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de191ee app-misc/screen: Stabilize 4.9.0 arm64, #836867 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index 36fda6a20220..d366aca856a7 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 10d1f6f2a64f5d2deb7992385889fd59fa7ddfe9 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Apr 24 18:01:55 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Apr 24 18:01:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d1f6f2 app-misc/screen: Stabilize 4.9.0 arm, #836867 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index d8007bdc0b1d..36fda6a20220 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 0ac56c12142a66080fc7cd95ffadc6906859b412 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Apr 24 17:47:17 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Apr 24 17:47:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac56c12 app-misc/screen: Stabilize 4.9.0 ppc, #836867 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index 881081f2c2d5..d8007bdc0b1d 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1ebe283b8b887192da2dad269437e8276c86e9d4 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Apr 24 06:33:12 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Apr 24 06:33:12 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ebe283b app-misc/screen: x86 stable wrt bug #836867 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index e021f2d8c346..881081f2c2d5 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 0375f5bcc337cbd2886d7a3c8a2384227bf2b959 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Apr 24 06:32:33 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Apr 24 06:32:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0375f5bc app-misc/screen: sparc stable wrt bug #836867 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index 2e30a955f57d..e021f2d8c346 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 32c0c8120922a5285666bf36945294d068c016f7 Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Apr 24 06:29:30 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Apr 24 06:29:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c0c812 app-misc/screen: amd64 stable wrt bug #836867 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index b6690acdf8fb..2e30a955f57d 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: f5f36d8e58f13c1684da6d77141b9f6a0527c0d4 Author: Sam James gentoo org> AuthorDate: Sun Apr 24 02:35:23 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 24 02:35:23 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f36d8e app-misc/screen: Stabilize 4.9.0 hppa, #836867 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.9.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.9.0.ebuild b/app-misc/screen/screen-4.9.0.ebuild index 18779966236e..b6690acdf8fb 100644 --- a/app-misc/screen/screen-4.9.0.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 7b99f401634d79ffe8cd4f0d1f49afa6cc136801 Author: Sven Wegener gentoo org> AuthorDate: Sat Feb 19 06:23:32 2022 + Commit: Sven Wegener gentoo org> CommitDate: Sat Feb 19 06:31:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b99f401 app-misc/screen: Revert changes to live ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Sven Wegener gentoo.org> app-misc/screen/files/screen--no-utempter.patch | 15 +++ app-misc/screen/screen-.ebuild | 17 - 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/app-misc/screen/files/screen--no-utempter.patch b/app-misc/screen/files/screen--no-utempter.patch new file mode 100644 index ..7eccc30c04c5 --- /dev/null +++ b/app-misc/screen/files/screen--no-utempter.patch @@ -0,0 +1,15 @@ +--- i/configure.ac w/configure.ac +@@ -151,12 +151,6 @@ AS_IF([test "x$enable_utmp" = "xyes"], [ + AS_IF([test "x$have_utmpx" != "xyes"], + AC_ERROR(Missing utmpx.h)) + +- AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no) +- AS_IF([test "x$have_utempter" = "xyes"], [ +- AC_DEFINE(HAVE_UTEMPTER) +- LIBS="$LIBS -lutempter" +- ]) +- + AC_MSG_CHECKING(if utmpx struct has ut_host field) + AC_TRY_COMPILE([#include ], [ + struct utmpx u; diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 18779966236e..abdf2c2458a2 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -32,8 +32,7 @@ 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 + "${FILESDIR}"/${P}-no-utempter.patch ) src_prepare() { @@ -41,7 +40,9 @@ src_prepare() { # 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 + 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 \ @@ -76,13 +77,12 @@ src_configure() { use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --with-socket-dir="${EPREFIX}/tmp/${PN}" - --with-sys-screenrc="${EPREFIX}/etc/screenrc" + --enable-socket-dir="${EPREFIX}/tmp/${PN}" + --with-system_screenrc="${EPREFIX}/etc/screenrc" --with-pty-mode=0620 --with-pty-group=5 - --enable-rxvt_osc --enable-telnet - --enable-colors256 + --enable-utmp $(use_enable pam) ) econf "${myeconfargs[@]}" @@ -90,7 +90,6 @@ src_configure() { src_compile() { LC_ALL=POSIX emake comm.h term.h - emake osdef.h emake -C doc screen.info default @@ -98,7 +97,7 @@ src_compile() { src_install() { local DOCS=( - README ChangeLog INSTALL TODO NEWS* patchlevel.h + README ChangeLog INSTALL TODO NEWS* doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} )
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 0af68c3658561385376cc7a76b09e1d12d99f423 Author: Sam James gentoo org> AuthorDate: Fri Feb 18 01:20:49 2022 + Commit: Sam James gentoo org> CommitDate: Fri Feb 18 01:21:35 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af68c36 app-misc/screen: add 4.9.0 Signed-off-by: Sam James gentoo.org> app-misc/screen/Manifest | 2 +- ...screen-4.9.0_rc1.ebuild => screen-4.9.0.ebuild} | 30 +-- app-misc/screen/screen-.ebuild | 44 ++ 3 files changed, 30 insertions(+), 46 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 0f251bd13da3..b9fe20e2f00b 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,2 +1,2 @@ DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c -DIST screen-4.9.0_rc1.tar.gz 812374 BLAKE2B b908ec64f932dafe34cd0032fd59da9352cf9e7a56cce06c6b2664a84a25637cfc6679f73bfb47e0cacb590739bfa9b61125d942e63f2cb2ae1aaa1b1a2dea8d SHA512 1f87ce0bc1cbfaa8fd7437eee707de8e047bb8f110c26d40f5cb7916816d10ea1830281c680189e855af9cf2f4e712dc08a7c480961d9aee9ea4bb092557b508 +DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84 diff --git a/app-misc/screen/screen-4.9.0_rc1.ebuild b/app-misc/screen/screen-4.9.0.ebuild similarity index 78% rename from app-misc/screen/screen-4.9.0_rc1.ebuild rename to app-misc/screen/screen-4.9.0.ebuild index 6e0c5455bf0e..18779966236e 100644 --- a/app-misc/screen/screen-4.9.0_rc1.ebuild +++ b/app-misc/screen/screen-4.9.0.ebuild @@ -3,21 +3,14 @@ EAPI=7 -inherit autotools flag-o-matic pam tmpfiles toolchain-funcs +inherit autotools flag-o-matic pam tmpfiles DESCRIPTION="screen manager with VT100/ANSI terminal emulation" HOMEPAGE="https://www.gnu.org/software/screen/; if [[ ${PV} != ]] ; then - if [[ ${PV} == *_rc* ]] ; then - # See https://lists.gnu.org/archive/html/screen-devel/2022-01/msg00010.html - MY_COMMIT="d591a396c7e41d10191c1f5676032d9e261da2f7" - SRC_URI="https://git.savannah.gnu.org/cgit/screen.git/snapshot/${PN}-${MY_COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${MY_COMMIT}/src - else - 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" - fi + 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; @@ -29,15 +22,13 @@ LICENSE="GPL-2" SLOT="0" IUSE="debug nethack pam selinux multiuser" -CDEPEND=" - >=sys-libs/ncurses-5.2:0= +DEPEND=">=sys-libs/ncurses-5.2:= virtual/libcrypt:= pam? ( sys-libs/pam )" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} acct-group/utmp selinux? ( sec-policy/selinux-screen )" -DEPEND="${CDEPEND} - sys-apps/texinfo" +BDEPEND="sys-apps/texinfo" PATCHES=( # Don't use utempter even if it is found on the system. @@ -52,7 +43,7 @@ src_prepare() { mv sched.h _sched.h || die sed -i '/include/ s:sched.h:_sched.h:' screen.h || die - # Fix manpage. + # Fix manpage sed -i \ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \ @@ -61,7 +52,7 @@ src_prepare() { -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \ doc/screen.1 || die - if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then + if [[ ${CHOST} == *-darwin* ]] || use elibc_musl; then sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die fi @@ -75,7 +66,7 @@ src_prepare() { src_configure() { append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" - if [[ ${CHOST} == *-solaris* ]] ; then + if [[ ${CHOST} == *-solaris* ]]; then # enable msg_header by upping the feature standard compatible # with c99 mode append-cppflags -D_XOPEN_SOURCE=600 @@ -142,8 +133,7 @@
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 2fa4adde51eff8cea7722a5e372db83652813ce7 Author: Sam James gentoo org> AuthorDate: Sat Jan 22 00:38:02 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jan 22 00:38:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa4adde app-misc/screen: add 4.9.0_rc1 (unkeyworded) See https://lists.gnu.org/archive/html/screen-devel/2022-01/msg00010.html for call for testers. It's been a long time since the last release so any testers are welcome. Signed-off-by: Sam James gentoo.org> app-misc/screen/Manifest| 1 + app-misc/screen/screen-4.9.0_rc1.ebuild | 155 2 files changed, 156 insertions(+) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index f27c84791634..0f251bd13da3 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1 +1,2 @@ DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c +DIST screen-4.9.0_rc1.tar.gz 812374 BLAKE2B b908ec64f932dafe34cd0032fd59da9352cf9e7a56cce06c6b2664a84a25637cfc6679f73bfb47e0cacb590739bfa9b61125d942e63f2cb2ae1aaa1b1a2dea8d SHA512 1f87ce0bc1cbfaa8fd7437eee707de8e047bb8f110c26d40f5cb7916816d10ea1830281c680189e855af9cf2f4e712dc08a7c480961d9aee9ea4bb092557b508 diff --git a/app-misc/screen/screen-4.9.0_rc1.ebuild b/app-misc/screen/screen-4.9.0_rc1.ebuild new file mode 100644 index ..6e0c5455bf0e --- /dev/null +++ b/app-misc/screen/screen-4.9.0_rc1.ebuild @@ -0,0 +1,155 @@ +# 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} != ]] ; then + if [[ ${PV} == *_rc* ]] ; then + # See https://lists.gnu.org/archive/html/screen-devel/2022-01/msg00010.html + MY_COMMIT="d591a396c7e41d10191c1f5676032d9e261da2f7" + SRC_URI="https://git.savannah.gnu.org/cgit/screen.git/snapshot/${PN}-${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/${PN}-${MY_COMMIT}/src + else + 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" + fi +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= + 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 +) + +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" +
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 8c6196d6e44e6fce001b39bd2db418a44678c63b Author: Thomas Deutschmann gentoo org> AuthorDate: Tue May 25 21:04:24 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue May 25 21:04:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6196d6 app-misc/screen: security cleanup Bug: https://bugs.gentoo.org/769770 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> app-misc/screen/screen-4.8.0-r1.ebuild | 158 - 1 file changed, 158 deletions(-) diff --git a/app-misc/screen/screen-4.8.0-r1.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild deleted file mode 100644 index e0b624d80bf..000 --- a/app-misc/screen/screen-4.8.0-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2021 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}" != ]] ; 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-2" -SLOT="0" -IUSE="debug nethack pam selinux multiuser" - -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" - -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[@]}" -} -
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: da750b5eb1a3f1bfb2a5231247088c31d3fc77c3 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Mar 26 12:01:22 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Mar 26 12:01:22 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da750b5e app-misc/screen: s390 stable wrt bug #769770 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index 589b58f2934..8c0c7cfd671 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 42235612153707f05b0778eb2a22da3bb1a71eac Author: Sam James gentoo org> AuthorDate: Fri Mar 5 21:42:57 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 5 21:42:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42235612 app-misc/screen: Stabilize 4.8.0-r2 arm64, #769770 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index 3aa4ee3bd86..589b58f2934 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 764bc2e2e665b2363024fc5c2d469f2e500b4f68 Author: Sam James gentoo org> AuthorDate: Fri Mar 5 20:32:59 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 5 20:32:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764bc2e2 app-misc/screen: Stabilize 4.8.0-r2 ppc64, #769770 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index d7a4300c826..3aa4ee3bd86 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 624ab0e268d9f7df4e0a0778d3f7be0893d733b1 Author: Sam James gentoo org> AuthorDate: Fri Mar 5 20:31:57 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 5 20:31:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624ab0e2 app-misc/screen: Stabilize 4.8.0-r2 ppc, #769770 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index df99269ab37..d7a4300c826 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 761083b33deb45ecb508ad4e381ea2b824234122 Author: Sam James gentoo org> AuthorDate: Fri Mar 5 18:52:39 2021 + Commit: Sam James gentoo org> CommitDate: Fri Mar 5 18:52:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761083b3 app-misc/screen: Stabilize 4.8.0-r2 arm, #769770 Signed-off-by: Sam James gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index 6759165aec2..df99269ab37 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 4eb82bb3f655133c22ca8bae6f69e712710ae962 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Mar 5 07:32:21 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Mar 5 07:32:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb82bb3 app-misc/screen: x86 stable wrt bug #769770 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index c0c1c1f67f5..6759165aec2 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 68a0b74168c813e217c70db9c2d2cba0842b1233 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Mar 5 07:27:01 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Mar 5 07:27:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a0b741 app-misc/screen: amd64 stable wrt bug #769770 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index 0908a80c98f..c0c1c1f67f5 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: d9e33cb81745b310d10a2117c9604d4efe4cddf1 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Mar 4 20:15:14 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Mar 4 20:26:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e33cb8 app-misc/screen: stable 4.8.0-r2 for hppa/sparc, bug #769770 Package-Manager: Portage-3.0.13, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-misc/screen/screen-4.8.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild index e5fef8fffea..0908a80c98f 100644 --- a/app-misc/screen/screen-4.8.0-r2.ebuild +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 3673b1b7cfa56d2e8f5ebc4de3d028774f331c52 Author: Sven Wegener gentoo org> AuthorDate: Wed Feb 24 19:21:31 2021 + Commit: Sven Wegener gentoo org> CommitDate: Wed Feb 24 19:25:15 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3673b1b7 app-misc/screen: Revision bump, security bug #769770 Bug: https://bugs.gentoo.org/769770 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Sven Wegener gentoo.org> app-misc/screen/files/screen-CVE-2021-26937.patch | 61 + app-misc/screen/screen-4.8.0-r2.ebuild| 159 ++ 2 files changed, 220 insertions(+) diff --git a/app-misc/screen/files/screen-CVE-2021-26937.patch b/app-misc/screen/files/screen-CVE-2021-26937.patch new file mode 100644 index 000..9556278274e --- /dev/null +++ b/app-misc/screen/files/screen-CVE-2021-26937.patch @@ -0,0 +1,61 @@ + 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; + {0x3, 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-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild new file mode 100644 index 000..e5fef8fffea --- /dev/null +++ b/app-misc/screen/screen-4.8.0-r2.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2021 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}" != ]] ; 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-2" +SLOT="0" +IUSE="debug nethack pam selinux multiuser" + +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" + +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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 6ef9b63f4107b63d5a0564f7bae40b9d40b7db86 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Jan 22 15:57:16 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Jan 22 15:57:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef9b63f app-misc/screen: install pam files conditionally Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> app-misc/screen/{screen-4.8.0.ebuild => screen-4.8.0-r1.ebuild} | 4 +++- app-misc/screen/screen-.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0-r1.ebuild similarity index 98% rename from app-misc/screen/screen-4.8.0.ebuild rename to app-misc/screen/screen-4.8.0-r1.ebuild index 22ea9a336fb..30a4c505376 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0-r1.ebuild @@ -126,7 +126,9 @@ src_install() { insinto /etc doins "${FILESDIR}"/screenrc - pamd_mimic_system screen auth + if use pam; then + pamd_mimic_system screen auth + fi dodoc "${DOCS[@]}" } diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 52f09640127..b61017df938 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -129,7 +129,9 @@ src_install() { insinto /etc doins "${FILESDIR}"/screenrc - pamd_mimic_system screen auth + if use pam; then + pamd_mimic_system screen auth + fi dodoc "${DOCS[@]}" }
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: e73db76b2ef05382c6d1758d984b438a1057e720 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 13:18:30 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 13:18:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73db76b app-misc/screen: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 4 ++-- app-misc/screen/screen-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 00c07832352..22ea9a336fb 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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; diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index f1d31c30f53..52f09640127 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + 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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 592e938b9fc207bb0e4cc44a9ef4e1c451dc316d Author: Patrice Clement gentoo org> AuthorDate: Mon Mar 30 08:34:54 2020 + Commit: Patrice Clement gentoo org> CommitDate: Mon Mar 30 08:35:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592e938b app-misc/screen: remove vulnerable versions. Bug: https://bugs.gentoo.org/708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Patrice Clement gentoo.org> app-misc/screen/Manifest | 3 - app-misc/screen/screen-4.6.1.ebuild| 161 - app-misc/screen/screen-4.6.2-r1.ebuild | 160 app-misc/screen/screen-4.7.0.ebuild| 160 4 files changed, 484 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 0d1264dcf42..f27c8479163 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,4 +1 @@ -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 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild deleted file mode 100644 index 00e1892a798..000 --- a/app-misc/screen/screen-4.6.1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -SCM="" -[[ "${PV}" = ]] && 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}" != ]] ; then - SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 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* ]] || 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 -
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 7ac5483f0ca4658f1ab3af865c573be4a6ab27e5 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Mar 19 19:21:19 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Mar 19 21:30:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac5483f app-misc/screen: stable 4.8.0 for hppa, bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 9897238bbce..46dcafe98e1 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 904a8e6edfd38d2a8bd57194950989a4f01332fa Author: Mart Raudsepp gentoo org> AuthorDate: Sat Mar 14 21:06:37 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat Mar 14 21:08:23 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=904a8e6e app-misc/screen: arm64 stable (bug #708460) Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index f5e1311677d..9897238bbce 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 96da7c9225502bd84571e836fb6f964f4cf369e8 Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Mar 5 15:05:56 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Mar 5 15:05:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96da7c92 app-misc/screen: arm stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index cfce29ca7b4..f5e1311677d 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ad7ba037196cb21727e1b7b94f1165a1ef69cc4c Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Mar 3 07:54:37 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Mar 3 07:54:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7ba037 app-misc/screen: ia64 stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ia64" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 6ac72822849..cfce29ca7b4 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ef1a4e8bb96824adefb355edc377a9c7c958fb19 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 2 15:22:45 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 2 15:22:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1a4e8b app-misc/screen: ppc stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 69e9eb84dbb..6ac72822849 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: b8200963609dc3b1fccc4a3dbc451d6469ffe778 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 2 12:39:20 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 2 12:39:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8200963 app-misc/screen: ppc64 stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 0a4515ecaca..69e9eb84dbb 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1f16d8827c4bcde84d6e3e90f4f861a0cf8240c0 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 2 12:33:37 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 2 12:33:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f16d882 app-misc/screen: s390 stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 1084fd42964..0a4515ecaca 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 3177817a6774756b14b8922c4c3036c5ba0f Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 2 12:31:23 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 2 12:31:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31778eee app-misc/screen: x86 stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 822a607833a..1084fd42964 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ed27763ec068dc7cb08b6cb655cb358934c81246 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Mar 2 12:29:21 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Mar 2 12:29:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed27763e app-misc/screen: sparc stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 16b74a22588..822a607833a 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 28a8898e0e007289826de5a7113d4d2068146f9b Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Mar 1 21:44:21 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Mar 1 21:44:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28a8898e app-misc/screen: amd64 stable wrt bug #708460 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index 84d601a1f28..16b74a22588 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; then SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - 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" + 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 inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: ff7d35548a42a29e7377730751aaac7977a21ae8 Author: Lars Wendler gentoo org> AuthorDate: Thu Feb 27 08:30:25 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Feb 27 08:59:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7d3554 app-misc/screen: Minor ebuild improvements Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> app-misc/screen/screen-4.8.0.ebuild | 38 ++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild index fcb1f1674b9..84d601a1f28 100644 --- a/app-misc/screen/screen-4.8.0.ebuild +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -26,9 +26,9 @@ CDEPEND=" >=sys-libs/ncurses-5.2:0= pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} + acct-group/utmp selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} - acct-group/utmp sys-apps/texinfo" PATCHES=( @@ -51,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 @@ -77,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() { @@ -102,25 +103,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 @@ -141,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"
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: c7652c1f375a096d86e4d13b17ae97327e7d3af6 Author: Hank Leininger korelogic com> AuthorDate: Sat Feb 8 03:43:38 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Feb 27 08:59:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7652c1f app-misc/screen: version bump (security fix); GLEP 81 Upstream released a fix for a memory overwrite; no CVE, but see referenced bug and https://lists.gnu.org/archive/html/screen-devel/2020-02/msg7.html Also updated for GLEP 81. Changed ${EROOT%/} to ${EROOT}, because CI complained. Signed-off-by: Hank Leininger korelogic.com> Bug: https://bugs.gentoo.org/708460 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> app-misc/screen/Manifest| 1 + app-misc/screen/screen-4.8.0.ebuild | 156 2 files changed, 157 insertions(+) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index f9d35a5e7c2..f850d85971b 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -4,3 +4,4 @@ DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e 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 +DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c diff --git a/app-misc/screen/screen-4.8.0.ebuild b/app-misc/screen/screen-4.8.0.ebuild new file mode 100644 index 000..fcb1f1674b9 --- /dev/null +++ b/app-misc/screen/screen-4.8.0.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2020 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}" != ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + 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 + 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? ( sys-libs/pam )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-screen )" +DEPEND="${CDEPEND} + acct-group/utmp + 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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 538c65e61e6e59fde584412ace81081955e84427 Author: Lars Wendler gentoo org> AuthorDate: Thu Feb 27 08:34:33 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Feb 27 08:59:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538c65e6 app-misc/screen: Removed old Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> app-misc/screen/Manifest | 3 - app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 app-misc/screen/files/screen-4.5.1-texinfo.patch | 13 -- app-misc/screen/screen-4.4.0.ebuild| 154 app-misc/screen/screen-4.5.1.ebuild| 160 app-misc/screen/screen-4.6.0.ebuild| 158 app-misc/screen/screen-4.6.2.ebuild| 162 - 7 files changed, 712 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index f850d85971b..0d1264dcf42 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,6 +1,3 @@ -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 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 990c73042cd..000 --- 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?= -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 --# define UTMPFILEUTMPX_FILE -+# ifdef UTMPX_FILE /* GNU extension */ -+# define UTMPFILE UTMPX_FILE -+# endif - # define utmputmpx - # define getutentgetutxent - # define getutid getutxid -@@ -260,7 +262,6 @@ extern int errno; - # define pututline pututxline - # define setutentsetutxent - # define endutentendutxent --# define ut_time ut_xtime - # else /* SVR4 */ - # include - # 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(); -- 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();
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 25b5156c8846199d363f932e7450b72ac2abdfa6 Author: Lars Wendler gentoo org> AuthorDate: Thu Feb 27 08:32:52 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Feb 27 08:59:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b5156c app-misc/screen: Synced live ebuild Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> app-misc/screen/metadata.xml | 4 +- app-misc/screen/screen-.ebuild | 93 -- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml index 85dc556e636..b10032bfdd9 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. -Enable multiuser support (by setting correct -permissions) +Enable multiuser support (by setting correct permissions) Express error messages in nethack style -Include utmp support diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 29951514a76..aa12bdddbbb 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.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}" != * ]] ; 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 \ -
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 6ce549fcb5482052dd2df8df0339105eb94c22ee Author: Mikle Kolyada gentoo org> AuthorDate: Sat Oct 12 18:28:49 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Oct 12 18:28:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce549fc app-misc/screen: migrate to sys-libs/pam Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> app-misc/screen/screen-4.4.0.ebuild| 4 ++-- app-misc/screen/screen-4.5.1.ebuild| 4 ++-- app-misc/screen/screen-4.6.0.ebuild| 4 ++-- app-misc/screen/screen-4.6.1.ebuild| 4 ++-- app-misc/screen/screen-4.6.2-r1.ebuild | 2 +- app-misc/screen/screen-4.6.2.ebuild| 4 ++-- app-misc/screen/screen-4.7.0.ebuild| 2 +- app-misc/screen/screen-.ebuild | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild index 61cfe8f452c..b6023c4e592 100644 --- a/app-misc/screen/screen-4.4.0.ebuild +++ b/app-misc/screen/screen-4.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,7 +16,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.5.1.ebuild b/app-misc/screen/screen-4.5.1.ebuild index c31022ba566..f5c5c519dea 100644 --- a/app-misc/screen/screen-4.5.1.ebuild +++ b/app-misc/screen/screen-4.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.6.0.ebuild b/app-misc/screen/screen-4.6.0.ebuild index e20fe609f01..3e1c3a55ab8 100644 --- a/app-misc/screen/screen-4.6.0.ebuild +++ b/app-misc/screen/screen-4.6.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 79b44cc9464..b4fad2505eb 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild index 4c49560591b..d7aa2d42548 100644 --- a/app-misc/screen/screen-4.6.2-r1.ebuild +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -24,7 +24,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild index 0448a9527ab..245a4135f54 100644 --- a/app-misc/screen/screen-4.6.2.ebuild +++ b/app-misc/screen/screen-4.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )" DEPEND="${CDEPEND} diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild index d74a2210835..bdc40e9094d 100644 --- a/app-misc/screen/screen-4.7.0.ebuild +++ b/app-misc/screen/screen-4.7.0.ebuild @@ -24,7 +24,7 @@ IUSE="debug nethack pam selinux multiuser" CDEPEND=" >=sys-libs/ncurses-5.2:0= - pam? ( virtual/pam )" + pam? ( sys-libs/pam )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-screen )"
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: dd77e43cbdbb2459af4c8be45313496391b6f874 Author: Sven Wegener gentoo org> AuthorDate: Fri Oct 4 13:11:55 2019 + Commit: Sven Wegener gentoo org> CommitDate: Fri Oct 4 13:27:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd77e43c app-misc/screen: Version bump to 4.7.0, bug #696050 Closes: https://bugs.gentoo.org/696050 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Sven Wegener gentoo.org> app-misc/screen/Manifest| 1 + app-misc/screen/screen-4.7.0.ebuild | 160 2 files changed, 161 insertions(+) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 69046bfdc86..f9d35a5e7c2 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -3,3 +3,4 @@ DIST screen-4.5.1.tar.gz 963153 BLAKE2B 8f7e20a0a3dde58435fc500714b49af97b4f2f22 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 diff --git a/app-misc/screen/screen-4.7.0.ebuild b/app-misc/screen/screen-4.7.0.ebuild new file mode 100644 index 000..b3063ef4e24 --- /dev/null +++ b/app-misc/screen/screen-4.7.0.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools 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}" != ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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}"/${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 + + # 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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: c87202f0e40874b29c770047011ec4df00def793 Author: Marcus Comstedt mc pp se> AuthorDate: Thu Jul 4 14:41:35 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Jul 5 21:12:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87202f0 app-misc/screen: keyworded 4.6.2-r1 and for riscv, bug #689252 Closes: https://bugs.gentoo.org/689252 Signed-off-by: Marcus Comstedt mc.pp.se> Signed-off-by: Andreas K. Hüttel gentoo.org> app-misc/screen/screen-4.6.2-r1.ebuild | 4 ++-- app-misc/screen/screen-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild index 5c29400df81..7d14914a868 100644 --- a/app-misc/screen/screen-4.6.2-r1.ebuild +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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; diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 92a319ff1fa..3bf613acb96 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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;
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: cd17366a8641123c44de0e9b86038da943afd41a Author: Anthony G. Basile gentoo org> AuthorDate: Sat Dec 29 17:21:14 2018 + Commit: Anthony G. Basile gentoo org> CommitDate: Sat Dec 29 17:21:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd17366a app-misc/screen: add support for musl Signed-off-by: Anthony G. Basile gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-4.6.1.ebuild| 7 +-- app-misc/screen/screen-4.6.2-r1.ebuild | 5 - app-misc/screen/screen-4.6.2.ebuild| 7 +-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 47cbadae894..ee99e929f82 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -59,10 +59,13 @@ src_prepare() { doc/screen.1 \ || die - if [[ ${CHOST} == *-darwin* ]] ; then + 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 } diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild index 3d5650e3147..5c29400df81 100644 --- a/app-misc/screen/screen-4.6.2-r1.ebuild +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -58,10 +58,13 @@ src_prepare() { doc/screen.1 \ || die - if [[ ${CHOST} == *-darwin* ]] ; then + 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 } diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild index 5de7a9460c3..74566a73346 100644 --- a/app-misc/screen/screen-4.6.2.ebuild +++ b/app-misc/screen/screen-4.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -60,10 +60,13 @@ src_prepare() { doc/screen.1 \ || die - if [[ ${CHOST} == *-darwin* ]] ; then + 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 }
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 01b4bc5be2a7c4adc134a633af50898e51bdf7ca Author: Sven Wegener gentoo org> AuthorDate: Wed Nov 21 19:22:09 2018 + Commit: Sven Wegener gentoo org> CommitDate: Wed Nov 21 19:22:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b4bc5b app-misc/screen: Re-add the dodoc call Signed-off-by: Sven Wegener gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-4.6.2-r1.ebuild | 2 ++ app-misc/screen/screen-.ebuild | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild index ede043d369e..3d5650e3147 100644 --- a/app-misc/screen/screen-4.6.2-r1.ebuild +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -128,6 +128,8 @@ src_install() { doins "${FILESDIR}"/screenrc pamd_mimic_system screen auth + + dodoc "${DOCS[@]}" } pkg_postinst() { diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 163a4ea7515..92a319ff1fa 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -123,6 +123,8 @@ src_install() { doins "${FILESDIR}"/screenrc pamd_mimic_system screen auth + + dodoc "${DOCS[@]}" } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 1d74e7aae1eb8ae2f3b913b46b28e17da51fd978 Author: Sven Wegener gentoo org> AuthorDate: Wed Nov 21 18:59:35 2018 + Commit: Sven Wegener gentoo org> CommitDate: Wed Nov 21 19:04:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d74e7aa app-misc/screen: Revision bump to include latest changes Signed-off-by: Sven Wegener gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-4.6.2-r1.ebuild | 155 + 1 file changed, 155 insertions(+) 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 000..ede043d369e --- /dev/null +++ b/app-misc/screen/screen-4.6.2-r1.ebuild @@ -0,0 +1,155 @@ +# 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}" != ]] ; 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 +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] + then + elog "Some dangerous key bindings
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 876e1e476410b387673bcc9024d8b9d47c891704 Author: Sven Wegener gentoo org> AuthorDate: Wed Nov 21 18:50:15 2018 + Commit: Sven Wegener gentoo org> CommitDate: Wed Nov 21 19:04:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876e1e47 app-misc/screen: Update live ebuild Signed-off-by: Sven Wegener gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-.ebuild | 45 -- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index c7c5f563852..552f2f82961 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.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 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}" != ]] ; 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,18 +93,23 @@ 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} + ) + + emake DESTDIR="${D}" SCREEN=screen-${PV} install - dobin screen + 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 @@ -109,19 +120,11 @@ src_install() { 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 } 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}" }
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: e5132760791ce0307362727befc7755e98aafbfd Author: Sven Wegener gentoo org> AuthorDate: Wed Nov 21 18:55:34 2018 + Commit: Sven Wegener gentoo org> CommitDate: Wed Nov 21 19:04:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5132760 app-misc/screen: Use tmpfiles.eclass, bug #670982 Bug: https://bugs.gentoo.org/670982 Signed-off-by: Sven Wegener gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-misc/screen/screen-.ebuild | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 552f2f82961..163a4ea7515 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools eutils flag-o-matic pam toolchain-funcs user +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/; @@ -114,9 +114,7 @@ src_install() { 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}
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 9a72e6c3e24c50d1b68d878da7c0dcf23f74d7c6 Author: Mikle Kolyada gentoo org> AuthorDate: Tue May 22 16:03:02 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue May 22 16:03:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a72e6c3 app-misc/screen: arm/ppc/ppc64 stable wrt bug #655490 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index a6a1ccd05e6..5ad1bf9cd4e 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: bb500c89c6e4beb7590022d738a5f9956b0b5948 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed May 16 21:17:25 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed May 16 21:19:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb500c89 app-misc/screen: stable 4.6.1 for ia64, bug #655490 Bug: https://bugs.gentoo.org/655490 Package-Manager: Portage-2.3.36, Repoman-2.3.9 RepoMan-Options: --include-arches="ia64" app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 928e94fa16a..a6a1ccd05e6 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 29fbc053120cacb51a34af6629a1108c31409db7 Author: Mikle Kolyada gentoo org> AuthorDate: Mon May 14 21:51:01 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon May 14 21:51:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29fbc053 app-misc/screen: m68k/s390/sh stable wrt bug #655490 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index fea1c81a1cc..928e94fa16a 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: af43cd10ecd524fde3c01a91d57f0ee897656c10 Author: Tobias Klausmann gentoo org> AuthorDate: Mon May 14 19:24:32 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Mon May 14 21:19:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af43cd10 app-misc/screen-4.6.1-r0: alpha stable Gentoo-Bug: http://bugs.gentoo.org/655490 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 0476bc1866e..fea1c81a1cc 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: a01dabd56e0f2438fd694de62261ed8d92e7 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 13 22:03:40 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 13 22:06:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01dabd5 app-misc/screen: x86 stable (bug #655490) Package-Manager: Portage-2.3.34, Repoman-2.3.9 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 04c2b7f603e..0476bc1866e 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 0eea46e3be4bcc95357afe5c2a1dda302162b2ea Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun May 13 19:36:50 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun May 13 19:39:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eea46e3 app-misc/screen: stable 4.6.1 for hppa/sparc Bug: https://bugs.gentoo.org/655490 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="hppa sparc" app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 814dde94ce1..04c2b7f603e 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: b76e8c18d1da691db9a005945e11f2a90572f95c Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 13 17:33:09 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 13 17:33:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76e8c18 app-misc/screen: amd64 stable wrt bug #655490 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index a5e8664e890..814dde94ce1 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 418a35a3e6b64453977c8f2f5be86d20e5de0552 Author: Mart Raudsepp gentoo org> AuthorDate: Sun May 13 17:00:56 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Sun May 13 17:00:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418a35a3 app-misc/screen-4.6.1: arm64 stable (bug #655490) Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-misc/screen/screen-4.6.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild index 11e428ca57c..a5e8664e890 100644 --- a/app-misc/screen/screen-4.6.1.ebuild +++ b/app-misc/screen/screen-4.6.1.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/; if [[ "${PV}" != ]] ; 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 ~arm-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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-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
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/
commit: 92d4dc9898f9066458248b332e258a56eddee4ff Author: Jeroen Roovers gentoo org> AuthorDate: Thu May 10 13:50:56 2018 + Commit: Jeroen Roovers gentoo org> CommitDate: Thu May 10 13:51:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d4dc98 app-misc/screen: Fix sed script, add one more. Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-misc/screen/screen-.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app-misc/screen/screen-.ebuild b/app-misc/screen/screen-.ebuild index 115c1160762..c7c5f563852 100644 --- a/app-misc/screen/screen-.ebuild +++ b/app-misc/screen/screen-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,7 +52,8 @@ 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:/local/screens/S\\-:'"${EPREFIX}"'/tmp/screen/S\\-:g' \ + -e 's:/usr/tmp/screens/:'"${EPREFIX}"'/tmp/screen/:g' \ doc/screen.1 \ || die
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 2aacf8d5e4052441f9bb791051a30146bf65793e Author: Sven Wegener gentoo org> AuthorDate: Thu Jan 4 23:15:15 2018 + Commit: Sven Wegener gentoo org> CommitDate: Thu Jan 4 23:18:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aacf8d5 app-misc/screen: Fix building on musl libc, bug #639424 Closes: https://bugs.gentoo.org/639424 Package-Manager: Portage-2.3.14, Repoman-2.3.6 app-misc/screen/files/screen-4.4.0-utmp-musl.patch | 62 ++ app-misc/screen/screen-4.4.0.ebuild| 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) 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 new file mode 100644 index 000..990c73042cd --- /dev/null +++ b/app-misc/screen/files/screen-4.4.0-utmp-musl.patch @@ -0,0 +1,62 @@ +From 74fdc8988b55633cd05f8625390cd3f6a8102003 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?=+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 +-# define UTMPFILEUTMPX_FILE ++# ifdef UTMPX_FILE /* GNU extension */ ++# define UTMPFILE UTMPX_FILE ++# endif + # define utmputmpx + # define getutentgetutxent + # define getutid getutxid +@@ -260,7 +262,6 @@ extern int errno; + # define pututline pututxline + # define setutentsetutxent + # define endutentendutxent +-# define ut_time ut_xtime + # else /* SVR4 */ + # include + # 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(); +- 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(); +- u->ut_time = now; ++ u->ut_tv.tv_sec = now; + } + + static slot_t diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild index 0ee4276016c..0dfbfbc066c 100644 --- a/app-misc/screen/screen-4.4.0.ebuild +++ b/app-misc/screen/screen-4.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -26,6 +26,7 @@ DEPEND="${CDEPEND} # - 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() {
[gentoo-commits] repo/gentoo:master commit in: app-misc/screen/files/, app-misc/screen/
commit: 10f7f30cb2ade13389c2a104128a9b86355f52c6 Author: Sven Wegener gentoo org> AuthorDate: Thu Jan 4 23:16:48 2018 + Commit: Sven Wegener gentoo org> CommitDate: Thu Jan 4 23:18:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f7f30c app-misc/screen: Fix building on uclibc, bug #562752 Closes: https://bugs.gentoo.org/562752 Package-Manager: Portage-2.3.14, Repoman-2.3.6 app-misc/screen/files/screen-4.6.2-utmp-exit.patch | 55 ++ app-misc/screen/screen-4.6.2.ebuild| 3 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/app-misc/screen/files/screen-4.6.2-utmp-exit.patch b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch new file mode 100644 index 000..11adf69a536 --- /dev/null +++ b/app-misc/screen/files/screen-4.6.2-utmp-exit.patch @@ -0,0 +1,55 @@ +From 2f1b9dfe03133c9b77ea450aed088d65128dc547 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?=+Date: Tue, 5 Apr 2016 12:47:08 +0200 +Subject: [PATCH] check if we have ut_exit in utmpx struct + +--- + acconfig.h | 5 + + configure.ac | 4 + utmp.c | 2 ++ + 3 files changed, 11 insertions(+) + +diff --git a/acconfig.h b/acconfig.h +index 656e117..d173c9c 100644 +--- a/acconfig.h b/acconfig.h +@@ -215,6 +215,11 @@ + #undef HAVE_UTEMPTER + + /* ++ * Define if your utmpx has ut_exit struct ++ */ ++#undef HAVE_UT_EXIT ++ ++/* + * If your system has the calls setreuid() and setregid(), + * define HAVE_SETREUID. Otherwise screen will use a forked process to + * safely create output files without retaining any special privileges. +diff --git a/configure.ac b/configure.ac +index 1a75020..8457619 100644 +--- a/configure.ac b/configure.ac +@@ -374,6 +374,10 @@ if test "$have_utempter" = yes; then + AC_DEFINE(HAVE_UTEMPTER) + LIBS="$LIBS -lutempter" + fi ++AC_CHECKING(ut_exit) ++AC_TRY_COMPILE([ ++#include ++],[struct utmpx u; u.ut_exit.e_exit;], AC_DEFINE(HAVE_UT_EXIT)) + + dnl + dnl signal handling +diff --git a/utmp.c b/utmp.c +index da8d7ff..c864d07 100644 +--- a/utmp.c b/utmp.c +@@ -381,7 +381,7 @@ static int pututslot(slot_t slot, struct utmpx *u, char *host, Window *win) + struct utmp *u; + { + u->ut_type = DEAD_PROCESS; +-#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) ++#if defined(HAVE_UT_EXIT) + u->ut_exit.e_termination = 0; + u->ut_exit.e_exit = 0; + #endif diff --git a/app-misc/screen/screen-4.6.2.ebuild b/app-misc/screen/screen-4.6.2.ebuild index 01169b42901..7b571355fa9 100644 --- a/app-misc/screen/screen-4.6.2.ebuild +++ b/app-misc/screen/screen-4.6.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,6 +35,7 @@ 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 ) pkg_setup() {