subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: net\-irc\/soju\/"

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2026-02-06 Thread Arthur Zamarin

commit: 3bbcd4cbeaf1c08850b8af795b4719d424ea34b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb  6 18:32:06 2026 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb  6 18:32:34 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bbcd4cb

net-irc/soju: enable verify-sig

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/soju/Manifest   |  6 --
 net-irc/soju/soju-0.10.1.ebuild | 14 +-
 net-irc/soju/soju-0.9.0.ebuild  | 16 
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 0168e96f85fb..d481368bcdbf 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,4 +1,6 @@
 DIST soju-0.10.1-vendor.tar.xz 8281156 BLAKE2B 
5b949cc5be6a3a962388eee847315cf0cf3dfac9249e9c6179c413830cede7509d7c98e5abaf7fdb4f2dbbbc25ba0281e96eae56508c19eb8d7250fd51e7
 SHA512 
11a3412db1306739883050f58def5cd0e658dcf3091b8d4ce0b59fab0e1951f4e257c1adc0bada92bf44c184831b4be38917db1f6b144e5790e2f448086e0ad9
-DIST soju-0.10.1.tar.gz 171517 BLAKE2B 
6386ed647c046b7aa3004c01e00b98b1edd9b031cabe74197c390e249a6fe7f85eb0a0e949c1a462656783ebaa311b35dcb475dc8155ae0fdf7bd90ba31c4d75
 SHA512 
9c7367e6a0371f232b25269942fd384410f21aa76713024e66ca11b4b8a81716d20567931b36a178beaaacfa32c169adb755e484d826df31270d3e7f10b4f468
+DIST soju-0.10.1.cb.tar.gz 172554 BLAKE2B 
ef76fc2795cabb5ca4a95122f0af3b617c002f7acbec6cbdf0c14545cc41fc9cf552fa5dfbbf2d65a1056b040bb334dc336bb47784616fa0754f8c61ecbdb589
 SHA512 
2b3b85436664d5554a23970abf41c70a48aaa0fe0ee9f967c23b54664ffc684e8b193ea8925bce347ff868eecc6b6afd120f0c4c66877182dcbce8b3a63777e1
+DIST soju-0.10.1.cb.tar.gz.sig 566 BLAKE2B 
220e381a520aaeef7524d3916d06348dc2fed616793366068a2fea90ae9864e18c1bd54c53bee979c96b73bf46cc94cc60c34c7d44cfc73f3c5a0d2bed896678
 SHA512 
d69f797c4b15ba13df6267a925662a804290f0c28b9a7fc688735f65478c70daba4572cb02593c54172221ca1f890a2e498a7c57292eb23ee5ff4b8708680ea4
 DIST soju-0.9.0-deps.tar.xz 165948980 BLAKE2B 
b6274b4b5fefd003c03948c58fcfb20095c9c27e3f9d6bb74155bc5cb63a53cce47727eecbe8d0a4e9b9ca37a7cd0beab8f98ac86787b3d4ad42a0405da46df8
 SHA512 
7bca581b5d455d761d16ae8786e3cc7ee5aff658dc1ae942aa9d220cc311320a3c00a7c303f3bc99965c4aa6337c31255d0d5a140220974938fc341c9beeac66
-DIST soju-0.9.0.tar.gz 164787 BLAKE2B 
58cfebf2f69c4b3ec54647ca869582c7874fd53902eaba16d2f28dc77fd0f82411b1b800983545333dce935e9dfb662539270c8c64939a1d1cf603118984b016
 SHA512 
13d1d1c172780a56d8751502015450cecbe09618b6b4f42305e014b19f1a032bd304a0bfb61e6ea56bd723838d8521ee8a1b90e92dfd82db574f0384338a3519
+DIST soju-0.9.0.cb.tar.gz 164868 BLAKE2B 
54ca15b0f57df42a5aa036873fb015f05bfd18c0592bbaae9bb08868f3cb9ff68fcf1d4213167ce63b8530bed516e6aeab6185ebd2f7e353c0ec50b91aa81a01
 SHA512 
e9a6d19154d7eebaff9714553851395c128271bf453f8331b2bcf0c7b04818e640aef603200c70e4c7e421e45676e02f4aa5f2661f87a054cbb6439ff668c155
+DIST soju-0.9.0.cb.tar.gz.sig 566 BLAKE2B 
f990d2668559e5eb4425740224114b358f9e6d7f560c829b2c816819d1ebeb2527c5a08e1b016946cdd475f787ab4f77217416f21723ed6b92e58330672cef14
 SHA512 
