Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] ergo: update to 2.8.0, rename from oragono
@ 2021-12-17  8:57 chilledfrogs
  2021-12-17  8:59 ` [PR PATCH] [Updated] " chilledfrogs
                   ` (24 more replies)
  0 siblings, 25 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-17  8:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 817 bytes --]

There is a new 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/34581

ergo: update to 2.8.0, rename from oragono
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6313 bytes --]

From cbd49ad7fecd194fc64425ff25c229d485048f7c 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.8.0, rename from oragono

---
 srcpkgs/ergo/files/ergo/log/run               |  2 ++
 srcpkgs/ergo/files/ergo/run                   |  6 ++++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++----
 srcpkgs/ergo/template                         | 33 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 --
 srcpkgs/oragono/files/oragono/run             |  6 ----
 srcpkgs/oragono/template                      | 32 ------------------
 8 files changed, 48 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 100644
index 000000000000..e28775884e4b
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t ergo
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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/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 ad9fb051231e..748da7060cd3 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 000000000000..6878081a4542
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,33 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=82e42df42baf36be4922f7a1bf966050a5e464004eca2e961403600be04751da
+replaces="oragono"
+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
+ }
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
@ 2021-12-17  8:59 ` chilledfrogs
  2021-12-17 14:43 ` TinfoilSubmarine
                   ` (23 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-17  8:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 822 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/34581

ergo: update to 2.8.0, rename from oragono
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6322 bytes --]

From 5a8d9cb388e2be3266d6abd4fc79e3581c48f2d8 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.8.0, rename from oragono

---
 srcpkgs/ergo/files/ergo/log/run               |  2 ++
 srcpkgs/ergo/files/ergo/run                   |  6 ++++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++----
 srcpkgs/ergo/template                         | 33 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 --
 srcpkgs/oragono/files/oragono/run             |  6 ----
 srcpkgs/oragono/template                      | 32 ------------------
 8 files changed, 48 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 100644
index 000000000000..e28775884e4b
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t ergo
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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/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 ad9fb051231e..748da7060cd3 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 000000000000..e4f741657e58
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,33 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=82e42df42baf36be4922f7a1bf966050a5e464004eca2e961403600be04751da
+replaces="oragono>=2.6.1_1"
+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
+ }
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
  2021-12-17  8:59 ` [PR PATCH] [Updated] " chilledfrogs
