gentoo auto-resync : 11:02:2025 - 00:12:37

4 files changed, 43 insertions, 8 deletions

diff --git a/net-misc/scponly/Manifest b/net-misc/scponly/Manifest
index 599524a8a4d3..a9a0a0a120e9 100644
--- a/net-misc/scponly/Manifest
+++ b/net-misc/scponly/Manifest
@@ -1,6 +1,7 @@
+AUX scponly-4.8-C23.patch 788 BLAKE2B 0e17192178f17143274dedc1efe131cae886d713549f158edd2904b8154f15de870fd8b8994407c8ed1a7f64394d5f20553479befb68b8cd88e3cc40f187db4a SHA512 b56fe9af6873a47daf978748a1b2e185bae285cb6f247483179857614c46a4549d0409b58bb583777940cfe7cd40959aeffbac3a60bfa561a05ba5b53f65ffbb
 AUX scponly-4.8-gcc4.4.0.patch 555 BLAKE2B 0eff2d5cd94f60540dd1bbb6b6f9f1486abbb25e4a32d6eab5c94e55a3d14b77e4724b7c1e70f8a39369becc554d20953bc9f43d44923582f41ed02adc37f665 SHA512 fd9727364591d528e17845eb3e103728382fa7b476b9c0331f16f3e09dc469df7068412047a30b554578887e7897e80574ac820314ec0dae5d58909e3bb5f7de
 AUX scponly-4.8-rsync.patch 7838 BLAKE2B 1d6191aee86b0e3e75e527dbb1f8dbf631940a34da3f29f36b0e55577555dc9ad02e2e787a8cd53aeab5a28d93da7dd528a486f1133fd7a04b91971774b4b2a1 SHA512 37885c9b46422ac034182f9c9f230b4e806ce8c894ebb6c621f0e2b3d5f46c91db902c2dae6aefe5471907025d400320e4eff37cc7c5cc4c6f7d8c88a38e53f8
 AUX scponly-4.8-sftp-server-path.patch 2692 BLAKE2B ead282d46cb25a6d8606fa65e538142c15dd0be82956c2c8a48c7d46cc9ec59605a4f1c10fc5235acb584945b00ee4c187391d198571d841b45225c328765b49 SHA512 86171549d894426d12eb2f8d65959d1be2e137327c135be31c762820a55256f5c4ac90a01f989c8bffd2b46b275de408912306209b5aba9a94b81dbc06ff5a24
 DIST scponly-4.8.tgz 101687 BLAKE2B aa7250464fa3b51a439d35418c64d49f8595eaac6ffe710137c7c53b96bcf66a5ead38e9520b2cead7a829b57520f988f873eb713d5f52045cba4ef02c8e9b61 SHA512 134c008a7377cef7b8e0be483df8413e162a515967147f561d23b72bdef3dfbe70a8313811dfff6372b88f15c1ac8a4385831fcf329261276993c64d5040f29b