fee4adc0e3eecf583e432501ffdcad6d5b3b4aaedb5beed64e69211f3b79785fb9632b267a70d2add8a686e80e23895a41eb9d34ca56ddbf4180fd078bcc073d

diff --git a/net-irc/soju/soju-0.10.1.ebuild b/net-irc/soju/soju-0.10.1.ebuild
index 55624ceda092..c9d2a7190042 100644
--- a/net-irc/soju/soju-0.10.1.ebuild
+++ b/net-irc/soju/soju-0.10.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit go-module systemd tmpfiles
+inherit go-module systemd tmpfiles verify-sig
 
 DESCRIPTION="soju is a user-friendly IRC bouncer"
 HOMEPAGE="https://soju.im/";
-SRC_URI="https://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI="https://codeberg.org/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz
 -> ${P}.cb.tar.gz
+   
https://codeberg.org/emersion/${PN}/releases/download/v${PV}/${P}.tar.gz.sig -> 
${P}.cb.tar.gz.sig"
 SRC_URI+=" 
https://github.com/gentoo-golang-dist/soju/releases/download/v${PV}/${P}-vendor.tar.xz";
 
 LICENSE="AGPL-3 Apache-2.0 MIT BSD"
@@ -18,6 +19,7 @@ REQUIRED_USE="?? ( moderncsqlite sqlite )"
 
 BDEPEND="
app-text/scdoc
+   verify-sig? ( sec-keys/openpgp-keys-emersion )
 "
 RDEPEND="
acct-user/soju
@@ -26,8 +28,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-   cp -r "${WORKDIR}"/${PN} -T "${S}" || die
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/emersion.asc"
+
+src_unpack() {
+   use verify-sig && verify-sig_verify_detached 
"${DISTDIR}"/${P}.cb.tar.gz{,.sig}
default
 }
 

diff --git a/net-irc/soju/soju-0.9.0.ebuild b/net-irc/soju/soju-0.9.0.ebuild
index 5eb2fd42e652..755369079303 100644
--- a/net-irc/soju/soju-0.9.0.ebuild
+++ b/net-irc/soju/soju-0.9.0.ebuild
@@ -1,15 +1,15 @@
-# Copyright 2022-2025 Gentoo Authors
+# Copyright 2022-2026 Gentoo

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2025-12-21 Thread Sam James

commit: 09a37614e7dbc8fd4f14e51df5e3af1712184640
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 21 13:58:09 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 21 13:58:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a37614

net-irc/soju: fix EapiFormat

Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/soju-0.10.1.ebuild | 1 +
 net-irc/soju/soju-0.9.0.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/net-irc/soju/soju-0.10.1.ebuild b/net-irc/soju/soju-0.10.1.ebuild
index d1199da921b5..55624ceda092 100644
--- a/net-irc/soju/soju-0.10.1.ebuild
+++ b/net-irc/soju/soju-0.10.1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 inherit go-module systemd tmpfiles

diff --git a/net-irc/soju/soju-0.9.0.ebuild b/net-irc/soju/soju-0.9.0.ebuild
index 031ee669620e..5eb2fd42e652 100644
--- a/net-irc/soju/soju-0.9.0.ebuild
+++ b/net-irc/soju/soju-0.9.0.ebuild
@@ -1,5 +1,6 @@
 # Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
 inherit go-module systemd tmpfiles

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2025-12-21 Thread Sam James

commit: 7d7ade107b08d7bb3ce97da449ee6d4ea0c9ca78
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 21 13:57:49 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 21 13:57:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7ade10

net-irc/soju: drop 0.8.2-r1

Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/Manifest |  2 -
 net-irc/soju/soju-0.8.2-r1.ebuild | 80 ---
 2 files changed, 82 deletions(-)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 04632ff1a56b..0168e96f85fb 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,6 +1,4 @@
 DIST soju-0.10.1-vendor.tar.xz 8281156 BLAKE2B 
5b949cc5be6a3a962388eee847315cf0cf3dfac9249e9c6179c413830cede7509d7c98e5abaf7fdb4f2dbbbc25ba0281e96eae56508c19eb8d7250fd51e7
 SHA512 
11a3412db1306739883050f58def5cd0e658dcf3091b8d4ce0b59fab0e1951f4e257c1adc0bada92bf44c184831b4be38917db1f6b144e5790e2f448086e0ad9
 DIST soju-0.10.1.tar.gz 171517 BLAKE2B 
6386ed647c046b7aa3004c01e00b98b1edd9b031cabe74197c390e249a6fe7f85eb0a0e949c1a462656783ebaa311b35dcb475dc8155ae0fdf7bd90ba31c4d75
 SHA512 
