Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] oragono: rename to ergo, Update to 2.10.0.
@ 2022-06-22 18:57 TeddyDD
  2022-06-22 18:59 ` [PR PATCH] [Updated] " TeddyDD
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: TeddyDD @ 2022-06-22 18:57 UTC (permalink / raw)
  To: ml

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

There is a new pull request by TeddyDD against master on the void-packages repository

https://github.com/TeddyDD/void-packages-1 update-ergo
https://github.com/void-linux/void-packages/pull/37645

oragono: rename to ergo, Update to 2.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From a8f519ddca297dfd66681fe62bbf2e64030786d6 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 20:57:16 +0200
Subject: [PATCH] oragono: rename to ergo, Update to 2.10.0.

---
 srcpkgs/ergo/files/ergo/log/run               |  2 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 36 +++++++++++-------
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 8 files changed, 68 insertions(+), 54 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 (51%)
 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..02c14887d864
--- /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.yaml
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
similarity index 51%
rename from srcpkgs/oragono/patches/paths.patch
rename to srcpkgs/ergo/patches/paths.patch
index ad9fb051231e..599f1165d62b 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -1,40 +1,48 @@
---- 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":
+diff --git i/default.yaml w/default.yaml
+index 8da88e..4c3295 100644
+--- i/default.yaml
++++ w/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/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.
-@@ -166,7 +166,7 @@
+@@ -169,7 +169,7 @@ server:
  
      # 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
-@@ -714,7 +714,7 @@
+@@ -753,12 +753,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/ircd.lock"
+ 
  # datastore configuration
  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
-@@ -743,7 +743,7 @@
+@@ -790,7 +790,7 @@ languages:
      default: en
  
      # 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..24d6882a6089
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.10.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/about"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be3a93e8c0ca30f40a1d82e8b282ea36f4de98b8277c74a5fe4c6260f28dcfb4
+conf_files="/etc/ergo.yaml"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="
+ /var/lib/ergo 0755 _ergo _ergo"
+
+ post_install() {
+	vlicense LICENSE
+
+	vconf default.yaml ergo.yaml
+
+	for doc in docs/*
+	do
+    	vdoc "$doc"
+	done
+
+	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..ed9e7ed7b01f
--- /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] 5+ messages in thread

* Re: [PR PATCH] [Updated] oragono: rename to ergo, Update to 2.10.0.
  2022-06-22 18:57 [PR PATCH] oragono: rename to ergo, Update to 2.10.0 TeddyDD
@ 2022-06-22 18:59 ` TeddyDD
  2022-06-22 19:02 ` [PR REVIEW] " classabbyamp
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: TeddyDD @ 2022-06-22 18:59 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by TeddyDD against master on the void-packages repository

https://github.com/TeddyDD/void-packages-1 update-ergo
https://github.com/void-linux/void-packages/pull/37645

oragono: rename to ergo, Update to 2.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From a1c7b2c8ea5850dbb92547425633323b00670500 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 20:57:16 +0200
Subject: [PATCH] oragono: rename to ergo, Update to 2.10.0.

---
 srcpkgs/ergo/files/ergo/log/run               |  2 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 36 +++++++++++-------
 srcpkgs/ergo/template                         | 37 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 ----------------
 8 files changed, 68 insertions(+), 54 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 (51%)
 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..02c14887d864
--- /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.yaml
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
similarity index 51%
rename from srcpkgs/oragono/patches/paths.patch
rename to srcpkgs/ergo/patches/paths.patch
index ad9fb051231e..599f1165d62b 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -1,40 +1,48 @@
---- 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":
+diff --git i/default.yaml w/default.yaml
+index 8da88e..4c3295 100644
+--- i/default.yaml
++++ w/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/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.
-@@ -166,7 +166,7 @@
+@@ -169,7 +169,7 @@ server:
  
      # 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
-@@ -714,7 +714,7 @@
+@@ -753,12 +753,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/ircd.lock"
+ 
  # datastore configuration
  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
-@@ -743,7 +743,7 @@
+@@ -790,7 +790,7 @@ languages:
      default: en
  
      # 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..7ab17a81efb4
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,37 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.10.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/about"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be3a93e8c0ca30f40a1d82e8b282ea36f4de98b8277c74a5fe4c6260f28dcfb4
+conf_files="/etc/ergo.yaml"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="
+ /var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+	vlicense LICENSE
+
+	vconf default.yaml ergo.yaml
+
+	for doc in docs/*
+	do
+		vdoc "$doc"
+	done
+
+	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..ed9e7ed7b01f
--- /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] 5+ messages in thread

* Re: [PR REVIEW] oragono: rename to ergo, Update to 2.10.0.
  2022-06-22 18:57 [PR PATCH] oragono: rename to ergo, Update to 2.10.0 TeddyDD
  2022-06-22 18:59 ` [PR PATCH] [Updated] " TeddyDD