-EBUILD scponly-4.8-r8.ebuild 6944 BLAKE2B d28b0a4a066ea4cb345d4e7a1219de4b932f6e95bfab5cf968e0025420242909ec0d46e69d7ba8cd276fb10ec2e83021f17ec5c542b1b39cfde154a3febbefa9 SHA512 fbfb223bf0ed14e2632224d590363a9083b519ea3a16569c8e5dfa4cf676e550d801134ff40364af782df147ea7547edb0f48942faeda32fc328089fb1de8ca2
-MISC metadata.xml 1761 BLAKE2B a2fbdcc0e9b89e85180548a97a12eeb27a5d973673451972c32184dfc932d6634950e0620fa2a1e2962d8a08508c31439f9a3e29a6e2a3e4f76d53933ac425e5 SHA512 bdfe9ab129bc9c939850756b23510c91908c21aa417529501b2ada83a30335ce4446f5bbc6dcb728df09e1b27d4cf7ba4eee4f43b96a1b92c0ea476d05ca7592
+EBUILD scponly-4.8-r9.ebuild 7021 BLAKE2B 719addadd400fab7615cc2889f958092db87c97c453deae383e351f48d207a65ea50ac0061e7edd7cbdc12a829d00f5bdeb9f789010ae5e56a8516e00178887d SHA512 fea34003aef58478d02e77e97f5a759ca339522baf4aaa50e472f074f81d851ffa0efca7d5ffdd44897463687daa5f46d4a468754129e2452279ee5db5b75384
+MISC metadata.xml 1816 BLAKE2B 3fe231b9ced26d79b296de4230f5dee7a13414dfad5ef683fec8c993099c59a5ace44b2741b29915b6b4e557b9604b0cd7e4614a3b361880df043412a3ec2112 SHA512 ef9efd06597dfe02ae896b37f9ad94ff3742d0c82a05bccef4f1f70c0561056879f46efe94ff318fc7735e945d6d94c9200977ae2b2d5164ae0ce28c8c8989db
diff --git a/net-misc/scponly/files/scponly-4.8-C23.patch b/net-misc/scponly/files/scponly-4.8-C23.patch
new file mode 100644
index 000000000000..113451e75aab
--- /dev/null
+++ b/net-misc/scponly/files/scponly-4.8-C23.patch
@@ -0,0 +1,26 @@
+diff -ru a/helper.c b/helper.c
+--- a/helper.c	2025-01-10 17:16:03.332900358 +0400
++++ b/helper.c	2025-01-10 17:17:24.801652374 +0400
+@@ -1,7 +1,9 @@
+ /*
+  *	helper functions for scponly
+  */
++#define _DEFAULT_SOURCE /* for strsep */
+ #include <stdio.h>	/* io */
++#include <strings.h>	/* for bzero */
+ #include <string.h>	/* for str* */
+ #include <sys/types.h>	/* for stat, getpwuid */
+ #include <sys/stat.h>	/* for stat */
+diff -ru a/scponly.c b/scponly.c
+--- a/scponly.c	2025-01-10 17:16:03.332900358 +0400
++++ b/scponly.c	2025-01-10 17:18:13.274524840 +0400
+@@ -6,7 +6,8 @@
+  *
+  *	see CONTRIB for additional credits
+  */
+- 
++
++#define _DEFAULT_SOURCE /* for seteuid */
+ #include <stdio.h>	/* io */
+ #include <string.h>	/* for str* */
+ #include <sys/types.h>	/* for fork, wait, stat */
diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
index 3beb7f62de5b..995af96bb41e 100644
--- a/net-misc/scponly/metadata.xml
+++ b/net-misc/scponly/metadata.xml
@@ -32,5 +32,6 @@
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">scponly</remote-id>
+		<remote-id type="github">scponly/scponly</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/scponly/scponly-4.8-r8.ebuild b/net-misc/scponly/scponly-4.8-r9.ebuild
index 93ddd8138d29..2d6d02714439 100644
--- a/net-misc/scponly/scponly-4.8-r8.ebuild
+++ b/net-misc/scponly/scponly-4.8-r9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit readme.gentoo-r1 toolchain-funcs
+inherit readme.gentoo-r1 toolchain-funcs autotools
 
 DESCRIPTION="A tiny pseudoshell which only permits scp and sftp"
 HOMEPAGE="https://github.com/scponly/scponly"
@@ -32,18 +32,25 @@ PATCHES=(
 	"${FILESDIR}/${P}-rsync.patch"
 	"${FILESDIR}/${P}-gcc4.4.0.patch"
 	"${FILESDIR}/${P}-sftp-server-path.patch"
+	"${FILESDIR}/${P}-C23.patch"
 )
 
+src_prepare() {
+	default
+
+	# bug #900316
+	eautoreconf
+}
+
 src_configure() {
 	CFLAGS="${CFLAGS} ${LDFLAGS}" econf \
-		--with-sftp-server="/usr/$(get_libdir)/misc/sftp-server" \
 		--disable-restrictive-names \
 		$(use_enable chroot chrooted-binary) \
-		$(use_enable chroot chrooted-checkdir) \
+		$(use_enable chroot chroot-checkdir) \
 		$(use_enable winscp winscp-compat) \
 		$(use_enable gftp gftp-compat) \
 		$(use_enable scp scp-compat) \
-		$(use_enable sftp sftp) \
+		$(use_with sftp sftp-server "/usr/$(get_libdir)/misc/sftp-server") \
 		$(use_enable quota quota-compat) \
 		$(use_enable passwd passwd-compat) \
 		$(use_enable rsync rsync-compat) \