Re: [PR PATCH] [Updated] ergo: update to 2.11.1, rename from oragono.

[chilledfrogs <chilledfrogs@users.noreply.github.com>]

[-- 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
- }