upstream v1.0.0 released

- stdout logging is now upstream default, removed from config patch
- enable full RELRO
- run project's tests in check()

4 files changed, 40 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfc5e514a78a..b0ec61e7a43f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = oragono
 	pkgdesc = A modern IRC server written in Go.
-	pkgver = 0.12.0
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = https://github.com/oragono/oragono
 	install = install
@@ -10,7 +10,7 @@ pkgbase = oragono
 	makedepends = git
 	depends = glibc
 	backup = etc/oragono.conf
-	source = git+https://github.com/oragono/oragono#tag=v0.12.0
+	source = git+https://github.com/oragono/oragono#tag=v1.0.0
 	source = git+https://github.com/oragono/oragono-vendor
 	source = oragono.service
 	source = oragono.sysusers
@@ -20,7 +20,7 @@ pkgbase = oragono
 	sha256sums = SKIP
 	sha256sums = d35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858
 	sha256sums = 7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4
-	sha256sums = be7b802fa047c94e4b714a9232cccd2d8f5db356fefd4c01bc970d5be23d4943
+	sha256sums = 9b6bae7dc9bb49cb2ca4ec4dedc23ac4f2f2275958caae34316ca4462d674e69
 	sha256sums = d56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a
 
 pkgname = oragono
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a07e3deafc25
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/oragono-*.pkg.tar.*
+/oragono/
+/oragono-vendor/
+/pkg/
+/src/
diff --git a/PKGBUILD b/PKGBUILD
index d8040e1ef79c..5cffcf57340e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Sean Enck <enckse@gmail.com>
+# Maintainer: Jason Papakostas <vithos@gmail.com>
+# Contributor: Sean Enck <enckse@gmail.com>
 
 pkgname=oragono
-pkgver=0.12.0
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="A modern IRC server written in Go."
 arch=('x86_64')
@@ -20,10 +21,11 @@ sha256sums=('SKIP'
             'SKIP'
             'd35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858'
             '7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4'
-            'be7b802fa047c94e4b714a9232cccd2d8f5db356fefd4c01bc970d5be23d4943'
+            '9b6bae7dc9bb49cb2ca4ec4dedc23ac4f2f2275958caae34316ca4462d674e69'
             'd56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a')
 backup=('etc/oragono.conf')
-build() {
+
+prepare() {
     export GOPATH=$(pwd)/..
     cd "${srcdir}/$pkgname"
     local _path=$(pwd)
@@ -36,16 +38,38 @@ build() {
     mkdir -p $pkgname
     ln -s "$_path"/irc $pkgname/irc
     ln -s "$_path"/mkcerts $pkgname/mkcerts
-    cd "$_path"
-    GOOS=linux GOARCH=amd64 go build oragono.go
+}
+
+build() {
+    cd "${srcdir}/$pkgname"
+
+    # flags from https://wiki.archlinux.org/index.php/Go_package_guidelines
+    # to address issues namcap warns about:
+    #   oragono W: ELF file ('usr/bin/oragono') lacks FULL RELRO, check LDFLAGS.
+    #   oragono W: ELF file ('usr/bin/oragono') lacks PIE.
+    # related: https://bugs.archlinux.org/task/60928
+    # GOFLAGS="-buildmode=pie"
+    GOOS=linux GOARCH=amd64 \
+        go build -v \
+            -gcflags "all=-trimpath=${PWD}" \
+            -asmflags "all=-trimpath=${PWD}" \
+            -ldflags "-extldflags ${LDFLAGS}"
+    
     rm languages/README.md
-    rm languages/example*
+    rm -rf languages/example
+}
+
+check() {
+    cd "${srcdir}/$pkgname"
+
+    go test ./...
 }
 
 package() {
-    install -Dm 644 oragono.service "$pkgdir/usr/lib/systemd/system/oragono.service"
+    install -Dm644 oragono.service "$pkgdir/usr/lib/systemd/system/oragono.service"
     install -Dm644 "$srcdir/oragono.sysusers" "$pkgdir/usr/lib/sysusers.d/oragono.conf"
     install -Dm644 "$srcdir/oragono.tmpfiles" "${pkgdir}"/usr/lib/tmpfiles.d/oragono.conf
+    
     cd "${srcdir}/$pkgname"
     install -Dm755 -d "$pkgdir/usr/share/$pkgname/i18n"
     cp languages/* "$pkgdir/usr/share/$pkgname/i18n/"
diff --git a/path.patch b/path.patch
index 238a51b15af0..492ca5fc3c87 100644
--- a/path.patch
+++ b/path.patch
@@ -22,19 +22,6 @@ index 6c5aa75..eed4991 100644
  
      # motd formatting codes
      # if this is true, the motd is escaped using formatting codes like $c, $b, and $i
-@@ -281,10 +281,10 @@ logging:
-         #   file    log to given target filename
-         #   stdout  log to stdout
-         #   stderr  log to stderr
--        method: file stderr
-+        method: stdout stderr
- 
-         # filename to log to, if file method is selected
--        filename: ircd.log
-+        #filename: ircd.log
- 
-         # type(s) of logs to keep here. you can use - to exclude those types
-         #
 @@ -340,7 +340,7 @@ debug:
  # datastore configuration
  datastore: