diff options
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/Manifest.gz | bin | 49775 -> 49768 bytes | |||
-rw-r--r-- | app-misc/detachtty/Manifest | 4 | ||||
-rw-r--r-- | app-misc/detachtty/detachtty-11.0.0-r1.ebuild | 30 | ||||
-rw-r--r-- | app-misc/detachtty/files/detachtty-11.0.0-clang16-build-fix.patch | 43 | ||||
-rw-r--r-- | app-misc/detachtty/metadata.xml | 3 | ||||
-rw-r--r-- | app-misc/jq/Manifest | 6 | ||||
-rw-r--r-- | app-misc/jq/jq-1.7_rc1.ebuild (renamed from app-misc/jq/jq-1.7_pre20230210.ebuild) | 22 | ||||
-rw-r--r-- | app-misc/jq/metadata.xml | 2 | ||||
-rw-r--r-- | app-misc/screen/Manifest | 2 | ||||
-rw-r--r-- | app-misc/screen/files/screen-4.9.0-clang16-chmod.patch | 12 | ||||
-rw-r--r-- | app-misc/screen/screen-4.9.0-r3.ebuild | 148 |
11 files changed, 253 insertions, 19 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 714faa085ad1..c9581d7e6126 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest index 0b4bf6bb8f2d..9a924ac8d95a 100644 --- a/app-misc/detachtty/Manifest +++ b/app-misc/detachtty/Manifest @@ -1,4 +1,6 @@ +AUX detachtty-11.0.0-clang16-build-fix.patch 810 BLAKE2B 9583e3c87803b78ffba6d86cf3786be0eacca2a186d6e5fd612157355ae22003d28139b541ef96de3342c7560ca4accda9ea62fd4f40a0f63bca97404993e4c9 SHA512 6ba2ba204097e756609c2c9af17b53a49d87cc45ab2a79d3fa775367ffc6920acba8c4c5f5760a3bf567dd961f1b41b79abefaad8db238dbab69fc812727babe AUX detachtty-11.0.0-sparc.patch 2669 BLAKE2B c1912520e5e7388bd905059a0d3f0d28726533884c4eafa89b1f6800feb2e05740dd96ee0b501f76d4f2329cf0e49b7b349d6990e12c359be13615f84e77670b SHA512 b62b7f809d79ba8f391f4f3b0c84eb969884b9de1f8ef27a50e1af84f6fe6f699c17321a6f4b225ae8c64d463c090a1bb5d105bf450a01aec4ccf8bb189449f5 DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10 +EBUILD detachtty-11.0.0-r1.ebuild 681 BLAKE2B 61382cb119e896487f13e974751c3a0b7f258c717f1595bfb5167f0c96f795b6d5fe5cfe13a5f6761ab4bc0b758f9eb15c3f330ce4631ca42612f167e0c723bd SHA512 70ffe9f2a4d6f4f683a546367797997951551a942c3f8a31b54f2682af019976b10a707347c4df16b3a9b5685af26d8901ba411460197e048df26ede575a00e7 EBUILD detachtty-11.0.0.ebuild 632 BLAKE2B 0a118db31a6f4dc05bb848f53d1949728deaa4956458bd9ca0848f16e49516605bc0a7e2ed494d090a16c3b6f6d6a6096ff0533059cb69df6fb4b9d83108a1c8 SHA512 6cdbf7fcfb37ec030344cf6ac68b544bbe8f68bad4fefde6f565c85a7ccc9cea6c825a09c0cd96bf7c6539c4019c665548d4a9971a81e2a00ea504417ca55b2f -MISC metadata.xml 722 BLAKE2B 37cae352305296b27699d3259b62de49d3e418e3d10edd854ff9f8ad8eb1aef245242bdf386e300d0426d21f184c8c5d64fe4eec7ffa7de4a6e156b5d0b0294f SHA512 07d6b9a618776747b6cdaa0d80abd0e8ad2d7dee3314ef16609aea1bfad9cc98acfa86879b02b53e98a1f3adf87b8a8790563761d39d0899d377a699f89588e1 +MISC metadata.xml 805 BLAKE2B 7414ac0367f4111cd0e453909bcc8ea89b921f0ef5c4bed76bf8751f2965eff639c1d0122605fe9e1383d16df8002f5235f0196cec6b8fe879c36e65c25a2a23 SHA512 311aec96e3feda42a65a924c56107f6e0b303e8bd1f702ca73557dbaeb6499cdc5bc062c5794a89c618312e558e66e4b0e9ff42d0667ccdd13389d92a353906f diff --git a/app-misc/detachtty/detachtty-11.0.0-r1.ebuild b/app-misc/detachtty/detachtty-11.0.0-r1.ebuild new file mode 100644 index 000000000000..48a44f103550 --- /dev/null +++ b/app-misc/detachtty/detachtty-11.0.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Attach/detach from interactive processes across the network" +HOMEPAGE="https://github.com/cosmos72/detachtty" +SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" + +PATCHES=( + "${FILESDIR}/${P}-sparc.patch" + "${FILESDIR}/${P}-clang16-build-fix.patch" +) + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + dobin attachtty detachtty + doman "${PN}.1" + dosym detachtty.1 /usr/share/man/man1/attachtty.1 + einstalldocs +} diff --git a/app-misc/detachtty/files/detachtty-11.0.0-clang16-build-fix.patch b/app-misc/detachtty/files/detachtty-11.0.0-clang16-build-fix.patch new file mode 100644 index 000000000000..62a3cc1c3eb1 --- /dev/null +++ b/app-misc/detachtty/files/detachtty-11.0.0-clang16-build-fix.patch @@ -0,0 +1,43 @@ +Bug: https://bugs.gentoo.org/894544 +Upstream PR: https://github.com/cosmos72/detachtty/pull/6 +--- a/attachtty.c ++++ b/attachtty.c +@@ -22,6 +22,7 @@ + + #include <errno.h> + #include <time.h> ++#include <string.h> + + #include "config.h" + +--- a/config.h ++++ b/config.h +@@ -24,7 +24,7 @@ + #define DETACHTTY_CONFIG_H + + #include <netdb.h> +-#include <sys/poll.h> ++#include <poll.h> + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/un.h> +--- a/copy-stream.c ++++ b/copy-stream.c +@@ -23,6 +23,7 @@ + #include <errno.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <string.h> + + #include "config.h" + +--- a/detachtty.c ++++ b/detachtty.c +@@ -26,6 +26,7 @@ + #include <sys/stat.h> + #include <pty.h> + #include <fcntl.h> ++#include <string.h> + + #ifndef UNIX_PATH_MAX + # define UNIX_PATH_MAX 108 diff --git a/app-misc/detachtty/metadata.xml b/app-misc/detachtty/metadata.xml index 42ebc5a05cc5..583880214955 100644 --- a/app-misc/detachtty/metadata.xml +++ b/app-misc/detachtty/metadata.xml @@ -15,4 +15,7 @@ concept to GNU Screen but is better suited toward scrolling interfaces (not full-screen, random-access based applications). </longdescription> + <upstream> + <remote-id type="github">cosmos72/detachtty</remote-id> + </upstream> </pkgmetadata> diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 3ab419e0dce4..506621a14e87 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -9,8 +9,8 @@ AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85 AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480 DIST jq-1.7_pre20201109.tar.gz 1181867 BLAKE2B 9db187ab927b635c43fbc6191aeffa00451b12253ae023bbabe6fba5fdf8fb393f8450ee2011ef58cb93e2f27994d454fac967984a721439aaac93259c02f7f1 SHA512 f2997d70edb36d0a23b71a7d933a763cedd7c74ffa3129c2a6cb7189aaff1c5095cdc51062b7cd119324ec2c83ebae6ff0b7da3941315303b7a31146b9eb285a -DIST jq-1.7_pre20230210.gh.tar.gz 1197799 BLAKE2B f4e90f78aa5afec88a4fc60f7a6f05f892647fcd9b59e67ea4727bb452eceead05b8cbe18b814d05665c5fadf8aaddc0cc9a06f2cb102c82503f857d0b70a485 SHA512 e7533c1dd53dad398c50b4cf37cef5d60f95eeee040d1c1ab776778fa14a093167500e1d99d71b22edc5f476079bad503c9c17f54fffefee0c5eb41b86bab406 +DIST jq-1.7_rc1.gh.tar.gz 1229662 BLAKE2B 3df964681eb8efbbab5932a5d58a3242cef5dfd9edb0486b7156f69aabbef33ee72141de14725ad2ea033bfb0dc4d3f29aa67f6ac2322ff474ba3bcceee78bd0 SHA512 c33ce7f7526d9d962c5507c9840da2a78c46e1c3b0e8b14a0e2185f4ed9d1b468f91e88bebfbf335a3cee40d357b9c30fb5b63ff780e448f8c5d4f7cc9393d95 EBUILD jq-1.6-r3.ebuild 2000 BLAKE2B e3d647a6c444db493d291f586d2accd96c34df232dcffc6137e66bbd7cbf7d164dac43d5d783e2666e6ff1135f9583dd2b1a48826808058295abf7c1ff2a311c SHA512 746bbeff6451adbd25916d5c0aad6630a5c2728841731d918b29bf7e4ea679b36b0b61489c8e5aa5bdd8e0a093b117fe04788a4046bbfc39039cb5c510e7cd69 EBUILD jq-1.7_pre20201109-r1.ebuild 2438 BLAKE2B b25860c0d8eb96b90fa79cfbe7f3fdc23b6376d0142dbc0fee9224aa3793c64d4345c18d49e88440884432885d68facef23724fbc279559f81d44fa835e1e821 SHA512 965be67264be11a74a2ce6486c2271062731eda59eadfd470a8fc29aac93d3c7bcb9fe677551926b9e14111cdc97205e5f1345b74bc3c949c148076d242b2813 -EBUILD jq-1.7_pre20230210.ebuild 2611 BLAKE2B 63f88fe5bcd8b23205c003b39e3ec0be2c98c5c77e666da72f5a457c335b1c142dfac787c67b139847a60dd229133cb2541fd9d08df10371dd1febb03fdd5abd SHA512 1f647c7dd676091680cdb97bd44740bbebcd8f2d146f4ab40a12cf43cc8953937bd38d887e12e737e0e56a439b62c57e6da825d02a092d8e5a51e7864479d5a4 -MISC metadata.xml 621 BLAKE2B 25da1d13b32964ec540f4e25f8d29807e5f954d3e47ace2143abfdd192382153e05947c4ccae46dd3c3608cc083ad1701f6aa66ab3b6b3c6866e858eab342be5 SHA512 955c6e85739c4b46f02e9f194a7534cd90e098014ee8df42587d3bc357ee25da45db830ea2736724c7f962b137e604b9818c7fe6c4427dadbb9d58ef4682da2b +EBUILD jq-1.7_rc1.ebuild 2306 BLAKE2B d2d1e5344732ffb13d6c920bb12cf8b51e47160eee3df54923a768c2a1d8f31e36fdd0b2973b98362e6d45bd53933563f04e5d9e5d5f70cc337db07a5b01f7f3 SHA512 49e50dc70af4be20a0f7837301826dcdb79644e6c66acc10bcf238855f898beda686089281182f4b4c9ef15dc30f8f7834721c6b9c2802f6f4bfa8af8bf1d9be +MISC metadata.xml 619 BLAKE2B 07d8852baec2c77bdef39bd1bb742ce1148dfdde1c76af80727ea7dda9ebfdc61ee24e3992c3f868c312fb258b8f7a2064996b3a609a801eaeabe09b7a10f6a0 SHA512 10824dca3462dcf96b2025d71f47dbddb3b1fa7ba864fcb5d0a7782423213323143c7c224174b1ac9d69e0c1094285286c213809f023d25542a865fc064d1b04 diff --git a/app-misc/jq/jq-1.7_pre20230210.ebuild b/app-misc/jq/jq-1.7_rc1.ebuild index e9939d011f3a..ff2204b79fda 100644 --- a/app-misc/jq/jq-1.7_pre20230210.ebuild +++ b/app-misc/jq/jq-1.7_rc1.ebuild @@ -5,20 +5,19 @@ EAPI=8 inherit autotools -COMMIT_HASH="cff5336ec71b6fee396a95bb0e4bea365e0cd1e8" - +MY_PV="${PV/_/}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="A lightweight and flexible command-line JSON processor" HOMEPAGE="https://stedolan.github.io/jq/" -#SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" -SRC_URI="https://github.com/stedolan/jq/archive/${COMMIT_HASH}.tar.gz -> ${P}.gh.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT_HASH}" +SRC_URI="https://github.com/jqlang/jq/archive/refs/tags/${MY_P}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${MY_P}" LICENSE="MIT CC-BY-3.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos ~x64-solaris" IUSE="+oniguruma static-libs test" -ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/ +ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.9.3' # Keep this in sync with bundled modules/oniguruma/ DEPEND=" >=sys-devel/bison-3.0 sys-devel/flex @@ -32,11 +31,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch "${FILESDIR}"/jq-1.7-runpath.patch - "${FILESDIR}"/jq-1.7-warnings-r1.patch - "${FILESDIR}"/jq-1.7-visible-null.patch - # https://bugs.gentoo.org/776385 - "${FILESDIR}"/jq-1.7_pre20201109-no-git-bdep.patch - "${FILESDIR}"/jq-1.7_pre20201109-fix-configure-test.patch ) RESTRICT="!test? ( test )" @@ -52,11 +46,11 @@ src_prepare() { # exists; save the cycles by nuking it. sed -e '/modules\/oniguruma/d' -i Makefile.am || die rm -rf "${S}"/modules/oniguruma || die - sed -i "s/^jq_version: .*/jq_version: \"${PV}\"/" docs/site.yml || die + sed -i "s/^jq_version: .*/jq_version: \"${MY_PV}\"/" docs/site.yml || die default - sed -i "s/\[jq_version\]/[${PV}]/" configure.ac || die + sed -i "s/\[jq_version\]/[${MY_PV}]/" configure.ac || die eautoreconf } @@ -85,7 +79,7 @@ src_test() { } src_install() { - local DOCS=( AUTHORS NEWS README.md ) + local DOCS=( AUTHORS NEWS.md README.md SECURITY.md ) default use static-libs || { find "${D}" -name '*.la' -delete || die; } diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml index aa4e2e57a5ad..c62cb69977a6 100644 --- a/app-misc/jq/metadata.xml +++ b/app-misc/jq/metadata.xml @@ -14,6 +14,6 @@ </use> <upstream> <remote-id type="cpe">cpe:/a:jq_project:jq</remote-id> - <remote-id type="github">stedolan/jq</remote-id> + <remote-id type="github">jqlang/jq</remote-id> </upstream> </pkgmetadata> diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 7c8c94e057ec..79ddfa76e291 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -1,11 +1,13 @@ AUX screen-4.3.0-no-utempter.patch 341 BLAKE2B 3339783b3574f82f093c82a613ad18c5c58c184c082c2c311281cdd57e7176abae0f5935466a4a8b4d931d1d1b93d8f0a4e6b558a268553af4a0170061e6ebfe SHA512 f4191ba1ecac3076f958f56309c0a1d523b455fa4e3388f1cfca59c8ccff0afdfb20ef18d54794ba539b2b6d1511ed599dc44787344dc5ccce2902c9b9848155 AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd899a7917954702ece0837099639079a746138374cbeaf71072cca64ae36a3c2a32250123c6747089e724272227e0dd SHA512 0e7c6c224f6fb8e01650b778cb2b155942752504dc97112d9594b7fa0da1bb8bd828240a2519b1c21f1c162181da89a8daa51ef7f74c8ced0b85cdb3e911a67c AUX screen-4.9.0-CVE-2023-24626.patch 1039 BLAKE2B ba35a0be4d75b02f08d29f0c135103213cc2d875cd4bbd39cd8ae7cc000eb7fb1b0671844220e0bb6ec48283d1c265c4ea889d82e5882af60c8472d71c57c6f9 SHA512 591599518c2a6505b2407834e9c676d8269eb5f2e8165e113885ee5e18a9176b5e0fc99c8a827f672126212c58257a7a5d852a484a46414026e0960c7e233315 +AUX screen-4.9.0-clang16-chmod.patch 303 BLAKE2B c55b727ca1d7a7acd758c1f123467d53e4d0f4909097f3c560b78910555f0312b9844ca202163c00bea36964c0fbbee6d5634e9926948aca628328ef1f9e0eee SHA512 8ccd19b9462514f6d91c5a3d7be69d808c2011e02ce0000b6730497ea2639a2ea5d0769e52bf0764d3e5e39ec01bcc965222928c89a2873995fb1d09051aee91 AUX screen-4.9.0-configure-implicit-function-decls.patch 16667 BLAKE2B 6079042dae21c51b81176aadf27314cf0502fcee995bd9668102bc114ac0c2fdb6587fe2c647cbd92d994cb9b6fdba9e259a1f0a6bd7cf7d7905c3f7e36e8aff SHA512 c9ff18fccba0a0ed19e64509ea128b91bbb6fac405e8395ce724435f1af2f2015f645342aa1fc1b4cb023927412db6e1c242c8060a81deab2a8c064523dedd4d AUX screen-9999-no-utempter.patch 465 BLAKE2B be4d690d2f478a2660cb3c0b0f83d9a62328b82b06b85860a84e1b3a924c751080d7e9f35c4b48c3fe6a0152ae75df1dc665b97f8bc70e026bbadd19d4891df1 SHA512 c011936e35e04e7704b0d8d7892f2ebe22fb6993241e7c4b6733e48f6400ca8aeb20c638108018fab006e402332460e89d321e2118f564316e3f7e26a05212d2 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84 EBUILD screen-4.9.0-r1.ebuild 3799 BLAKE2B 9122bd6fe28ed527d67e39ff496ea5250160aeb434339c40a61ab247474574c46d837af4104e5708bfbef5e293647e0a407ac4b4d6ab0ec34a0b0430b4bb4385 SHA512 b47d14da8ff0ff3daf772dbfcc3820d40e5bb38be6445912e460e0f61cb615adffc174e03f52b69337c7a710cfe60275e636f0d882e350ef723712531ac9f2a9 EBUILD screen-4.9.0-r2.ebuild 3853 BLAKE2B 80cb85fffcb64598b4fa69753b72e460e47e953bcef070b35d2e34ac851cfd5e51f2d5cac74a73598abf3d967866e1306a7db81f64c7cc3a12813d95dde54ac0 SHA512 fb77ebc81eee36b71b7667ff2bac1d6e132eebeebd5b127c467ae9cf0c1a2237601ff4140b2ff96fd457b4cdc9144cf89d30b4efdd23874c8e45f4c42aaa89b7 +EBUILD screen-4.9.0-r3.ebuild 3908 BLAKE2B e92d53fe269ecdfea1b9c7d2a8bc76edb19c2ca07873898ad6af95307ff940bd150102d4879c6ff1accaf486e6a5508cc005c6a27b1aa037e92a13fc6bcc4ccc SHA512 de4a3debc5546cb6ebfbac88422d2b13af9710f7c302ff0dcdb1c01527aa3648c1eb93ce4a7c843d59678eedcf4c4245425cae2eab7c33e9fdc3c0ae3ce23813 EBUILD screen-9999.ebuild 3737 BLAKE2B 2baafb117eaf022530aa430d7b9ba7b810e7995dcad916ee4d96cf4ff5933aa437119621a7a8b984148f74277f089fe6b7ab7fbe244411d89f66781bee76f9b8 SHA512 95259ccf47b3f934857cd166b4c8ca9cdef1578d2e130590d60cf72e8be6928998eaa6595a566168c7b976662f4b2507a264414036c13572d845c2f388af9b58 MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca 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 000000000000..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 <sys/types.h> ++#include <sys/stat.h> + #include <signal.h> + #include <fcntl.h> + #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 000000000000..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} != 9999 ]] ; then + SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~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}" SCREEN="${P}" install + + local tmpfiles_perms tmpfiles_group + + if use multiuser || use prefix ; then + fperms 4755 /usr/bin/${P} + tmpfiles_perms="0755" + tmpfiles_group="root" + else + fowners root:utmp /usr/bin/${P} + fperms 2755 /usr/bin/${P} + tmpfiles_perms="0775" + tmpfiles_group="utmp" + fi + + newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" + + insinto /usr/share/${PN} + doins terminfo/{screencap,screeninfo.src} + + insinto /etc + doins "${FILESDIR}"/screenrc + + if use pam; then + pamd_mimic_system screen auth + fi + + dodoc "${DOCS[@]}" +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Some dangerous key bindings have been removed or changed to more safe values." + elog "We enable some xterm hacks in our default screenrc, which might break some" + elog "applications. Please check /etc/screenrc for information on these changes." + fi + + tmpfiles_process screen.conf + + ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}" +} |