commit: 22d04d652dc28427a492a108a6a849e2d060ea1f Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org> AuthorDate: Wed Jun 7 02:16:31 2023 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Sun Jun 11 08:44:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d04d65
net-irc/soju: drop 0.6.0, 0.6.0-r1 Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org> Closes: https://github.com/gentoo/gentoo/pull/31336 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> net-irc/soju/Manifest | 2 - .../soju-0.6.0-fix-dup-upstream-connections.patch | 69 ---------------------- net-irc/soju/soju-0.6.0-r1.ebuild | 68 --------------------- net-irc/soju/soju-0.6.0.ebuild | 60 ------------------- 4 files changed, 199 deletions(-) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index ef8aef21dc61..54de71724b66 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -1,5 +1,3 @@ -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 DIST soju-0.6.2-deps.tar.xz 146973828 BLAKE2B 170660a36635859327f7f4f5a03e2fe7feb31e113191dfffeae28a3d5e247454556a76da86743a69c43b4dee8749b117cfcfc231cccf9362efb2b20196f4d023 SHA512 57c4156c781bcb3ea76ec1f1174923d08b95b7c15e6f3b933ab150c64a94f80972dd53020737568a3507a4de2f20b87c2c615be8247c9222bf21a87b42b2ca43 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-r1.ebuild b/net-irc/soju/soju-0.6.0-r1.ebuild deleted file mode 100644 index f95f3178e06c..000000000000 --- a/net-irc/soju/soju-0.6.0-r1.ebuild +++ /dev/null @@ -1,68 +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="moderncsqlite +sqlite pam" -REQUIRED_USE="?? ( moderncsqlite sqlite )" - -BDEPEND=" - app-text/scdoc -" -RDEPEND=" - acct-user/soju - acct-group/soju - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-0.6.0-fix-dup-upstream-connections.patch -) - -src_compile() { - if use sqlite; then - GOFLAGS+=" -tags=libsqlite3" - elif use moderncsqlite; then - GOFLAGS+=" -tags=moderncsqlite" - else - GOFLAGS+=" -tags=nosqlite" - fi - 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.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]" -}
