use virtualenv to solve dependencies

4 files changed, 83 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52d63c7f6202..3295371947b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,29 @@
-# Generated by mksrcinfo v8
-# Fri Nov 18 11:25:43 UTC 2016
 pkgbase = pritunl-git
 	pkgdesc = Enterprise VPN Server
-	pkgver = 10744.de3c11b
+	pkgver = 1.29.2547.95
 	pkgrel = 1
 	url = https://github.com/pritunl/pritunl
 	install = pritunl.install
-	arch = any
+	arch = x86_64
+	arch = aarch64
 	license = custom
-	makedepends = python2-distribute
-	makedepends = python2-flask
-	makedepends = python2-pyopenssl
-	makedepends = python2-pymongo
 	makedepends = git
-	depends = python
-	depends = python2
-	depends = python2-flask
-	depends = python2-pyopenssl
-	depends = python2-pymongo
-	depends = net-tools
-	depends = iproute2
-	depends = openvpn
-	depends = python2-netifaces
-	depends = python2-boto
-	depends = python2-requests
-	depends = python2-psutil
-	depends = python2-dateutil
-	depends = python2-redis
-	depends = python2-cherrypy
-	depends = python2-pyroute2
-	depends = mongodb
-	depends = go
+	makedepends = python2-setuptools
+	makedepends = python2-virtualenv
+	makedepends = python2-pip
+	optdepends = mongodb
 	provides = pritunl
 	conflicts = pritunl
 	options = emptydirs
 	backup = etc/pritunl.conf
-	backup = var/lib/pritunl/pritunl.db
-	backup = var/log/pritunl.log
-	backup = var/log/pritunl.log.1
 	source = git+https://github.com/pritunl/pritunl
 	sha256sums = SKIP
 
 pkgname = pritunl-git
+	depends = pritunl-dns
+	depends = pritunl-web
+	depends = python2
+	depends = net-tools
+	depends = iproute2
+	depends = openvpn
 
diff --git a/.gitignore b/.gitignore
index 51c591611a71..7f7b48c3414a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 */
 *.pkg*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 84484946e91d..e65cc25d61e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,88 @@
-# Maintainer: Pritunl <contact@pritunl.com>
+# Maintainer: Jingbei Li <i@jingbei.li>
+# Contributor: Pritunl <contact@pritunl.com>
 
 pkgname=pritunl-git
 _pkgname=pritunl
-pkgver=10744.de3c11b
+pkgver=1.29.2547.95
 pkgrel=1
 pkgdesc="Enterprise VPN Server"
-arch=("any")
+arch=("x86_64" "aarch64")
 license=("custom")
 url="https://github.com/${_pkgname}/${_pkgname}"
-depends=("python" "python2" "python2-flask" "python2-pyopenssl" "python2-pymongo" "net-tools" "iproute2" "openvpn" "python2-netifaces" "python2-boto" "python2-requests" "python2-psutil" "python2-dateutil" "python2-redis" "python2-cherrypy" "python2-pyroute2" "mongodb" "go")
-makedepends=("python2-distribute" "python2-flask" "python2-pyopenssl" "python2-pymongo" "git")
+_depends=(
+	pritunl-dns
+	pritunl-web
+	#python2-jinja
+	#python2-urllib3
+	#python2-iptables
+
+	python2
+	#python-boto
+	#python-boto3
+	##python-bson is provided by python-pymongo
+	#python-cheroot
+	#python-cryptography
+	#python-dateutil
+	#python-flask
+	#python-google-api-python-client
+	#python-netifaces
+	#python-oauth2client
+	#python-oci
+	#python-psutil
+	#python-pymongo
+	#python-pynacl
+	#python-pyroute2
+	#python-redis
+	#python-requests
+	#python-yubico-client
+
+	net-tools
+	iproute2
+	openvpn
+)
+makedepends=(
+	git
+	python2-setuptools
+	python2-virtualenv
+	python2-pip
+)
+optdepends=(mongodb)
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
 install=${_pkgname}.install
-source=("git+https://github.com/${_pkgname}/${_pkgname}")
-sha256sums=("SKIP")
+source=("git+$url")
+sha256sums=('SKIP')
 options=("emptydirs")
-backup=("etc/${_pkgname}.conf" "var/lib/${_pkgname}/${_pkgname}.db" "var/log/${_pkgname}.log" "var/log/${_pkgname}.log.1")
+backup=("etc/${_pkgname}.conf")
 
 pkgver() {
 	cd $_pkgname
-	echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+	git describe --always --tags | sed -e 's/-/./g' -e 's/v//g'
 }
 
-build() {
+_build() {
+	export virtualenv="${pkgdir}/opt/${_pkgname}"
+	export mirror="-i https://pypi.tuna.tsinghua.edu.cn/simple"
+
 	cd "$srcdir/$_pkgname"
-	python2 setup.py build
-	export GOPATH=$srcdir/go
-	go get github.com/pritunl/pritunl-dns
-	go get github.com/pritunl/pritunl-web
+	#python2 setup.py build
+	virtualenv2 "$virtualenv"
+	${virtualenv}/bin/python setup.py build
+	${virtualenv}/bin/python setup.py install --root="${pkgdir}" --prefix="/opt/${_pkgname}"
+	${virtualenv}/bin/pip install $mirror -U -r requirements.txt --root="${pkgdir}" --prefix="/opt/${_pkgname}"
 }
 
 package() {
-	cd "$srcdir/$_pkgname"
-	mkdir -p "${pkgdir}/var/lib/${_pkgname}"
-	python2 setup.py install --root="${pkgdir}" --prefix=/usr
-	install -Dm755 $GOPATH/bin/pritunl-{dns,web} $pkgdir/usr/bin
+	depends=(${_depends[@]})
+
+	_build
+
+	mkdir -p "${pkgdir}/usr/bin"
+	ln -s "/opt/${_pkgname}/bin/${_pkgname}" "${pkgdir}/usr/bin"
+
+	msg2 "Replacing \$pkgdir"
+	sed -e "s|${pkgdir}||g" -i $(grep "${virtualenv}" ${pkgdir} -rIl 2>/dev/null)
+
+	#mkdir -p "${pkgdir}/var/lib/${_pkgname}"
+	#python2 setup.py install --root="${pkgdir}" --prefix=/usr
 }
diff --git a/pritunl.install b/pritunl.install
index 6d535e448146..79d2ea69eaed 100644
--- a/pritunl.install
+++ b/pritunl.install
@@ -1,6 +1,6 @@
 pre_remove() {
-    systemctl stop pritunl || true
-    systemctl disable pritunl || true
+    systemctl stop pritunl || :
+    systemctl disable pritunl || :
 }
 
 post_remove() {