9c7367e6a0371f232b25269942fd384410f21aa76713024e66ca11b4b8a81716d20567931b36a178beaaacfa32c169adb755e484d826df31270d3e7f10b4f468
-DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 
5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48
 SHA512 
64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
-DIST soju-0.8.2.tar.gz 155059 BLAKE2B 
17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef
 SHA512 
7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b
 DIST soju-0.9.0-deps.tar.xz 165948980 BLAKE2B 
b6274b4b5fefd003c03948c58fcfb20095c9c27e3f9d6bb74155bc5cb63a53cce47727eecbe8d0a4e9b9ca37a7cd0beab8f98ac86787b3d4ad42a0405da46df8
 SHA512 
7bca581b5d455d761d16ae8786e3cc7ee5aff658dc1ae942aa9d220cc311320a3c00a7c303f3bc99965c4aa6337c31255d0d5a140220974938fc341c9beeac66
 DIST soju-0.9.0.tar.gz 164787 BLAKE2B 
58cfebf2f69c4b3ec54647ca869582c7874fd53902eaba16d2f28dc77fd0f82411b1b800983545333dce935e9dfb662539270c8c64939a1d1cf603118984b016
 SHA512 
13d1d1c172780a56d8751502015450cecbe09618b6b4f42305e014b19f1a032bd304a0bfb61e6ea56bd723838d8521ee8a1b90e92dfd82db574f0384338a3519

