gentoo auto-resync : 09:05:2024 - 00:01:03

7 files changed, 123 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 89e1a39d0cd2..124ab2a73c65 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/sitecopy/Manifest b/net-misc/sitecopy/Manifest
index 80eef648e6f1..1e5edd80585b 100644
--- a/net-misc/sitecopy/Manifest
+++ b/net-misc/sitecopy/Manifest
@@ -6,7 +6,9 @@ AUX sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch 1671 BLAKE2
 AUX sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch 555 BLAKE2B 6e51ed4d345fe29d56ec4ec2d4e03fef1779103bb5b1ca0bf9202c5274f1703a0dea8253492778c6d0626d1552bbfc1b1a14e1df5f2f14d458cd2f55521bc524 SHA512 28f27d6ccf526a6c4553236b840c2be9430e72ab1f338242737e06715ea01712d75ee030804a9a2df4d5c45728c5909343e4adf435636db968868e86e27551a0
 AUX sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch 1628 BLAKE2B 51f63c89f259b5e3a9c28dab50d563472f8e85a07d11853b076123f58e8abd7eaaa5e8d8d34a5295d0577655069a6e9dc404740566000b7cb160bb4bdf3fb52d SHA512 cdd3abe65fbaadc52caa83641212fd96430df9ea8dfaf08568d63907df3cc87b48b9de0febde545b24722ba7e77c5a8fb4226d8a6dd696b87820dfc1d4fdb6d4
 AUX sitecopy-0.16.6-32-neon-0.31.patch 346 BLAKE2B 7140d51c507ce81e568806e6c3ac3a00cadc0fcc00cfa55150de3718039365b7ca4c79f757331b639c1c182c979288a308241def2c7d03ac7d3b0e64091b6bc0 SHA512 87b2d063b463109351789c259c0d879a96144bf9c27c8a6bd3ddabd21b6b152d73a04a7311e3b17266b42b5c0f30028402b4a8e929154b867a055743a275623c
+AUX sitecopy-0.16.6-33-c99-build-fix.patch 304 BLAKE2B 6bafbaec861af759dcc3de59ee17f78681c2872864a9aeefc20c3cca1c06740e62e90bf496af78ac6f030c8c923f1fef9372702378efed70c723783ffa981ec2 SHA512 3ed2a3e92271f7b85b1d12c478202c7dd19ca4d04a361fd43d123f903f9187b7cf44d3fbdff544ad8191b33856c4e1db618a7d71dca314d4263c65a46d03992d
 DIST sitecopy-0.16.6-04-manpages-addition-fixes.patch 46803 BLAKE2B a5667dac3e81d4c34f97429d952d96d9c5ef813f9ac1eae021a9af795d939546cc77a2bc9831adffe74485a35f2b3fb8a9765a743cbf67198ba4dcc0fca9dd60 SHA512 4d50eee14111dd817e9b484ecad22fe2b5af234d719a732133114fcff47f2dd12557f53f8e65a4e275bf52e4f9709f78e672174ef5195bcb4f9ca9c91976b965
 DIST sitecopy-0.16.6.tar.gz 1022265 BLAKE2B b962f9ebd40da80d4ebb83ea5c7cd9acfcffc49d5c42de4103272f38a1bf4d1c050863fba2861f162c143ed9d082d44a50a1399a044fbbf4e3d9bf4a971b3800 SHA512 9dee1d499d8faf4a3cd91c9e3d47e3b2777f5deac26bb5e8a1d3e988391a1e7188d52338ef2bddbb4e194f50a328ab5c7b54b4964fcaea9d467c924ef9c71734
 EBUILD sitecopy-0.16.6-r2.ebuild 2031 BLAKE2B 2a0a279bfe2359f42ef82f728d3ed6331f1a1d0198148e183326e12a0dcad8a9e5b4bea59887eb1207f5c3a368c48e5d00460da52f0bdfeb93eb48eb066fd170 SHA512 b70a87ea91ff7f1a673bb2e173b61be38d36d1e4fef7ac40cb9a7fdd8048fed8caf8d2c6d0db53cd16a4efeb7561ece0a189366a63a2a3b6292e40e7e4bb3003
