gentoo auto-resync : 11:06:2023 - 14:17:09

4 files changed, 10 insertions, 140 deletions

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 6eabc3d08839..3ce8f8589c3a 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,10 +1,8 @@
-AUX soju-0.6.0-fix-dup-upstream-connections.patch 1719 BLAKE2B 5046c883c828deb7fc97b73091e4cb185f83c96e31731806820e7fce82738c5b95d1eec22effbda1d1f249dc8b443e44f5c73f87a1771027ebef22633db36a74 SHA512 4a97368524bdaa66d2250cbc75db5e82e23de54e02d1daf3886e9ec9c376d5962210913de2e7e9358dba702869afdbc99026b2480d523be6ac107564488dd725
 AUX soju.initd 574 BLAKE2B 4f80e6b9e5bb004477be832e5b9123cd0b68c1432434aa142a0c083300e778f414207951949e58e08fb061fc49d8e03adc91979b4b74d1bf46012ad8fc1e6678 SHA512 abb615ea1b406bc1c9a4dc3712740be9b95945bdff2ddb6200551b540b426befe3d3a6b4d5b42a796c6282edc2b692adf2ede4d259822de6611685122693bcdc
-DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e6918c4502960356cbf7c7f12103ba2134257b9d0bfcce673352c256b9aa367368c280991069913f3764f916af731d4d21 SHA512 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9bbbb539163f140cd25
-DIST soju-0.6.0.tar.gz 161364 BLAKE2B c8dcf2d8355f90e362f5f1cd5f5f2bb2ab84dce0dbbd07be3d3b492d944f5d8aa35d93038e2d1134f285e248c8bd8b4e83eab27a959bcefcc38198a3de24a4cd SHA512 99e80a82c3ceda6567524bb4b7aab74095b0c4b18d1f268b84e4173770f3ded26bba5092f3adf105c90c28bffd86001801c0bad9f57fd2a3302bb816b77ac423
 DIST soju-0.6.1-deps.tar.xz 147239188 BLAKE2B c76cce444d78f6e1efa92835211af6b3e955f1960103e9b62e8a46f69015ba269ec3142822f726c67ab2d695d44395e7029991b5e229ca46a66d61144b345e3b SHA512 c02cc46c22cc396f7ee56a94376674ec0cc543e7105278c4649ae8d0a0df9d73bbdb0d94add0b402be02fb37511b60a2f03aeebbfe9382928e2bb99221da345d
 DIST soju-0.6.1.tar.gz 161536 BLAKE2B 3e61f13a2f711c9a1a280c158113fd75da53525c32cf8d04cf5459f25e55286e090fbf64c844e19bdf60780a9db37ee45976714500b12e92023330a426706c23 SHA512 12c939a050bf7276ee9e8fec05285533907a2787530ebe113a6be012cbfbcaac3c5cb5c42c3791618136cd45df6c9fb5739bcbec068650bf0d7ea2995443c0bf
