update to 0.12.0

* PKGBUILD rewrite

6 files changed, 67 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80fa730f2db4..f701ed7bfd6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = swarm-bee-clef
 	pkgdesc = Go Ethereum's external signer packaged for bee
-	pkgver = 0.6.0
+	pkgver = 0.12.0
 	pkgrel = 1
-	url = https://swarm.ethereum.org/
-	install = swarm-bee-clef.install
+	url = https://github.com/ethersphere/bee-clef
+	install = bee-clef.install
 	arch = x86_64
-	license = GPLv3
+	license = GPL3
 	makedepends = go
-	makedepends = git
 	depends = bash
-	options = !strip
-	options = !buildflags
-	options = !makeflags
+	conflicts = go-ethereum
 	backup = etc/bee-clef/4byte.json
 	backup = etc/bee-clef/rules.js
-	source = git+https://github.com/ethersphere/bee-clef.git#tag=v0.6.0
-	sha512sums = SKIP
+	source = swarm-bee-clef-0.12.0.tar.gz::https://github.com/ethersphere/bee-clef/archive/v0.12.0.tar.gz
+	source = go-ethereum-bee-clef-1.10.17.tar.gz::https://github.com/ethereum/go-ethereum/archive/v1.10.17.tar.gz
+	source = bee-clef.sysusers
+	source = bee-clef.tmpfiles
+	sha256sums = e23f6f8ffef749999e810fdb0565595361279067c69029308680d0fa81f947ba
+	sha256sums = 00db123e1b23d3d904bd8a6bd4de8f3330d14db1622e8f22bf1653c94f03e09c
+	sha256sums = 7314d2aa0ce149621a5d59b881ada3ea37231743b5875389b3041bb845233491
+	sha256sums = c5dbcb978de5b7c31482f4fd1cff3101a738df85e27758ec2b4e469a1762384c
 
 pkgname = swarm-bee-clef
diff --git a/PKGBUILD b/PKGBUILD
index 8762b45a5cef..004f7343d02d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,56 @@
 # Maintainer: MFW78 <mfw78@chasingseed.com>
 
 pkgname=swarm-bee-clef
-pkgver=0.6.0
+pkgver=0.12.0
+_clefver=1.10.17
 pkgrel=1
 pkgdesc="Go Ethereum's external signer packaged for bee"
 arch=('x86_64')
-url='https://swarm.ethereum.org/'
-license=('GPLv3')
+url='https://github.com/ethersphere/bee-clef'
+license=('GPL3')
 depends=('bash')
-makedepends=('go' 'git')
-options=('!strip' '!buildflags' '!makeflags')
-backup=(
-    'etc/bee-clef/4byte.json'
-    'etc/bee-clef/rules.js'
-)
-source=("git+https://github.com/ethersphere/bee-clef.git#tag=v${pkgver}")
-sha512sums=('SKIP')
-install="${pkgname}.install"
+makedepends=('go')
+conflicts=('go-ethereum')
+backup=('etc/bee-clef/4byte.json'
+        'etc/bee-clef/rules.js')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "go-ethereum-bee-clef-$_clefver.tar.gz::https://github.com/ethereum/go-ethereum/archive/v$_clefver.tar.gz"
+        'bee-clef.sysusers'
+        'bee-clef.tmpfiles')
+sha256sums=('e23f6f8ffef749999e810fdb0565595361279067c69029308680d0fa81f947ba'
+            '00db123e1b23d3d904bd8a6bd4de8f3330d14db1622e8f22bf1653c94f03e09c'
+            '7314d2aa0ce149621a5d59b881ada3ea37231743b5875389b3041bb845233491'
+            'c5dbcb978de5b7c31482f4fd1cff3101a738df85e27758ec2b4e469a1762384c')
+install=bee-clef.install
+
+prepare() {
+	cd "go-ethereum-$_clefver"
+	mkdir -p build
+	go mod download
+}
 
 build() {
-    cd "$srcdir/bee-clef"
-    export GOBIN="$srcdir/bee-clef"
-    go install github.com/ethereum/go-ethereum/cmd/clef@latest
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+	cd "go-ethereum-$_clefver"
+	go build -o build ./cmd/clef
+}
+
+check() {
+	cd "go-ethereum-$_clefver"
+	go test ./cmd/clef
 }
 
 package() {
-    cd "$srcdir/bee-clef"
-    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/bee-clef"
-    install -Dm644 packaging/{4byte.json,rules.js} -t "$pkgdir/etc/bee-clef"
-    install -Dm644 packaging/bee-clef.service -t "$pkgdir/usr/lib/systemd/system"
-    install -Dm755 packaging/bee-clef-{keys,service} -t "$pkgdir/usr/bin"
-    mv packaging/default packaging/bee-clef
-    install -Dm644 packaging/bee-clef -t "$pkgdir/etc/default"
-    install -Dm755 clef -t "$pkgdir/usr/bin"
+	install -D "go-ethereum-$_clefver/build/clef" -t "$pkgdir/usr/bin/"
+	install -Dm644 bee-clef.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+	install -Dm644 bee-clef.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+	cd "bee-clef-$pkgver"
+	install -Dm644 packaging/{4byte.json,rules.js} -t "$pkgdir/etc/bee-clef"
+	install -Dm644 packaging/bee-clef.service -t "$pkgdir/usr/lib/systemd/system"
+	install -D packaging/bee-clef-{keys,service} -t "$pkgdir/usr/bin"
+	install -Dm644 packaging/default "$pkgdir/etc/default/bee-clef"
 }
