gentoo auto-resync : 23:02:2024 - 23:40:53

8 files changed, 225 insertions, 2 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2f4e69efe776..8fa996a6d85a 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index aad421e2375d..128b2150de23 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -9,6 +9,7 @@ AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b
 DIST screen-4.9.0.tar.gz 798229 BLAKE2B 0f64a14ce9a719bd4a6d045c55069769045a09ee2086c44c2e3d9da6d1e5ada2f094e00e16029767e1155ce35d4f360d0e2879995eefa052f3214ced71b7617c SHA512 18bbb085d77ecd02cbc02fa88a945c39f06e0c6de4eeaa16b278440dac5c9896811abbe0838144e997cd344ae08b9530399fa8fcb31a65fc571ead90e8307f84
 DIST screen-4.9.1.tar.gz 1040785 BLAKE2B 27d9c100bc1f747e39e109a4957702388d943c7d3b75b4c59dfc3894456d5249257742106fb24cf6f07a36764db0a1c5f7e0a44123edda1c570d771d7f46c638 SHA512 1f278313528815f4246bb162ced611c5d77321d11055e8d853168dc804c75d5f78568056a23e46db0640e1605e5cad4a5ce05e95e50cf02bb322cb6f57e5a126
 EBUILD screen-4.9.0-r3.ebuild 3900 BLAKE2B 9beb03ca53bfcf3e1c9a1dae44dd1a4cdcc7fa1e9857f43dfa1a8c70c13460714a362132433b1c39a816bb5c52b7b4bba57453e4d68d9781d6745a94e379898a SHA512 44a0d22fab59608e63713ec2cb4bbc2f951fdec1e35cbe6982d5a67f3a95ccb3278962482d2adbc45032975084f8858d9ed5df2db903420f7661dad828c8cc86
+EBUILD screen-4.9.1-r1.ebuild 3771 BLAKE2B f93bb9ea4febd03462f0eff63c7a8b4a4067f3c17e520edc7837bbb19452650d4bad40e933708ca0544597b540851ac128f9641bde8bf4c46fcfd9dfac8e4730 SHA512 bc9b6377c304fb48ddb8f8565e5fdb8ebceffae5367dea294c7350760c2061ee3a60c2103ca7784a11ea6aa55c4fef00670e92a9cc3b6d59315a9206fecba0e9
 EBUILD screen-4.9.1.ebuild 3745 BLAKE2B e942b43e0a257eaf26ac0b302f5c891130fb5fba492d04ec36523043aab64aec7f72be4eaf079d19f6d63e8c5ef4fbb605587126de14ecb9509ca9afcaeedf0e SHA512 1e0996cf7f213fe7378031f50be77f46024f0e32259ad1731a6d2edaef95859a1dd20c4b8704b85a7c4022908156f79515e9b7fc15b44fe65f58e38a763bbf9a
-EBUILD screen-9999.ebuild 3737 BLAKE2B 2baafb117eaf022530aa430d7b9ba7b810e7995dcad916ee4d96cf4ff5933aa437119621a7a8b984148f74277f089fe6b7ab7fbe244411d89f66781bee76f9b8 SHA512 95259ccf47b3f934857cd166b4c8ca9cdef1578d2e130590d60cf72e8be6928998eaa6595a566168c7b976662f4b2507a264414036c13572d845c2f388af9b58
-MISC metadata.xml 1894 BLAKE2B 2312aa5911bfd18b3f9202ccb52afa84f2a29462c8282d36a84fb9624f5ff9bcf3d96e06cace55d542ff7c8182eed5560483717265ecc3fc9218e43bdf9d9094 SHA512 a7c331d1614b5bf139d61a72ad27c070184c208039da97c218b55e07a699d635c0db20ec3792c87d93affa2cb038ae834adcf3dc7c37a4b5c2f8aa36b081cfca
+EBUILD screen-9999.ebuild 3755 BLAKE2B 093bac9a26584d105b678293f1db60ad1932fa1fbd53d97078cf76cf9399d353c28b7a033783bf6224449174e839c460c4d21a6970b51531492914ea7f9fa896 SHA512 a9c0d8082496f37372eb6cc78429f8d4bc6c6739ab8fb2cfd83cb76cd8a0c9c5f2f5abcba25dc7877a4e91c7d3254e77138b951f83f9234c3d1344dec89d12b5
+MISC metadata.xml 1950 BLAKE2B e774b14285910f8641e9f3d2908378af5143497eea9153705452674d3e2c20d685fb5df351ab8d0be3afb9c7c7a626b4c5435b18599b07e1d24d4afe7e19af42 SHA512 48af1b145bbfcff379ff77336cff40ca32de5b5e00dbf275cfafd94d8d2d774a7d3ca741a1ecf79fb5d979f0729fcbf929213dad7f695b16be1bf53bf3771e75
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 @@
     <flag name="nethack">Express error messages in nethack style</flag>
   </use>
   <upstream>
