summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited2020-01-06 09:45:50 -0500
committerSam Whited2020-01-06 09:46:12 -0500
commitdbf58df4179583764b4aa900b4d36c514eccd749 (patch)
treedc1c199b95144b54c08e1d48e15f9a509c743916
parent1a709cba0ed406361ef972d91dacb305c1e56682 (diff)
downloadaur-dbf58df4179583764b4aa900b4d36c514eccd749.tar.gz
Cleanup some namcap lints
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD10
-rw-r--r--makefile.patch2
-rw-r--r--writefreely.install2
-rw-r--r--writefreely.tmpfiles4
6 files changed, 18 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50758719878..66f12076e5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = writefreely
pkgdesc = Federated blogging from write.as
pkgver = 0.11.2
- pkgrel = 1
+ pkgrel = 2
url = https://writefreely.org/
install = writefreely.install
arch = x86_64
@@ -20,12 +20,12 @@ pkgbase = writefreely
source = writefreely.tmpfiles
source = config.ini
source = makefile.patch
- source = https://github.com/writeas/writefreely/archive/v0.11.2.tar.gz
+ source = writefreely-0.11.2.tar.gz::https://github.com/writeas/writefreely/archive/v0.11.2.tar.gz
sha256sums = 6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10
sha256sums = 28328462c921cc6dfc690231da190ed77635da60d5f76c9f2646aeb0cc48f13e
- sha256sums = 7884d61cf16b7ef94616c5aa2954229979dace22deb6d5c2ece25405bcf41aae
+ sha256sums = 15806f435013b0565074b22f5acdc826a79dd7f99bf99777e3c2b8d94f558719
sha256sums = 4c404097744537bc3c6b58913c4c20a36da8a8953b756f80b136c2b11b02e6d3
- sha256sums = f6282ce91ada86b77f54469f0c24db20089b87bf4593ee23f5855cbf5fde4859
+ sha256sums = 6a23c3a8c252b007fd0773af6b5cc798b84504e59b412185e177db80c8490f0f
sha256sums = 70b1f2101e75d36410b8d94624488d9cc826e34f4078cbac11e0e5242ff1b0d5
pkgname = writefreely
diff --git a/.gitignore b/.gitignore
index b53c6dff121..13ebca0ec59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
pkg/
src/
-*.zip
-*.tar.xz
+*.tar
*.tar.gz
+*.tar.xz
+*.tar.zstd
+*.zip
diff --git a/PKGBUILD b/PKGBUILD
index aac101e97a0..8b1cbd483c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=writefreely
pkgver=0.11.2
-pkgrel=1
+pkgrel=2
pkgdesc='Federated blogging from write.as'
arch=('x86_64')
url='https://writefreely.org/'
@@ -22,12 +22,12 @@ source=("${pkgname}-sysusers.conf"
"${pkgname}.tmpfiles"
config.ini
makefile.patch
- "https://github.com/writeas/writefreely/archive/v${pkgver}.tar.gz")
+ "${pkgname}-${pkgver}.tar.gz::https://github.com/writeas/writefreely/archive/v${pkgver}.tar.gz")
sha256sums=('6c74c81e27165851daf20d4bcf958227342f063aa3ec53b1cb86a56dac565f10'
'28328462c921cc6dfc690231da190ed77635da60d5f76c9f2646aeb0cc48f13e'
- '7884d61cf16b7ef94616c5aa2954229979dace22deb6d5c2ece25405bcf41aae'
+ '15806f435013b0565074b22f5acdc826a79dd7f99bf99777e3c2b8d94f558719'
'4c404097744537bc3c6b58913c4c20a36da8a8953b756f80b136c2b11b02e6d3'
- 'f6282ce91ada86b77f54469f0c24db20089b87bf4593ee23f5855cbf5fde4859'
+ '6a23c3a8c252b007fd0773af6b5cc798b84504e59b412185e177db80c8490f0f'
'70b1f2101e75d36410b8d94624488d9cc826e34f4078cbac11e0e5242ff1b0d5')
prepare() {
@@ -46,8 +46,6 @@ build() {
}
package() {
- install -dm700 "${pkgdir}"/var/lib/${pkgname}/data
- install -dm700 "${pkgdir}"/var/lib/${pkgname}/keys
install -dm755 "${pkgdir}"/usr/share/${pkgname}/pages
install -dm755 "${pkgdir}"/usr/share/${pkgname}/static
install -dm755 "${pkgdir}"/usr/share/${pkgname}/templates
diff --git a/makefile.patch b/makefile.patch
index 9755325a23a..edc49e368be 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -22,7 +22,7 @@
< GOTEST=$(GOCMD) test $(LDFLAGS)
---
> GOINSTALL=$(GOCMD) install $(GOLDFLAGS) $(GCFLAGS) $(ASMFLAGS)
-> GOBUILD=$(GOCMD) build $(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
diff --git a/writefreely.install b/writefreely.install
index 6f7719f65b9..f6ff3755668 100644
--- a/writefreely.install
+++ b/writefreely.install
@@ -6,6 +6,8 @@ post_update() {
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.tmpfiles b/writefreely.tmpfiles
index 86ceff87f12..3fd99de30f9 100644
--- a/writefreely.tmpfiles
+++ b/writefreely.tmpfiles
@@ -1 +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