[arch-commits] Commit in tuntox/trunk (PKGBUILD)

[Felix Yan]

    Date: Monday, December 20, 2021 @ 02:14:41
  Author: felixonmars
Revision: 1079268

upgpkg: tuntox 0.0.10-1

Modified:
  tuntox/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-20 02:14:22 UTC (rev 1079267)
+++ PKGBUILD	2021-12-20 02:14:41 UTC (rev 1079268)
@@ -2,9 +2,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=tuntox
-pkgver=0.0.9
-_commit=ef49516b967e1b3a1af777725554e5081ee0c688
-pkgrel=2
+pkgver=0.0.10
+pkgrel=1
 pkgdesc='Tunnel TCP connections over the Tox protocol'
 arch=('x86_64')
 url='https://github.com/gjedeer/tuntox'
@@ -11,19 +10,14 @@
 license=('GPL3')
 depends=('toxcore' 'libevent')
 makedepends=('cscope' 'git')
-
-## Using git commit to fix toxcore 0.2.x compatibility
-source=( "git+https://github.com/gjedeer/tuntox.git#commit=$_commit"  #tag=$pkgver
-        #"https://github.com/gjedeer/${pkgname}/archive/${pkgver}.tar.gz"
+source=("https://github.com/gjedeer/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz"
         #"https://github.com/gjedeer/${pkgname}/releases/download/${pkgver}/${pkgver}.tar.gz.asc"
        )
-
-sha512sums=('SKIP')
+sha512sums=('25536fc8fbccc6e25aab42131a9973422a0e3313669d5fe5aa7317162250aa96d05d42b8eea239f4e621856ff2ba3a2d886c35ff77b0f5cdb82fd4263794bf82')
 validpgpkeys=('11C1B15A5D5DD662E469928AEBDA6B974ED3D2B7')  # GDR!_ <gdr at gdr.name>
 
 prepare() {
-  #cd $pkgname-$pkgver
-  cd $pkgname
+  cd $pkgname-$pkgver
   #sed -i "s|DEPS=libsodium toxcore|DEPS=libsodium libtoxcore|" Makefile
   sed -i "/^CFLAGS=/d" Makefile # use CFLAGS from makepkg
   sed -i "/^LDFLAGS=/d" Makefile # use LDFLAGS from makepkg
@@ -32,21 +26,14 @@
 }
 
 build() {
-  #cd $pkgname-$pkgver
-  cd $pkgname
+  cd $pkgname-$pkgver
 
-  # Makefile requires these, make it happy
-  # pending issue: https://github.com/gjedeer/tuntox/issues/35
-  # mkdir -p .git
-  # touch .git/HEAD .git/index
-  # echo "#define GITVERSION \"${_commit}\"" > gitversion.h
   make tuntox_nostatic  # use dynamic linking
   mv tuntox_nostatic tuntox
 }
 
 package() {
-  #cd $pkgname-$pkgver
-  cd $pkgname
+  cd $pkgname-$pkgver
   install -Dm755 tuntox "$pkgdir/usr/bin/tuntox"
   install -Dm755 scripts/tokssh "$pkgdir/usr/bin/tokssh"
   install -Dm644 scripts/tuntox.service "$pkgdir/usr/lib/systemd/system/tuntox.service"