gentoo auto-resync : 18:02:2024 - 05:38:53

3 files changed, 2 insertions, 76 deletions

diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index 8525794db4b2..02c16f533091 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -12,11 +12,9 @@ AUX 0.88-tcprules.patch 483 BLAKE2B 851f22f3064237c94c6e1939a2c3d46fb3e937afc8a7
 AUX 0.88-uint-headers.patch 3100 BLAKE2B b3ae425066a313b58cbd95a977b3dd08134b469f2b3393d2713a3b500af96b5556f9e1d458d39446aeb0dae2734b9553b184453d7f5ac780c796d5300437d5dc SHA512 515ab4a81a420697b955578986f544bec082ca42a4384d7795f26e197d6948ded810862d500536ce431e2e7e8dccc8874ffc38c0f1fdea193e9c9e843535f5f6
 AUX tcprules-Makefile 168 BLAKE2B a2fcda7ef405c4c588d7b97815f21e8188d7f0d8d28a8dd28e52c58aaa32d314c3c2ccb8bfc3b24948aed8a679af3974bbc0d446a0ad7eafc115d0a4c578b26c SHA512 b119ef421dee61a939cb05407481d5a9c109c88cca86271c045d27a5c1b22f2cb73cd28d541d17bca6b13ab6f50c568be95fa8d4554a11a7b29653947a006a18
 DIST ucspi-rss.diff 1828 BLAKE2B 1ac6f97791425b2ad4f912f4773f60d85494c52417d28ef9b8059dd78850637b5d2f70ccdfdeebc60fdb5ad0f02fa681dab7fcb1ec752a96928f1061b7d3a611 SHA512 643514c57570fc0b4e817b07e6d26e831cec5b4657c3d1b9948bd90267fe370a340b911897d575eb94192e24ba71a03ac68ceb2774ef7c0e7ff819c5b4285bc3
-DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57b900045ea71b4557c3f788662c16c579bea90c42a4213c45e6348ed78517e93198407eb3787e2edbd1719ce844dcb5c2d5 SHA512 58e38f9437b03aab121c5c1b9260806b5abd5a72bf22d14468955d6ff7ad2fb2ab285cb7a37b5dc3a568389aa02b8b3ecff0026b49a097ea86cfd340f2b38000
 DIST ucspi-tcp-0.88-ipv6.diff20.bz2 22088 BLAKE2B faa6cf37b828241fe8b0365aadc912465ed811b28cd6a02eef638afe5d8ec2d18a0635e756c4e5ed65e5dc13d49afee37a255e229f2cb2713628e6e8eb57d6ec SHA512 f8d3ae49adec2b6a643458958679b712e803b0e4609b4395ff9c4fd13b5a29b6f9fc35aee59f2928b892908d37ed83b708c67346a4a42ec21e05e7782bff215b
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2098 BLAKE2B ce1c31ca563c75103dbf423de4fe9c5f6eafd37a298d0aa4af80305ba110de98381ea10ac9105936bf3edab5595969c2a1aa2d7cd70f443659fa5e79fd2c871e SHA512 5b3d5bd0e1d4c2a29c590116918a52825846669a85002ff15236eef60881f755d451427873aee6e49794dfb1c5348a4cfc78806dfc6853849e0031cc6d55c2f0
-EBUILD ucspi-tcp-0.88-r19.ebuild 2198 BLAKE2B bd93f360cdc6d4be6c35a4d0c2b77241c72c40d59506631d609cddcdf35dc2c7df8fffc0c543fcfc64fb877083148173eedbe8f1eacbd8c4aaf22ed81564feb2 SHA512 39e06db60fd2579045367d8a155ef5b73a4016df7cc2db46f876441e07924d7f8d69a04b4f8989e5314e585cdffb3eabf505807b24357210510b01b1e644d207
+EBUILD ucspi-tcp-0.88-r19.ebuild 2200 BLAKE2B 53e2cc09426c8a9bbc26ac1702478d07f05b08254c7fc8de1ad3b8e545f49132ef69bf63c55b9fe8c31fa00f261c7876329ce1f2cfa898a65c6cc7660eeb2205 SHA512 e525f6a96c62233873409768fba903e4c12f7bfce17fbd1cc9e6501402984e694b2b07928c756ad680d94ea1fc2ae6d536ac33daf63de9b408c3337a263ef580
 MISC metadata.xml 601 BLAKE2B f93f353c688147d0f0430e176de1f75e22321b6ddd621a8be45efba153a70ac697a2c383aec03a7ce860d79fffa7a3f3f5eed084d1ddf48c23c31fbf8d0ad3cf SHA512 41f81dd288b2ec4b48830876a7fc16f7361038803707e8f5f93fc4dfa6e8fb58c7836e762147917102621a2eb76cefd293d0cf260df6638d9b4427a261597214
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
deleted file mode 100644
index aaee0abe1acb..000000000000
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmail toolchain-funcs
-
-DESCRIPTION="Collection of tools for managing UNIX services"
-HOMEPAGE="https://cr.yp.to/ucspi-tcp.html"
-SRC_URI="
-	https://cr.yp.to/${PN}/${P}.tar.gz
-	mirror://qmail/ucspi-rss.diff
-	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
-	ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff19.bz2 )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 qmail-spp selinux"
-RESTRICT="test"
-
-RDEPEND="
-	!app-doc/ucspi-tcp-man
-	selinux? ( sec-policy/selinux-ucspitcp )"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PV}-protos.patch
-	if use ipv6; then
-		eapply "${WORKDIR}"/${P}-ipv6.diff19
-		eapply "${FILESDIR}"/${PV}-protos-ipv6.patch
-		eapply "${FILESDIR}"/${PV}-tcprules.patch #135571
-		eapply "${FILESDIR}"/${PV}-bigendian.patch #18892
-	else
-		eapply "${FILESDIR}"/${PV}-protos-no-ipv6.patch
-	fi
-	eapply "${DISTDIR}"/ucspi-rss.diff
-	eapply "${FILESDIR}"/${PV}-rblsmtpd-ignore-on-RELAYCLIENT.patch
-	eapply "${DISTDIR}"/${P}-rblspp.patch
-	eapply "${FILESDIR}"/${PV}-protos-rblspp.patch
-	eapply "${FILESDIR}"/${PV}-large-responses.patch
-	eapply "${FILESDIR}"/${PV}-uint-headers.patch
-	eapply "${FILESDIR}"/${PV}-ar-ranlib.patch
-
-	eapply_user
-}
-
-src_configure() {
-	qmail_set_cc
-	# The AR/RANLIB logic probably should get moved to the qmail eclass.
-	# See also the patch above for generating the "makelib" script.
-	tc-export AR RANLIB
-
-	echo "${EPREFIX}/usr/" > conf-home || die
-}
-
-src_install() {
-	dobin tcpserver tcprules tcprulescheck argv0 recordio tcpclient *\@ \
-		tcpcat mconnect mconnect-io addcr delcr fixcrio rblsmtpd
-
-	if use qmail-spp; then
-		insinto "${QMAIL_HOME}"/plugins
-		insopts -m 755
-		doins rblspp
-	fi
-
-	doman "${WORKDIR}"/${P}-man/*.[1-8]
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
-
-	insinto /etc/tcprules.d
-	newins "${FILESDIR}"/tcprules-Makefile Makefile
-}
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
index 318040c69422..0a9f3ed0cc53 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r19.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Collection of tools for managing UNIX services"
 HOMEPAGE="https://cr.yp.to/ucspi-tcp.html"
 SRC_URI="
 	https://cr.yp.to/${PN}/${P}.tar.gz
-	mirror://qmail/ucspi-rss.diff
+	http://qmail.org/ucspi-rss.diff
 	http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
 	http://xs3.b92.net/tomislavr/${P}-rblspp.patch
 	ipv6? ( https://www.fefe.de/ucspi/${P}-ipv6.diff20.bz2 )"