diff --git a/net-irc/soju/soju-0.8.2-r1.ebuild 
b/net-irc/soju/soju-0.8.2-r1.ebuild
deleted file mode 100644
index 0d8a5761bc01..
--- a/net-irc/soju/soju-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-inherit go-module systemd tmpfiles
-
-DESCRIPTION="soju is a user-friendly IRC bouncer"
-HOMEPAGE="https://soju.im/";
-SRC_URI="https://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz";
-S="${WORKDIR}/soju"
-
-LICENSE="AGPL-3 Apache-2.0 MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~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
-   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
-   scdoc doc/sojuctl.1 || die
-}
-
-src_install() {
-   dobin soju
-   dobin sojudb
-   dobin sojuctl
-
-   doman doc/soju.1
-   doman doc/sojuctl.1
-   systemd_dounit contrib/soju.service
-
-   newtmpfiles "${FILESDIR}/soju.tmpfiles" soju.conf
-
-   keepdir /etc/soju
-   insinto /etc/soju
-   newins config.in config
-   newinitd "${FILESDIR}"/soju.initd soju
-   einstalldocs
-}
-
-pkg_postinst() {
-   tmpfiles_process soju.conf
-
-   elog "${PN} requires a user database for authenticating clie

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2025-12-21 Thread Sam James

commit: 89222c66fb50f790c85b309866d3554d02fe72bf
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 21 13:54:19 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 21 13:56:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89222c66

net-irc/soju: add 0.10.1

Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/Manifest   |  2 +
 net-irc/soju/soju-0.10.1.ebuild | 84 +
 2 files changed, 86 insertions(+)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index edcecc3c63fc..04632ff1a56b 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,3 +1,5 @@
+DIST soju-0.10.1-vendor.tar.xz 8281156 BLAKE2B 
5b949cc5be6a3a962388eee847315cf0cf3dfac9249e9c6179c413830cede7509d7c98e5abaf7fdb4f2dbbbc25ba0281e96eae56508c19eb8d7250fd51e7
 SHA512 
11a3412db1306739883050f58def5cd0e658dcf3091b8d4ce0b59fab0e1951f4e257c1adc0bada92bf44c184831b4be38917db1f6b144e5790e2f448086e0ad9
+DIST soju-0.10.1.tar.gz 171517 BLAKE2B 
6386ed647c046b7aa3004c01e00b98b1edd9b031cabe74197c390e249a6fe7f85eb0a0e949c1a462656783ebaa311b35dcb475dc8155ae0fdf7bd90ba31c4d75
 SHA512 
9c7367e6a0371f232b25269942fd384410f21aa76713024e66ca11b4b8a81716d20567931b36a178beaaacfa32c169adb755e484d826df31270d3e7f10b4f468
 DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 
5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48
 SHA512 
64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
 DIST soju-0.8.2.tar.gz 155059 BLAKE2B 
17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef
 SHA512 
7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b
 DIST soju-0.9.0-deps.tar.xz 165948980 BLAKE2B 
b6274b4b5fefd003c03948c58fcfb20095c9c27e3f9d6bb74155bc5cb63a53cce47727eecbe8d0a4e9b9ca37a7cd0beab8f98ac86787b3d4ad42a0405da46df8
 SHA512 
7bca581b5d455d761d16ae8786e3cc7ee5aff658dc1ae942aa9d220cc311320a3c00a7c303f3bc99965c4aa6337c31255d0d5a140220974938fc341c9beeac66

diff --git a/net-irc/soju/soju-0.10.1.ebuild b/net-irc/soju/soju-0.10.1.ebuild
new file mode 100644
index ..d1199da921b5
--- /dev/null
+++ b/net-irc/soju/soju-0.10.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit go-module systemd tmpfiles
+
+DESCRIPTION="soju is a user-friendly IRC bouncer"
+HOMEPAGE="https://soju.im/";
+SRC_URI="https://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI+=" 
https://github.com/gentoo-golang-dist/soju/releases/download/v${PV}/${P}-vendor.tar.xz";
+
+LICENSE="AGPL-3 Apache-2.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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_prepare() {
+   cp -r "${WORKDIR}"/${PN} -T "${S}" || die
+   default
+}
+
+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
+   scdoc doc/sojuctl.1 || die
+}
+
+src_install() {
+   dobin soju
+   dobin sojudb
+   dobin sojuctl
+
+   doman doc/soju.1
+   doman doc/sojuctl.1
+   systemd_dounit contrib/soju.service
+
+   newtmpfiles "${FILESDIR}/soju.tmpfiles" soju.conf
+
+   keepdir /etc/soju
+   insinto /etc/soju
+   newins config.in config
+   newinitd "${FILESDIR}"/soju.initd soju
+   einstalldocs
+}
+
+pkg_postinst() {
+   tmpfiles_process soju.conf
+
+   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/

2025-12-14 Thread Sam James

commit: fd2a96489072ea0618b651047e3f0c6cba088830
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 15 07:16:38 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 15 07:16:48 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2a9648

net-irc/soju: Stabilize 0.9.0 arm64, #967483

Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/soju-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/soju/soju-0.9.0.ebuild b/net-irc/soju/soju-0.9.0.ebuild
index cfa9501c1577..031ee669620e 100644
--- a/net-irc/soju/soju-0.9.0.ebuild
+++ b/net-irc/soju/soju-0.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/soju"
 
 LICENSE="AGPL-3 Apache-2.0 MIT BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~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/

2025-12-14 Thread Sam James

commit: dd87e186c272e0d02022c1a29a498adaae0f5503
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 15 06:46:23 2025 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 15 06:46:23 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd87e186

net-irc/soju: Stabilize 0.9.0 amd64, #967483

Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/soju-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-irc/soju/soju-0.9.0.ebuild b/net-irc/soju/soju-0.9.0.ebuild
index 2711143890e2..cfa9501c1577 100644
--- a/net-irc/soju/soju-0.9.0.ebuild
+++ b/net-irc/soju/soju-0.9.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/soju"
 
 LICENSE="AGPL-3 Apache-2.0 MIT BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~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/

2025-05-17 Thread Yixun Lan

commit: 62032710b0a51f0bde4ccbe4771f144aa00fab7a
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Tue May 13 19:32:18 2025 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat May 17 09:20:29 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62032710

net-irc/soju: add 0.9.0

Closes: https://github.com/gentoo/gentoo/pull/42077
Signed-off-by: Alfred Persson Forsberg  catcream.org>
Signed-off-by: Yixun Lan  gentoo.org>

 net-irc/soju/Manifest  |  2 ++
 net-irc/soju/soju-0.9.0.ebuild | 80 ++
 2 files changed, 82 insertions(+)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 7d4dd1823322..edcecc3c63fc 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,2 +1,4 @@
 DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 
5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48
 SHA512 
64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
 DIST soju-0.8.2.tar.gz 155059 BLAKE2B 
17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef
 SHA512 
7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b
+DIST soju-0.9.0-deps.tar.xz 165948980 BLAKE2B 
b6274b4b5fefd003c03948c58fcfb20095c9c27e3f9d6bb74155bc5cb63a53cce47727eecbe8d0a4e9b9ca37a7cd0beab8f98ac86787b3d4ad42a0405da46df8
 SHA512 
7bca581b5d455d761d16ae8786e3cc7ee5aff658dc1ae942aa9d220cc311320a3c00a7c303f3bc99965c4aa6337c31255d0d5a140220974938fc341c9beeac66
+DIST soju-0.9.0.tar.gz 164787 BLAKE2B 
58cfebf2f69c4b3ec54647ca869582c7874fd53902eaba16d2f28dc77fd0f82411b1b800983545333dce935e9dfb662539270c8c64939a1d1cf603118984b016
 SHA512 
13d1d1c172780a56d8751502015450cecbe09618b6b4f42305e014b19f1a032bd304a0bfb61e6ea56bd723838d8521ee8a1b90e92dfd82db574f0384338a3519

diff --git a/net-irc/soju/soju-0.9.0.ebuild b/net-irc/soju/soju-0.9.0.ebuild
new file mode 100644
index ..2711143890e2
--- /dev/null
+++ b/net-irc/soju/soju-0.9.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2022-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+EAPI=8
+
+inherit go-module systemd tmpfiles
+
+DESCRIPTION="soju is a user-friendly IRC bouncer"
+HOMEPAGE="https://soju.im/";
+SRC_URI="https://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz";
+S="${WORKDIR}/soju"
+
+LICENSE="AGPL-3 Apache-2.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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
+   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
+   scdoc doc/sojuctl.1 || die
+}
+
+src_install() {
+   dobin soju
+   dobin sojudb
+   dobin sojuctl
+
+   doman doc/soju.1
+   doman doc/sojuctl.1
+   systemd_dounit contrib/soju.service
+
+   newtmpfiles "${FILESDIR}/soju.tmpfiles" soju.conf
+
+   keepdir /etc/soju
+   insinto /etc/soju
+   newins config.in config
+   newinitd "${FILESDIR}"/soju.initd soju
+   einstalldocs
+}
+
+pkg_postinst() {
+   tmpfiles_process soju.conf
+
+   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/

2024-10-30 Thread Sam James

commit: b3131c6d4af946f0a4e358a85755595445f29dc8
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Wed Oct 30 13:26:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 30 15:10:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3131c6d

net-irc/soju: drop 0.8.0

Signed-off-by: Alfred Persson Forsberg  catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/39157
Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/Manifest  |  2 --
 net-irc/soju/soju-0.8.0.ebuild | 74 --
 2 files changed, 76 deletions(-)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 57042043d326..7d4dd1823322 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,4 +1,2 @@
-DIST soju-0.8.0-deps.tar.xz 79434480 BLAKE2B 
4cb3bbcd7d4c0fc610dffc585291fe07981c0d5d08e81fe800c6a08f3655eb999e097e17fe59342b896091a8e5640782f65bba351b94948ff9ed0f548fe6280c
 SHA512 
a1f82740e673ed95cde2917d5dad53645b8cfcdefd673f44cd5b0573238c39a17355ea27e55572bb03625529202be50bf00f4bb57322ffa8857409cb1b190872
-DIST soju-0.8.0.tar.gz 154571 BLAKE2B 
737fc3e44ea04b42c6a5029db0c6c65a03c22dd30c26196439c97abe2ee9f1379b9cd49ef2cf15e25a911c0d05af1f17fcfea585c85278e081e4f3b7d9d55342
 SHA512 
22fb0815704b70dd302d75c4a00d80ac22cd622175066e7365277ef7d5a531537aa308b53703d15651a5ae841e2a02a3d7f19165c847078c5a0ae3c40d750738
 DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 
5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48
 SHA512 
64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
 DIST soju-0.8.2.tar.gz 155059 BLAKE2B 
17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef
 SHA512 
7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b

diff --git a/net-irc/soju/soju-0.8.0.ebuild b/net-irc/soju/soju-0.8.0.ebuild
deleted file mode 100644
index 43d0b770ae70..
--- a/net-irc/soju/soju-0.8.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2024 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 ~arm ~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
-   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
-   scdoc doc/sojuctl.1 || die
-}
-
-src_install() {
-   dobin soju
-   dobin sojudb
-   dobin sojuctl
-
-   doman doc/soju.1
-   doman doc/sojuctl.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/files/, net-irc/soju/

2024-10-30 Thread Sam James

commit: 521bd2bc26491f73dcb5e680116b0d247d960f12
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Wed Oct 30 14:28:15 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 30 15:10:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521bd2bc

net-irc/soju: add tmpfiles.d config

Closes: https://bugs.gentoo.org/942477
Signed-off-by: Alfred Persson Forsberg  catcream.org>
Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/files/soju.tmpfiles | 1 +
 net-irc/soju/{soju-0.8.2.ebuild => soju-0.8.2-r1.ebuild} | 7 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-irc/soju/files/soju.tmpfiles b/net-irc/soju/files/soju.tmpfiles
new file mode 100644
index ..6280a148121c
--- /dev/null
+++ b/net-irc/soju/files/soju.tmpfiles
@@ -0,0 +1 @@
+d /run/soju 0750 soju soju

diff --git a/net-irc/soju/soju-0.8.2.ebuild b/net-irc/soju/soju-0.8.2-r1.ebuild
similarity index 94%
rename from net-irc/soju/soju-0.8.2.ebuild
rename to net-irc/soju/soju-0.8.2-r1.ebuild
index f92c219dc9f1..0d8a5761bc01 100644
--- a/net-irc/soju/soju-0.8.2.ebuild
+++ b/net-irc/soju/soju-0.8.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-inherit go-module systemd
+inherit go-module systemd tmpfiles
 
 DESCRIPTION="soju is a user-friendly IRC bouncer"
 HOMEPAGE="https://soju.im/";
@@ -61,6 +61,9 @@ src_install() {
doman doc/soju.1
doman doc/sojuctl.1
systemd_dounit contrib/soju.service
+
+   newtmpfiles "${FILESDIR}/soju.tmpfiles" soju.conf
+
keepdir /etc/soju
insinto /etc/soju
newins config.in config
@@ -69,6 +72,8 @@ src_install() {
 }
 
 pkg_postinst() {
+   tmpfiles_process soju.conf
+
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/

2024-09-05 Thread Sam James

commit: 3bfb977d852477b73782111ed940e414ea37516c
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Thu Sep  5 19:14:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  5 19:17:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bfb977d

net-irc/soju: add 0.8.2

Signed-off-by: Alfred Persson Forsberg  catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/38338
Signed-off-by: Sam James  gentoo.org>

 net-irc/soju/Manifest  |  2 ++
 net-irc/soju/metadata.xml  |  1 +
 net-irc/soju/soju-0.8.2.ebuild | 75 ++
 3 files changed, 78 insertions(+)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index 42b20a9d03d9..57042043d326 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,2 +1,4 @@
 DIST soju-0.8.0-deps.tar.xz 79434480 BLAKE2B 
4cb3bbcd7d4c0fc610dffc585291fe07981c0d5d08e81fe800c6a08f3655eb999e097e17fe59342b896091a8e5640782f65bba351b94948ff9ed0f548fe6280c
 SHA512 
a1f82740e673ed95cde2917d5dad53645b8cfcdefd673f44cd5b0573238c39a17355ea27e55572bb03625529202be50bf00f4bb57322ffa8857409cb1b190872
 DIST soju-0.8.0.tar.gz 154571 BLAKE2B 
737fc3e44ea04b42c6a5029db0c6c65a03c22dd30c26196439c97abe2ee9f1379b9cd49ef2cf15e25a911c0d05af1f17fcfea585c85278e081e4f3b7d9d55342
 SHA512 
22fb0815704b70dd302d75c4a00d80ac22cd622175066e7365277ef7d5a531537aa308b53703d15651a5ae841e2a02a3d7f19165c847078c5a0ae3c40d750738
+DIST soju-0.8.2-deps.tar.xz 72699036 BLAKE2B 
5abfa3d683a0f06be7361bfeec751b6f4892fde51f1d9216cca163eac125e72f68a8116279b16b8ce6f5076293b7ad67b6098f887ac3cea3f099f2b27643ed48
 SHA512 
64fa60a90a33021661f51f2f6456bf8f2e8d01282143ad41b966ade105e6b4f2310f83f81f45bcea6baa2f76857e549f1548844ec1c3f17c1f1e0615523ef813
+DIST soju-0.8.2.tar.gz 155059 BLAKE2B 
17f220440c8135abeb570808d7a4cb5cdb6993c076ffe9eb2fa0bb0e8487f9b29831049b2702692cc0903277399603dbe8e0ad27ed6356b932c29979a6eeddef
 SHA512 
7e5bc27394223c021ce6e1b9d93b617ade5bd803f37e030ea05e079efdf343ff0128753803a2e1c86ca2c83786bdaf21600cb6457b4404dd0cf2ff0e5646c62b

diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml
index e5c26b9d7f79..408b34bb938d 100644
--- a/net-irc/soju/metadata.xml
+++ b/net-irc/soju/metadata.xml
@@ -10,6 +10,7 @@
   Proxy Maintainers
 
 
+  emersion/soju
   ~emersion/soju
   alfredfo/soju-deps
 

diff --git a/net-irc/soju/soju-0.8.2.ebuild b/net-irc/soju/soju-0.8.2.ebuild
new file mode 100644
index ..f92c219dc9f1
--- /dev/null
+++ b/net-irc/soju/soju-0.8.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2022-2024 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://codeberg.org/emersion/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+SRC_URI+=" https://github.com/alfredfo/${PN}-deps/raw/master/${P}-deps.tar.xz";
+S="${WORKDIR}/soju"
+
+LICENSE="AGPL-3 Apache-2.0 MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~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
+   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
+   scdoc doc/sojuctl.1 || die
+}
+
+src_install() {
+   dobin soju
+   dobin sojudb
+   dobin sojuctl
+
+   doman doc/soju.1
+   doman doc/sojuctl.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/

2024-09-05 Thread Sam James

commit: 44b6acd83b85c35f94cbbf686ddbc2e5c8011693
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Thu Sep  5 19:12:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  5 19:17:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b6acd8

net-irc/soju: drop 0.7.0-r1

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-r1.ebuild | 74 ---
 2 files changed, 76 deletions(-)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index ee3b47f0067c..42b20a9d03d9 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,4 +1,2 @@
-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
 DIST soju-0.8.0-deps.tar.xz 79434480 BLAKE2B 
4cb3bbcd7d4c0fc610dffc585291fe07981c0d5d08e81fe800c6a08f3655eb999e097e17fe59342b896091a8e5640782f65bba351b94948ff9ed0f548fe6280c
 SHA512 
a1f82740e673ed95cde2917d5dad53645b8cfcdefd673f44cd5b0573238c39a17355ea27e55572bb03625529202be50bf00f4bb57322ffa8857409cb1b190872
 DIST soju-0.8.0.tar.gz 154571 BLAKE2B 
737fc3e44ea04b42c6a5029db0c6c65a03c22dd30c26196439c97abe2ee9f1379b9cd49ef2cf15e25a911c0d05af1f17fcfea585c85278e081e4f3b7d9d55342
 SHA512 
22fb0815704b70dd302d75c4a00d80ac22cd622175066e7365277ef7d5a531537aa308b53703d15651a5ae841e2a02a3d7f19165c847078c5a0ae3c40d750738

diff --git a/net-irc/soju/soju-0.7.0-r1.ebuild 
b/net-irc/soju/soju-0.7.0-r1.ebuild
deleted file mode 100644
index 43d0b770ae70..
--- a/net-irc/soju/soju-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2022-2024 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 ~arm ~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
-   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
-   scdoc doc/sojuctl.1 || die
-}
-
-src_install() {
-   dobin soju
-   dobin sojudb
-   dobin sojuctl
-
-   doman doc/soju.1
-   doman doc/sojuctl.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/

2024-07-05 Thread Arthur Zamarin

commit: 72ea45de8318c376b1e74340483135ff8a99b281
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Tue Jun  4 20:28:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul  5 10:49:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ea45de

net-irc/soju: drop 0.6.2

Signed-off-by: Alfred Persson Forsberg  catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/37029
Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/soju/soju-0.6.2.ebuild | 72 --
 1 file changed, 72 deletions(-)

diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild
deleted file mode 100644
index 266c4335c650..
--- a/net-irc/soju/soju-0.6.2.ebuild
+++ /dev/null
@@ -1,72 +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 ~arm ~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
-   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/

2024-07-05 Thread Arthur Zamarin

commit: 6404c5404f0493f5c9a341a5cf39502471e3572b
Author: Alfred Persson Forsberg  catcream  org>
AuthorDate: Tue Jun  4 20:25:42 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul  5 10:49:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6404c540

net-irc/soju: add 0.8.0

Signed-off-by: Alfred Persson Forsberg  catcream.org>
Signed-off-by: Arthur Zamarin  gentoo.org>

 net-irc/soju/Manifest  |  4 +--
 net-irc/soju/soju-0.8.0.ebuild | 74 ++
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/net-irc/soju/Manifest b/net-irc/soju/Manifest
index dbad38d41da7..ee3b47f0067c 100644
--- a/net-irc/soju/Manifest
+++ b/net-irc/soju/Manifest
@@ -1,4 +1,4 @@
-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
+DIST soju-0.8.0-deps.tar.xz 79434480 BLAKE2B 
4cb3bbcd7d4c0fc610dffc585291fe07981c0d5d08e81fe800c6a08f3655eb999e097e17fe59342b896091a8e5640782f65bba351b94948ff9ed0f548fe6280c
 SHA512 
a1f82740e673ed95cde2917d5dad53645b8cfcdefd673f44cd5b0573238c39a17355ea27e55572bb03625529202be50bf00f4bb57322ffa8857409cb1b190872
+DIST soju-0.8.0.tar.gz 154571 BLAKE2B 
737fc3e44ea04b42c6a5029db0c6c65a03c22dd30c26196439c97abe2ee9f1379b9cd49ef2cf15e25a911c0d05af1f17fcfea585c85278e081e4f3b7d9d55342
 SHA512 
22fb0815704b70dd302d75c4a00d80ac22cd622175066e7365277ef7d5a531537aa308b53703d15651a5ae841e2a02a3d7f19165c847078c5a0ae3c40d750738

diff --git a/net-irc/soju/soju-0.8.0.ebuild b/net-irc/soju/soju-0.8.0.ebuild
new file mode 100644
index ..43d0b770ae70
--- /dev/null
+++ b/net-irc/soju/soju-0.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2022-2024 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 ~arm ~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
+   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
+   scdoc doc/sojuctl.1 || die
+}
+
+src_install() {
+   dobin soju
+   dobin sojudb
+   dobin sojuctl
+
+   doman doc/soju.1
+   doman doc/sojuctl.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 usin

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2024-06-06 Thread Viorel Munteanu

commit: 66e46f4359e05ef356b5959e821dc1979085eb2c
Author: Denis Strizhkin  gmail  com>
AuthorDate: Sun Apr 28 00:18:11 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Jun  6 08:41:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e46f43

net-irc/soju: install shojuctl(1) man page

Signed-off-by: Denis Strizhkin  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36464
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-irc/soju/{soju-0.7.0.ebuild => soju-0.7.0-r1.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-irc/soju/soju-0.7.0.ebuild b/net-irc/soju/soju-0.7.0-r1.ebuild
similarity index 94%
rename from net-irc/soju/soju-0.7.0.ebuild
rename to net-irc/soju/soju-0.7.0-r1.ebuild
index 266c4335c650..43d0b770ae70 100644
--- a/net-irc/soju/soju-0.7.0.ebuild
+++ b/net-irc/soju/soju-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
@@ -49,6 +49,7 @@ src_compile() {
ego build ${GOFLAGS} ./cmd/sojuctl
 
scdoc doc/soju.1 || die
+   scdoc doc/sojuctl.1 || die
 }
 
 src_install() {
@@ -57,6 +58,7 @@ src_install() {
dobin sojuctl
 
doman doc/soju.1
+   doman doc/sojuctl.1
systemd_dounit contrib/soju.service
keepdir /etc/soju
insinto /etc/soju

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2024-06-06 Thread Viorel Munteanu

commit: 1d4ed080f8a362a4eb5d9791ad4aa923a170ec4c
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Jun  6 08:39:58 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Jun  6 08:41:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4ed080

net-irc/soju: add github upstream metadata

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-irc/soju/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-irc/soju/metadata.xml b/net-irc/soju/metadata.xml
index 7f2f852dba69..e5c26b9d7f79 100644
--- a/net-irc/soju/metadata.xml
+++ b/net-irc/soju/metadata.xml
@@ -11,6 +11,7 @@
 
 
   ~emersion/soju
+  alfredfo/soju-deps
 
 
   Use moderncsqlite, a cgo-free port of

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2023-12-08 Thread Sam James

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/

2023-12-08 Thread Sam James

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/

2023-12-08 Thread Sam James

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/

2023-12-08 Thread Sam James

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/

2023-11-17 Thread Sam James

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/

2023-08-17 Thread Sam James

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/

2023-06-22 Thread Sam James

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/

2023-06-11 Thread Joonas Niilola

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(&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) d

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2023-06-11 Thread Joonas Niilola

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/

2023-04-25 Thread Sam James

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/

2023-04-25 Thread Sam James

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/

2023-04-25 Thread Sam James

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/

2023-04-09 Thread Sam James

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/

2023-04-09 Thread Sam James

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(&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
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/

2023-04-09 Thread Sam James

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/

2023-04-09 Thread Sam James

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/

2023-04-09 Thread Sam James

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/

2023-04-09 Thread Sam James

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/

2023-04-09 Thread Sam James

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/

2022-12-15 Thread Sam James

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 @@
   [email protected]
   Proxy Maintainers
 
+
+  ~emersion/soju
+

[gentoo-commits] repo/gentoo:master commit in: net-irc/soju/

2022-12-14 Thread Sam James

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/

2022-12-13 Thread Sam James

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'>
+
+
+  [email protected]
+  Alfred Persson
+
+
+  [email protected]
+  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."
+}

37 matches

Mail list logo