* Re: ergo: update to 2.11.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
@ 2023-11-27 1:46 ` github-actions
2023-11-30 21:08 ` chilledfrogs
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: github-actions @ 2023-11-27 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#issuecomment-1827005579
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ergo: update to 2.11.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
2023-11-27 1:46 ` github-actions
@ 2023-11-30 21:08 ` chilledfrogs
2024-03-01 1:46 ` github-actions
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2023-11-30 21:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#issuecomment-1834562616
Comment:
Bump
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: ergo: update to 2.11.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
2023-11-27 1:46 ` github-actions
2023-11-30 21:08 ` chilledfrogs
@ 2024-03-01 1:46 ` github-actions
2024-03-01 11:52 ` [PR PATCH] [Updated] " chilledfrogs
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: github-actions @ 2024-03-01 1:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#issuecomment-1972298498
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] ergo: update to 2.11.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (2 preceding siblings ...)
2024-03-01 1:46 ` github-actions
@ 2024-03-01 11:52 ` chilledfrogs
2024-04-07 22:17 ` chilledfrogs
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-03-01 11:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
ergo: update to 2.11.1, rename from oragono.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 6720 bytes --]
From 5e6b9eeb8e494b2d32559d3d14ee78b124ed5541 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] ergo: update to 2.11.1, rename from oragono.
---
srcpkgs/ergo/files/ergo/run | 6 +++
srcpkgs/ergo/oragono.INSTALL | 10 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 +
srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
srcpkgs/ergo/template | 37 +++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 ---
srcpkgs/oragono/template | 32 ----------------
8 files changed, 62 insertions(+), 44 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
rename srcpkgs/{oragono => ergo}/patches/paths.patch (84%)
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..e4dc1e8ebc1606
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run --conf /etc/ergo.conf
diff --git a/srcpkgs/ergo/oragono.INSTALL b/srcpkgs/ergo/oragono.INSTALL
new file mode 100644
index 00000000000000..ea5ca24a50d461
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL
@@ -0,0 +1,10 @@
+case "$ACTION" in
+post)
+ if [ "$UPDATE" = "yes" ]; then
+ [ -f etc/oragono.conf ] && mv etc/oragono.conf etc/ergo.conf
+ if [ -d var/lib/oragono ]; then
+ mv -T var/lib/oragono var/lib/ergo
+ chown -R _ergo:_ergo var/lib/ergo
+ fi
+ fi ;;
+esac
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..9ab59e358fcdae
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+Oragono was renamed to Ergo since version 2.7.0.
+
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
similarity index 84%
rename from srcpkgs/oragono/patches/paths.patch
rename to srcpkgs/ergo/patches/paths.patch
index ad9fb051231eb5..748da7060cd30e 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -6,8 +6,8 @@
tls:
- cert: fullchain.pem
- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
++ cert: /var/lib/ergo/fullchain.pem
++ key: /var/lib/ergo/privkey.pem
# 'proxy' should typically be false. It's for cloud load balancers that
# always send a PROXY protocol header ahead of the connection. See the
# manual ("Reverse proxies") for more details.
@@ -15,8 +15,8 @@
# motd filename
# if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
+- motd: ergo.motd
++ motd: /var/lib/ergo/motd
# motd formatting codes
# if this is true, the motd is escaped using formatting codes like $c, $b, and $i
@@ -25,7 +25,7 @@
datastore:
# path to the datastore
- path: ircd.db
-+ path: /var/lib/oragono/db
++ path: /var/lib/ergo/db
# if the database schema requires an upgrade, `autoupgrade` will attempt to
# perform it automatically on startup. the database will be backed
@@ -34,7 +34,7 @@
# which directory contains our language files
- path: languages
-+ path: /usr/share/oragono/i18n
++ path: /usr/share/ergo/i18n
# limits - these need to be the same across the network
limits:
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..5ffb3fd0610784
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.11.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=045cfffd2a387b37a344d6f538de7eeda0b718d71a898fe9919da579bdb25cfd
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] ergo: update to 2.11.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (3 preceding siblings ...)
2024-03-01 11:52 ` [PR PATCH] [Updated] " chilledfrogs
@ 2024-04-07 22:17 ` chilledfrogs
2024-05-06 21:29 ` [PR PATCH] [Updated] ergo: update to 2.13.0, " chilledfrogs
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-04-07 22:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
ergo: update to 2.11.1, rename from oragono.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 8966 bytes --]
From 8102f35a7a784e3062ca8671735ae14428b69978 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] ergo: update to 2.13.0, rename from oragono.
---
srcpkgs/ergo/files/ergo/run | 6 ++++
srcpkgs/ergo/oragono.INSTALL | 10 ++++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/patches/paths.patch | 49 +++++++++++++++++++++++++++++
srcpkgs/ergo/template | 41 ++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 ----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------
srcpkgs/oragono/template | 32 -------------------
9 files changed, 109 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/patches/paths.patch
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..e4dc1e8ebc1606
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run --conf /etc/ergo.conf
diff --git a/srcpkgs/ergo/oragono.INSTALL b/srcpkgs/ergo/oragono.INSTALL
new file mode 100644
index 00000000000000..ea5ca24a50d461
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL
@@ -0,0 +1,10 @@
+case "$ACTION" in
+post)
+ if [ "$UPDATE" = "yes" ]; then
+ [ -f etc/oragono.conf ] && mv etc/oragono.conf etc/ergo.conf
+ if [ -d var/lib/oragono ]; then
+ mv -T var/lib/oragono var/lib/ergo
+ chown -R _ergo:_ergo var/lib/ergo
+ fi
+ fi ;;
+esac
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..9ab59e358fcdae
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+Oragono was renamed to Ergo since version 2.7.0.
+
diff --git a/srcpkgs/ergo/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
new file mode 100644
index 00000000000000..6c36365999f34e
--- /dev/null
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -0,0 +1,49 @@
+diff --git a/default.yaml b/default.yaml
+index 36f3ee1e..51031fea 100644
+--- a/default.yaml
++++ b/default.yaml
+@@ -52,8 +52,8 @@ server:
+ # this is a standard TLS configuration with a single certificate;
+ # see the manual for instructions on how to configure SNI
+ tls:
+- cert: fullchain.pem
+- key: privkey.pem
++ cert: /var/lib/ergo/fullchain.pem
++ key: /var/lib/ergo/privkey.pem
+ # 'proxy' should typically be false. It's for cloud load balancers that
+ # always send a PROXY protocol header ahead of the connection. See the
+ # manual ("Reverse proxies") for more details.
+@@ -171,8 +171,7 @@ server:
+ #password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
+
+ # motd filename
+- # if you change the motd, you should move it to ircd.motd
+- motd: ergo.motd
++ motd: /usr/share/ergo/default.motd
+
+ # motd formatting codes
+ # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
+@@ -807,12 +806,12 @@ debug:
+ # started at once. comment out or set to the empty string ("") to disable.
+ # this path is relative to the working directory; if your datastore.path
+ # is absolute, you should use an absolute path here as well.
+-lock-file: "ircd.lock"
++lock-file: "/var/lib/ergo/ergo.lock"
+
+ # datastore configuration
+ datastore:
+ # path to the datastore
+- path: ircd.db
++ path: /var/lib/ergo/db
+
+ # if the database schema requires an upgrade, `autoupgrade` will attempt to
+ # perform it automatically on startup. the database will be backed
+@@ -844,7 +843,7 @@ languages:
+ default: en
+
+ # which directory contains our language files
+- path: languages
++ path: /usr/share/ergo/i18n
+
+ # limits - these need to be the same across the network
+ limits:
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..e83634d283690f
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,41 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=85a1e5501d4a4cb05b263de4b59e1fb20896963a2fd053483c90b40e4b31c4ab
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] ergo: update to 2.13.0, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (4 preceding siblings ...)
2024-04-07 22:17 ` chilledfrogs
@ 2024-05-06 21:29 ` chilledfrogs
2024-06-22 0:31 ` [PR REVIEW] ergo: update to 2.13.1, " classabbyamp
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-05-06 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
ergo: update to 2.13.0, rename from oragono.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 8966 bytes --]
From b79c311fe48064fad60e1198dc9298ca7a803f93 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] ergo: update to 2.13.1, rename from oragono.
---
srcpkgs/ergo/files/ergo/run | 6 ++++
srcpkgs/ergo/oragono.INSTALL | 10 ++++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/patches/paths.patch | 49 +++++++++++++++++++++++++++++
srcpkgs/ergo/template | 41 ++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 ----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------
srcpkgs/oragono/template | 32 -------------------
9 files changed, 109 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/patches/paths.patch
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..e4dc1e8ebc1606
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run --conf /etc/ergo.conf
diff --git a/srcpkgs/ergo/oragono.INSTALL b/srcpkgs/ergo/oragono.INSTALL
new file mode 100644
index 00000000000000..ea5ca24a50d461
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL
@@ -0,0 +1,10 @@
+case "$ACTION" in
+post)
+ if [ "$UPDATE" = "yes" ]; then
+ [ -f etc/oragono.conf ] && mv etc/oragono.conf etc/ergo.conf
+ if [ -d var/lib/oragono ]; then
+ mv -T var/lib/oragono var/lib/ergo
+ chown -R _ergo:_ergo var/lib/ergo
+ fi
+ fi ;;
+esac
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..9ab59e358fcdae
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+Oragono was renamed to Ergo since version 2.7.0.
+
diff --git a/srcpkgs/ergo/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
new file mode 100644
index 00000000000000..6c36365999f34e
--- /dev/null
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -0,0 +1,49 @@
+diff --git a/default.yaml b/default.yaml
+index 36f3ee1e..51031fea 100644
+--- a/default.yaml
++++ b/default.yaml
+@@ -52,8 +52,8 @@ server:
+ # this is a standard TLS configuration with a single certificate;
+ # see the manual for instructions on how to configure SNI
+ tls:
+- cert: fullchain.pem
+- key: privkey.pem
++ cert: /var/lib/ergo/fullchain.pem
++ key: /var/lib/ergo/privkey.pem
+ # 'proxy' should typically be false. It's for cloud load balancers that
+ # always send a PROXY protocol header ahead of the connection. See the
+ # manual ("Reverse proxies") for more details.
+@@ -171,8 +171,7 @@ server:
+ #password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
+
+ # motd filename
+- # if you change the motd, you should move it to ircd.motd
+- motd: ergo.motd
++ motd: /usr/share/ergo/default.motd
+
+ # motd formatting codes
+ # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
+@@ -807,12 +806,12 @@ debug:
+ # started at once. comment out or set to the empty string ("") to disable.
+ # this path is relative to the working directory; if your datastore.path
+ # is absolute, you should use an absolute path here as well.
+-lock-file: "ircd.lock"
++lock-file: "/var/lib/ergo/ergo.lock"
+
+ # datastore configuration
+ datastore:
+ # path to the datastore
+- path: ircd.db
++ path: /var/lib/ergo/db
+
+ # if the database schema requires an upgrade, `autoupgrade` will attempt to
+ # perform it automatically on startup. the database will be backed
+@@ -844,7 +843,7 @@ languages:
+ default: en
+
+ # which directory contains our language files
+- path: languages
++ path: /usr/share/ergo/i18n
+
+ # limits - these need to be the same across the network
+ limits:
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..6cb897d80e1cdc
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,41 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (5 preceding siblings ...)
2024-05-06 21:29 ` [PR PATCH] [Updated] ergo: update to 2.13.0, " chilledfrogs
@ 2024-06-22 0:31 ` classabbyamp
2024-06-22 21:17 ` [PR PATCH] [Updated] " chilledfrogs
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-22 0:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1649511498
Comment:
```suggestion
Oragono was renamed to Ergo in version 2.7.0.
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (6 preceding siblings ...)
2024-06-22 0:31 ` [PR REVIEW] ergo: update to 2.13.1, " classabbyamp
@ 2024-06-22 21:17 ` chilledfrogs
2024-06-25 12:31 ` [PR REVIEW] " ahesford
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-22 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
ergo: update to 2.13.1, rename from oragono.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 8958 bytes --]
From 1e4538feaec49ad7f4268759db33fb0afea80322 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] ergo: update to 2.13.1, rename from oragono.
---
srcpkgs/ergo/files/ergo/run | 6 ++++
srcpkgs/ergo/oragono.INSTALL | 10 ++++++
srcpkgs/ergo/oragono.INSTALL.msg | 1 +
srcpkgs/ergo/patches/paths.patch | 49 +++++++++++++++++++++++++++++
srcpkgs/ergo/template | 41 ++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 ----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------
srcpkgs/oragono/template | 32 -------------------
9 files changed, 108 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/patches/paths.patch
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..e4dc1e8ebc1606
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run --conf /etc/ergo.conf
diff --git a/srcpkgs/ergo/oragono.INSTALL b/srcpkgs/ergo/oragono.INSTALL
new file mode 100644
index 00000000000000..ea5ca24a50d461
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL
@@ -0,0 +1,10 @@
+case "$ACTION" in
+post)
+ if [ "$UPDATE" = "yes" ]; then
+ [ -f etc/oragono.conf ] && mv etc/oragono.conf etc/ergo.conf
+ if [ -d var/lib/oragono ]; then
+ mv -T var/lib/oragono var/lib/ergo
+ chown -R _ergo:_ergo var/lib/ergo
+ fi
+ fi ;;
+esac
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..bc208107c95cad
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1 @@
+Oragono was renamed to Ergo in version 2.7.0.
diff --git a/srcpkgs/ergo/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
new file mode 100644
index 00000000000000..6c36365999f34e
--- /dev/null
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -0,0 +1,49 @@
+diff --git a/default.yaml b/default.yaml
+index 36f3ee1e..51031fea 100644
+--- a/default.yaml
++++ b/default.yaml
+@@ -52,8 +52,8 @@ server:
+ # this is a standard TLS configuration with a single certificate;
+ # see the manual for instructions on how to configure SNI
+ tls:
+- cert: fullchain.pem
+- key: privkey.pem
++ cert: /var/lib/ergo/fullchain.pem
++ key: /var/lib/ergo/privkey.pem
+ # 'proxy' should typically be false. It's for cloud load balancers that
+ # always send a PROXY protocol header ahead of the connection. See the
+ # manual ("Reverse proxies") for more details.
+@@ -171,8 +171,7 @@ server:
+ #password: "$2a$04$0123456789abcdef0123456789abcdef0123456789abcdef01234"
+
+ # motd filename
+- # if you change the motd, you should move it to ircd.motd
+- motd: ergo.motd
++ motd: /usr/share/ergo/default.motd
+
+ # motd formatting codes
+ # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
+@@ -807,12 +806,12 @@ debug:
+ # started at once. comment out or set to the empty string ("") to disable.
+ # this path is relative to the working directory; if your datastore.path
+ # is absolute, you should use an absolute path here as well.
+-lock-file: "ircd.lock"
++lock-file: "/var/lib/ergo/ergo.lock"
+
+ # datastore configuration
+ datastore:
+ # path to the datastore
+- path: ircd.db
++ path: /var/lib/ergo/db
+
+ # if the database schema requires an upgrade, `autoupgrade` will attempt to
+ # perform it automatically on startup. the database will be backed
+@@ -844,7 +843,7 @@ languages:
+ default: en
+
+ # which directory contains our language files
+- path: languages
++ path: /usr/share/ergo/i18n
+
+ # limits - these need to be the same across the network
+ limits:
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..6cb897d80e1cdc
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,41 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (7 preceding siblings ...)
2024-06-22 21:17 ` [PR PATCH] [Updated] " chilledfrogs
@ 2024-06-25 12:31 ` ahesford
2024-06-25 12:31 ` ahesford
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-25 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1652705508
Comment:
```suggestion
The package `oragono` has been renamed `ergo`.
Manually migrate any existing configuration.
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (8 preceding siblings ...)
2024-06-25 12:31 ` [PR REVIEW] " ahesford
@ 2024-06-25 12:31 ` ahesford
2024-06-25 12:31 ` ahesford
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-25 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1652692464
Comment:
If this is going to source a configuration, that configuration might as well provide the opportunity to override the configuration file:
```suggestion
exec chpst -u _ergo:_ergo ergo run ${OPTS:---conf /etc/ergo.conf}
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (9 preceding siblings ...)
2024-06-25 12:31 ` ahesford
@ 2024-06-25 12:31 ` ahesford
2024-06-25 12:31 ` ahesford
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-25 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 451 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1652719441
Comment:
Isn't this going to result in a broken default configuration? There are no certificates installed in `/var/lib/ergo`. If so, I recommend dropping this patch entirely and shipping this as an example only. Alternatively, modify the configuration to disable TLS in the default, and let users configure it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (10 preceding siblings ...)
2024-06-25 12:31 ` ahesford
@ 2024-06-25 12:31 ` ahesford
2024-06-26 7:14 ` chilledfrogs
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-25 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1652693586
Comment:
Strike this file. Automated moving of prior configuration is a nightmare; let users manually migrate.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] ergo: update to 2.13.1, rename from oragono.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (11 preceding siblings ...)
2024-06-25 12:31 ` ahesford
@ 2024-06-26 7:14 ` chilledfrogs
2024-06-26 10:42 ` [PR REVIEW] oragono: rename to ergo, update to 2.13.1 ahesford
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-26 7:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 328 bytes --]
New review comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1654262184
Comment:
I'm not married to this patch, but I added it more as a suggestion where to put the files, since the defaults are in the current directory which doesn't make much sense either
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (12 preceding siblings ...)
2024-06-26 7:14 ` chilledfrogs
@ 2024-06-26 10:42 ` ahesford
2024-06-27 18:20 ` [PR PATCH] [Updated] " chilledfrogs
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-26 10:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1654582304
Comment:
We expect package users to understand how to use the software, and if the configuration is going to be non-functional anyway, I'd just drop the patch, `vsconf` the original as an example, and let people deal with it as they need it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (13 preceding siblings ...)
2024-06-26 10:42 ` [PR REVIEW] oragono: rename to ergo, update to 2.13.1 ahesford
@ 2024-06-27 18:20 ` chilledfrogs
2024-06-27 18:23 ` chilledfrogs
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-27 18:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
oragono: rename to ergo, update to 2.13.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 6222 bytes --]
From 6b5632663b6876bae5e3252f661143efb0ba5c81 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] oragono: rename to ergo, update to 2.13.1.
---
srcpkgs/ergo/files/ergo/run | 6 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/template | 41 +++++++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 -----
srcpkgs/oragono/patches/paths.patch | 40 ----------------------------
srcpkgs/oragono/template | 32 ----------------------
7 files changed, 50 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..5ff23384f37175
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run ${OPTS:---conf /etc/ergo.conf}
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..833ddc008137f0
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+The package `oragono` was renamed to `ergo`.
+Manually migrate any existing configuration.
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..8a81650b73c899
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,41 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vsconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (14 preceding siblings ...)
2024-06-27 18:20 ` [PR PATCH] [Updated] " chilledfrogs
@ 2024-06-27 18:23 ` chilledfrogs
2024-06-27 18:30 ` [PR REVIEW] " classabbyamp
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-27 18:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
oragono: rename to ergo, update to 2.13.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 6195 bytes --]
From 98d6ff5e1481daef51ebee834f4ec3d8cd5b6342 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] oragono: rename to ergo, update to 2.13.1.
---
srcpkgs/ergo/files/ergo/run | 6 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/template | 40 +++++++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 -----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------------
srcpkgs/oragono/template | 32 -----------------------
7 files changed, 49 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..5ff23384f37175
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run ${OPTS:---conf /etc/ergo.conf}
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..833ddc008137f0
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+The package `oragono` was renamed to `ergo`.
+Manually migrate any existing configuration.
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..d080bfd8f982fc
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,40 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vsconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (15 preceding siblings ...)
2024-06-27 18:23 ` chilledfrogs
@ 2024-06-27 18:30 ` classabbyamp
2024-06-27 18:31 ` classabbyamp
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-27 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1657633586
Comment:
```suggestion
short_desc="Modern IRC server (daemon/ircd)"
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (16 preceding siblings ...)
2024-06-27 18:30 ` [PR REVIEW] " classabbyamp
@ 2024-06-27 18:31 ` classabbyamp
2024-06-27 18:34 ` classabbyamp
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-27 18:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1657634409
Comment:
```suggestion
vcopy languages/ usr/share/${pkgname}/i18n/
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (17 preceding siblings ...)
2024-06-27 18:31 ` classabbyamp
@ 2024-06-27 18:34 ` classabbyamp
2024-06-27 18:39 ` classabbyamp
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-27 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1657636748
Comment:
```suggestion
vinstall ergo.motd 644 usr/share/${pkgname} default.motd
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (18 preceding siblings ...)
2024-06-27 18:34 ` classabbyamp
@ 2024-06-27 18:39 ` classabbyamp
2024-06-27 18:39 ` classabbyamp
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-27 18:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1657649287
Comment:
```suggestion
go_import_path="github.com/ergochat/ergo"
go_ldflags=""-X main.commit=$version -X main.version=$version"
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (19 preceding siblings ...)
2024-06-27 18:39 ` classabbyamp
@ 2024-06-27 18:39 ` classabbyamp
2024-06-28 21:29 ` chilledfrogs
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-27 18:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1657649287
Comment:
```suggestion
go_import_path="github.com/ergochat/ergo"
go_ldflags="-X main.version=$version"
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (20 preceding siblings ...)
2024-06-27 18:39 ` classabbyamp
@ 2024-06-28 21:29 ` chilledfrogs
2024-06-28 21:30 ` chilledfrogs
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-28 21:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1659350364
Comment:
> Modern IRC server (daemon/ircd) with integrated bouncer features and services
Maybe better?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (21 preceding siblings ...)
2024-06-28 21:29 ` chilledfrogs
@ 2024-06-28 21:30 ` chilledfrogs
2024-06-28 21:37 ` classabbyamp
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-28 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1659350364
Comment:
> Modern IRC server (daemon/ircd) with integrated bouncer features and services
Maybe better?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (22 preceding siblings ...)
2024-06-28 21:30 ` chilledfrogs
@ 2024-06-28 21:37 ` classabbyamp
2024-06-28 21:40 ` ahesford
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: classabbyamp @ 2024-06-28 21:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1659354822
Comment:
sure
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (23 preceding siblings ...)
2024-06-28 21:37 ` classabbyamp
@ 2024-06-28 21:40 ` ahesford
2024-06-28 23:01 ` [PR PATCH] [Updated] " chilledfrogs
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-06-28 21:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/45805#discussion_r1659356687
Comment:
Drop the `(daemon/ircd)` while you're at it.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (24 preceding siblings ...)
2024-06-28 21:40 ` ahesford
@ 2024-06-28 23:01 ` chilledfrogs
2024-06-28 23:03 ` chilledfrogs
2024-07-01 15:02 ` [PR PATCH] [Merged]: " ahesford
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-28 23:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
oragono: rename to ergo, update to 2.13.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 6190 bytes --]
From bdf81192c0872f72b1b7a2a4315e197c85436042 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] oragono: rename to ergo, update to 2.13.1.
---
srcpkgs/ergo/files/ergo/run | 6 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/template | 39 ++++++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 -----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------------
srcpkgs/oragono/template | 32 -----------------------
7 files changed, 48 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..5ff23384f37175
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run ${OPTS:---conf /etc/ergo.conf}
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..833ddc008137f0
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+The package `oragono` was renamed to `ergo`.
+Manually migrate any existing configuration.
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..ed87759899eb95
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,39 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+go_ldflags="-X main.version=$version"
+short_desc="Modern IRC server with integrated bouncer features and services"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vsconf default.yaml ergo.conf
+
+ vinstall ergo.motd 644 usr/share/${pkgname}/default.motd
+
+ vcopy languages/ usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (25 preceding siblings ...)
2024-06-28 23:01 ` [PR PATCH] [Updated] " chilledfrogs
@ 2024-06-28 23:03 ` chilledfrogs
2024-07-01 15:02 ` [PR PATCH] [Merged]: " ahesford
27 siblings, 0 replies; 29+ messages in thread
From: chilledfrogs @ 2024-06-28 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
There is an updated pull request by chilledfrogs against master on the void-packages repository
https://github.com/chilledfrogs/void-packages ergo
https://github.com/void-linux/void-packages/pull/45805
oragono: rename to ergo, update to 2.13.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
A patch file from https://github.com/void-linux/void-packages/pull/45805.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-45805.patch --]
[-- Type: text/x-diff, Size: 6190 bytes --]
From 396a67b5b41fe974d50ea38ff185575ecd09fc03 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] oragono: rename to ergo, update to 2.13.1.
---
srcpkgs/ergo/files/ergo/run | 6 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 ++
srcpkgs/ergo/template | 39 ++++++++++++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 -----
srcpkgs/oragono/patches/paths.patch | 40 -----------------------------
srcpkgs/oragono/template | 32 -----------------------
7 files changed, 48 insertions(+), 78 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/patches/paths.patch
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 00000000000000..5ff23384f37175
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+exec 2>&1
+exec chpst -u _ergo:_ergo ergo run ${OPTS:---conf /etc/ergo.conf}
diff --git a/srcpkgs/ergo/oragono.INSTALL.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 00000000000000..833ddc008137f0
--- /dev/null
+++ b/srcpkgs/ergo/oragono.INSTALL.msg
@@ -0,0 +1,2 @@
+The package `oragono` was renamed to `ergo`.
+Manually migrate any existing configuration.
diff --git a/srcpkgs/ergo/template b/srcpkgs/ergo/template
new file mode 100644
index 00000000000000..936bdc07e5029e
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,39 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.13.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+go_ldflags="-X main.version=$version"
+short_desc="Modern IRC server with integrated bouncer features and services"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be2b938d35e7022bf347d70f627ec8cbe8c9836abe1cc3635048e35e61dca5cf
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vsconf default.yaml ergo.conf
+
+ vinstall ergo.motd 644 usr/share/${pkgname} default.motd
+
+ vcopy languages/ usr/share/${pkgname}/i18n/
+
+ vdoc docs/MANUAL.md
+ vdoc docs/MOTDFORMATTING.md
+ vdoc docs/USERGUIDE.md
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 00000000000000..2af7ee74e1d8ae
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a29..00000000000000
--- a/srcpkgs/oragono/files/oragono/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -r ./conf ] && . ./conf
-
-exec 2>&1
-exec chpst -u _oragono:_oragono oragono run --conf /etc/oragono.conf
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch
deleted file mode 100644
index ad9fb051231eb5..00000000000000
--- a/srcpkgs/oragono/patches/paths.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/default.yaml 2021-01-30 22:19:08.000000000 -0500
-+++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500
-@@ -50,8 +50,8 @@
- # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces:
- ":6697":
- tls:
-- cert: fullchain.pem
-- key: privkey.pem
-+ cert: /var/lib/oragono/fullchain.pem
-+ key: /var/lib/oragono/privkey.pem
- # 'proxy' should typically be false. It's for cloud load balancers that
- # always send a PROXY protocol header ahead of the connection. See the
- # manual ("Reverse proxies") for more details.
-@@ -166,7 +166,7 @@
-
- # motd filename
- # if you change the motd, you should move it to ircd.motd
-- motd: oragono.motd
-+ motd: /var/lib/oragono/motd
-
- # motd formatting codes
- # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -714,7 +714,7 @@
- # datastore configuration
- datastore:
- # path to the datastore
-- path: ircd.db
-+ path: /var/lib/oragono/db
-
- # if the database schema requires an upgrade, `autoupgrade` will attempt to
- # perform it automatically on startup. the database will be backed
-@@ -743,7 +743,7 @@
- default: en
-
- # which directory contains our language files
-- path: languages
-+ path: /usr/share/oragono/i18n
-
- # limits - these need to be the same across the network
- limits:
diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template
deleted file mode 100644
index 075b44c0f98aef..00000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=2
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=60473898e439c8b12a4326267620efd60b3f944b2613cc9d466a3603e4e73bb5
-conf_files="/etc/oragono.conf"
-system_accounts="_oragono"
-_oragono_homedir="/var/lib/oragono"
-make_dirs="
- /var/lib/oragono 0755 _oragono _oragono"
-
- post_install() {
- vlicense LICENSE
-
- vconf default.yaml oragono.conf
-
- vmkdir usr/share/${pkgname}
- vcopy oragono.motd usr/share/${pkgname}/default.motd
-
- vmkdir usr/share/${pkgname}/i18n
- vcopy "languages/*" usr/share/${pkgname}/i18n/
-
- vsv oragono
- }
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Merged]: oragono: rename to ergo, update to 2.13.1.
2023-08-28 23:53 [PR PATCH] ergo: update to 2.11.1, rename from oragono chilledfrogs
` (26 preceding siblings ...)
2024-06-28 23:03 ` chilledfrogs
@ 2024-07-01 15:02 ` ahesford
27 siblings, 0 replies; 29+ messages in thread
From: ahesford @ 2024-07-01 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1093 bytes --]
There's a merged pull request on the void-packages repository
oragono: rename to ergo, update to 2.13.1.
https://github.com/void-linux/void-packages/pull/45805
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-glibc
Continuation of #34581
^ permalink raw reply [flat|nested] 29+ messages in thread