Upgrade to 0.5.5

9 files changed, 12 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f141e75cfe1..e9f3f9f70c49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = go-swarm
 	pkgdesc = Censorship resistant storage and communication infrastructure for a truly sovereign digital society
-	pkgver = 0.5.4
+	pkgver = 0.5.5
 	pkgrel = 1
 	url = https://swarm.ethereum.org
 	install = go-swarm.install
-	changelog = CHANGELOG_v0.5.4
+	changelog = CHANGELOG_v0.5.5
 	arch = x86_64
 	groups = eth-swarm
 	license = LGPL3
@@ -16,15 +16,15 @@ pkgbase = go-swarm
 	optdepends = go-ethereum
 	optdepends = systemd
 	provides = go-swarm
-	source = https://github.com/ethersphere/swarm/archive/v0.5.4.tar.gz
-	source = v0.5.4.tar.gz.sig
+	source = https://github.com/ethersphere/swarm/archive/v0.5.5.tar.gz
+	source = v0.5.5.tar.gz.sig
 	source = swarm-resources.tar.gz
 	source = swarm-resources.tar.gz.sig
 	source = README
 	validpgpkeys = 0826EDA1702D1E87C6E2875121D2E7BB88C2A746
-	md5sums = 0b123c44f2f69a32899fef10c656dbe8
+	md5sums = 9f310eda79eb4bfd79bfbebbc9a24555
 	md5sums = SKIP
-	md5sums = 19eea4bf47a58afb05fc3eaef209ec84
+	md5sums = 2fa858d7e4cb420ee9cdf53a33bf0a67
 	md5sums = SKIP
 	md5sums = 02f48077fb06278a5b9eed4950b2ce3e
 
diff --git a/CHANGELOG_v0.5.4 b/CHANGELOG_v0.5.5
index e87d9f4d4f11..e87d9f4d4f11 100644
--- a/CHANGELOG_v0.5.4
+++ b/CHANGELOG_v0.5.5
diff --git a/PKGBUILD b/PKGBUILD
index de23289f5fe6..2e777202b528 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Louis Holbrook <dev@holbrook.no>
 pkgname=go-swarm
-pkgver=0.5.4
+pkgver=0.5.5
 pkgrel=1
 epoch=
 pkgdesc="Censorship resistant storage and communication infrastructure for a truly sovereign digital society"
@@ -18,16 +18,16 @@ replaces=()
 backup=()
 options=()
 install=${pkgname}.install
-changelog="CHANGELOG_v0.5.4"
+changelog="CHANGELOG_v0.5.5"
 source=("https://github.com/ethersphere/swarm/archive/v${pkgver}.tar.gz"
 	"v${pkgver}.tar.gz.sig"
 	"swarm-resources.tar.gz"
 	"swarm-resources.tar.gz.sig"
 	"README")
 noextract=()
-md5sums=("0b123c44f2f69a32899fef10c656dbe8"
+md5sums=("9f310eda79eb4bfd79bfbebbc9a24555"
 	"SKIP"
-	"19eea4bf47a58afb05fc3eaef209ec84"
+	"2fa858d7e4cb420ee9cdf53a33bf0a67"
 	"SKIP"
 	"02f48077fb06278a5b9eed4950b2ce3e")
 validpgpkeys=("0826EDA1702D1E87C6E2875121D2E7BB88C2A746")
@@ -70,7 +70,8 @@ check() {
 
 package() {
 	install -v -D -m0755 build/swarm ${pkgdir}/usr/local/bin/swarm
-	install -v -D -m0644 swarm.service ${pkgdir}/usr/lib/systemd/system/swarm.service
+	install -v -D -m0644 systemd/swarm.service ${pkgdir}/usr/lib/systemd/system/swarm.service
+	install -v -D -m0644 systemd/swarm.conf ${pkgdir}/usr/lib/sysusers.d/swarm.conf
 	if [ ${_pythonwalletdepends} -eq 1 ]; then
 		install -v -D -m0700 swarm-genkey.py ${pkgdir}/usr/local/bin/swarm-genkey
 	fi
diff --git a/go-swarm.install b/go-swarm.install
index 8fbd302f0080..52d78bf90e2b 100644
--- a/go-swarm.install
+++ b/go-swarm.install
@@ -1,8 +1,3 @@
-pre_install () {
-	getent group bzz > /dev/null || groupadd -r bzz
-	getent passwd bzz > /dev/null || useradd -g bzz -d /var/lib/bzz -m -r bzz
-}
-
 post_install () {
 	if [ -f /var/lib/bzz/.swarm-pass ]; then
 		echo "you already have a Swarm data dir. I'll leave it alone ;)"
diff --git a/swarm-resources.tar.gz b/swarm-resources.tar.gz
index 3e0cab1921d4..734e04b64a03 100644
--- a/swarm-resources.tar.gz
+++ b/swarm-resources.tar.gz
diff --git a/swarm-resources.tar.gz.sig b/swarm-resources.tar.gz.sig
index 41afe6a2563e..a18e82c3e08b 100644
--- a/swarm-resources.tar.gz.sig
+++ b/swarm-resources.tar.gz.sig
diff --git a/swarm.service b/swarm.service
deleted file mode 100644
index ec6f0fd6a892..000000000000
--- a/swarm.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Swarm daemon
-After=network.target
-
-[Service]
-User=bzz
-Group=bzz
-ExecStart=/usr/local/bin/swarm --password $SWARM_PASSWORD
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/v0.5.4.tar.gz.sig b/v0.5.4.tar.gz.sig
deleted file mode 100644
index 95703de944cf..000000000000
--- a/v0.5.4.tar.gz.sig
+++ /dev/null
diff --git a/v0.5.5.tar.gz.sig b/v0.5.5.tar.gz.sig
new file mode 100644
index 000000000000..f3259c408d99
--- /dev/null
+++ b/v0.5.5.tar.gz.sig