update to 1.4.3

5 files changed, 47 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2a1dbd14f130..c3743c25985e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = swarm-bee-bin
 	pkgdesc = Swarm client implemented in Go, basic building block for Swarm Network
-	pkgver = 1.0.0
+	pkgver = 1.4.3
 	pkgrel = 1
-	url = https://swarm.ethereum.org/
+	url = https://github.com/ethersphere/bee
 	install = bee.install
 	arch = x86_64
 	arch = i686
@@ -14,15 +14,19 @@ pkgbase = swarm-bee-bin
 	provides = swarm-bee
 	conflicts = swarm-bee
 	backup = etc/bee/bee.yaml
-	source = https://raw.githubusercontent.com/ethersphere/bee/v1.0.0/LICENSE
-	sha512sums = 63cb4eacde7f6f664dc42f07fd2b46dab7c72a621b57ef60481f0f3484445073c8c11310c38a6b85c801be64bc38a6e4c38186ffe0b2abd188d2a6ec6e03a9ab
-	source_x86_64 = https://github.com/ethersphere/bee/releases/download/v1.0.0/bee_1.0.0_amd64.deb
-	sha512sums_x86_64 = b711a6d19d65414cdddfc1498aec572c169283cd4aa35d0d57b0dade453a74d8db0aed6c195ffa32ca78ee8aeb7c546e656b6554dbc4cf80184fcb3429f099f1
-	source_i686 = https://github.com/ethersphere/bee/releases/download/v1.0.0/bee_1.0.0_386.deb
-	sha512sums_i686 = e9042aae76a7f0882201cab10efdad49dc347ef7bfd7391b75c91111fda20240e405d7efb4126ebc5df8c21f22510ca5146aa605efae0b1d7455805449408476
-	source_armv7h = https://github.com/ethersphere/bee/releases/download/v1.0.0/bee_1.0.0_armv7.deb
-	sha512sums_armv7h = 4569555ee01887a28704a4d455915dc190eeaeef6abf5b65551f20dd7fdd136fa37ef75a1a1e471f32a0029b65e0fba14210fa682f9e014eb859a630f02aeeac
-	source_aarch64 = https://github.com/ethersphere/bee/releases/download/v1.0.0/bee_1.0.0_arm64.deb
-	sha512sums_aarch64 = d9bae3dea2c11b3af23ce800630a88d4ca2e02061539c877424ade601e0e7e84e34998aea34f344ef458ded1a512dd009ca7d9cdfff63df1603eb0caf61a956d
+	source = LICENSE-1.4.3::https://github.com/ethersphere/bee/raw/v1.4.3/LICENSE
+	source = bee.sysusers
+	source = bee.tmpfiles
+	sha256sums = be2cfae74a424aa5e5c82480bc91483ddecac4b8b319fd16fa556940ffefce6e
+	sha256sums = 36a50889de810ee1dba3fbcb5cc04942e298b8825e4e4fc4f2eabbd844b2cf39
+	sha256sums = 27465c707fe2600700438cb8c2c5a3b87926ab086ce2e43f72b628650c8de034
+	source_x86_64 = swarm-bee-bin-1.4.3-x86_64.deb::https://github.com/ethersphere/bee/releases/download/v1.4.3/bee_1.4.3_amd64.deb
+	sha256sums_x86_64 = 46f25dea5d9bd071d1063b91ddeb16deb185956f748dda70265357d3d552bc86
+	source_i686 = swarm-bee-bin-1.4.3-i686.deb::https://github.com/ethersphere/bee/releases/download/v1.4.3/bee_1.4.3_386.deb
+	sha256sums_i686 = 64190046ee8f0da987aaa815357f2cd3eb895979e6d831bfc6db08b1c97b118b
+	source_armv7h = swarm-bee-bin-1.4.3-armv7h.deb::https://github.com/ethersphere/bee/releases/download/v1.4.3/bee_1.4.3_armv7.deb
+	sha256sums_armv7h = f45adfa31fe390810ef270ee6df3f6efa05d5bd971fbb2b0318e8168c9d7f94d
+	source_aarch64 = swarm-bee-bin-1.4.3-aarch64.deb::https://github.com/ethersphere/bee/releases/download/v1.4.3/bee_1.4.3_arm64.deb
+	sha256sums_aarch64 = 2c6ff2da9d27b8767ba3f2bbab260adb8ecbbfde804527d50336e010a47360eb
 
 pkgname = swarm-bee-bin
