Update to 0.6.2-6

2 files changed, 54 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bab83efa16d1..61ee40e3bfd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = wireguard-ui
-	pkgdesc = Web user interface to manage your WireGuard setup.
+	pkgdesc = Web user interface to manage your WireGuard setup
 	pkgver = 0.6.2
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/ngoduykhanh/wireguard-ui
 	install = wireguard-ui.install
+	arch = aarch64
+	arch = armv7h
 	arch = i686
 	arch = x86_64
-	arch = armv7h
-	arch = aarch64
 	license = MIT
 	makedepends = yarn
 	makedepends = npm
 	makedepends = go
+	depends = glibc
 	depends = wireguard-tools
-	provides = wireguard-ui=0.6.2
-	conflicts = wireguard-ui-bin
+	conflicts = wireguard-ui
 	options = !debug
+	backup = usr/bin/wgiptables
 	source = wireguard-ui-0.6.2.tar.gz::https://github.com/ngoduykhanh/wireguard-ui/archive/refs/tags/v0.6.2.tar.gz
 	source = wireguard-ui.service
 	source = 99-wg.conf
diff --git a/PKGBUILD b/PKGBUILD
index 66cd33b27b58..bffd60e50c39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,29 @@
 
 pkgname=wireguard-ui
 pkgver=0.6.2
-pkgrel=5
-pkgdesc="Web user interface to manage your WireGuard setup."
-arch=(i686 x86_64 armv7h aarch64)
-url="https://github.com/ngoduykhanh/${pkgname}"
+pkgrel=6
+pkgdesc="Web user interface to manage your WireGuard setup"
+arch=(aarch64 armv7h i686 x86_64)
+url="https://github.com/ngoduykhanh/$pkgname"
 license=(MIT)
-depends=(wireguard-tools)
+depends=(glibc wireguard-tools)
 makedepends=(yarn npm go)
-provides=(${pkgname}=${pkgver})
-conflicts=(${pkgname}-bin)
+conflicts=($pkgname)
 options=(!debug)