+EBUILD sitecopy-0.16.6-r3.ebuild 2092 BLAKE2B 302038aa33cdf50614d8711d2821ea60d2392940090ccc6ac5247535f25ca68db40abaa96b9917d94440be4c41ac24279535ed8ea7da1275aaa7ad0c640442c3 SHA512 cef75500702b7074cbf2264c737daf0e52c1e9893c0d8b0fecfbe7b27088375c0176d1e7495ad75faec5fc0d1c23b049ac52115a6992f47f0328de898f8bf39b
 MISC metadata.xml 612 BLAKE2B 0c206ae7b2894a24efa3c7bf0c98a6d8bc2a4eaae0a4015fd55d793e2cd2462a82c4a0ab4983de7f0dc3ee85eb216d997c73e1fd769d36814ce6393600ae0581 SHA512 026dabe1f9f701a737affa9da967118ab722d49f5ef289fd3ea55147b09326c7223711887c2c8258fcf9fdab775e24f687f773a732c502f602a53184de239dec
diff --git a/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch
new file mode 100644
index 000000000000..59b8e089b5a4
--- /dev/null
+++ b/net-misc/sitecopy/files/sitecopy-0.16.6-33-c99-build-fix.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/921255
+--- a/src/ftp.c
++++ b/src/ftp.c
+@@ -634,7 +634,7 @@ static int dtp_open_active(ftp_session *sess, const char *command)
+     char *a, *p;
+     int ret;
+     int listener;
+-    size_t alen;
++    socklen_t alen;
+     struct sockaddr_in addr;
+ 
+     ret = ftp_open(sess);
diff --git a/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
new file mode 100644
index 000000000000..d309794b2639
--- /dev/null
+++ b/net-misc/sitecopy/sitecopy-0.16.6-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit autotools
+
+DESCRIPTION="Maintain remote web sites with ease"
+HOMEPAGE=" http://www.manyfish.co.uk/sitecopy/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~jstein/files/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="expat nls rsh ssl webdav xml zlib"
+
+RDEPEND="
+	rsh? ( net-misc/netkit-rsh )
+	>=net-libs/neon-0.24.6[zlib?,ssl?,expat?]
+	<=net-libs/neon-0.32.9999[zlib?,ssl?,expat?]
+	xml? ( >=net-libs/neon-0.24.6:=[-expat] )
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# SiteCopy patches are being currently pulled & ported from
+	# http://ftp.debian.org/debian/pool/main/s/sitecopy/
+	# Consider SiteCopy to be more or less being actively maintained by
+	# Debian maintainers, but GPL patches ported into Gentoo.
+
+	eapply \
+		"${FILESDIR}/sitecopy-0.16.6-01-remote-dynamic-rc.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-02-french-po-fix.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-03-wrong-memory-397155.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-06-sftpdriver.c-fix-for-new-openssh.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-10-bts410703-preserve-storage-files-sigint.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-20-bts549721-add-compatibility-for-neon-0.29.0.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-30-bts320586-manpage-document-sftp.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-32-neon-0.31.patch" \
+		"${FILESDIR}/sitecopy-0.16.6-33-c99-build-fix.patch" \
+		"${DISTDIR}/sitecopy-0.16.6-04-manpages-addition-fixes.patch"
+
+	# Source package uses incorrect '/usr/doc' for the doc folder.  So use
+	# sed to correct this error.
+	sed -i -e "s:docdir \= .*:docdir \= \$\(prefix\)\/share/doc\/${PF}:" \
+		Makefile.in || die "Documentation directory patching failed"
+
+	mv configure.in configure.ac || die
+	eautoconf
+	eautomake
+}
+
+src_configure() {
+	econf \
+		$(use_with ssl ssl openssl) \
+		$(use_enable webdav) \
+		$(use_enable nls) \
+		$(use_enable rsh) \
+		$(use_with expat) \
+		$(use_with xml libxml2 ) \
+		--with-neon
+}
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
index c21ca6423c4d..dbcdeea6c227 100644
--- a/net-misc/vrrpd/Manifest
+++ b/net-misc/vrrpd/Manifest
@@ -1,4 +1,6 @@
 AUX vrrpd-1.9-rollup.patch 820 BLAKE2B 4862766d23aa2811023c5f7a37fd3ed08f74701a6b434ae1d6ae84dd1aa72f31d599db6779edd6216fa0e1b499c701f0f442dce7ae150173b74b370e8a03a880 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a
