[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: a22d803d86c9aca5fcd5fc596c25f52067f21c44 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Dec 5 12:09:09 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 8 11:35:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22d803d net-irc/soju: drop 0.6.1 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/34134 Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 -- net-irc/soju/soju-0.6.1.ebuild | 63 -- 2 files changed, 65 deletions(-) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index e063d9a3fe85..dbad38d41da7 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -1,5 +1,3 @@ -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 DIST soju-0.6.2.tar.gz 161636 BLAKE2B c4d05d924b921b5d7ba9a61f0d3f269d6ed1a6ba9935a29b694dbc2a6193d0ff633e7c60e1f182b5dfc5aaeb93e4dfb9c98ee46035fdffe13facc8e9bc236171 SHA512 fb74a3eb732b30f2cc0be2c4ada531e160442e6d9b725672784f0b4e4865c2a52970a086f04255d2213305b4a7d041d6a669201aec365216c6bb7764d2b3b769 DIST soju-0.7.0-deps.tar.xz 89862684 BLAKE2B d56302c5b330c581365da56f1718571144ac0475fa5879a839e723d2d13aa6cb9793a8f64418098aa0035421192eb2ae955603330ea3be6116db057d5fef3b1a SHA512 08fb5f2e75508840b76fb5f3479023eb735abc128cef0a621a3bafbc8d1dde504cf78812cb4e7921d7fc40595ca592ce0b8aaf21c388fd781b52b5d266d2 diff --git a/net-irc/soju/soju-0.6.1.ebuild b/net-irc/soju/soju-0.6.1.ebuild deleted file mode 100644 index f71ea46cb2d7.. --- a/net-irc/soju/soju-0.6.1.ebuild +++ /dev/null @@ -1,63 +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 Apache-2.0 MIT BSD" -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}" - -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 || 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 [-admin]" -}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 5b31abc612b43a41bc505d089561b92909f194cd Author: Sam James gentoo org> AuthorDate: Fri Dec 8 11:34:56 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 8 11:35:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b31abc6 net-irc/soju: forward keywords Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.7.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/soju/soju-0.7.0.ebuild b/net-irc/soju/soju-0.7.0.ebuild index c276c2d14e4f..266c4335c650 100644 --- a/net-irc/soju/soju-0.7.0.ebuild +++ b/net-irc/soju/soju-0.7.0.ebuild @@ -11,7 +11,7 @@ SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz; LICENSE="AGPL-3 Apache-2.0 MIT BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" IUSE="moderncsqlite +sqlite pam" REQUIRED_USE="?? ( moderncsqlite sqlite )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 2a716f8f9cade462e3b52d71179ccc9ad2f08201 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Dec 5 12:04:43 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 8 11:35:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a716f8f net-irc/soju: add 0.7.0 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 ++ net-irc/soju/soju-0.7.0.ebuild | 72 ++ 2 files changed, 74 insertions(+) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index 54de71724b66..e063d9a3fe85 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -2,3 +2,5 @@ DIST soju-0.6.1-deps.tar.xz 147239188 BLAKE2B c76cce444d78f6e1efa92835211af6b3e9 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 DIST soju-0.6.2.tar.gz 161636 BLAKE2B c4d05d924b921b5d7ba9a61f0d3f269d6ed1a6ba9935a29b694dbc2a6193d0ff633e7c60e1f182b5dfc5aaeb93e4dfb9c98ee46035fdffe13facc8e9bc236171 SHA512 fb74a3eb732b30f2cc0be2c4ada531e160442e6d9b725672784f0b4e4865c2a52970a086f04255d2213305b4a7d041d6a669201aec365216c6bb7764d2b3b769 +DIST soju-0.7.0-deps.tar.xz 89862684 BLAKE2B d56302c5b330c581365da56f1718571144ac0475fa5879a839e723d2d13aa6cb9793a8f64418098aa0035421192eb2ae955603330ea3be6116db057d5fef3b1a SHA512 08fb5f2e75508840b76fb5f3479023eb735abc128cef0a621a3bafbc8d1dde504cf78812cb4e7921d7fc40595ca592ce0b8aaf21c388fd781b52b5d266d2 +DIST soju-0.7.0.tar.gz 149198 BLAKE2B 2047b61792454f20a7cc4c24466047ffa43f5d56a1726b32f5120686d5fecd1f81d057adafc8696e2d85e922e37ae6f158808c0b35529ca2cb7018ecbec0d381 SHA512 9b199c5e3270e325cb6e101b0e7b5c70af75c831442a135fa0484bd2aef3ada98ab48261cd91342d278bfb626c2c83eeec8029388a8fe9663515e676ba43 diff --git a/net-irc/soju/soju-0.7.0.ebuild b/net-irc/soju/soju-0.7.0.ebuild new file mode 100644 index ..fdf339e65d19 --- /dev/null +++ b/net-irc/soju/soju-0.7.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +inherit flag-o-matic 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 Apache-2.0 MIT BSD" +SLOT="0" +KEYWORDS="~amd64" +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}" + +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 + CGO_CFLAGS="${CGO_CFLAGS}" + if use sqlite; then + GOFLAGS+=" -tags=libsqlite3" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + elif use moderncsqlite; then + GOFLAGS+=" -tags=moderncsqlite" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" + else + GOFLAGS+=" -tags=nosqlite" + fi + # Only way to pass CFLAGS to CGO at the + # moment. https://github.com/gentoo/gentoo/pull/33539/ + export CGO_CFLAGS + use pam && GOFLAGS+=" -tags=pam" + + ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojudb + ego build ${GOFLAGS} ./cmd/sojuctl + + scdoc 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 [-admin]" +}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: b099961a27aa32e0abacb3a880c9c8c2f5fe0b13 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Dec 5 12:08:05 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 8 11:35:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b099961a net-irc/soju: drop flag-o-matic Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.2.ebuild | 2 +- net-irc/soju/soju-0.7.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild index 2768e43d3193..266c4335c650 100644 --- a/net-irc/soju/soju-0.6.2.ebuild +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic go-module systemd +inherit go-module systemd DESCRIPTION="soju is a user-friendly IRC bouncer" HOMEPAGE="https://soju.im/; diff --git a/net-irc/soju/soju-0.7.0.ebuild b/net-irc/soju/soju-0.7.0.ebuild index fdf339e65d19..c276c2d14e4f 100644 --- a/net-irc/soju/soju-0.7.0.ebuild +++ b/net-irc/soju/soju-0.7.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit flag-o-matic go-module systemd +inherit go-module systemd DESCRIPTION="soju is a user-friendly IRC bouncer" HOMEPAGE="https://soju.im/;
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 5f0751d20026400268c4126f49634d28798df203 Author: Alfred Persson Forsberg catcream org> AuthorDate: Fri Nov 17 05:48:28 2023 + Commit: Sam James gentoo org> CommitDate: Fri Nov 17 12:06:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0751d2 net-irc/soju: pass -D_LARGEFILE64_SOURCE for musl-1.2.4 [sam: The macro is not ideal at all but patching Go isn't exactly ideal itself. Besides, this was arleady in the ebuild, but ignored b/c Go doesn't yet in Gentoo respect CFLAGS et. al, although should soon.] See-also: https://github.com/mattn/go-sqlite3/issues/1164 Closes: https://bugs.gentoo.org/912311 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/33863 Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.2.ebuild | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild index c46ca0fef568..2768e43d3193 100644 --- a/net-irc/soju/soju-0.6.2.ebuild +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -26,19 +26,22 @@ RDEPEND=" DEPEND="${RDEPEND}" 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" - + # 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 + CGO_CFLAGS="${CGO_CFLAGS}" if use sqlite; then GOFLAGS+=" -tags=libsqlite3" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" elif use moderncsqlite; then GOFLAGS+=" -tags=moderncsqlite" + CGO_CFLAGS="-D_LARGEFILE64_SOURCE" else GOFLAGS+=" -tags=nosqlite" fi + # Only way to pass CFLAGS to CGO at the + # moment. https://github.com/gentoo/gentoo/pull/33539/ + export CGO_CFLAGS use pam && GOFLAGS+=" -tags=pam" ego build ${GOFLAGS} ./cmd/soju
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: aa0a3ea9234aa3ba7266c6c87b3d60ccd6337ada Author: Sam James gentoo org> AuthorDate: Fri Aug 18 04:22:44 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 04:22:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0a3ea9 net-irc/soju: Keyword 0.6.2 arm, #912245 Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild index bfebd16695f7..c46ca0fef568 100644 --- a/net-irc/soju/soju-0.6.2.ebuild +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -11,7 +11,7 @@ SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz; LICENSE="AGPL-3 Apache-2.0 MIT BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~riscv" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv" IUSE="moderncsqlite +sqlite pam" REQUIRED_USE="?? ( moderncsqlite sqlite )"
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 9d016c0ae0bb5b834e3af1fb7fe545446e464e70 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Jun 20 21:55:51 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jun 23 02:13:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d016c0a net-irc/soju: update LICENSE Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/31560 Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.1.ebuild | 2 +- net-irc/soju/soju-0.6.2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-irc/soju/soju-0.6.1.ebuild b/net-irc/soju/soju-0.6.1.ebuild index 99a1a193b5e5..f71ea46cb2d7 100644 --- a/net-irc/soju/soju-0.6.1.ebuild +++ b/net-irc/soju/soju-0.6.1.ebuild @@ -9,7 +9,7 @@ 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" +LICENSE="AGPL-3 Apache-2.0 MIT BSD" SLOT="0" KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="moderncsqlite +sqlite pam" diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild index 11f84c48fbf7..bfebd16695f7 100644 --- a/net-irc/soju/soju-0.6.2.ebuild +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -9,7 +9,7 @@ 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" +LICENSE="AGPL-3 Apache-2.0 MIT BSD" SLOT="0" KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="moderncsqlite +sqlite pam"
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/, net-irc/soju/files/
commit: 22d04d652dc28427a492a108a6a849e2d060ea1f Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Jun 7 02:16:31 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jun 11 08:44:29 2023 + 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 catcream.org> Closes: https://github.com/gentoo/gentoo/pull/31336 Signed-off-by: Joonas Niilola 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 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9539163f140cd25 -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.. --- 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()) - 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
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 4141cf9c10519adfd589c404dcf18b09371f65d7 Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Jun 7 02:11:47 2023 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Jun 11 08:44:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4141cf9c net-irc/soju: add 0.6.2 Closes: https://bugs.gentoo.org/907811 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Joonas Niilola gentoo.org> net-irc/soju/Manifest | 2 ++ net-irc/soju/soju-0.6.2.ebuild | 69 ++ 2 files changed, 71 insertions(+) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index 480f7bb0a6ea..ef8aef21dc61 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -2,3 +2,5 @@ DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e691 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 +DIST soju-0.6.2.tar.gz 161636 BLAKE2B c4d05d924b921b5d7ba9a61f0d3f269d6ed1a6ba9935a29b694dbc2a6193d0ff633e7c60e1f182b5dfc5aaeb93e4dfb9c98ee46035fdffe13facc8e9bc236171 SHA512 fb74a3eb732b30f2cc0be2c4ada531e160442e6d9b725672784f0b4e4865c2a52970a086f04255d2213305b4a7d041d6a669201aec365216c6bb7764d2b3b769 diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild new file mode 100644 index ..11f84c48fbf7 --- /dev/null +++ b/net-irc/soju/soju-0.6.2.ebuild @@ -0,0 +1,69 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +EAPI=8 + +inherit flag-o-matic 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}" + +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 + 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 || 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 [-admin]" +}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 1497dac1f1cbe05ec02535c59e32c827945f3c66 Author: Alfred Persson Forsberg catcream org> AuthorDate: Thu Apr 20 12:02:34 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:02:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1497dac1 net-irc/soju: drop 0.5.2 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 -- net-irc/soju/soju-0.5.2.ebuild | 53 -- 2 files changed, 55 deletions(-) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index 1895cd28ff81..28dfc723bf27 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -1,4 +1,2 @@ -DIST soju-0.5.2-deps.tar.xz 144017976 BLAKE2B 09be5c159d8c5a12bef9fe52e1d7d4883e3a3ebc8f1131fadd33808588413db9d318eb4be589f9e088d4d6257b47b8c5fa61373a872bae3b9f6570a390312972 SHA512 4f33185ee8fb7a1969ea5c2de82d9ecd7f5f7795f890ec35d87c557e973a53f93c22e1b02ba47dc52d1d6528b7e18fe43fc88cb77ab4615bafe5c70ae8bd -DIST soju-0.5.2.tar.gz 141911 BLAKE2B 3fb9455a55d8fc0a1da17303156f43cc989f601d0dc837b795a32fa4be14a45571edbc2067159990fd72c75a44c71b52a579ed01572aae43c39ebaf143d502e1 SHA512 2ee9abf9d989a6cc361350bcaa94ff78bf45119c507142d6200684c79c4e1418d0f895931d0889a6f9f15f07d7b5969e2d34ae235034f3a53f04e2bf997dc85f DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e6918c4502960356cbf7c7f12103ba2134257b9d0bfcce673352c256b9aa367368c280991069913f3764f916af731d4d21 SHA512 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9539163f140cd25 DIST soju-0.6.0.tar.gz 161364 BLAKE2B c8dcf2d8355f90e362f5f1cd5f5f2bb2ab84dce0dbbd07be3d3b492d944f5d8aa35d93038e2d1134f285e248c8bd8b4e83eab27a959bcefcc38198a3de24a4cd SHA512 99e80a82c3ceda6567524bb4b7aab74095b0c4b18d1f268b84e4173770f3ded26bba5092f3adf105c90c28bffd86001801c0bad9f57fd2a3302bb816b77ac423 diff --git a/net-irc/soju/soju-0.5.2.ebuild b/net-irc/soju/soju-0.5.2.ebuild deleted file mode 100644 index 08e925cb0a65.. --- a/net-irc/soju/soju-0.5.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module - -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://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz; - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="sqlite" - -BDEPEND=" - app-text/scdoc -" -RDEPEND=" - acct-user/soju - acct-group/soju - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND}" - -src_compile() { - GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)" - - ego build ${GOFLAGS} ./cmd/soju - ego build ${GOFLAGS} ./cmd/sojuctl - - scdoc doc/soju.1 -} - -src_install() { - dobin soju - dobin sojuctl - - doman doc/soju.1 - 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 "$ sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" -}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 6a8d0b8a7d612edbde3c15fd9a737052e8563cf3 Author: Alfred Persson Forsberg catcream org> AuthorDate: Tue Apr 25 17:44:07 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:02:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a8d0b8a net-irc/soju: add 0.6.1 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/30753 Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 ++ net-irc/soju/soju-0.6.1.ebuild | 63 ++ 2 files changed, 65 insertions(+) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index 28dfc723bf27..480f7bb0a6ea 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -1,2 +1,4 @@ DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e6918c4502960356cbf7c7f12103ba2134257b9d0bfcce673352c256b9aa367368c280991069913f3764f916af731d4d21 SHA512 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9539163f140cd25 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 diff --git a/net-irc/soju/soju-0.6.1.ebuild b/net-irc/soju/soju-0.6.1.ebuild new file mode 100644 index ..99a1a193b5e5 --- /dev/null +++ b/net-irc/soju/soju-0.6.1.ebuild @@ -0,0 +1,63 @@ +# 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}" + +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 || 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 [-admin]" +}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 18560e34f64657ce43582592ad68c00d18dab16a Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Apr 10 14:45:11 2023 + Commit: Sam James gentoo org> CommitDate: Wed Apr 26 04:02:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18560e34 net-irc/soju: add sqlite and moderncsqlite USE flags Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/metadata.xml | 4 +++ net-irc/soju/soju-0.6.0-r1.ebuild | 68 +++ 2 files changed, 72 insertions(+) diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml index df600cfb1ced..7f2f852dba69 100644 --- a/net-irc/soju/metadata.xml +++ b/net-irc/soju/metadata.xml @@ -12,4 +12,8 @@ ~emersion/soju + + Use moderncsqlite, a cgo-free port of + SQLite + diff --git a/net-irc/soju/soju-0.6.0-r1.ebuild b/net-irc/soju/soju-0.6.0-r1.ebuild new file mode 100644 index ..f95f3178e06c --- /dev/null +++ b/net-irc/soju/soju-0.6.0-r1.ebuild @@ -0,0 +1,68 @@ +# 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 || 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 [-admin]" +}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 4eaae67755324ed6d0299875368e089419a8f9dc Author: Alfred Persson Forsberg catcream org> AuthorDate: Sun Apr 9 03:35:10 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eaae677 net-irc/soju: keyword 0.6.0 for ~arm64 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/30460 Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild index cec8de059876..a233f27ef458 100644 --- a/net-irc/soju/soju-0.6.0.ebuild +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -12,7 +12,7 @@ SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz; LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="~amd64 ~arm64 ~riscv" IUSE="pam" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/files/, net-irc/soju/
commit: df056a8be36b580156a0d198e1a141efdb5a2dd7 Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Apr 5 18:38:35 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df056a8b net-irc/soju: add patch for dup upstream connections https://todo.sr.ht/~emersion/soju/207 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> .../soju-0.6.0-fix-dup-upstream-connections.patch | 69 ++ net-irc/soju/soju-0.6.0.ebuild | 4 ++ 2 files changed, 73 insertions(+) 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 new file mode 100644 index ..ca1f0fdf41c7 --- /dev/null +++ b/net-irc/soju/files/soju-0.6.0-fix-dup-upstream-connections.patch @@ -0,0 +1,69 @@ +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()) + 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 index 6a410939fdc3..cec8de059876 100644 --- a/net-irc/soju/soju-0.6.0.ebuild +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -24,6 +24,10 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-0.6.0-fix-dup-upstream-connections.patch +) + src_compile() { GOFLAGS+=" -tags=moderncsqlite" use pam && GOFLAGS+=" -tags=pam"
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: d255ee2ba21dbf50109d5b42dd6a63e61bc52a52 Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Apr 5 18:36:38 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d255ee2b net-irc/soju: drop USE=sqlite and use native go version Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.0.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild index f726d1503050..f5b9f0231436 100644 --- a/net-irc/soju/soju-0.6.0.ebuild +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -13,7 +13,6 @@ SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz; LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~riscv" -IUSE="sqlite" BDEPEND=" app-text/scdoc @@ -21,12 +20,11 @@ BDEPEND=" RDEPEND=" acct-user/soju acct-group/soju - sqlite? ( dev-db/sqlite:3 ) " DEPEND="${RDEPEND}" src_compile() { - GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)" + GOFLAGS+=" -tags=moderncsqlite" ego build ${GOFLAGS} ./cmd/soju ego build ${GOFLAGS} ./cmd/sojudb
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: c24233afd8db2429c0415ecdb7acefceffd5e94a Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Apr 3 16:06:00 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24233af net-irc/soju: build the sojudb tool Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild index 9e41371c3733..f726d1503050 100644 --- a/net-irc/soju/soju-0.6.0.ebuild +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -29,6 +29,7 @@ src_compile() { GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)" ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojudb ego build ${GOFLAGS} ./cmd/sojuctl scdoc doc/soju.1 || die @@ -36,6 +37,7 @@ src_compile() { src_install() { dobin soju + dobin sojudb dobin sojuctl doman doc/soju.1 @@ -50,5 +52,5 @@ src_install() { pkg_postinst() { elog "${PN} requires a user database for authenticating clients." elog "As the soju user, create a database using:" - elog "$ sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" + elog "$ sojudb -config ${EROOT}/etc/soju/config create-user [-admin]" }
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: d8f17dfd7a8243b309c9c4dd708747f007918033 Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Apr 3 14:47:09 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f17dfd net-irc/soju: add 0.6.0 Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 ++ net-irc/soju/soju-0.6.0.ebuild | 54 ++ 2 files changed, 56 insertions(+) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest index 89ec9362ebc9..1895cd28ff81 100644 --- a/net-irc/soju/Manifest +++ b/net-irc/soju/Manifest @@ -1,2 +1,4 @@ DIST soju-0.5.2-deps.tar.xz 144017976 BLAKE2B 09be5c159d8c5a12bef9fe52e1d7d4883e3a3ebc8f1131fadd33808588413db9d318eb4be589f9e088d4d6257b47b8c5fa61373a872bae3b9f6570a390312972 SHA512 4f33185ee8fb7a1969ea5c2de82d9ecd7f5f7795f890ec35d87c557e973a53f93c22e1b02ba47dc52d1d6528b7e18fe43fc88cb77ab4615bafe5c70ae8bd DIST soju-0.5.2.tar.gz 141911 BLAKE2B 3fb9455a55d8fc0a1da17303156f43cc989f601d0dc837b795a32fa4be14a45571edbc2067159990fd72c75a44c71b52a579ed01572aae43c39ebaf143d502e1 SHA512 2ee9abf9d989a6cc361350bcaa94ff78bf45119c507142d6200684c79c4e1418d0f895931d0889a6f9f15f07d7b5969e2d34ae235034f3a53f04e2bf997dc85f +DIST soju-0.6.0-deps.tar.xz 146900140 BLAKE2B 0ecf3844694a6d2dbb8f90fbb44c87e6918c4502960356cbf7c7f12103ba2134257b9d0bfcce673352c256b9aa367368c280991069913f3764f916af731d4d21 SHA512 ccaf6cde616114a8afb9f7c2f41a816c458f685d7895cbb47a36135e5f1b12e39580ce81973ee9a5d61f3efb603e71f40820abd515dfb9539163f140cd25 +DIST soju-0.6.0.tar.gz 161364 BLAKE2B c8dcf2d8355f90e362f5f1cd5f5f2bb2ab84dce0dbbd07be3d3b492d944f5d8aa35d93038e2d1134f285e248c8bd8b4e83eab27a959bcefcc38198a3de24a4cd SHA512 99e80a82c3ceda6567524bb4b7aab74095b0c4b18d1f268b84e4173770f3ded26bba5092f3adf105c90c28bffd86001801c0bad9f57fd2a3302bb816b77ac423 diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild new file mode 100644 index ..9e41371c3733 --- /dev/null +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -0,0 +1,54 @@ +# 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 ~riscv" +IUSE="sqlite" + +BDEPEND=" + app-text/scdoc +" +RDEPEND=" + acct-user/soju + acct-group/soju + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND}" + +src_compile() { + GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)" + + ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojuctl + + scdoc doc/soju.1 || die +} + +src_install() { + dobin soju + 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 "$ sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" +}
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 5cfe09ece13bd011e2bbf56d1482661268a2df93 Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Apr 5 18:37:50 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfe09ec net-irc/soju: add USE=pam for pam auth support Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.6.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-irc/soju/soju-0.6.0.ebuild b/net-irc/soju/soju-0.6.0.ebuild index f5b9f0231436..6a410939fdc3 100644 --- a/net-irc/soju/soju-0.6.0.ebuild +++ b/net-irc/soju/soju-0.6.0.ebuild @@ -13,6 +13,7 @@ SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz; LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~riscv" +IUSE="pam" BDEPEND=" app-text/scdoc @@ -25,6 +26,7 @@ DEPEND="${RDEPEND}" src_compile() { GOFLAGS+=" -tags=moderncsqlite" + use pam && GOFLAGS+=" -tags=pam" ego build ${GOFLAGS} ./cmd/soju ego build ${GOFLAGS} ./cmd/sojudb
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: ad47955dfe188f5df3ac6469caf2162715d23c78 Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Apr 3 14:05:10 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 02:51:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad47955d net-irc/soju: change postinst message Signed-off-by: Alfred Persson Forsberg catcream.org> Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.5.2.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net-irc/soju/soju-0.5.2.ebuild b/net-irc/soju/soju-0.5.2.ebuild index 0bd379808496..08e925cb0a65 100644 --- a/net-irc/soju/soju-0.5.2.ebuild +++ b/net-irc/soju/soju-0.5.2.ebuild @@ -47,8 +47,7 @@ src_install() { } pkg_postinst() { - elog "${PN} requires a user database for authenticating bouncer users," - elog "please create a user using:" - elog "# sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" - elog "then set ${EROOT}/var/lib/soju/main.db owner and group to soju:soju." + elog "${PN} requires a user database for authenticating clients." + elog "As the soju user, create a database using:" + elog "$ sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" }
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 13e4bd0c0e625cde01d3512a1d403ca7beb9b807 Author: Sam James gentoo org> AuthorDate: Fri Dec 16 07:23:11 2022 + Commit: Sam James gentoo org> CommitDate: Fri Dec 16 07:23:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13e4bd0c net-irc/soju: add sourcehut upstream metadata Signed-off-by: Sam James gentoo.org> net-irc/soju/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml index d8299f5a010f..df600cfb1ced 100644 --- a/net-irc/soju/metadata.xml +++ b/net-irc/soju/metadata.xml @@ -9,4 +9,7 @@ proxy-ma...@gentoo.org Proxy Maintainers + + ~emersion/soju +
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/
commit: 26c41cdc9bf03499276255b6b69d8ef43b85344b Author: Alfred Persson Forsberg catcream org> AuthorDate: Wed Dec 14 20:54:20 2022 + Commit: Sam James gentoo org> CommitDate: Thu Dec 15 04:43:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c41cdc net-irc/soju: Fix install message Should be ${PN}, not ${P}. Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/28664 Signed-off-by: Sam James gentoo.org> net-irc/soju/soju-0.5.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-irc/soju/soju-0.5.2.ebuild b/net-irc/soju/soju-0.5.2.ebuild index 38c2fe241f2f..0bd379808496 100644 --- a/net-irc/soju/soju-0.5.2.ebuild +++ b/net-irc/soju/soju-0.5.2.ebuild @@ -47,7 +47,7 @@ src_install() { } pkg_postinst() { - elog "${P} requires a user database for authenticating bouncer users," + elog "${PN} requires a user database for authenticating bouncer users," elog "please create a user using:" elog "# sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" elog "then set ${EROOT}/var/lib/soju/main.db owner and group to soju:soju."
[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/, net-irc/soju/files/
commit: 4b15dafee38fd8cda22d6a8743fa7d248bc588ea Author: Alfred Persson Forsberg catcream org> AuthorDate: Mon Oct 17 16:31:45 2022 + Commit: Sam James gentoo org> CommitDate: Wed Dec 14 00:22:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b15dafe net-irc/soju: new package, add 0.5.2 Signed-off-by: Alfred Persson Forsberg catcream.org> Closes: https://github.com/gentoo/gentoo/pull/27449 Signed-off-by: Sam James gentoo.org> net-irc/soju/Manifest | 2 ++ net-irc/soju/files/soju.initd | 30 +++ net-irc/soju/metadata.xml | 12 ++ net-irc/soju/soju-0.5.2.ebuild | 54 ++ 4 files changed, 98 insertions(+) diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest new file mode 100644 index ..89ec9362ebc9 --- /dev/null +++ b/net-irc/soju/Manifest @@ -0,0 +1,2 @@ +DIST soju-0.5.2-deps.tar.xz 144017976 BLAKE2B 09be5c159d8c5a12bef9fe52e1d7d4883e3a3ebc8f1131fadd33808588413db9d318eb4be589f9e088d4d6257b47b8c5fa61373a872bae3b9f6570a390312972 SHA512 4f33185ee8fb7a1969ea5c2de82d9ecd7f5f7795f890ec35d87c557e973a53f93c22e1b02ba47dc52d1d6528b7e18fe43fc88cb77ab4615bafe5c70ae8bd +DIST soju-0.5.2.tar.gz 141911 BLAKE2B 3fb9455a55d8fc0a1da17303156f43cc989f601d0dc837b795a32fa4be14a45571edbc2067159990fd72c75a44c71b52a579ed01572aae43c39ebaf143d502e1 SHA512 2ee9abf9d989a6cc361350bcaa94ff78bf45119c507142d6200684c79c4e1418d0f895931d0889a6f9f15f07d7b5969e2d34ae235034f3a53f04e2bf997dc85f diff --git a/net-irc/soju/files/soju.initd b/net-irc/soju/files/soju.initd new file mode 100644 index ..db6069e85c5f --- /dev/null +++ b/net-irc/soju/files/soju.initd @@ -0,0 +1,30 @@ +#!/sbin/openrc-run +supervisor=supervise-daemon + +name="soju" +description="User-friendly IRC bouncer" + +: ${command_args:="-config /etc/soju/config"} +: ${error_log:=/var/log/soju.log} + +command=/usr/bin/soju +command_user=soju:soju +directory="/var/lib/$RC_SVCNAME" + +extra_started_commands="reload" +description_reload="Reload TLS certificate" + +depend() { + need net localmount +} + +start_pre() { + checkpath -d -o $command_user "$directory" + checkpath -f -o $command_user "$error_log" +} + +reload() { + ebegin "Reloading TLS certificate" + $supervisor $RC_SVCNAME --signal HUP + eend $? +} diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml new file mode 100644 index ..d8299f5a010f --- /dev/null +++ b/net-irc/soju/metadata.xml @@ -0,0 +1,12 @@ + +https://www.gentoo.org/dtd/metadata.dtd'> + + + c...@catcream.org + Alfred Persson + + + proxy-ma...@gentoo.org + Proxy Maintainers + + diff --git a/net-irc/soju/soju-0.5.2.ebuild b/net-irc/soju/soju-0.5.2.ebuild new file mode 100644 index ..38c2fe241f2f --- /dev/null +++ b/net-irc/soju/soju-0.5.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +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://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz; + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="sqlite" + +BDEPEND=" + app-text/scdoc +" +RDEPEND=" + acct-user/soju + acct-group/soju + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${RDEPEND}" + +src_compile() { + GOFLAGS+=" -tags=$(usex sqlite libsqlite3 nosqlite)" + + ego build ${GOFLAGS} ./cmd/soju + ego build ${GOFLAGS} ./cmd/sojuctl + + scdoc doc/soju.1 +} + +src_install() { + dobin soju + dobin sojuctl + + doman doc/soju.1 + keepdir /etc/soju + insinto /etc/soju + newins config.in config + newinitd "${FILESDIR}"/soju.initd soju + einstalldocs +} + +pkg_postinst() { + elog "${P} requires a user database for authenticating bouncer users," + elog "please create a user using:" + elog "# sojuctl -config ${EROOT}/etc/soju/config create-user [-admin]" + elog "then set ${EROOT}/var/lib/soju/main.db owner and group to soju:soju." +}