diff --git a/PKGBUILD b/PKGBUILD
index 07a841338e6d..c79d780a2c3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,33 @@
-# Maintainer: Luis Martinez <luis dot martinez at tuta dot io>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Vyacheslav Konovalov <🦀vk@protonmail.com>
 
 pkgname=swarm-bee-bin
-pkgver=1.0.0
+pkgver=1.4.3
 pkgrel=1
 pkgdesc='Swarm client implemented in Go, basic building block for Swarm Network'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
-url='https://swarm.ethereum.org/'
+url='https://github.com/ethersphere/bee'
 license=('BSD')
 depends=('bash')
-optdepends=('bee-clef: external signer for bee')
+optdepends=('swarm-bee-clef: external signer for bee')
 provides=('swarm-bee')
 conflicts=('swarm-bee')
 backup=('etc/bee/bee.yaml')
-source=("https://raw.githubusercontent.com/ethersphere/bee/v$pkgver/LICENSE")
-source_x86_64=("https://github.com/ethersphere/bee/releases/download/v$pkgver/bee_${pkgver}_amd64.deb")
-source_i686=("https://github.com/ethersphere/bee/releases/download/v$pkgver/bee_${pkgver}_386.deb")
-source_armv7h=("https://github.com/ethersphere/bee/releases/download/v$pkgver/bee_${pkgver}_armv7.deb")
-source_aarch64=("https://github.com/ethersphere/bee/releases/download/v$pkgver/bee_${pkgver}_arm64.deb")
-sha512sums=('63cb4eacde7f6f664dc42f07fd2b46dab7c72a621b57ef60481f0f3484445073c8c11310c38a6b85c801be64bc38a6e4c38186ffe0b2abd188d2a6ec6e03a9ab')
-sha512sums_x86_64=('b711a6d19d65414cdddfc1498aec572c169283cd4aa35d0d57b0dade453a74d8db0aed6c195ffa32ca78ee8aeb7c546e656b6554dbc4cf80184fcb3429f099f1')
-sha512sums_i686=('e9042aae76a7f0882201cab10efdad49dc347ef7bfd7391b75c91111fda20240e405d7efb4126ebc5df8c21f22510ca5146aa605efae0b1d7455805449408476')
-sha512sums_armv7h=('4569555ee01887a28704a4d455915dc190eeaeef6abf5b65551f20dd7fdd136fa37ef75a1a1e471f32a0029b65e0fba14210fa682f9e014eb859a630f02aeeac')
-sha512sums_aarch64=('d9bae3dea2c11b3af23ce800630a88d4ca2e02061539c877424ade601e0e7e84e34998aea34f344ef458ded1a512dd009ca7d9cdfff63df1603eb0caf61a956d')
+source=(
+	"LICENSE-$pkgver::$url/raw/v$pkgver/LICENSE"
+	'bee.sysusers'
+	'bee.tmpfiles')
+source_x86_64=("$pkgname-$pkgver-x86_64.deb::$url/releases/download/v$pkgver/bee_${pkgver}_amd64.deb")
+source_i686=("$pkgname-$pkgver-i686.deb::$url/releases/download/v$pkgver/bee_${pkgver}_386.deb")
+source_armv7h=("$pkgname-$pkgver-armv7h.deb::$url/releases/download/v$pkgver/bee_${pkgver}_armv7.deb")
+source_aarch64=("$pkgname-$pkgver-aarch64.deb::$url/releases/download/v$pkgver/bee_${pkgver}_arm64.deb")
+sha256sums=('be2cfae74a424aa5e5c82480bc91483ddecac4b8b319fd16fa556940ffefce6e'
+            '36a50889de810ee1dba3fbcb5cc04942e298b8825e4e4fc4f2eabbd844b2cf39'
+            '27465c707fe2600700438cb8c2c5a3b87926ab086ce2e43f72b628650c8de034')
+sha256sums_x86_64=('46f25dea5d9bd071d1063b91ddeb16deb185956f748dda70265357d3d552bc86')
+sha256sums_i686=('64190046ee8f0da987aaa815357f2cd3eb895979e6d831bfc6db08b1c97b118b')
+sha256sums_armv7h=('f45adfa31fe390810ef270ee6df3f6efa05d5bd971fbb2b0318e8168c9d7f94d')
+sha256sums_aarch64=('2c6ff2da9d27b8767ba3f2bbab260adb8ecbbfde804527d50336e010a47360eb')
 install=bee.install
 
 prepare() {
@@ -30,9 +35,11 @@ prepare() {
 }
 
 package() {
-	install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
+	install -Dm644 "LICENSE-$pkgver" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	install -Dm644 etc/default/bee -t "$pkgdir/etc/default"
 	install -Dm644 etc/bee/bee.yaml -t "$pkgdir/etc/bee"
 	install -Dm644 lib/systemd/system/bee.service -t "$pkgdir/usr/lib/systemd/system"
-	install -Dm755 usr/bin/bee{,-get-addr} -t "$pkgdir/usr/bin"
+	install -Dm644 bee.sysusers "$pkgdir/usr/lib/sysusers.d/bee.conf"
+	install -Dm644 bee.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/bee.conf"
+	install -D usr/bin/bee{,-get-addr} -t "$pkgdir/usr/bin"
 }
diff --git a/bee.install b/bee.install
index 82c80d9267d8..3e052ab80cd9 100644
--- a/bee.install
+++ b/bee.install
@@ -1,54 +1,4 @@
-pre_install() {
-    if ! getent passwd bee >/dev/null; then
-        useradd -r -d /var/lib/bee -s /sbin/nologin -c 'Bee user' -U bee
-    fi
-
-    if getent passwd bee-clef >/dev/null; then
-        usermod -a -G bee-clef bee >/dev/null
-    fi
-
-    if ! test -d /var/lib/bee; then
-        mkdir -p /var/lib/bee
-        chmod 0750 /var/lib/bee
-        chown -R bee:bee /var/lib/bee
-    fi
-
-    if ! test -f /var/lib/bee/password; then
-        tr </dev/urandom -dc _A-Z-a-z-0-9 2>/dev/null | head -c32 >/var/lib/bee/password
-        chmod 0600 /var/lib/bee/password
-        chown bee:bee /var/lib/bee/password
-    fi
-}
-
 post_install() {
-    # On first install
-    if ! test -f /var/lib/bee/keys/libp2p.key; then
-        /usr/bin/bee init --config /etc/bee/bee.yaml >/dev/null && chown -R bee:bee /var/lib/bee/keys
-
-        echo "
-Logs:   journalctl -f -u bee.service
-Config: /etc/bee/bee.yaml
-
-Bee requires an Ethereum endpoint to function. By default is using ws://localhost:8546 ethereum endpoint.
-If needed obtain a free Infura account and set:
-
-    swap-endpoint: wss://goerli.infura.io/ws/v3/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-It is recommended to use external signer with bee.
-Check documentation for more info:
-- External signer https://docs.ethswarm.org/docs/installation/bee-clef
-
-After you finish configuration run 'sudo bee-get-addr'.
-        "
-    fi
-
-    # Allow group members (bee user) to use clef's socket
-    if test -S /var/lib/bee-clef/clef.ipc; then
-        chmod 660 /var/lib/bee-clef/clef.ipc
-    fi
-}
-
-post_remove() {
-    userdel bee >/dev/null 2>&1 || true
-    groupdel bee >/dev/null 2>&1 || true
+	echo ':: This package requires manual configuration.'
+	echo ':: Check upstream documentation for more information.'
 }
diff --git a/bee.sysusers b/bee.sysusers
new file mode 100644
index 000000000000..9fda0834be15
--- /dev/null
+++ b/bee.sysusers
@@ -0,0 +1,2 @@
+# vim: se ft=conf:
+u bee - "Swarm Bee user" /var/lib/bee
diff --git a/bee.tmpfiles b/bee.tmpfiles
new file mode 100644
index 000000000000..77e6d1c4e99b
--- /dev/null
+++ b/bee.tmpfiles
@@ -0,0 +1,4 @@
+# vim: se ft=conf:
+D /var/lib/bee 750 bee
+D /var/lib/bee/keys 700 bee
+f /var/lib/bee/password 600 bee