-install=${pkgname}.install
-source=(${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz
-        ${pkgname}.service
+backup=(usr/bin/wgiptables)
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz
+        $pkgname.service
         99-wg.conf
         wgiptables.sh
         wgui.path
         wgui.service
-        001.patch::${url}/commit/73108f7f21904a7afe0cc1829f1b80d84fb04555.patch # Fix updateSearchList js error (#524)
-        002.patch::${url}/commit/ecea82d1724359cd7a1b554bdd87b68da449fd16.patch # Support for notes about clients (#527)
-        003.patch::${url}/commit/7856ce9555a4c6bfba63029947f1e03a7505c70f.patch # Status page: display peers IPs only to admins (#521)
-        004.patch::${url}/commit/1aa6bf3b9e0258ccc707b797de3cfb7f5b9deeb8.patch # Case-insensitive search by notes; display notes on the client card (#532)
-        005.patch::${url}/commit/32339d5d5a606874257589d74664f76f2cd60d89.patch # Cache user crc32 on db init (fix for #523) (#534)
-        006.patch::${url}/commit/2fdafd34ca6c8f7f1415a3a1d89498bb575a7171.patch # Fix dependencies (#535)
+        001.patch::$url/commit/73108f7f21904a7afe0cc1829f1b80d84fb04555.patch # Fix updateSearchList js error (#524)
+        002.patch::$url/commit/ecea82d1724359cd7a1b554bdd87b68da449fd16.patch # Support for notes about clients (#527)
+        003.patch::$url/commit/7856ce9555a4c6bfba63029947f1e03a7505c70f.patch # Status page: display peers IPs only to admins (#521)
+        004.patch::$url/commit/1aa6bf3b9e0258ccc707b797de3cfb7f5b9deeb8.patch # Case-insensitive search by notes; display notes on the client card (#532)
+        005.patch::$url/commit/32339d5d5a606874257589d74664f76f2cd60d89.patch # Cache user crc32 on db init (fix for #523) (#534)
+        006.patch::$url/commit/2fdafd34ca6c8f7f1415a3a1d89498bb575a7171.patch # Fix dependencies (#535)
        )
 b2sums=('78b972b802bdc9da33a3cd17682dc435b4855a4eef06b1b60b0919e8dfb098c31bf677483b4923e847017481963f30a2067495200034afabf8bf43a7a29739de'
         '89d9e0ccc55a2b01b7625ddc7da70a260960c77e1fc2c876cd92934e41bb59bef2097af56813ab8cad1f8db7dc596fd5500f324722b626abeb4a8fa4b303a703'
@@ -32,44 +32,44 @@ b2sums=('78b972b802bdc9da33a3cd17682dc435b4855a4eef06b1b60b0919e8dfb098c31bf6774
         'ddf1833a1de4cb9478ac17007743d934b9c28358252a8e0b9c770b933cc1aed26464b6227ef2feabbe7247e8cda7e8fbc8258e3536e29319bb4d4dd0560edcad'
         'd7ea6f2c405abd6b2a07e6c216387e8eb085476899e8bf6101cbed41115934816d0362e2030e3165b481314d65b88adcc5bd4928071e34ceb602fa45ffe1db4d'
         'f7045f01d73757129cc98675d7fa87b477b780548fe2d72562c2aef33bdfb87c661fd6306c6e55a1d757f9c920bbcdc80f38f32b2a38df7029e5413ddc0b03aa'
-        'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'                               # Skip checking hashsums of patches, Github issue
+        'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'                             # Skip checking hashsums of patches, Github issue
        )
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  # Apply commits (fixies and new features) from source Github since last release, in proper order
-  local src
-  for src in "${source[@]}"; do
-    src="${src%%::*}"
-    src="${src##*/}"
-    [[ $src = *.patch ]] || continue
-    echo "Applying patch $src..."
-    patch -Np1 < "../$src"
-  done
-  export NPM_CONFIG_USERCONFIG=${srcdir}/.npmrc
-  export NPM_CONFIG_CACHE=${srcdir}/npm_cache
-  export YARN_CACHE_FOLDER=${srcdir}/yarn_cache
-  ./prepare_assets.sh
+    cd $pkgname-$pkgver
+    # Apply commits (fixies and new features) from source Github since last release, in proper order
+    local src
+    for src in "${source[@]}"; do
+        src="${src%%::*}"
+        src="${src##*/}"
+        [[ $src = *.patch ]] || continue
+        echo "Applying patch $src..."
+        patch -Np1 < "../$src"
+    done
+    export NPM_CONFIG_USERCONFIG=$srcdir/.npmrc
+    export NPM_CONFIG_CACHE=$srcdir/npm_cache
+    export YARN_CACHE_FOLDER=$srcdir/yarn_cache
+    ./prepare_assets.sh
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
-  export GOPATH=${srcdir}
-  export CGO_CPPFLAGS=${CPPFLAGS}
-  export CGO_CFLAGS=${CFLAGS}
-  export CGO_CXXFLAGS=${CXXFLAGS}
-  export CGO_LDFLAGS=${LDFLAGS}
-  export CGO_ENABLED=1
-  export GOCACHE=${srcdir}/go-build
-  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-  go build -o ${pkgname}
+    cd $pkgname-$pkgver
+    export GOPATH=$srcdir
+    export CGO_CPPFLAGS=$CPPFLAGS
+    export CGO_CFLAGS=$CFLAGS
+    export CGO_CXXFLAGS=$CXXFLAGS
+    export CGO_LDFLAGS=$LDFLAGS
+    export CGO_ENABLED=1
+    export GOCACHE=$srcdir/go-build
+    export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+    go build -o $pkgname
 }
 
 package() {
-  install -Dm644 ${pkgname}-${pkgver}/LICENSE    -t ${pkgdir}/usr/share/licenses/${pkgname}/
-  install -Dm755 ${pkgname}-${pkgver}/${pkgname} -t ${pkgdir}/usr/bin/
-  install -Dm755 ${srcdir}/wgiptables.sh            ${pkgdir}/usr/bin/wgiptables
-  install -Dm644 ${srcdir}/${pkgname}.service    -t ${pkgdir}/usr/lib/systemd/system/
-  install -Dm644 ${srcdir}/wgui.{path,service}   -t ${pkgdir}/usr/lib/systemd/system/
-  install -Dm644 ${srcdir}/99-wg.conf            -t ${pkgdir}/etc/sysctl.d/
+    install -Dm644 99-wg.conf                -t $pkgdir/etc/sysctl.d/
+    install -Dm755 $pkgname-$pkgver/$pkgname -t $pkgdir/usr/bin/
+    install -Dm755 wgiptables.sh                $pkgdir/usr/bin/wgiptables
+    install -Dm644 $pkgname.service          -t $pkgdir/usr/lib/systemd/system/
+    install -Dm644 wgui.{path,service}       -t $pkgdir/usr/lib/systemd/system/
+    install -Dm644 $pkgname-$pkgver/LICENSE  -t $pkgdir/usr/share/licenses/$pkgname/
 }