From 3f5fbf6e72e8e16fcae42e19c0591a7fa9c570ea Mon Sep 17 00:00:00 2001 From: Allen Sobot 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 " +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 " -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 - }