9 files changed, 96 insertions, 85 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 9bc7caef08b2..e830dac7cf3b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index d577c9330868..ac94eeb8b60d 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,5 +1,3 @@
-AUX less-608-CVE-2022-46663.patch 696 BLAKE2B 3f4ddff375321ec410b12b9dac457536c98a9a3f123e0715dc40cbd0fe85e4b59676767ea6819688338d6280158ae7f04f93bbf283d8616da5021816f4125fa3 SHA512 417c06b1dd7ff764b58b4cc4c93df2d44d224780b5799ecaad50348b4654bd26f181082539855203d9f1e6a928908cdf650269c9998dbd6dab31e5e912d41cfc
-AUX less-608-procfs.patch 1669 BLAKE2B b44ca75d76df10eb65e73230a68d3d8566121f60d0c60ef454bf96d0af9300b0a47aa633860802bfa548c014e2767c1f0cf14b29eff1719d81a6042b0255db28 SHA512 7a08a8935530326edc645ec2db5c089b7989a94cef2bba90da201173089621a1fcbdb333fd519e1ef49b6ebe82a8f725e361b33520bcd9efd3d55d4732d00668
 AUX less-643-lesstest-pkg-config.patch 1483 BLAKE2B 2c0fb65721c2b1c5af74a4fd516d9255059e9aeba7eb91de8aff9d6b35fe708fe275bdde9df6047b6bf4c79534c8410cb946be436a35fe21ce254c87235c6908 SHA512 b6d9911efb20da00f28ceebd922c7f97f7957f964ccb2c50187a52019b35dffaa1e2a7a76cf846ca9f76100af5b2fa38468fb5d49bab9a6b6b02747da2c8f76b
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
diff --git a/sys-apps/less/files/less-608-CVE-2022-46663.patch b/sys-apps/less/files/less-608-CVE-2022-46663.patch
deleted file mode 100644
index a358dd6f1a77..000000000000
--- a/sys-apps/less/files/less-608-CVE-2022-46663.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/893530
-https://github.com/gwsw/less/commit/a78e1351113cef564d790a730d657a321624d79c
-
-From a78e1351113cef564d790a730d657a321624d79c Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Fri, 7 Oct 2022 19:25:46 -0700
-Subject: [PATCH] End OSC8 hyperlink on invalid embedded escape sequence.
-
---- a/line.c
-+++ b/line.c
-@@ -633,8 +633,8 @@ ansi_step(pansi, ch)
- 		/* Hyperlink ends with \7 or ESC-backslash. */
- 		if (ch == '\7')
- 			return ANSI_END;
--		if (pansi->prev_esc && ch == '\\')
--			return ANSI_END;
-+		if (pansi->prev_esc)
-+            return (ch == '\\') ? ANSI_END : ANSI_ERR;
- 		pansi->prev_esc = (ch == ESC);
- 		return ANSI_MID;
- 	}
-
diff --git a/sys-apps/less/files/less-608-procfs.patch b/sys-apps/less/files/less-608-procfs.patch
deleted file mode 100644
index 4f66322b8123..000000000000
--- a/sys-apps/less/files/less-608-procfs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 03f011f219a6d6068c4ccd07dbd8dcd50641ff10 Mon Sep 17 00:00:00 2001
-From: Mark Nudelman <markn@greenwoodsoftware.com>
-Date: Tue, 20 Sep 2022 12:32:30 -0700
-Subject: [PATCH] Fix reading procfs files on Linux: bad detection of
- HAVE_PROCFS.
-
-diff --git a/ch.c b/ch.c
-index bfad09c7..fcf136b9 100644
---- a/ch.c
-+++ b/ch.c
-@@ -28,6 +28,9 @@ extern ino_t curr_ino;
- 
- #if HAVE_PROCFS
- #include <sys/statfs.h>
-+#if HAVE_LINUX_MAGIC_H
-+#include <linux/magic.h>
-+#endif
- #endif
- 
- typedef POSITION BLOCKNUM;
-diff --git a/configure.ac b/configure.ac
-index f7c64814..b10adce9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ AC_SEARCH_LIBS([regcmp], [gen intl PW])
- 
- # Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h sys/ioctl.h sys/stream.h wctype.h])
-+AC_CHECK_HEADERS([ctype.h errno.h fcntl.h limits.h stdio.h stdlib.h string.h termcap.h termio.h termios.h time.h unistd.h values.h linux/magic.h sys/ioctl.h sys/stream.h wctype.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STAT
-@@ -271,7 +271,10 @@ AC_TRY_COMPILE([#include <sys/types.h>
-   [struct stat s; dev_t dev = s.st_dev; ino_t ino = s.st_ino;],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_STAT_INO)], [AC_MSG_RESULT(no)])
- AC_MSG_CHECKING(for procfs)
--AC_TRY_COMPILE([#include <sys/statfs.h>],
-+AC_TRY_COMPILE([#include <sys/statfs.h>
-+#if HAVE_LINUX_MAGIC_H
-+#include <linux/magic.h>
-+#endif],
-   [struct statfs s; s.f_type = PROC_SUPER_MAGIC; (void) fstatfs(0,&s); ],
-   [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_PROCFS)], [AC_MSG_RESULT(no)])
- 
diff --git a/sys-apps/stroke/Manifest b/sys-apps/stroke/Manifest
index c9be8ea8d582..d0dd15ec4cef 100644
--- a/sys-apps/stroke/Manifest
+++ b/sys-apps/stroke/Manifest
@@ -1,4 +1,4 @@
 AUX stroke-0.1.3-missing-header.patch 292 BLAKE2B f079bbc651d5c0b7fc4cd4dd4c2e7b2824de66b0e8380dc2acd0ee55d1414fb7dc175dff1d00e0b70e1472adc6408c16369d9bd03d46af187a2c2cd5da187624 SHA512 2a77155004aa6f860e4aab7b3784444af2604522944fad07b073a97b1bc701d09a00dd514e8c6fa2f4333cebc5f25474123abfa47a9b5056541427aed475abdd
 DIST stroke-0.1.3.tar.gz 180438 BLAKE2B f7b36905707a1a940ea01858562e7b01df5385b67bd7e7c627b9ea7e762d02659c455a25adc43f9a560250243f136101a56b77f9b2dccbb077f8d9238681e178 SHA512 b500f9c158a66f5947a28bf3dbb7caddd20427b4c9bdc2849002995f830019d54a3f0e070e973a0a6475f755ffc14a2995c7c8736c355cf4ae06b22beb07897e
-EBUILD stroke-0.1.3-r1.ebuild 396 BLAKE2B aa03d48eb455b54cdfa06106f3a709c20ffb5999f47ae22528984321c4d1dd2e891396d44cdd8d4a56e86290808c82574aae88a5225a66c2536259f00ad88434 SHA512 4776efcd39d68dcbc693ea4d97810da3a5c0f3a319e6cd4e55e8000cc66310f4b6840a2a70a4b88c35123c6042766ff8a68d1a87553b51baff29ae471f96f02b
+EBUILD stroke-0.1.3-r2.ebuild 463 BLAKE2B 80b9a7bef079aedfe0282e3ea591fc85fb242d5c0294a5fb07827bb26cb45f4ea411515298707f8f4d5af2559e4af45cf651bb52add16f237a96dcaf7ffec894 SHA512 6d7c8509af001b1f6edbde5b6a38729068de9b227566a8a67002d678969f12601e2dbfc306690d4a184683bd064a1e081903a621a8a24f6990a40cfb5053dcfc
 MISC metadata.xml 244 BLAKE2B c476cf4dba0c8a06269dfdd41f6b62521f63aa1b7e1411a76cad5e61a7ffcff7b183f551ca20046d22f7cbfa5915013cf62b8349953fe6c87782e016be8467d7 SHA512 291c752b107732171176597c6927d8e2d5c47cbf8e3cdf662bc5b9b201874d73172903f4fce94b2f5dad14f19c4041ce2a29bc901ebff44ab1922e6589049579
diff --git a/sys-apps/stroke/stroke-0.1.3-r1.ebuild b/sys-apps/stroke/stroke-0.1.3-r1.ebuild
deleted file mode 100644
index 3df34f91f63e..000000000000
--- a/sys-apps/stroke/stroke-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A powerful tool to change file timestamps (including ctimes)"
-HOMEPAGE="http://stroke.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
diff --git a/sys-apps/stroke/stroke-0.1.3-r2.ebuild b/sys-apps/stroke/stroke-0.1.3-r2.ebuild
new file mode 100644
index 000000000000..f2db03b70c44
--- /dev/null
+++ b/sys-apps/stroke/stroke-0.1.3-r2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Powerful tool to change file timestamps (including ctimes)"
+HOMEPAGE="https://stroke.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index fc05fab2cef8..3d7a8c7d3687 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -4,4 +4,5 @@ AUX udevil-0.4.4-no-libtool.patch 223 BLAKE2B d31cc00b2aeb4143a2ce58f36dd13f3701
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
 EBUILD udevil-0.4.4-r4.ebuild 1962 BLAKE2B 88b6ef67e4debbc000d804c720c82fc67c40e9cedab1a86951a05be4807ae19922e92382a207be5d8d292f61ee1ace48bd10f56f9a8ca63ab3ddb33cbdca0f5d SHA512 701adfd668daa884ea4493d4ba1f6ba19bc6ccac3f423ba29bf5d9556a06cecb3cdde9c111a4eafc4535f31c23bd71176979636e5e65a1747fa3d99c8204eddf
+EBUILD udevil-0.4.4-r5.ebuild 2011 BLAKE2B 9052db5fbe49425d93c2d9980e7e55f3ebaac9b5d03bfb6fc7d9d3846807f3eec21e2647e5bf3a4959f28094886d13a50424bc3d279516c5899e29edcf477788 SHA512 1cb1135cdef85b2ac5e9af3abcb02a4c7fa6a76cd184da3b772e99a973a56138348975b9c950abb26462857800a74b36d4ef04884653ca7d4c573f8c3949ab95
 MISC metadata.xml 251 BLAKE2B 244d36e34c1c35dee56280e5a13f35e62d0d58c020930b47ea7eead42fd79d6471732f42b1a1fc3ed08f88aa151a5c63244ae6d3e5d3e8dbeece47c11cbd10c6 SHA512 176a31b5c64dd3158b04a492f26ee65bf653cdd884ed870000ab4a8c22208c33637d44d77b2bac355b7c89125f50299607407dc2ab13797d8e97e30b22a1ef4e
diff --git a/sys-apps/udevil/udevil-0.4.4-r5.ebuild b/sys-apps/udevil/udevil-0.4.4-r5.ebuild
new file mode 100644
index 000000000000..b92ab33e9b0e
--- /dev/null
+++ b/sys-apps/udevil/udevil-0.4.4-r5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info optfeature
+
+DESCRIPTION="Mount and unmount removable devices without a password"
+HOMEPAGE="https://ignorantguru.github.io/udevil/"
+SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	acct-group/plugdev
+	>=app-shells/bash-4.0:*
+	dev-libs/glib:2
+	sys-apps/util-linux
+	virtual/acl
+	>=virtual/udev-143"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# This works for 0.4.4 too, no sense copying the patch
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.4-stat.patch
+	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-0.4.4-no-libtool.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-setfacl-prog="$(type -P setfacl)" \
+		--enable-systemd
+}
+
+src_install() {
+	default
+	fowners root:plugdev /usr/bin/udevil
+	fperms 4754 /usr/bin/udevil
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please add your user to the plugdev group"
+	elog "to be able to use ${PN} as a user"
+	elog
+	optfeature_header "Optional dependencies:"
+	optfeature "Devmon popups" "gnome-extra/zenity"
+	optfeature "Mounting WebDAV resources" "net-fs/davfs2"
+	optfeature "Mounting Samba shares" "net-fs/cifs-utils"
+	optfeature "Mounting FTP shares" "net-fs/curlftpfs"
+	optfeature "Mounting NFS shares" "net-fs/nfs-utils"
+	optfeature "Mounting SFTP shares" "net-fs/sshfs"
+	if ! has_version 'sys-fs/udisks' ; then
+		elog
+		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See https://ignorantguru.github.com/${PN}/#polling"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}