-EBUILD soju-0.6.0-r1.ebuild 1516 BLAKE2B 990073441046534a453ab51778acdd01d8dda1e4a103a2efb3d130a379b214560c6b84151112dab0fa77c7dbb2e879112f5cf48adccc9bf1c1e9a8e235484903 SHA512 77374e2cec031421a493688ca8938c62101fde2af7f4aa2f066e99795595f25e796b4b6a086150cb992e5e1cd9ce1b6479f582159b8569932c7847f2bc49ec2b
-EBUILD soju-0.6.0.ebuild 1300 BLAKE2B 5fa2a135b40ff43953cca17a3e93abe2c6e8498dda6f58ef518e944c75c48365a062520b889c4dff7f7713f271e0aebf64c340422ef153ac0fcafc100d2c76d0 SHA512 209606a16721b47096e0b771cee7cca9011ea9bc990f363c6f8cd3886012ddf659e0cab29cd9820cdcc7c340e26701647dba8e8a2fcca43a33373999b254ceae
+DIST soju-0.6.2-deps.tar.xz 146973828 BLAKE2B 170660a36635859327f7f4f5a03e2fe7feb31e113191dfffeae28a3d5e247454556a76da86743a69c43b4dee8749b117cfcfc231cccf9362efb2b20196f4d023 SHA512 57c4156c781bcb3ea76ec1f1174923d08b95b7c15e6f3b933ab150c64a94f80972dd53020737568a3507a4de2f20b87c2c615be8247c9222bf21a87b42b2ca43
+DIST soju-0.6.2.tar.gz 161636 BLAKE2B c4d05d924b921b5d7ba9a61f0d3f269d6ed1a6ba9935a29b694dbc2a6193d0ff633e7c60e1f182b5dfc5aaeb93e4dfb9c98ee46035fdffe13facc8e9bc236171 SHA512 fb74a3eb732b30f2cc0be2c4ada531e160442e6d9b725672784f0b4e4865c2a52970a086f04255d2213305b4a7d041d6a669201aec365216c6bb7764d2b3b769
 EBUILD soju-0.6.1.ebuild 1440 BLAKE2B 91798531aba57643d84880fea175b4bd41de1bc3165c9a92da61afc9c98970ea7bac1805c089014c466739d65087f53a0fd313d71c69c7df76b9c10d1f5345ea SHA512 77989483e71eef644efd60f9ae8bb5b91c4ca7b0e16bd5712b10e734232d02e67728516f5687aa2e06b54a35ac295d89627ee27bdf259a33afa910f2299815ef
+EBUILD soju-0.6.2.ebuild 1687 BLAKE2B d2e0d44a72d1c5c942f98e02969844dfb25c1cd206946d39e30060abf4ca3105722797cd66060c59fc46d98430c5687d606a382a97a60ff3d1a80095c0e0e6b5 SHA512 d905ac38dfb1be1906a2da3fa1c354025450e64196bcf186667655dd7870b6d948a6fc7eff92c420e1e83ad66cc0c0c8ffa0f126a1ba17c6189d67b91307c293
 MISC metadata.xml 626 BLAKE2B 74d9ed6f3cd4b712587aa8824b562b4e26da2403a5f27e338296e514721187143790b027cb229dd8712c999bbb0fc9130207b0a419bd3bdd3062e2f4594767af SHA512 37c75e5842ce0582407266c5778dd8cc30bc6f028802a0d70cf793a7ca0d4a32d6a0c734fa89643b1c582162e0691ac20c231d636b8e7cca0911e9bc1b27eaab
