commit: 2b12855fb784504d9bca99f9c7f8f8895ffb7c09 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 18 05:01:51 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 18 05:04:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b12855f
app-misc/screen: add 5.0.1, sync live, drop 5.0.0 * Restrict tests as the situation is a mess w/ screen (see bug 955907 and bug 935755) for bug #956963. * Fix unrecognised configure args for bug #958343. * Security bump for bug #955907. Note that screen-5 has been and remains masked since it was added, so ~arch users were fine all along other than the issue mentioned at https://bugs.gentoo.org/955907#c4. Bug: https://bugs.gentoo.org/955907 Closes: https://bugs.gentoo.org/958343 Closes: https://bugs.gentoo.org/956963 Signed-off-by: Sam James <sam <AT> gentoo.org> app-misc/screen/Manifest | 2 +- app-misc/screen/files/screen-5.0.1-texi.patch | 27 ++++++++++++++++++++++ .../{screen-5.0.0.ebuild => screen-5.0.1.ebuild} | 7 +++--- app-misc/screen/screen-9999.ebuild | 7 +++--- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 382429842a2b..7888a666521b 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,2 +1,2 @@ DIST screen-4.9.1.tar.gz 1040785 BLAKE2B 27d9c100bc1f747e39e109a4957702388d943c7d3b75b4c59dfc3894456d5249257742106fb24cf6f07a36764db0a1c5f7e0a44123edda1c570d771d7f46c638 SHA512 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126 -DIST screen-5.0.0.tar.gz 895882 BLAKE2B 5ff218afc1692ae201776f759ff2217a51dcf02202e4ba5d12de50a768df83e0e2a7a3511a5f85a3b21362892f31a4fd90d6444918915165ae12a8c0c2b3af39 SHA512 18a163313025c58950ec65fa83037ba1df0fa8e2346925593217fb0a6596f2f51914a4f0aec7f0e1c280d3d3ef964e7a886521f41f4b96f4ff08935be7f62117 +DIST screen-5.0.1.tar.gz 897507 BLAKE2B ce8478718903ea4f9f7d5de2c77008cee304fef1065f3d564844844cb3ba7acb88bfe2cda051cecee0f034b19ea4e52a0fcc1549f9339eac33e7748ab59cd0f5 SHA512 9bda35689d73a816515df30f50101531cf3af8906cb47f086d1f97c464cb729f4ee6e3d4aca220acc4c6125d81e923ee3a11fb3a85fe6994002bf1e0f3cc46fb diff --git a/app-misc/screen/files/screen-5.0.1-texi.patch b/app-misc/screen/files/screen-5.0.1-texi.patch new file mode 100644 index 000000000000..2d10b1faf2a1 --- /dev/null +++ b/app-misc/screen/files/screen-5.0.1-texi.patch @@ -0,0 +1,27 @@ +https://cgit.git.savannah.gnu.org/cgit/screen.git/commit/?h=screen-v5&id=7333452aa52d61a170b1fc199869ea6059849058 + +From 7333452aa52d61a170b1fc199869ea6059849058 Mon Sep 17 00:00:00 2001 +From: Holger Hoffstätte <[email protected]> +Date: Thu, 15 May 2025 13:54:44 +0200 +Subject: Fix: unescaped @ in email address + +bug#67126 +--- + doc/screen.texinfo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/screen.texinfo b/doc/screen.texinfo +index b3568b9..76d0588 100644 +--- a/doc/screen.texinfo ++++ b/doc/screen.texinfo +@@ -5940,7 +5940,7 @@ of @code{Screen} which you are using. Also include in your message the + hardware and operating system, the compiler used to compile, a + description of the bug behavior, and the conditions that triggered the + bug. In case of security issue please send an mail to +-@w{@samp{[email protected]}}. ++@w{@samp{alexander_naumov@@opensuse.org}}. + + @node Availability, , Reporting Bugs, Bugs + @section Availability +-- +cgit v1.2.3 diff --git a/app-misc/screen/screen-5.0.0.ebuild b/app-misc/screen/screen-5.0.1.ebuild similarity index 96% rename from app-misc/screen/screen-5.0.0.ebuild rename to app-misc/screen/screen-5.0.1.ebuild index 0b436bb9d018..505c6a74088e 100644 --- a/app-misc/screen/screen-5.0.0.ebuild +++ b/app-misc/screen/screen-5.0.1.ebuild @@ -21,6 +21,8 @@ fi LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux utempter multiuser" +# bug #956963 +RESTRICT="test" DEPEND=">=sys-libs/ncurses-5.2:= virtual/libcrypt:= @@ -33,6 +35,7 @@ BDEPEND="sys-apps/texinfo" PATCHES=( "${FILESDIR}"/${PN}-5.0.0-utmp-musl.patch + "${FILESDIR}"/${PN}-5.0.1-texi.patch ) src_prepare() { @@ -70,13 +73,11 @@ src_configure() { use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --with-socket-dir="${EPREFIX}/tmp/${PN}" + --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 $(use_enable pam) $(use_enable utempter utmp) ) diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild index 0b436bb9d018..505c6a74088e 100644 --- a/app-misc/screen/screen-9999.ebuild +++ b/app-misc/screen/screen-9999.ebuild @@ -21,6 +21,8 @@ fi LICENSE="GPL-3+" SLOT="0" IUSE="debug nethack pam selinux utempter multiuser" +# bug #956963 +RESTRICT="test" DEPEND=">=sys-libs/ncurses-5.2:= virtual/libcrypt:= @@ -33,6 +35,7 @@ BDEPEND="sys-apps/texinfo" PATCHES=( "${FILESDIR}"/${PN}-5.0.0-utmp-musl.patch + "${FILESDIR}"/${PN}-5.0.1-texi.patch ) src_prepare() { @@ -70,13 +73,11 @@ src_configure() { use debug && append-cppflags "-DDEBUG" local myeconfargs=( - --with-socket-dir="${EPREFIX}/tmp/${PN}" + --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 $(use_enable pam) $(use_enable utempter utmp) )