diff --git a/bee-clef.install b/bee-clef.install
new file mode 100644
index 000000000000..3e052ab80cd9
--- /dev/null
+++ b/bee-clef.install
@@ -0,0 +1,4 @@
+post_install() {
+	echo ':: This package requires manual configuration.'
+	echo ':: Check upstream documentation for more information.'
+}
diff --git a/bee-clef.sysusers b/bee-clef.sysusers
new file mode 100644
index 000000000000..10e49e45698e
--- /dev/null
+++ b/bee-clef.sysusers
@@ -0,0 +1,3 @@
+# vim: se ft=conf:
+u bee-clef - "Swarm Bee Clef user" /var/lib/bee-clef
+m bee bee-clef
diff --git a/bee-clef.tmpfiles b/bee-clef.tmpfiles
new file mode 100644
index 000000000000..0ff0a1981d42
--- /dev/null
+++ b/bee-clef.tmpfiles
@@ -0,0 +1,4 @@
+# vim: se ft=conf:
+D /var/lib/bee-clef 750 bee-clef
+D /var/lib/bee-clef/keystore 700 bee-clef
+f /var/lib/bee-clef/password 600 bee-clef
diff --git a/swarm-bee-clef.install b/swarm-bee-clef.install
deleted file mode 100644
index 1dfabfef03a7..000000000000
--- a/swarm-bee-clef.install
+++ /dev/null
@@ -1,48 +0,0 @@
-pre_install() {
-    if ! getent passwd bee-clef >/dev/null; then
-        useradd -r -d /var/lib/bee-clef -s /sbin/nologin -c 'Clef user' -U bee-clef
-    fi
-
-    if getent passwd bee >/dev/null; then
-        usermod -a -G bee-clef bee >/dev/null
-    fi
-
-    if ! test -d /var/lib/bee-clef; then
-        mkdir -p /var/lib/bee-clef/keystore
-        chmod 0750 /var/lib/bee-clef
-        chmod 0700 /var/lib/bee-clef/keystore
-        chown -R bee-clef:bee-clef /var/lib/bee-clef
-    fi
-
-    if ! test -f /var/lib/bee-clef/password; then
-        tr </dev/urandom -dc _A-Z-a-z-0-9 2>/dev/null | head -c32 >/var/lib/bee-clef/password
-        chmod 0600 /var/lib/bee-clef/password
-        chown bee-clef:bee-clef /var/lib/bee-clef/password
-    fi
-}
-
-post_install() {
-    SECRET=$(cat /var/lib/bee-clef/password)
-    parse_json() { echo $1 | sed -e 's/[{}]/''/g' | sed -e 's/", "/'\",\"'/g' | sed -e 's/" ,"/'\",\"'/g' | sed -e 's/" , "/'\",\"'/g' | sed -e 's/","/'\"---SEPERATOR---\"'/g' | awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}" | sed -e "s/\"$2\"://" | tr -d "\n\t" | sed -e 's/\\"/"/g' | sed -e 's/\\\\/\\/g' | sed -e 's/^[ \t]*//g' | sed -e 's/^"//' -e 's/"$//'; }
-    clef --configdir /var/lib/bee-clef --stdio-ui init >/dev/null 2>&1 <<EOF
-$SECRET
-$SECRET
-EOF
-    clef --keystore /var/lib/bee-clef/keystore --stdio-ui newaccount --lightkdf >/dev/null 2>&1 <<EOF
-$SECRET
-EOF
-    clef --keystore /var/lib/bee-clef/keystore --configdir /var/lib/bee-clef --stdio-ui setpw 0x$(parse_json $(cat /var/lib/bee-clef/keystore/*) address) >/dev/null 2>&1 <<EOF
-$SECRET
-$SECRET
-$SECRET
-EOF
-    clef --keystore /var/lib/bee-clef/keystore --configdir /var/lib/bee-clef --stdio-ui attest $(sha256sum /etc/bee-clef/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null 2>&1 <<EOF
-$SECRET
-EOF
-    chown -R bee-clef:bee-clef /var/lib/bee-clef
-}
-
-post_remove() {
-    userdel bee-clef >/dev/null 2>&1 || true
-    groupdel bee-clef >/dev/null 2>&1 || true
-}