Update to latest version

9 files changed, 26 insertions, 134 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73236c0d8374..b5fb9e77f99b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = writefreely
 	pkgdesc = Federated blogging from write.as
-	pkgver = 0.12.0
+	pkgver = 0.13.1
 	pkgrel = 1
 	url = https://writefreely.org/
-	install = writefreely.install
 	arch = x86_64
 	license = AGPL3
 	makedepends = go
@@ -15,18 +14,13 @@ pkgbase = writefreely
 	optdepends = sqlite: For SQLite support,
 	optdepends = mariadb: For MariaDB support
 	backup = etc/writefreely/config.ini
-	source = writefreely-sysusers.conf
 	source = writefreely.service
+	source = writefreely.sysusers
 	source = writefreely.tmpfiles
-	source = config.ini
-	source = makefile.patch
-	source = writefreely-0.12.0.tar.gz::https://github.com/writeas/writefreely/archive/v0.12.0.tar.gz
+	source = writefreely-0.13.1.tar.gz::https://github.com/writeas/writefreely/archive/v0.13.1.tar.gz
+	sha256sums = 5f8dc4dfa200b395b0a615a0ab3faa40d363978d460aa800a022725c6973ae25
 	sha256sums = 6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10
-	sha256sums = 28328462c921cc6dfc690231da190ed77635da60d5f76c9f2646aeb0cc48f13e
-	sha256sums = 15806f435013b0565074b22f5acdc826a79dd7f99bf99777e3c2b8d94f558719
-	sha256sums = 4c404097744537bc3c6b58913c4c20a36da8a8953b756f80b136c2b11b02e6d3
-	sha256sums = 6a23c3a8c252b007fd0773af6b5cc798b84504e59b412185e177db80c8490f0f
-	sha256sums = 4a9ed4011a31183ccaa1db69ef03507c23393318517ffb317e9605a811f29d0d
+	sha256sums = 591e6067e08a35dad90c82302dbb853bb08943fdcea4af20abf5940128aada08
+	sha256sums = f7ac0a02721bc4fb7451dd1ab3dc3c4b4f450d1d7623b3c55e6d0b1c73add43c
 
 pkgname = writefreely
-
diff --git a/.gitignore b/.gitignore
index 13ebca0ec59c..f1e4e2eacb17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ src/
 *.tar
 *.tar.gz
 *.tar.xz
-*.tar.zstd
+*.tar.zst
 *.zip
diff --git a/PKGBUILD b/PKGBUILD
index c8b26c8047c4..38daf01a6430 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Sam Whited <sam@samwhited.com>
+# Maintainer: ltdk <usr@ltdk.xyz>
+# Contributor: Sam Whited <sam@samwhited.com>
 
 pkgname=writefreely
-pkgver=0.12.0
+pkgver=0.13.1
 pkgrel=1
 pkgdesc='Federated blogging from write.as'
 arch=('x86_64')
