[lilac] updated to 1.4.5.b.2.g1adddee-1

2 files changed, 48 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a539ce4af6e2..f7359b7ab87e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = opengnb-git
 	pkgdesc = GNB is open source de-centralized VPN to achieve layer3 network via p2p with the ultimate capability of NAT Traversal.
-	pkgver = 1.3.0.c.35.gb668a52
+	pkgver = 1.4.5.b.2.g1adddee
 	pkgrel = 1
 	url = https://github.com/gnbdev/opengnb
 	arch = x86_64
-	license = GPLv3
+	arch = aarch64
+	arch = riscv64
+	license = GPL-3.0-or-later
 	makedepends = git
 	makedepends = sed
-	depends = miniupnpc
+	makedepends = libnatpmp
+	makedepends = miniupnpc
+	makedepends = zlib
+	depends = bash
+	depends = glibc
 	provides = opengnb
 	conflicts = opengnb
-	options = !strip
-	source = opengnb::git+https://github.com/gnbdev/opengnb.git
+	options = !makeflags
+	source = opengnb-git::git+https://github.com/gnbdev/opengnb.git
 	sha256sums = SKIP
 
 pkgname = opengnb-git
diff --git a/PKGBUILD b/PKGBUILD
index 5e51a4fe2a91..31c25824ceed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,63 @@
-# Contributor: taotieren <admin@taotieren.com>
+# Maintainer: taotieren <admin@taotieren.com>
 
 pkgname=opengnb-git
-pkgver=1.3.0.c.35.gb668a52
+pkgver=1.4.5.b.2.g1adddee
 pkgrel=1
 pkgdesc="GNB is open source de-centralized VPN to achieve layer3 network via p2p with the ultimate capability of NAT Traversal."
-arch=('x86_64')
+arch=(x86_64
+    aarch64
+    riscv64)
 url="https://github.com/gnbdev/opengnb"
-license=('GPLv3')
+license=('GPL-3.0-or-later')
 provides=(${pkgname%-git})
 conflicts=(${pkgname%-git})
 replaces=()
-depends=(miniupnpc)
+depends=(
+    bash
+    glibc)
 optdepends=()
-makedepends=(git sed)
+makedepends=(git
+    sed
+    libnatpmp
+    miniupnpc
+    zlib)
 backup=()
-options=('!strip')
+options=('!makeflags')
 install=
-source=("${pkgname%-git}::git+${url}.git")
+source=("${pkgname}::git+${url}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "${srcdir}/${pkgname%-git}"
-    git describe --always | sed 's/^v//' | sed 's|-|.|g'
+    cd "${srcdir}/${pkgname}"
+    git describe --tags --always | sed 's/^v\{0,1\}ver\{0,1\}//' | sed 's|-|.|g'
 }
 
 prepare() {
-    cd "${srcdir}/${pkgname%-git}"
-    sed -i 's|-I./libs/miniupnpc|-I/usr/include/miniupnpc/|g'  Makefile.linux
+    git -C "${srcdir}/${pkgname}" clean -dfx
+
+    cd "${srcdir}/${pkgname}"
+    sed -i  -e 's|-I./libs|-I./libs -I/usr/include|g' \
+        -e 's|-I./libs/miniupnpc/|-I/usr/include/miniupnpc|g' \
+        -e 's|-I./libs/libnatpmp | |g' \
+        -e 's|-I./libs/zlib | |g' \
+        -e 's| -pthread| -pthread -z relro -z now -z shstk|g' Makefile.linux
+
+    sed -i -e 's|sbin|bin|g' scripts/opengnb\@.service
 }
 
 build() {
-    cd "${srcdir}/${pkgname%-git}"
+    cd "${srcdir}/${pkgname}"
     make -f Makefile.linux
 }
 
 package() {
-    cd "${srcdir}/${pkgname%-git}"
+    cd "${srcdir}/${pkgname}"
     make -f Makefile.linux install
-    install -dm0755 "${pkgdir}/usr" \
-                    "${pkgdir}/usr/lib/systemd/system/" \
-                    "${pkgdir}/usr/share/${pkgname%-git}/"
-    cp -rv bin "${pkgdir}/usr"
-    cp -rv scripts/${pkgname%-git}@.service "${pkgdir}/usr/lib/systemd/system/"
-    cp -rv examples/* "${pkgdir}/usr/share/${pkgname%-git}/"
-    install -Dm0644 "${srcdir}/${pkgname%-git}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
+
+    install -dm0755 "${pkgdir}/etc/opengnb"
+    install -Dm0755  bin/* -t "${pkgdir}/usr/bin/"
+    install -Dm0644  scripts/${pkgname%-git}@.service -t "${pkgdir}/usr/lib/systemd/system/"
+    install -Dm0644  examples/node_config_example/*.conf -t "${pkgdir}/usr/share/${pkgname}/node_config_example/"
+    install -Dm0644  examples/node_config_example/scripts/* -t "${pkgdir}/usr/share/${pkgname}/node_config_example/scripts/"
+    install -Dm0644 docs/* -t "${pkgdir}/usr/share/doc/${pkgname}/docs/"
 }