diff --git a/net-irc/soju/files/soju-0.6.0-fix-dup-upstream-connections.patch b/net-irc/soju/files/soju-0.6.0-fix-dup-upstream-connections.patch
deleted file mode 100644
index ca1f0fdf41c7..000000000000
--- a/net-irc/soju/files/soju-0.6.0-fix-dup-upstream-connections.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-https://todo.sr.ht/~emersion/soju/207
-
-diff -u b/user.go b/user.go
---- b/user.go
-+++ b/user.go
-@@ -218,6 +218,7 @@
- 	net.user.srv.metrics.upstreams.Add(1)
- 	defer net.user.srv.metrics.upstreams.Add(-1)
- 
-+	done := ctx.Done()
- 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
- 	defer cancel()
- 
-@@ -227,6 +228,12 @@
- 	}
- 	defer uc.Close()
- 
-+	// The context is cancelled by the caller when the network is stopped.
-+	go func() {
-+		<-done
-+		uc.Close()
-+	}()
-+
- 	if net.user.srv.Identd != nil {
- 		net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User))
- 		defer net.user.srv.Identd.Delete(uc.RemoteAddr().String(), uc.LocalAddr().String())
-@@ -239,9 +246,6 @@
- 		return fmt.Errorf("failed to register: %w", err)
- 	}
- 
--	// TODO: this is racy with net.stopped. If the network is stopped
--	// before the user goroutine receives eventUpstreamConnected, the
--	// connection won't be closed.
- 	net.user.events <- eventUpstreamConnected{uc}
- 	defer func() {
- 		net.user.events <- eventUpstreamDisconnected{uc}
-@@ -259,6 +263,12 @@
- 		return
- 	}
- 
-+	ctx, cancel := context.WithCancel(context.TODO())
-+	go func() {
-+		<-net.stopped
-+		cancel()
-+	}()
-+
- 	var lastTry time.Time
- 	backoff := newBackoffer(retryConnectMinDelay, retryConnectMaxDelay, retryConnectJitter)
- 	for {
-@@ -273,7 +283,7 @@
- 		}
- 		lastTry = time.Now()
- 
--		if err := net.runConn(context.TODO()); err != nil {
-+		if err := net.runConn(ctx); err != nil {
- 			text := err.Error()
- 			temp := true
- 			var regErr registrationError
-@@ -299,10 +309,6 @@
- 	if !net.isStopped() {
- 		close(net.stopped)
- 	}
--
--	if net.conn != nil {
--		net.conn.Close()
--	}
- }
- 
- func (net *network) detach(ch *database.Channel) {
diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild
deleted file mode 100644
index a233f27ef458..000000000000
--- a/net-irc/soju/soju-0.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module systemd
-
-DESCRIPTION="soju is a user-friendly IRC bouncer"
-HOMEPAGE="https://soju.im/"
-SRC_URI="https://git.sr.ht/~emersion/${PN}/refs/download/v${PV}/${P}.tar.gz"
-SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
-IUSE="pam"
-
-BDEPEND="
-	app-text/scdoc
-"
-RDEPEND="
-	acct-user/soju
-	acct-group/soju
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-fix-dup-upstream-connections.patch
-)
-
-src_compile() {
-	GOFLAGS+=" -tags=moderncsqlite"
-	use pam && GOFLAGS+=" -tags=pam"
-
-	ego build ${GOFLAGS} ./cmd/soju
-	ego build ${GOFLAGS} ./cmd/sojudb
-	ego build ${GOFLAGS} ./cmd/sojuctl
-
-	scdoc <doc/soju.1.scd >doc/soju.1 || die
-}
-
-src_install() {
-	dobin soju
-	dobin sojudb
-	dobin sojuctl
-
-	doman doc/soju.1
-	systemd_dounit contrib/soju.service
-	keepdir /etc/soju
-	insinto /etc/soju
-	newins config.in config
-	newinitd "${FILESDIR}"/soju.initd soju
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} requires a user database for authenticating clients."
-	elog "As the soju user, create a database using:"
-	elog "$ sojudb -config ${EROOT}/etc/soju/config create-user <username> [-admin]"
-}
diff --git a/net-irc/soju/soju-0.6.0-r1.ebuild b/net-irc/soju/soju-0.6.2.ebuild
index f95f3178e06c..11f84c48fbf7 100644
--- a/net-irc/soju/soju-0.6.0-r1.ebuild
+++ b/net-irc/soju/soju-0.6.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-
 EAPI=8
 
-inherit go-module systemd
+inherit flag-o-matic go-module systemd
 
 DESCRIPTION="soju is a user-friendly IRC bouncer"
 HOMEPAGE="https://soju.im/"
@@ -26,11 +25,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.0-fix-dup-upstream-connections.patch
-)
-
 src_compile() {
+	# musl removed legacy LFS64 interfaces in version 1.2.4
+	# temporarily reenabled using _LARGEFILE64_SOURCE until
+	# this is resolved upstream
+	# https://github.com/mattn/go-sqlite3/issues/1164
+	append-cflags "-D_LARGEFILE64_SOURCE"
+
 	if use sqlite; then
 		GOFLAGS+=" -tags=libsqlite3"
 	elif use moderncsqlite; then