summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Papakostas2020-03-09 06:58:26 -0500
committerJason Papakostas2020-03-09 06:58:26 -0500
commit82a4cf650cb5158fe4f74b29cc729f9ff19f37cd (patch)
treea31a19bd1b3891e9f66e834c827380f715c9e390
parent396d8707f262b731ee03cd3e5ac7aa0953cdae07 (diff)
downloadaur-82a4cf650cb5158fe4f74b29cc729f9ff19f37cd.tar.gz
upstream v2.0.0 released
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD15
-rw-r--r--path.patch25
3 files changed, 23 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 342ab0156723..254d1ee905f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = oragono
pkgdesc = A modern IRC server written in Go.
- pkgver = 1.2.0
+ pkgver = 2.0.0
pkgrel = 1
url = https://github.com/oragono/oragono
install = install
@@ -10,17 +10,15 @@ pkgbase = oragono
makedepends = git
depends = glibc
backup = etc/oragono.conf
- source = git+https://github.com/oragono/oragono#tag=v1.2.0
- source = git+https://github.com/oragono/oragono-vendor
+ source = git+https://github.com/oragono/oragono#tag=v2.0.0
source = oragono.service
source = oragono.sysusers
source = path.patch
source = oragono.tmpfiles
sha256sums = SKIP
- sha256sums = SKIP
sha256sums = d35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858
sha256sums = 7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4
- sha256sums = 7bd95ebd15a7b8838abe7aaa6ea31eca00d685749e337485a8a09a2c25d4eb03
+ sha256sums = 11d251220beea1637ec9bff6be31d1bb95bfe3a1de4fdae5e3cc5c53cea996fd
sha256sums = 8f6baaa89e9723ac3344a2af201a93f348975537bc748024c0a48b0773f42b1f
pkgname = oragono
diff --git a/PKGBUILD b/PKGBUILD
index 350736fca277..db1ccfea30cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Sean Enck <enckse@gmail.com>
pkgname=oragono
-pkgver=1.2.0
+pkgver=2.0.0
pkgrel=1
pkgdesc="A modern IRC server written in Go."
arch=('x86_64')
@@ -12,31 +12,20 @@ install=install
depends=('glibc')
makedepends=('go' 'git')
source=("git+$url#tag=v$pkgver"
- "git+https://github.com/oragono/oragono-vendor"
"oragono.service"
"oragono.sysusers"
"path.patch"
"oragono.tmpfiles")
sha256sums=('SKIP'
- 'SKIP'
'd35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858'
'7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4'
- '7bd95ebd15a7b8838abe7aaa6ea31eca00d685749e337485a8a09a2c25d4eb03'
+ '11d251220beea1637ec9bff6be31d1bb95bfe3a1de4fdae5e3cc5c53cea996fd'
'8f6baaa89e9723ac3344a2af201a93f348975537bc748024c0a48b0773f42b1f')
backup=('etc/oragono.conf')
prepare() {
cd "${srcdir}/$pkgname"
- local _path=$(pwd)
- git submodule init
- git config submodule.vendor.url "$srcdir"/oragono-vendor
- git submodule update
patch -p1 < ../path.patch
- cd vendor/github.com/$pkgname
- rm -rf $pkgname
- mkdir -p $pkgname
- ln -s "$_path"/irc $pkgname/irc
- ln -s "$_path"/mkcerts $pkgname/mkcerts
}
build() {
diff --git a/path.patch b/path.patch
index f987522f05d8..08f8623ac031 100644
--- a/path.patch
+++ b/path.patch
@@ -1,5 +1,14 @@
+From 4f96b050a45a79741fa045499ec172f865142ceb Mon Sep 17 00:00:00 2001
+From: Jason Papakostas <vithos@gmail.com>
+Date: Mon, 9 Mar 2020 06:06:14 -0500
+Subject: [PATCH] config: default paths for arch linux package
+
+---
+ oragono.yaml | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
diff --git a/oragono.yaml b/oragono.yaml
-index d671673..6eddf66 100644
+index 5733d56..f37d5cc 100644
--- a/oragono.yaml
+++ b/oragono.yaml
@@ -28,8 +28,8 @@ server:
@@ -10,10 +19,10 @@ index d671673..6eddf66 100644
- cert: tls.crt
+ key: /var/lib/oragono/tls.key
+ cert: /var/lib/oragono/tls.crt
-
- # Example of a Unix domain socket for proxying:
- # "/tmp/oragono_sock":
-@@ -90,7 +90,7 @@ server:
+ # 'proxy' should typically be false. It's only for Kubernetes-style load
+ # balancing that does not terminate TLS, but sends an initial PROXY line
+ # in plaintext.
+@@ -114,7 +114,7 @@ server:
# motd filename
# if you change the motd, you should move it to ircd.motd
@@ -22,7 +31,7 @@ index d671673..6eddf66 100644
# motd formatting codes
# if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -509,7 +509,7 @@ debug:
+@@ -593,7 +593,7 @@ debug:
# datastore configuration
datastore:
# path to the datastore
@@ -31,7 +40,7 @@ index d671673..6eddf66 100644
# if the database schema requires an upgrade, `autoupgrade` will attempt to
# perform it automatically on startup. the database will be backed
-@@ -526,7 +526,7 @@ languages:
+@@ -621,7 +621,7 @@ languages:
default: en
# which directory contains our language files
@@ -40,3 +49,5 @@ index d671673..6eddf66 100644
# limits - these need to be the same across the network
limits:
+--
+2.25.1