@ 2022-06-22 19:02 ` classabbyamp
  2022-06-22 21:01 ` paper42
  2022-06-24 21:23 ` [PR PATCH] [Updated] " TeddyDD
  3 siblings, 0 replies; 5+ messages in thread
From: classabbyamp @ 2022-06-22 19:02 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/37645#discussion_r904132532

Comment:
missing a transitional dummy subpkg for oragono

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

* Re: oragono: rename to ergo, Update to 2.10.0.
  2022-06-22 18:57 [PR PATCH] oragono: rename to ergo, Update to 2.10.0 TeddyDD
  2022-06-22 18:59 ` [PR PATCH] [Updated] " TeddyDD
  2022-06-22 19:02 ` [PR REVIEW] " classabbyamp
@ 2022-06-22 21:01 ` paper42
  2022-06-24 21:23 ` [PR PATCH] [Updated] " TeddyDD
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-06-22 21:01 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/37645#issuecomment-1163596053

Comment:
#34581

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

* Re: [PR PATCH] [Updated] oragono: rename to ergo, Update to 2.10.0.
  2022-06-22 18:57 [PR PATCH] oragono: rename to ergo, Update to 2.10.0 TeddyDD
                   ` (2 preceding siblings ...)
  2022-06-22 21:01 ` paper42
@ 2022-06-24 21:23 ` TeddyDD
  3 siblings, 0 replies; 5+ messages in thread
From: TeddyDD @ 2022-06-24 21:23 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by TeddyDD against master on the void-packages repository

https://github.com/TeddyDD/void-packages-1 update-ergo
https://github.com/void-linux/void-packages/pull/37645

oragono: rename to ergo, Update to 2.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f488e38092efab03469f6afe39a30c654e850748 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Wed, 22 Jun 2022 20:57:16 +0200
Subject: [PATCH] oragono: rename to ergo, Update to 2.10.0.

---
 srcpkgs/ergo/files/ergo/log/run               |  2 +
 srcpkgs/ergo/files/ergo/run                   |  6 +++
 srcpkgs/{oragono => ergo}/patches/paths.patch | 36 ++++++++++------
 srcpkgs/ergo/template                         | 43 +++++++++++++++++++
 srcpkgs/oragono                               |  1 +
 srcpkgs/oragono/files/oragono/log/run         |  2 -
 srcpkgs/oragono/files/oragono/run             |  6 ---
 srcpkgs/oragono/template                      | 32 --------------
 8 files changed, 74 insertions(+), 54 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 (51%)
 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..02c14887d864
--- /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.yaml
diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/ergo/patches/paths.patch
similarity index 51%
rename from srcpkgs/oragono/patches/paths.patch
rename to srcpkgs/ergo/patches/paths.patch
index ad9fb051231e..599f1165d62b 100644
--- a/srcpkgs/oragono/patches/paths.patch
+++ b/srcpkgs/ergo/patches/paths.patch
@@ -1,40 +1,48 @@
---- 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":
+diff --git i/default.yaml w/default.yaml
+index 8da88e..4c3295 100644
+--- i/default.yaml
++++ w/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/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.
-@@ -166,7 +166,7 @@
+@@ -169,7 +169,7 @@ server:
  
      # 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
-@@ -714,7 +714,7 @@
+@@ -753,12 +753,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/ircd.lock"
+ 
  # datastore configuration
  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
-@@ -743,7 +743,7 @@
+@@ -790,7 +790,7 @@ languages:
      default: en
  
      # 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..e3e5c1c4794f
--- /dev/null
+++ b/srcpkgs/ergo/template
@@ -0,0 +1,43 @@
+# Template file for 'ergo'
+pkgname=ergo
+version=2.10.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/about"
+distfiles="https://github.com/ergochat/ergo/archive/v${version}.tar.gz"
+checksum=be3a93e8c0ca30f40a1d82e8b282ea36f4de98b8277c74a5fe4c6260f28dcfb4
+conf_files="/etc/ergo.yaml"
+system_accounts="_ergo"
+_ergo_homedir="/var/lib/ergo"
+make_dirs="
+ /var/lib/ergo 0755 _ergo _ergo"
+
+post_install() {
+	vlicense LICENSE
+
+	vconf default.yaml ergo.yaml
+
+	for doc in docs/*
+	do
+		vdoc "$doc"
+	done
+
+	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..ed9e7ed7b01f
--- /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] 5+ messages in thread

end of thread, other threads:[~2022-06-24 21:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-22 18:57 [PR PATCH] oragono: rename to ergo, Update to 2.10.0 TeddyDD
2022-06-22 18:59 ` [PR PATCH] [Updated] " TeddyDD
2022-06-22 19:02 ` [PR REVIEW] " classabbyamp
2022-06-22 21:01 ` paper42
2022-06-24 21:23 ` [PR PATCH] [Updated] " TeddyDD

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).