From: chilledfrogs <chilledfrogs@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] ergo: update to 2.11.1, rename from oragono.
Date: Tue, 29 Aug 2023 01:53:04 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45805@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1253 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/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: 6704 bytes --]
From 2980207155f6225e23f584438ce8a015661bfbe1 Mon Sep 17 00:00:00 2001
From: Allen Sobot <chilledfrogs@disroot.org>
Date: Fri, 17 Dec 2021 09:42:45 +0100
Subject: [PATCH] ergo: update to 2.11.1, rename from oragono.
---
srcpkgs/ergo/files/ergo/run | 6 +++
srcpkgs/ergo/oragono.INSTALL | 10 +++++
srcpkgs/ergo/oragono.INSTALL.msg | 2 +
srcpkgs/{oragono => ergo}/patches/paths.patch | 12 +++---
srcpkgs/ergo/template | 37 +++++++++++++++++++
srcpkgs/oragono | 1 +
srcpkgs/oragono/files/oragono/run | 6 ---
srcpkgs/oragono/template | 32 ----------------
8 files changed, 62 insertions(+), 44 deletions(-)
create mode 100644 srcpkgs/ergo/files/ergo/run
create mode 100644 srcpkgs/ergo/oragono.INSTALL
create mode 100644 srcpkgs/ergo/oragono.INSTALL.msg
rename srcpkgs/{oragono => ergo}/patches/paths.patch (84%)
create mode 100644 srcpkgs/ergo/template
create mode 120000 srcpkgs/oragono
delete mode 100644 srcpkgs/oragono/files/oragono/run
delete mode 100644 srcpkgs/oragono/template
diff --git a/srcpkgs/ergo/files/ergo/run b/srcpkgs/ergo/files/ergo/run
new file mode 100644
index 0000000000000..e4dc1e8ebc160
--- /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 0000000000000..ea5ca24a50d46
--- /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 0000000000000..9ab59e358fcda
--- /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 ad9fb051231eb..748da7060cd30 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 0000000000000..5ffb3fd061078
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.11.1
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ergo"
+short_desc="Modern IRC server (daemon/ircd) written in Go"
+maintainer="Allen Sobot <chilledfrogs@disroot.org>"
+license="MIT"
+homepage="https://ergo.chat/"
+changelog="https://raw.githubusercontent.com/ergochat/ergo/master/CHANGELOG.md"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=045cfffd2a387b37a344d6f538de7eeda0b718d71a898fe9919da579bdb25cfd
+conf_files="/etc/ergo.conf"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="/var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+ vlicense LICENSE
+
+ vconf default.yaml ergo.conf
+
+ vmkdir usr/share/${pkgname}
+ vcopy ergo.motd usr/share/${pkgname}/default.motd
+
+ vmkdir usr/share/${pkgname}/i18n
+ vcopy "languages/*" usr/share/${pkgname}/i18n/
+
+ vsv ergo
+}
+
+oragono_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/oragono b/srcpkgs/oragono
new file mode 120000
index 0000000000000..2af7ee74e1d8a
--- /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 22e850aa395a2..0000000000000
--- 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 075b44c0f98ae..0000000000000
--- 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
- }
next reply other threads:[~2023-08-28 23:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 23:53 chilledfrogs [this message]
2023-11-27 1:46 ` github-actions
2023-11-30 21:08 ` chilledfrogs
2024-03-01 1:46 ` github-actions
2024-03-01 11:52 ` [PR PATCH] [Updated] " chilledfrogs
2024-04-07 22:17 ` chilledfrogs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45805@inbox.vuxu.org \
--to=chilledfrogs@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).