@@ -16,33 +17,23 @@ makedepends=('go'
 optdepends=('sqlite: For SQLite support',
             'mariadb: For MariaDB support')
 backup=('etc/writefreely/config.ini')
-install="${pkgname}.install"
-source=("${pkgname}-sysusers.conf"
-        "${pkgname}.service"
+source=("${pkgname}.service"
+        "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        config.ini
-        makefile.patch
         "${pkgname}-${pkgver}.tar.gz::https://github.com/writeas/writefreely/archive/v${pkgver}.tar.gz")
-sha256sums=('6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
-            '28328462c921cc6dfc690231da190ed77635da60d5f76c9f2646aeb0cc48f13e'
-            '15806f435013b0565074b22f5acdc826a79dd7f99bf99777e3c2b8d94f558719'
-            '4c404097744537bc3c6b58913c4c20a36da8a8953b756f80b136c2b11b02e6d3'
-            '6a23c3a8c252b007fd0773af6b5cc798b84504e59b412185e177db80c8490f0f'
-            '4a9ed4011a31183ccaa1db69ef03507c23393318517ffb317e9605a811f29d0d')
-
-prepare() {
-  export GO111MODULE=on
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-
-  patch -p1 Makefile ../makefile.patch
-}
+sha256sums=('5f8dc4dfa200b395b0a615a0ab3faa40d363978d460aa800a022725c6973ae25'
+            '6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
+            '591e6067e08a35dad90c82302dbb853bb08943fdcea4af20abf5940128aada08'
+            'f7ac0a02721bc4fb7451dd1ab3dc3c4b4f450d1d7623b3c55e6d0b1c73add43c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/less"
   make all
 
   cd ../
-  GO111MODULE=on make GOLDFLAGS="-ldflags=\"-X 'github.com/writeas/writefreely.softwareVer=${pkgver}-arch-${pkgrel}' -extldflags '\$(LDFLAGS)'\"" build
+  ORIGLDFLAGS="$LDFLAGS" GO111MODULE=on make LDFLAGS="-ldflags=\"-X 'github.com/writeas/writefreely.softwareVer=${pkgver}-arch-${pkgrel}' -extldflags '\$(ORIGLDFLAGS)'\"" build
+
+  cmd/writefreely/writefreely config generate
 }
 
 package() {
@@ -50,15 +41,18 @@ package() {
   install -dm755 "${pkgdir}"/usr/share/${pkgname}/static
   install -dm755 "${pkgdir}"/usr/share/${pkgname}/templates
 
-  install -Dm644 config.ini "${pkgdir}"/etc/writefreely/config.ini
+  install -Dm644 "${pkgname}-${pkgver}"/config.ini "${pkgdir}"/etc/writefreely/config.ini
   install -Dm644 "${pkgname}.service" -t "${pkgdir}"/usr/lib/systemd/system/
-  install -Dm644 "${pkgname}-sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm644 "${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   install -Dm644 "${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
   install -Dm755 "${pkgname}-${pkgver}"/cmd/writefreely/writefreely "${pkgdir}"/usr/bin/writefreely
 
   cp -r "${pkgname}-${pkgver}"/pages/* "${pkgdir}"/usr/share/writefreely/pages
   cp -r "${pkgname}-${pkgver}"/static/* "${pkgdir}"/usr/share/writefreely/static
   cp -r "${pkgname}-${pkgver}"/templates/* "${pkgdir}"/usr/share/writefreely/templates
+
+  install -dm700 "${pkgdir}"/var/lib/writefreely/data
+  install -dm700 "${pkgdir}"/var/lib/writefreely/keys
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/config.ini b/config.ini
deleted file mode 100644
index e1aa83f24e82..000000000000
--- a/config.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-[server]
-hidden_host          =
-port                 = 8080
-bind                 = localhost
-tls_cert_path        =
-tls_key_path         =
-autocert             = true
-templates_parent_dir = /usr/share/writefreely
-static_parent_dir    = /usr/share/writefreely
-pages_parent_dir     = /usr/share/writefreely
-keys_parent_dir      = /var/lib/writefreely
-
-[database]
-type     = sqlite3
-filename = /var/lib/writefreely/data/data.db
-username =
-password =
-database =
-host     = localhost
-port     = 3306
-
-[app]
-site_name          =
-site_description   =
-host               = http://localhost:8080
-theme              = write
-editor             =
-disable_js         = false
-webfonts           = true
-landing            =
-simple_nav         = false
-wf_modesty         = false
-chorus             = false
-disable_drafts     = false
-single_user        = true
-open_registration  = false
-min_username_len   = 3
-max_blogs          = 1
-federation         = true
-public_stats       = true
-private            = false
-local_timeline     = false
-user_invites       =
-default_visibility =
-
diff --git a/makefile.patch b/makefile.patch
deleted file mode 100644
index edc49e368bec..000000000000
--- a/makefile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-1,2c1,14
-< GITREV=`git describe | cut -c 2-`
-< LDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)'"
----
-> # make(1) from NetBSD (bmake on many Linux's) uses $(.CURDIR), but GNU Make uses
-> # $(CURDIR). Normalize on $(.CURDIR) by setting it to $(CURDIR) if not set, and
-> # then $(PWD) if still not set.
-> .CURDIR ?= $(CURDIR)
-> .CURDIR ?= $(PWD)
-> 
-> # For reproducible builds, don't store the current build directory by default;
-> # instead store only the path from the root of the repo (so there is still
-> # enough info in debug messages to find the correct file).
-> GCFLAGS  = -gcflags="all=-trimpath=$(.CURDIR)"
-> ASMFLAGS = -asmflags="all=-trimpath=$(.CURDIR)"
-> 
-> GITREV!=git describe --tags | cut -c 2-
-> GOLDFLAGS=-ldflags="-X 'github.com/writeas/writefreely.softwareVer=$(GITREV)' -extldflags '$(LDFLAGS)'"
-5,7c17,19
-< GOINSTALL=$(GOCMD) install $(LDFLAGS)
-< GOBUILD=$(GOCMD) build $(LDFLAGS)
-< GOTEST=$(GOCMD) test $(LDFLAGS)
----
-> GOINSTALL=$(GOCMD) install $(GOLDFLAGS) $(GCFLAGS) $(ASMFLAGS)
-> GOBUILD=$(GOCMD) build -buildmode=pie $(GOLDFLAGS) $(GCFLAGS) $(ASMFLAGS)
-> GOTEST=$(GOCMD) test $(GOLDFLAGS) $(GCFLAGS) $(ASMFLAGS)
-29c41
-< 	xgo --targets=linux/amd64, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
----
-> 	xgo --targets=linux/amd64, -dest build/ $(GOLDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
-35c47
-< 	xgo --targets=windows/amd64, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
----
-> 	xgo --targets=windows/amd64, -dest build/ $(GOLDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
-41c53
-< 	xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
----
-> 	xgo --targets=darwin/amd64, -dest build/ $(GOLDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
diff --git a/writefreely.install b/writefreely.install
deleted file mode 100644
index 270f9a027cb2..000000000000
--- a/writefreely.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_update() {
-	echo "---"
-	echo "After updating, backup the database then run run 'writefreely db migrate'."
-	echo "---"
-}
-
-post_install() {
-  cd /var/lib/writefreely
-  install -dm700 /var/lib/writefreely/data
-  install -dm700 /var/lib/writefreely/keys
-  /usr/bin/writefreely -c /etc/writefreely/config.ini -gen-keys
-  /usr/bin/writefreely -c /etc/writefreely/config.ini -init-db
-}
diff --git a/writefreely.service b/writefreely.service
index e43b812e1652..18d796bc5d5e 100644
--- a/writefreely.service
+++ b/writefreely.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Write Freely
+Description=WriteFreely
 After=syslog.target
 After=network.target
 After=mysqld.service
diff --git a/writefreely-sysusers.conf b/writefreely.sysusers
index a01f780dca94..a01f780dca94 100644
--- a/writefreely-sysusers.conf
+++ b/writefreely.sysusers
diff --git a/writefreely.tmpfiles b/writefreely.tmpfiles
index 3fd99de30f97..fd9cd4562a09 100644
--- a/writefreely.tmpfiles
+++ b/writefreely.tmpfiles
@@ -1,3 +1,3 @@
-Z /var/lib//writefreely     0700 writefreely writefreely - -
+Z /var/lib/writefreely      0700 writefreely writefreely - -
 d /var/lib/writefreely/data 700  writefreely writefreely
 d /var/lib/writefreely/keys 700  writefreely writefreely