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

[Felix Yan]

    Date: Monday, April 7, 2014 @ 12:17:38
  Author: fyan
Revision: 108906

upgpkg: goagent 3.1.7-1

- upstream new release
- known failure on bug tracker, need to test more

Modified:
  goagent/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-07 10:15:52 UTC (rev 108905)
+++ PKGBUILD	2014-04-07 10:17:38 UTC (rev 108906)
@@ -4,7 +4,7 @@
 # Contributor: Guten <ywzhaifei at gmail.com> 
 
 pkgname=goagent
-pkgver=3.1.6
+pkgver=3.1.7
 pkgrel=1
 pkgdesc="A gae proxy forked from gappproxy/wallproxy"
 arch=("any")
@@ -14,19 +14,29 @@
 conflicts=('python2-gevent<0.99')
 optdepends=('python2-crypto: Optimization for RC4'
             'python2-pacparser: PAC proxy support'
-            'python2-geoip: To Automatically detect trusted servers')
+            'python2-pygeoip: for GAE Regions mode support & DNS region auto detect')
 makedepends=('git')
 source=("git+https://github.com/goagent/goagent.git#tag=v$pkgver"
+        https://github.com/goagent/goagent/commit/3f86076eff059b52145c7c14cc1ab69cc7af34c8.patch
         "${pkgname}.user.ini"
         "${pkgname}.service")
 backup=('etc/goagent')
 install=goagent.install
 
+prepare() {
+  cd $pkgname
+
+  # https://github.com/goagent/goagent/pull/6
+  patch -p1 -i "$srcdir/3f86076eff059b52145c7c14cc1ab69cc7af34c8.patch"
+
+  sed -e "s|^#!/usr/bin/env python|#!/usr/bin/env python2|" \
+      -e 's|^    geoip = .*)\( if.*\)$|    geoip = pygeoip.GeoIP("/usr/share/GeoIP/GeoIP.dat")\1|' \
+      -i local/proxy.py
+}
+
 package() {
   cd $pkgname
 
-  sed -i -e "s|^#!/usr/bin/env python|#!/usr/bin/env python2|" local/proxy.py
-  
   install -Dm755 local/proxy.py "$pkgdir/usr/share/$pkgname/local/goagent"
   install -Dm755 local/dnsproxy.py "$pkgdir/usr/share/$pkgname/local/dnsproxy.py"
   install -Dm644 local/proxy.pac "$pkgdir/usr/share/$pkgname/local/proxy.pac"
@@ -47,5 +57,6 @@
 
 # vim:set ts=2 sw=2 et:
 sha512sums=('SKIP'
+            'ded168fcb906ad3113f1ceebcd9af884fcd4113bfca0ecce6d940f268ac117590e3534cf03f31918874f91eefd8c9d315a83451fd15f3752da7732fcf918c031'
             'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
             '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')