@ 2021-12-17 14:43 ` TinfoilSubmarine
  2021-12-17 14:43 ` TinfoilSubmarine
                   ` (22 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-996774693

Comment:
I think you need a dummy package, see e.g. `mysql` which is symlinked to `mariadb` and has the `provides=...` and `replaces=...` for mysql.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
  2021-12-17  8:59 ` [PR PATCH] [Updated] " chilledfrogs
  2021-12-17 14:43 ` TinfoilSubmarine
@ 2021-12-17 14:43 ` TinfoilSubmarine
  2021-12-17 14:50 ` TinfoilSubmarine
                   ` (21 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 289 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-996774693

Comment:
I think you need a dummy package, see e.g. `mysql` which is symlinked to `mariadb` and has the `provides=...` and `replaces=...` for mysql.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (2 preceding siblings ...)
  2021-12-17 14:43 ` TinfoilSubmarine
@ 2021-12-17 14:50 ` TinfoilSubmarine
  2021-12-17 14:59 ` TinfoilSubmarine
                   ` (20 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 14:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-996780219

Comment:
Sorry, commented before I was done thinking :)

You already have the symlink, but I think the `provides=...` and `replaces=...` should be similar to what `mysql`/`mariadb` has since this is just a rename, as well as an `oragano_package()` similar to `mysql_package()`.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (3 preceding siblings ...)
  2021-12-17 14:50 ` TinfoilSubmarine
@ 2021-12-17 14:59 ` TinfoilSubmarine
  2021-12-17 15:15 ` TinfoilSubmarine
                   ` (19 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 14:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-996786535

Comment:
Actually, you should follow what was done for `pulseeffects` being renamed to `easyeffects`, since that was more recent and was just a rename unlike the `mysql`/`mariadb` drop-in case.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (4 preceding siblings ...)
  2021-12-17 14:59 ` TinfoilSubmarine
@ 2021-12-17 15:15 ` TinfoilSubmarine
  2021-12-18 18:28 ` [PR PATCH] [Updated] " chilledfrogs
                   ` (18 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: TinfoilSubmarine @ 2021-12-17 15:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-996780219

Comment:
Sorry, commented before I was done thinking :)

~~You already have the symlink, but I think the `provides=...` and `replaces=...` should be similar to what `mysql`/`mariadb` has since this is just a rename, as well as an `oragano_package()` similar to `mysql_package()`.~~

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.8.0, rename from oragono
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (5 preceding siblings ...)
  2021-12-17 15:15 ` TinfoilSubmarine
@ 2021-12-18 18:28 ` chilledfrogs
  2021-12-19  4:03 ` [PR REVIEW] " ericonr
                   ` (17 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-18 18:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 822 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/34581

ergo: update to 2.8.0, rename from oragono
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6777 bytes --]

From 42fa08f669c9ca3d43c0d88033fdbed39a500f10 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.8.0, rename from oragono.

---
 srcpkgs/ergo/INSTALL.msg                      |  1 +
 srcpkgs/ergo/files/ergo/log/run               |  2 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 100644 srcpkgs/ergo/INSTALL.msg
 create mode 100644 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/INSTALL.msg b/srcpkgs/ergo/INSTALL.msg
new file mode 100644
index 000000000000..74095a123484
--- /dev/null
+++ b/srcpkgs/ergo/INSTALL.msg
@@ -0,0 +1 @@
+Oragono was renamed to Ergo since version 2.7.0.
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 100644
index 000000000000..e28775884e4b
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -t ergo
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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/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 ad9fb051231e..748da7060cd3 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 000000000000..e97522ea028a
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=82e42df42baf36be4922f7a1bf966050a5e464004eca2e961403600be04751da
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (7 preceding siblings ...)
  2021-12-19  4:03 ` [PR REVIEW] " ericonr
@ 2021-12-19  4:03 ` ericonr
  2021-12-19  4:19 ` pbui
                   ` (15 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-12-19  4:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r771894187

Comment:
It's missing a trailing newline

And I think it should be `oragono.INSTALL.msg` so only the people using the old package get the warning.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (6 preceding siblings ...)
  2021-12-18 18:28 ` [PR PATCH] [Updated] " chilledfrogs
@ 2021-12-19  4:03 ` ericonr
  2021-12-19  4:03 ` ericonr
                   ` (16 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2021-12-19  4:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r771893997

Comment:
Please use the symlink approach instead.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (8 preceding siblings ...)
  2021-12-19  4:03 ` ericonr
@ 2021-12-19  4:19 ` pbui
  2021-12-19 11:41 ` [PR REVIEW] " chilledfrogs
                   ` (14 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: pbui @ 2021-12-19  4:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#issuecomment-997327091

Comment:
> @pbui ok for you?

Yes, these changes look reasonable.

As a side note, you can probably remove me from the maintainer field... as I don't use Void Linux anymore and probably will not be contributing updates for the foreseeable future.

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (9 preceding siblings ...)
  2021-12-19  4:19 ` pbui
@ 2021-12-19 11:41 ` chilledfrogs
  2021-12-19 11:42 ` chilledfrogs
                   ` (13 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-19 11:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r771936931

Comment:
I see, will do in just a minute

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (10 preceding siblings ...)
  2021-12-19 11:41 ` [PR REVIEW] " chilledfrogs
@ 2021-12-19 11:42 ` chilledfrogs
  2021-12-19 21:07 ` [PR PATCH] [Updated] " chilledfrogs
                   ` (12 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-19 11:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r771936991

Comment:
Whoops, true 😅

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (11 preceding siblings ...)
  2021-12-19 11:42 ` chilledfrogs
@ 2021-12-19 21:07 ` chilledfrogs
  2021-12-19 21:09 ` chilledfrogs
                   ` (11 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-19 21:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.8.0, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6796 bytes --]

From a19bd3e065507a6fd4bfee2df55e0349bb464a4b 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.8.0, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..e97522ea028a
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Peter Bui <pbui@github.bx612.space>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=82e42df42baf36be4922f7a1bf966050a5e464004eca2e961403600be04751da
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (12 preceding siblings ...)
  2021-12-19 21:07 ` [PR PATCH] [Updated] " chilledfrogs
@ 2021-12-19 21:09 ` chilledfrogs
  2022-01-14 16:37 ` chilledfrogs
                   ` (10 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2021-12-19 21:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.8.0, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6799 bytes --]

From 62d2307d68c092dcddf43b248b8bfdd7fba0971e 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.8.0, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..9d0b3a7c6b58
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.8.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=82e42df42baf36be4922f7a1bf966050a5e464004eca2e961403600be04751da
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.8.0, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (13 preceding siblings ...)
  2021-12-19 21:09 ` chilledfrogs
@ 2022-01-14 16:37 ` chilledfrogs
  2022-01-14 16:38 ` [PR PATCH] [Updated] ergo: update to 2.9.1, " chilledfrogs
                   ` (9 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-01-14 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.8.0, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6799 bytes --]

From 3f5fbf6e72e8e16fcae42e19c0591a7fa9c570ea 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.8.0, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..0208b756c32f
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.9.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=b3263a1a346b0b6f9e1ad04ac4b113b1ac3671ef373fd50868e2a9d443d3e2e4
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (14 preceding siblings ...)
  2022-01-14 16:37 ` chilledfrogs
@ 2022-01-14 16:38 ` chilledfrogs
  2022-05-01  9:53 ` [PR REVIEW] " paper42
                   ` (8 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-01-14 16:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.9.1, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6799 bytes --]

From 4d8deb79eb9535e1742fa79d9cdb07b58c647c3d 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.9.1, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..0208b756c32f
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.9.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+hostmakedepends="git"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=b3263a1a346b0b6f9e1ad04ac4b113b1ac3671ef373fd50868e2a9d443d3e2e4
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (16 preceding siblings ...)
  2022-05-01  9:53 ` [PR REVIEW] " paper42
@ 2022-05-01  9:53 ` paper42
  2022-05-04 15:15 ` chilledfrogs
                   ` (6 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: paper42 @ 2022-05-01  9:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r862450306

Comment:
git is most likely not necessary

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (15 preceding siblings ...)
  2022-01-14 16:38 ` [PR PATCH] [Updated] ergo: update to 2.9.1, " chilledfrogs
@ 2022-05-01  9:53 ` paper42
  2022-05-01  9:53 ` paper42
                   ` (7 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: paper42 @ 2022-05-01  9:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r862450341

Comment:
```suggestion
homepage="https://ergo.chat/"
changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
```

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (17 preceding siblings ...)
  2022-05-01  9:53 ` paper42
@ 2022-05-04 15:15 ` chilledfrogs
  2022-05-08 23:44 ` chilledfrogs
                   ` (5 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-04 15:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r864964727

Comment:
Will try without, I thought I saw it written to always add that for Go stuff

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (18 preceding siblings ...)
  2022-05-04 15:15 ` chilledfrogs
@ 2022-05-08 23:44 ` chilledfrogs
  2022-05-08 23:44 ` chilledfrogs
                   ` (4 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-08 23:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r867557300

Comment:
Done

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (19 preceding siblings ...)
  2022-05-08 23:44 ` chilledfrogs
@ 2022-05-08 23:44 ` chilledfrogs
  2022-05-09  8:43 ` paper42
                   ` (3 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-08 23:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r867557330

Comment:
Worked without

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (20 preceding siblings ...)
  2022-05-08 23:44 ` chilledfrogs
@ 2022-05-09  8:43 ` paper42
  2022-05-10  7:13 ` chilledfrogs
                   ` (2 subsequent siblings)
  24 siblings, 0 replies; 26+ messages in thread
From: paper42 @ 2022-05-09  8:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r867773822

Comment:
commenting this out doesn't make much sense, let's remove it

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR REVIEW] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (21 preceding siblings ...)
  2022-05-09  8:43 ` paper42
@ 2022-05-10  7:13 ` chilledfrogs
  2022-05-14 12:12 ` [PR PATCH] [Updated] " chilledfrogs
  2022-05-14 12:15 ` chilledfrogs
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-10  7:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/34581#discussion_r868893713

Comment:
Whoops, terribly sorry, wanted to do that but forgot

^ permalink raw reply	[flat|nested] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (22 preceding siblings ...)
  2022-05-10  7:13 ` chilledfrogs
@ 2022-05-14 12:12 ` chilledfrogs
  2022-05-14 12:15 ` chilledfrogs
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-14 12:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.9.1, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6857 bytes --]

From fd3048a46f81fa4fd2990886a5030968b371be65 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.9.1, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..789eac348415
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.9.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=b3263a1a346b0b6f9e1ad04ac4b113b1ac3671ef373fd50868e2a9d443d3e2e4
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

* Re: [PR PATCH] [Updated] ergo: update to 2.9.1, rename from oragono.
  2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
                   ` (23 preceding siblings ...)
  2022-05-14 12:12 ` [PR PATCH] [Updated] " chilledfrogs
@ 2022-05-14 12:15 ` chilledfrogs
  24 siblings, 0 replies; 26+ messages in thread
From: chilledfrogs @ 2022-05-14 12:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 823 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/34581

ergo: update to 2.9.1, rename from oragono.
**Note**: I couldn't find out what was the procedure for updating packages where they get renamed, I did what I thought wasn't stupid, please feel free to tell me if I screwed anything up with it :sweat_smile:

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### 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


A patch file from https://github.com/void-linux/void-packages/pull/34581.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ergo-34581.patch --]
[-- Type: text/x-diff, Size: 6857 bytes --]

From 9b84f2ea8b50a072c51a14980482e0221c9e408c 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.9.1, rename from oragono.

---
 srcpkgs/ergo/files/ergo/log/run               |  1 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/ergo/oragono.INSTALL.msg              |  2 +
 srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 9 files changed, 53 insertions(+), 46 deletions(-)
 create mode 120000 srcpkgs/ergo/files/ergo/log/run
 create mode 100644 srcpkgs/ergo/files/ergo/run
 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/log/run
 delete mode 100644 srcpkgs/oragono/files/oragono/run
 delete mode 100644 srcpkgs/oragono/template

diff --git a/srcpkgs/ergo/files/ergo/log/run b/srcpkgs/ergo/files/ergo/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/ergo/files/ergo/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 000000000000..e4dc1e8ebc16
--- /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.msg b/srcpkgs/ergo/oragono.INSTALL.msg
new file mode 100644
index 000000000000..9ab59e358fcd
--- /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 ad9fb051231e..748da7060cd3 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 000000000000..789eac348415
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.9.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=b3263a1a346b0b6f9e1ad04ac4b113b1ac3671ef373fd50868e2a9d443d3e2e4
+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 000000000000..2af7ee74e1d8
--- /dev/null
+++ b/srcpkgs/oragono
@@ -0,0 +1 @@
+ergo/
\ No newline at end of file
diff --git a/srcpkgs/oragono/files/oragono/log/run b/srcpkgs/oragono/files/oragono/log/run
deleted file mode 100644
index 0308e8a75127..000000000000
--- a/srcpkgs/oragono/files/oragono/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t oragono
diff --git a/srcpkgs/oragono/files/oragono/run b/srcpkgs/oragono/files/oragono/run
deleted file mode 100644
index 22e850aa395a..000000000000
--- 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 33a91197e97c..000000000000
--- a/srcpkgs/oragono/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'oragono'
-pkgname=oragono
-version=2.6.1
-revision=1
-build_style=go
-go_import_path="github.com/oragono/oragono"
-hostmakedepends="git"
-short_desc="Modern IRC server (daemon/ircd) written in Go"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="MIT"
-homepage="https://oragono.io/"
-distfiles="https://github.com/oragono/oragono/archive/v${version}.tar.gz"
-checksum=d123f1aa413bb4541ca0b174286ccb372bf924cec2d635a7cde65791682c41bf
-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] 26+ messages in thread

end of thread, other threads:[~2022-05-14 12:15 UTC | newest]

Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-17  8:57 [PR PATCH] ergo: update to 2.8.0, rename from oragono chilledfrogs
2021-12-17  8:59 ` [PR PATCH] [Updated] " chilledfrogs
2021-12-17 14:43 ` TinfoilSubmarine
2021-12-17 14:43 ` TinfoilSubmarine
2021-12-17 14:50 ` TinfoilSubmarine
2021-12-17 14:59 ` TinfoilSubmarine
2021-12-17 15:15 ` TinfoilSubmarine
2021-12-18 18:28 ` [PR PATCH] [Updated] " chilledfrogs
2021-12-19  4:03 ` [PR REVIEW] " ericonr
2021-12-19  4:03 ` ericonr
2021-12-19  4:19 ` pbui
2021-12-19 11:41 ` [PR REVIEW] " chilledfrogs
2021-12-19 11:42 ` chilledfrogs
2021-12-19 21:07 ` [PR PATCH] [Updated] " chilledfrogs
2021-12-19 21:09 ` chilledfrogs
2022-01-14 16:37 ` chilledfrogs
2022-01-14 16:38 ` [PR PATCH] [Updated] ergo: update to 2.9.1, " chilledfrogs
2022-05-01  9:53 ` [PR REVIEW] " paper42
2022-05-01  9:53 ` paper42
2022-05-04 15:15 ` chilledfrogs
2022-05-08 23:44 ` chilledfrogs
2022-05-08 23:44 ` chilledfrogs
2022-05-09  8:43 ` paper42
2022-05-10  7:13 ` chilledfrogs
2022-05-14 12:12 ` [PR PATCH] [Updated] " chilledfrogs
2022-05-14 12:15 ` chilledfrogs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).