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

[Felix Yan]

    Date: Wednesday, October 1, 2014 @ 12:56:46
  Author: fyan
Revision: 119952

upgpkg: goagent 3.2.0-1

Modified:
  goagent/trunk/PKGBUILD

----------+
 PKGBUILD |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 10:53:19 UTC (rev 119951)
+++ PKGBUILD	2014-10-01 10:56:46 UTC (rev 119952)
@@ -4,7 +4,7 @@
 # Contributor: Guten <ywzhaifei at gmail.com> 
 
 pkgname=goagent
-pkgver=3.1.25
+pkgver=3.2.0
 #_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc="A gae proxy forked from gappproxy/wallproxy"
@@ -14,7 +14,6 @@
 depends=('python2' 'python2-pyopenssl' 'python2-gevent' 'python2-dnslib')
 conflicts=('python2-gevent<0.99')
 optdepends=('python2-crypto: Optimization for RC4'
-            'python2-pacparser: PAC proxy support'
             'python2-pygeoip: for GAE Regions mode support & DNS region auto detect')
 makedepends=('git')
 source=("git+https://github.com/goagent/goagent.git#tag=v$pkgver"
@@ -32,6 +31,9 @@
   sed -e 's|^            self.geoip = .*$|            self.geoip = pygeoip.GeoIP("/usr/share/GeoIP/GeoIP.dat")|' \
       -e "s|os.path.join(os.path.dirname(os.path.abspath(__file__)), 'cacert.pem')|'/etc/ssl/certs/ca-certificates.crt'|" \
       -i local/proxylib.py
+  sed -e 's|^.*google_appengine.zip.*$||' \
+      -e 's|sys\.modules\.pop(.google., None)||' \
+      -i server/uploader.py
 }
 
 package() {
@@ -49,7 +51,7 @@
   ln -sf "/etc/goagent" "${pkgdir}/usr/share/$pkgname/local/goagent.user.ini"
   
   cp -r server "$pkgdir/usr/share/$pkgname/"
-  rm "$pkgdir/usr/share/$pkgname/server/uploader.bat"
+  rm "$pkgdir/usr/share/$pkgname/server/"{uploader.bat,google_appengine.zip}
 
   # systemd service
   install -Dm644 "${srcdir}/goagent.service" "${pkgdir}/usr/lib/systemd/system/goagent.service"