+    <remote-id type="cpe">cpe:/a:gnu:screen</remote-id>
     <remote-id type="savannah">screen</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-misc/screen/screen-4.9.1-r1.ebuild b/app-misc/screen/screen-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..30f16f08c059
--- /dev/null
+++ b/app-misc/screen/screen-4.9.1-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2024 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.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 [[ ${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-lfs-flags
+	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# enable msg_header by upping the feature standard compatible
+		# with c99 mode
+		append-cppflags -D_XOPEN_SOURCE=600
+	fi
+
+	use nethack || append-cppflags "-DNONETHACK"
+	use debug && append-cppflags "-DDEBUG"
+
+	local myeconfargs=(
+		--with-socket-dir="${EPREFIX}/tmp/${PN}"
+		--with-sys-screenrc="${EPREFIX}/etc/screenrc"
+		--with-pty-mode=0620
+		--with-pty-group=5
+		--enable-rxvt_osc
+		--enable-telnet
+		--enable-colors256
+		$(use_enable pam)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	LC_ALL=POSIX emake comm.h term.h
+	emake osdef.h
+
+	emake -C doc screen.info
+	default
+}
+
+src_install() {
+	local DOCS=(
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+	)
+
+	emake DESTDIR="${D}" SCREEN="${P}" install
+
+	local tmpfiles_perms tmpfiles_group
+
+	if use multiuser || use prefix ; then
+		fperms 4755 /usr/bin/${P}
+		tmpfiles_perms="0755"
+		tmpfiles_group="root"
+	else
+		fowners root:utmp /usr/bin/${P}
+		fperms 2755 /usr/bin/${P}
+		tmpfiles_perms="0775"
+		tmpfiles_group="utmp"
+	fi
+
+	newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+	insinto /usr/share/${PN}
+	doins terminfo/{screencap,screeninfo.src}
+
+	insinto /etc
+	doins "${FILESDIR}"/screenrc
+
+	if use pam; then
+		pamd_mimic_system screen auth
+	fi
+
+	dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Some dangerous key bindings have been removed or changed to more safe values."
+		elog "We enable some xterm hacks in our default screenrc, which might break some"
+		elog "applications. Please check /etc/screenrc for information on these changes."
+	fi
+
+	tmpfiles_process screen.conf
+
+	ewarn "This revision changes the screen socket location to ${EROOT}/tmp/${PN}"
+}
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 45e4dc36300a..f7b2fb9bb6fc 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -65,6 +65,7 @@ src_prepare() {
 }
 
 src_configure() {
+	append-lfs-flags
 	append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
 
 	if [[ ${CHOST} == *-solaris* ]]; then
diff --git a/app-misc/siegfried/Manifest b/app-misc/siegfried/Manifest
new file mode 100644
index 000000000000..f85ef3b97afa
--- /dev/null
+++ b/app-misc/siegfried/Manifest
@@ -0,0 +1,5 @@
+DIST siegfried-1.11.0-data.zip 14626213 BLAKE2B 64bdb75c278c7e21ceb96dea7b96b3ba5f2e361ea9123ab14549832545968519b6504f9d6223cbcaa0f4509d2491a6892e8383dc5891ec0b2dec833506c0b968 SHA512 e7fd2e66158efb4016189f2563af0818ced75ac346985806f2eb7e75a208411dcd1adae226957f486809e9904df3750a932bcf62ecc48c16a5a3c363e64f96ec
+DIST siegfried-1.11.0.deps.tar.xz 12660688 BLAKE2B c894faa87fbc8d1a662e0336d59283b70130875b17d82078a630ad663a340efc02d5a392b55e33c16d7f48a1db39f670fcce8d4a69192b4d195eb33229de2b85 SHA512 a7eefd2d9a6743ca0bbd6e8dee59025b0153570729c630606bdfd9239ed7eb40d65d64107da19959d2b6eab31fa59ef5891750788292323dc5aa75eae09682e2
+DIST siegfried-1.11.0.gh.tar.gz 14122315 BLAKE2B 262b73b32d08a2c65cf758321da8c6c7520fddad006f6562b5356282ae25dcca253ce18b73ff11313ff7103b28ae4262ca7aa50437e2ceefe706ce668aaddaac SHA512 fc7b3f42da7a78cc66f9e71586220acefac8986d645aaf0ba6138a46fc3bf125e76a954c95fec74ac6d369b9bdb16090777fe36eadbf4f6ac994623b3529e723
+EBUILD siegfried-1.11.0.ebuild 1423 BLAKE2B 7d761cc5802ff3c6c7f24431e20677e9014ee79ec43b3b2ca1da6bdecc380d1f539d0f8d895ddadc83ce3949af30057f1737cf9c3a90e388354a81fdb5c2618b SHA512 77418db3d0977fecd7c173239efd34cd0f463862bb0546e61f6a3bbf40901681f984a7568ac6102ce90beb552fad46285cba2e26875ea5eae9e8a9a0bba42821
+MISC metadata.xml 336 BLAKE2B a58829456227745c751329cbfc76aed60fac62f4e4b3f49a5df6cb6978bbfccdf2871616c348aa53268cb631d1cf3b46b2896ad60e4e996a55dc307fee6302fb SHA512 170c8f587dfb65c718a9e7cd334595c718e39ae0a2a0baee2b621e32cf0d360c33bfeddf8260a11d373bc4cd5e070210730e46e6ee8dd96085e438896124a766
diff --git a/app-misc/siegfried/metadata.xml b/app-misc/siegfried/metadata.xml
new file mode 100644
index 000000000000..deee7035f1c8
--- /dev/null
+++ b/app-misc/siegfried/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">richardlehane/siegfried</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/siegfried/siegfried-1.11.0.ebuild b/app-misc/siegfried/siegfried-1.11.0.ebuild
new file mode 100644
index 000000000000..3c1e49b97832
--- /dev/null
+++ b/app-misc/siegfried/siegfried-1.11.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Signature-based file format identification"
+HOMEPAGE="
+	https://www.itforarchivists.com/siegfried/
+	https://github.com/richardlehane/siegfried/
+"
+SRC_URI="
+	https://github.com/richardlehane/siegfried/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	https://github.com/richardlehane/siegfried/releases/download/v${PV}/data_1-11-0.zip
+		-> ${P}-data.zip
+"
+if [[ ${PKGBUMPING} != ${PVR} ]]; then
+	SRC_URI+="
+		https://dev.gentoo.org/~mgorny/dist/${P}.deps.tar.xz
+	"
+fi
+
+LICENSE="Apache-2.0"
+# vendored deps
+LICENSE+=" BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+	go build -v -work -x "${S}"/cmd/roy || die
+	go build -v -work -x "${S}"/cmd/sf || die
+}
+
+src_test() {
+	cp "${WORKDIR}/siegfried/fddXML.zip" cmd/roy/data || die
+	go test -v "${S}"/cmd/roy || die
+	go test -v "${S}"/cmd/sf || die
+}
+
+src_install() {
+	dobin roy sf
+	insinto /usr/share/siegfried
+	doins "${WORKDIR}/siegfried/default.sig"
+	newenvd - 99siegfried <<-EOF
+		SIEGFRIED_HOME="${EPREFIX}/usr/share/siegfried"
+	EOF
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "We use SIEGFRIED_HOME environment variable to point Siegfried"
+		elog "to the signature file.  Please source /etc/profile to make it"
+		elog "work.  If you would like to use another home directory, check"
+		elog "the -home option."
+	fi
+}