+DIST vrrpd-1.15.tar.bz2 148430 BLAKE2B 787fa185ce64a0711403718b2627d9d2d8867ef3956090b93196f62d92428e0e02ee4440bc23fda46cdca70ca6693b76ed28a5e469a31e86fa4e36dc25c6a82a SHA512 4e7fa17e01d9b667f538204fbe84decea47ac7d84da8adf2e8e3bcf042d233a704a99347d3d97531993f2693c145ff54fb3ac346ade33f5d99cfbbac405ed784
 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b
+EBUILD vrrpd-1.15.ebuild 794 BLAKE2B 2addd7db108ed1f385813c2095019736a85396029eb21691f5a49df0c40bb44caa2cb32fdfb78ecbb548f4e038ba1bf6bacc68a6ca477adcf4057d7ac38ac65d SHA512 f58c6a9e8ec092fcac64c9c160fb856e7380804d0e81336a38f25e5ecae29a8055a3be125b113d9de97aa0b4b78a1e04db71e98b9a3f5416a844201e429c1f34
 EBUILD vrrpd-1.9-r1.ebuild 904 BLAKE2B 55adba87adc1cc1204ca327847e2b492f35e03b10b1c5f56dcf740c78684788ec7dcfb335fde70510d2c17230c231d3d1185b4df831d4b9aef1c0705b21195d0 SHA512 f466c4a4318771247bbada8a8f70563f6c45af1c4b62602ea9757b959c1aa5c563fcc057a335ef83830b9ac93323b8398afa5848a208a0e78d7a9227367d98e5
-MISC metadata.xml 393 BLAKE2B 6d57b9c90d6314c40313182e349c083f87e1683bd00c0ad4002aac743c3a4dcb5f44f4f7dff6d62e280bc79ad70f20119beabde7670c2a1befdf5f7d0e2a6ee4 SHA512 67adeb2323ac9b77e43abcf795734e05be16089f77c978ad3e45ab9991d64f035dd43bf2e1417825af6931f446a0a2ba8e72a7bac4ebde7f52caf6215cd89853
+MISC metadata.xml 393 BLAKE2B 3032bbaddc57b00b15bd0e900f070ff650fdd5abc1993d9e73a3fecc0a9614f85889e55bf9a169c8972f2d14ebd8934610accab4562d6cf88ed4b3d20f3b1c43 SHA512 d05a4a62c6726e67ae195ae7536d261e4df770eb4325c8c9dbd217c84b5f545455a1b2d6e53aab2c2216f09d4468d029233ebf09961c112ff672df955a093f3f
diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml
index f1c67d2187e4..ee849f0e1dd3 100644
--- a/net-misc/vrrpd/metadata.xml
+++ b/net-misc/vrrpd/metadata.xml
@@ -6,7 +6,7 @@
     <name>Robin H. Johnson</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">fredbcode/Vrrpd</remote-id>
+    <remote-id type="gitlab">fredbcode/Vrrpd</remote-id>
     <remote-id type="sourceforge">vrrpd</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/net-misc/vrrpd/vrrpd-1.15.ebuild b/net-misc/vrrpd/vrrpd-1.15.ebuild
new file mode 100644
index 000000000000..89e3f7fe5ba8
--- /dev/null
+++ b/net-misc/vrrpd/vrrpd-1.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Virtual Router Redundancy Protocol Daemon"
+HOMEPAGE="https://gitlab.com/fredbcode/Vrrpd/"
+GITLAB_SHA1="a318281271973c7430cfa520b540585153454c4b"
+SRC_URI="https://gitlab.com/fredbcode/Vrrpd/-/archive/v${PV}/${P}.tar.bz2"
+
+S="${WORKDIR}/Vrrpd-v${PV}-${GITLAB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	# Don't hardcore GCC
+	sed -e '/CC=/d' -i Makefile || die
+
+	emake mrproper
+}
+
+src_compile() {
+	local myemakeargs=(
+		DBG_OPT=""
+		MACHINEOPT="${CFLAGS}"
+		PROF_OPT="${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dosbin vrrpd atropos
+	doman vrrpd.8
+	dodoc FAQ Changes TODO scott_example README.md
+	dodoc doc/*
+}