subject:"\[arch\-commits\] Commit in goagent\/trunk \(PKGBUILD\)"

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

2015-07-14 Thread Felix Yan

Date: Tuesday, July 14, 2015 @ 08:25:51
  Author: fyan
Revision: 136814

upgpkg: goagent 3.2.3.20150617-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-07-14 03:27:01 UTC (rev 136813)
+++ PKGBUILD2015-07-14 06:25:51 UTC (rev 136814)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.2.3.20150606
-_commit=c35fb8e25e7d952943c3d8b0717282a978960157
+pkgver=3.2.3.20150617
+_commit=985cbd55e232833a859e7f2940b54f7dcb6cdb14
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2015-06-10 Thread Felix Yan

Date: Wednesday, June 10, 2015 @ 16:56:40
  Author: fyan
Revision: 135139

upgpkg: goagent 3.2.3.20150606-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |   19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-06-10 14:46:07 UTC (rev 135138)
+++ PKGBUILD2015-06-10 14:56:40 UTC (rev 135139)
@@ -4,9 +4,9 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.2.3
-#_commit=d911497475c516405dde59a968cd506424326b55
-pkgrel=3
+pkgver=3.2.3.20150606
+_commit=c35fb8e25e7d952943c3d8b0717282a978960157
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -15,23 +15,19 @@
 optdepends=('python2-crypto: Optimization for RC4'
 'python2-pygeoip: for GAE Regions mode support  DNS region auto 
detect')
 makedepends=('git')
-source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
-#source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
+#source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
-${pkgname}.service
-sslwrap-python-2.7.9.patch)
+${pkgname}.service)
 backup=('etc/goagent')
 install=goagent.install
 sha512sums=('SKIP'
 
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c'
-
'c999f2c3de574a2826b2ae51a0469c0a070e2f7177a86c70a21304fadede999342d1b01f5925a8785fa56f0745154734df65cb929b00bd5f9066f85c3d300354')
+
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')
 
 prepare() {
   cd $pkgname
 
-  patch -p1 -i ../sslwrap-python-2.7.9.patch
-
   sed -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| \
   -i local/{proxy.py,dnsproxy.py}
   sed -e 's|^self.geoip = .*$|self.geoip = 
pygeoip.GeoIP(/usr/share/GeoIP/GeoIP.dat)|' \
@@ -50,7 +46,6 @@
   install -Dm644 local/proxylib.py 
$pkgdir/usr/share/$pkgname/local/proxylib.py
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
-  install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
   install -Dm644 local/proxy.ini $pkgdir/usr/share/$pkgname/local/goagent.ini
   install -Dm640 -g nobody ../goagent.user.ini $pkgdir/etc/goagent

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

2015-05-16 Thread Felix Yan

Date: Sunday, May 17, 2015 @ 00:53:12
  Author: fyan
Revision: 133628

upgpkg: goagent 3.2.3-3

fix install message.

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|6 --
 goagent.install |4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-16 22:26:11 UTC (rev 133627)
+++ PKGBUILD2015-05-16 22:53:12 UTC (rev 133628)
@@ -6,7 +6,7 @@
 pkgname=goagent
 pkgver=3.2.3
 #_commit=d911497475c516405dde59a968cd506424326b55
-pkgrel=2
+pkgrel=3
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -54,7 +54,9 @@
 
   install -Dm644 local/proxy.ini $pkgdir/usr/share/$pkgname/local/goagent.ini
   install -Dm640 -g nobody ../goagent.user.ini $pkgdir/etc/goagent
-  ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/goagent.user.ini
+  ln -sf /etc/goagent $pkgdir/usr/share/$pkgname/local/goagent.user.ini
+
+  chown -R nobody:nobody $pkgdir/usr/share/$pkgname/local
   
   cp -r server $pkgdir/usr/share/$pkgname/
   rm $pkgdir/usr/share/$pkgname/server/{uploader.bat,google_appengine.zip}

Modified: goagent.install
===
--- goagent.install 2015-05-16 22:26:11 UTC (rev 133627)
+++ goagent.install 2015-05-16 22:53:12 UTC (rev 133628)
@@ -3,11 +3,11 @@
 
 #cd /opt/goagent/local
 #python2 -c 'from proxy import CertUtil; CertUtil.check_ca()'
-chown -R nobody:daemon /usr/share/goagent/local
+#chown -R nobody:nobody /usr/share/goagent/local
 }
 
 post_upgrade() {
-post_install
+(( $(vercmp $2 '3.1.2-2')  0 ))  post_install $1 || true
 }
 
 pre_upgrade() {

[arch-commits] Commit in goagent/trunk (PKGBUILD sslwrap-python-2.7.9.patch)

2014-12-13 Thread Felix Yan

Date: Saturday, December 13, 2014 @ 10:09:54
  Author: fyan
Revision: 123826

upgpkg: goagent 3.2.3-2

add patch to work under python 2.7.9

Added:
  goagent/trunk/sslwrap-python-2.7.9.patch
Modified:
  goagent/trunk/PKGBUILD

+
 PKGBUILD   |   14 
 sslwrap-python-2.7.9.patch |   47 +++
 2 files changed, 56 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-13 08:16:18 UTC (rev 123825)
+++ PKGBUILD2014-12-13 09:09:54 UTC (rev 123826)
@@ -6,7 +6,7 @@
 pkgname=goagent
 pkgver=3.2.3
 #_commit=d911497475c516405dde59a968cd506424326b55
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -18,13 +18,20 @@
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
 #source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
-${pkgname}.service)
+${pkgname}.service
+sslwrap-python-2.7.9.patch)
 backup=('etc/goagent')
 install=goagent.install
+sha512sums=('SKIP'
+
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
+
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c'
+
'c999f2c3de574a2826b2ae51a0469c0a070e2f7177a86c70a21304fadede999342d1b01f5925a8785fa56f0745154734df65cb929b00bd5f9066f85c3d300354')
 
 prepare() {
   cd $pkgname
 
+  patch -p1 -i ../sslwrap-python-2.7.9.patch
+
   sed -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| \
   -i local/{proxy.py,dnsproxy.py}
   sed -e 's|^self.geoip = .*$|self.geoip = 
pygeoip.GeoIP(/usr/share/GeoIP/GeoIP.dat)|' \
@@ -57,6 +64,3 @@
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('SKIP'
-
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

Added: sslwrap-python-2.7.9.patch
===
--- sslwrap-python-2.7.9.patch  (rev 0)
+++ sslwrap-python-2.7.9.patch  2014-12-13 09:09:54 UTC (rev 123826)
@@ -0,0 +1,47 @@
+From 0a050807191e0aaff09160256d254a7368b8892e Mon Sep 17 00:00:00 2001
+From: Felix Yan felixonm...@gmail.com
+Date: Sat, 13 Dec 2014 16:24:15 +0800
+Subject: [PATCH] Re-add sslwrap to workaround gevent on Python 2.7.9
+
+---
+ local/proxylib.py | 27 +++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/local/proxylib.py b/local/proxylib.py
+index 73e032e..ebaf067 100644
+--- a/local/proxylib.py
 b/local/proxylib.py
+@@ -40,6 +40,33 @@
+ gevent = sys.modules.get('gevent') or logging.warn('please enable gevent.')
+ 
+ 
++# Re-add sslwrap to Python 2.7.9
++import inspect
++__ssl__ = __import__('ssl')
++
++try:
++_ssl = __ssl__._ssl
++except AttributeError:
++_ssl = __ssl__._ssl2
++
++
++def new_sslwrap(sock, server_side=False, keyfile=None, certfile=None, 
cert_reqs=__ssl__.CERT_NONE, ssl_version=__ssl__.PROTOCOL_SSLv23, 
ca_certs=None, ciphers=None):
++context = __ssl__.SSLContext(ssl_version)
++context.verify_mode = cert_reqs or __ssl__.CERT_NONE
++if ca_certs:
++context.load_verify_locations(ca_certs)
++if certfile:
++context.load_cert_chain(certfile, keyfile)
++if ciphers:
++context.set_ciphers(ciphers)
++
++caller_self = inspect.currentframe().f_back.f_locals['self']
++return context._wrap_socket(sock, server_side=server_side, 
ssl_sock=caller_self)
++
++if not hasattr(_ssl, 'sslwrap'):
++_ssl.sslwrap = new_sslwrap
++
++
+ try:
+ from Crypto.Cipher.ARC4 import new as RC4Cipher
+ except ImportError:

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

2014-11-22 Thread Felix Yan

Date: Sunday, November 23, 2014 @ 08:44:47
  Author: fyan
Revision: 122976

upgpkg: goagent 3.2.3-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-23 03:23:08 UTC (rev 122975)
+++ PKGBUILD2014-11-23 07:44:47 UTC (rev 122976)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.2.2
+pkgver=3.2.3
 #_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy

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

2014-11-04 Thread Felix Yan

Date: Tuesday, November 4, 2014 @ 14:05:53
  Author: fyan
Revision: 121808

upgpkg: goagent 3.2.2-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-04 13:05:40 UTC (rev 121807)
+++ PKGBUILD2014-11-04 13:05:53 UTC (rev 121808)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.2.1
+pkgver=3.2.2
 #_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
@@ -12,7 +12,6 @@
 url=http://goagent.googlecode.com;
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl' 'python2-gevent' 'python2-dnslib')
-conflicts=('python2-gevent0.99')
 optdepends=('python2-crypto: Optimization for RC4'
 'python2-pygeoip: for GAE Regions mode support  DNS region auto 
detect')
 makedepends=('git')

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

2014-10-18 Thread Felix Yan

Date: Saturday, October 18, 2014 @ 16:21:11
  Author: fyan
Revision: 120937

upgpkg: goagent 3.2.1-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-18 10:25:34 UTC (rev 120936)
+++ PKGBUILD2014-10-18 14:21:11 UTC (rev 120937)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.2.0
+pkgver=3.2.1
 #_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy

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

2014-10-01 Thread 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
===
--- PKGBUILD2014-10-01 10:53:19 UTC (rev 119951)
+++ PKGBUILD2014-10-01 10:56:46 UTC (rev 119952)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@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-gevent0.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

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

2014-09-17 Thread Felix Yan

Date: Thursday, September 18, 2014 @ 04:36:29
  Author: fyan
Revision: 119140

upgpkg: goagent 3.1.25-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-09-17 20:49:39 UTC (rev 119139)
+++ PKGBUILD2014-09-18 02:36:29 UTC (rev 119140)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.24
-_commit=d911497475c516405dde59a968cd506424326b55
+pkgver=3.1.25
+#_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -17,8 +17,8 @@
 '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;
-source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
+source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+#source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')

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

2014-09-15 Thread Felix Yan

Date: Monday, September 15, 2014 @ 13:20:02
  Author: fyan
Revision: 119018

upgpkg: goagent 3.1.24-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 11:14:25 UTC (rev 119017)
+++ PKGBUILD2014-09-15 11:20:02 UTC (rev 119018)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.23
-#_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
+pkgver=3.1.24
+_commit=d911497475c516405dde59a968cd506424326b55
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -17,8 +17,8 @@
 '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;
-#source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
+#source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')

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

2014-09-11 Thread Felix Yan

Date: Thursday, September 11, 2014 @ 09:52:44
  Author: fyan
Revision: 118809

upgpkg: goagent 3.1.22-2

- use system ca-certificates instead of the shipped one

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-09-11 07:08:59 UTC (rev 118808)
+++ PKGBUILD2014-09-11 07:52:44 UTC (rev 118809)
@@ -6,7 +6,7 @@
 pkgname=goagent
 pkgver=3.1.22
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -30,6 +30,7 @@
   sed -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| \
   -i local/{proxy.py,dnsproxy.py}
   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
 }
 
@@ -40,7 +41,6 @@
   install -Dm755 local/dnsproxy.py 
$pkgdir/usr/share/$pkgname/local/dnsproxy.py
   install -Dm644 local/proxylib.py 
$pkgdir/usr/share/$pkgname/local/proxylib.py
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
-  install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
   install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx

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

2014-09-11 Thread Felix Yan

Date: Thursday, September 11, 2014 @ 19:23:43
  Author: fyan
Revision: 118830

upgpkg: goagent 3.1.23-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-09-11 13:00:01 UTC (rev 118829)
+++ PKGBUILD2014-09-11 17:23:43 UTC (rev 118830)
@@ -4,9 +4,9 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.22
+pkgver=3.1.23
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
-pkgrel=2
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;

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

2014-08-17 Thread Felix Yan

Date: Sunday, August 17, 2014 @ 10:39:41
  Author: fyan
Revision: 117471

upgpkg: goagent 3.1.22-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-17 06:06:40 UTC (rev 117470)
+++ PKGBUILD2014-08-17 08:39:41 UTC (rev 117471)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.21
+pkgver=3.1.22
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy

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

2014-08-08 Thread Felix Yan

Date: Friday, August 8, 2014 @ 20:01:36
  Author: fyan
Revision: 117046

upgpkg: goagent 3.1.21-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-08-08 17:19:44 UTC (rev 117045)
+++ PKGBUILD2014-08-08 18:01:36 UTC (rev 117046)
@@ -4,9 +4,9 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.20
+pkgver=3.1.21
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
-pkgrel=2
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;

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

2014-07-26 Thread Felix Yan

Date: Saturday, July 26, 2014 @ 11:17:33
  Author: fyan
Revision: 116362

upgpkg: goagent 3.1.20-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-26 09:02:37 UTC (rev 116361)
+++ PKGBUILD2014-07-26 09:17:33 UTC (rev 116362)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.19
+pkgver=3.1.20
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy

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

2014-07-26 Thread Felix Yan

Date: Saturday, July 26, 2014 @ 11:34:54
  Author: fyan
Revision: 116364

upgpkg: goagent 3.1.20-2

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-26 09:18:00 UTC (rev 116363)
+++ PKGBUILD2014-07-26 09:34:54 UTC (rev 116364)
@@ -6,7 +6,7 @@
 pkgname=goagent
 pkgver=3.1.20
 #_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -29,8 +29,8 @@
 
   sed -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| \
   -i local/{proxy.py,dnsproxy.py}
-  sed -e 's|^geoip = .*)\( if.*\)$|geoip = 
pygeoip.GeoIP(/usr/share/GeoIP/GeoIP.dat)\1|' \
-  -i local/proxy.py
+  sed -e 's|^self.geoip = .*$|self.geoip = 
pygeoip.GeoIP(/usr/share/GeoIP/GeoIP.dat)|' \
+  -i local/proxylib.py
 }
 
 package() {
@@ -38,6 +38,7 @@
 
   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/proxylib.py 
$pkgdir/usr/share/$pkgname/local/proxylib.py
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
   install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak

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

2014-07-20 Thread Felix Yan

Date: Sunday, July 20, 2014 @ 18:41:49
  Author: fyan
Revision: 116021

upgpkg: goagent 3.1.19-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-07-20 16:02:15 UTC (rev 116020)
+++ PKGBUILD2014-07-20 16:41:49 UTC (rev 116021)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.18.20140705
-_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
+pkgver=3.1.19
+#_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -17,8 +17,8 @@
 '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;
-source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
+source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+#source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')

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

2014-07-05 Thread Felix Yan

Date: Saturday, July 5, 2014 @ 10:33:01
  Author: fyan
Revision: 115081

upgpkg: goagent 3.1.18.20140705-1

- hotfix from upstream

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|6 --
 goagent.install |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-05 08:22:39 UTC (rev 115080)
+++ PKGBUILD2014-07-05 08:33:01 UTC (rev 115081)
@@ -4,7 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.18
+pkgver=3.1.18.20140705
+_commit=0772f4ecb4c825d556801d1ba418ca2d1ea37971
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -16,7 +17,8 @@
 '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;
+#source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+source=(git+https://github.com/goagent/goagent.git#commit=$_commit; 
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')

Modified: goagent.install
===
--- goagent.install 2014-07-05 08:22:39 UTC (rev 115080)
+++ goagent.install 2014-07-05 08:33:01 UTC (rev 115081)
@@ -1,5 +1,5 @@
 post_install() {
-echo From 3.1.2-2, /etc/goagent becomes user configuration for goagent. 
Put any customization there, not the default settings. For details, please 
refer to wiki: 
https://wiki.archlinux.org/index.php?title=GoAgent_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)
+echo Since 3.1.2-2, /etc/goagent becomes user configuration for goagent. 
Put any customization there, not the default settings. For details, please 
refer to wiki: 
https://wiki.archlinux.org/index.php?title=GoAgent_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)
 
 #cd /opt/goagent/local
 #python2 -c 'from proxy import CertUtil; CertUtil.check_ca()'

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

2014-06-09 Thread Felix Yan

Date: Monday, June 9, 2014 @ 17:39:12
  Author: fyan
Revision: 112927

upgpkg: goagent 3.1.18-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-09 15:26:02 UTC (rev 112926)
+++ PKGBUILD2014-06-09 15:39:12 UTC (rev 112927)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.17
+pkgver=3.1.18
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-06-07 Thread Felix Yan

Date: Sunday, June 8, 2014 @ 06:00:18
  Author: fyan
Revision: 112815

upgpkg: goagent 3.1.17-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-08 01:28:49 UTC (rev 112814)
+++ PKGBUILD2014-06-08 04:00:18 UTC (rev 112815)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.16
+pkgver=3.1.17
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-31 Thread Felix Yan

Date: Sunday, June 1, 2014 @ 06:25:00
  Author: fyan
Revision: 112352

upgpkg: goagent 3.1.16-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-01 04:17:25 UTC (rev 112351)
+++ PKGBUILD2014-06-01 04:25:00 UTC (rev 112352)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.15
+pkgver=3.1.16
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-30 Thread Felix Yan

Date: Saturday, May 31, 2014 @ 07:04:21
  Author: fyan
Revision: 112301

upgpkg: goagent 3.1.15-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-31 04:10:19 UTC (rev 112300)
+++ PKGBUILD2014-05-31 05:04:21 UTC (rev 112301)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.14
+pkgver=3.1.15
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-29 Thread Felix Yan

Date: Friday, May 30, 2014 @ 06:16:35
  Author: fyan
Revision: 112208

upgpkg: goagent 3.1.14-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-30 03:51:52 UTC (rev 112207)
+++ PKGBUILD2014-05-30 04:16:35 UTC (rev 112208)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.13
+pkgver=3.1.14
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-27 Thread Felix Yan

Date: Tuesday, May 27, 2014 @ 19:57:29
  Author: fyan
Revision: 111987

upgpkg: goagent 3.1.13-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-27 16:58:50 UTC (rev 111986)
+++ PKGBUILD2014-05-27 17:57:29 UTC (rev 111987)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.12
+pkgver=3.1.13
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-22 Thread Felix Yan

Date: Thursday, May 22, 2014 @ 16:09:27
  Author: fyan
Revision: 111674

upgpkg: goagent 3.1.12-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-22 12:49:49 UTC (rev 111673)
+++ PKGBUILD2014-05-22 14:09:27 UTC (rev 111674)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.11
+pkgver=3.1.12
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-05-04 Thread Felix Yan

Date: Sunday, May 4, 2014 @ 20:05:08
  Author: fyan
Revision: 110663

upgpkg: goagent 3.1.11-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-05-04 15:28:10 UTC (rev 110662)
+++ PKGBUILD2014-05-04 18:05:08 UTC (rev 110663)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.10
+pkgver=3.1.11
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -26,7 +26,8 @@
   cd $pkgname
 
   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,dnsproxy.py}
+  sed -e 's|^geoip = .*)\( if.*\)$|geoip = 
pygeoip.GeoIP(/usr/share/GeoIP/GeoIP.dat)\1|' \
   -i local/proxy.py
 }

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

2014-04-26 Thread Felix Yan

Date: Sunday, April 27, 2014 @ 06:05:30
  Author: fyan
Revision: 110211

upgpkg: goagent 3.1.10-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-26 23:41:32 UTC (rev 110210)
+++ PKGBUILD2014-04-27 04:05:30 UTC (rev 110211)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.9
+pkgver=3.1.10
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-04-13 Thread Felix Yan

Date: Monday, April 14, 2014 @ 05:56:50
  Author: fyan
Revision: 109363

upgpkg: goagent 3.1.9-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-04-14 01:59:38 UTC (rev 109362)
+++ PKGBUILD2014-04-14 03:56:50 UTC (rev 109363)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.8
+pkgver=3.1.9
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -17,7 +17,6 @@
 '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/cc91b381c5bbd43220c36dd74491584cec3f20cd.patch
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')
@@ -26,9 +25,6 @@
 prepare() {
   cd $pkgname
 
-  # https://code.google.com/p/goagent/issues/detail?id=13208
-  patch -p1 -i ../cc91b381c5bbd43220c36dd74491584cec3f20cd.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
@@ -57,6 +53,5 @@
 
 # vim:set ts=2 sw=2 et:
 sha512sums=('SKIP'
-
'f45b74699db618fd456b12724ef1c87d05d2bb51fc9d8c7676ff21bbd03f2a026b892c3e00fe89532426f5e01757693cb41014a20873393c496b3dfea1874b79'
 
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
 
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

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

2014-04-09 Thread Felix Yan

Date: Thursday, April 10, 2014 @ 04:00:41
  Author: fyan
Revision: 109062

upgpkg: goagent 3.1.8-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-04-10 02:00:03 UTC (rev 109061)
+++ PKGBUILD2014-04-10 02:00:41 UTC (rev 109062)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.7
+pkgver=3.1.8
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -17,7 +17,7 @@
 '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
+
https://github.com/goagent/goagent/commit/cc91b381c5bbd43220c36dd74491584cec3f20cd.patch
 ${pkgname}.user.ini
 ${pkgname}.service)
 backup=('etc/goagent')
@@ -26,8 +26,8 @@
 prepare() {
   cd $pkgname
 
-  # https://github.com/goagent/goagent/pull/6
-  patch -p1 -i $srcdir/3f86076eff059b52145c7c14cc1ab69cc7af34c8.patch
+  # https://code.google.com/p/goagent/issues/detail?id=13208
+  patch -p1 -i ../cc91b381c5bbd43220c36dd74491584cec3f20cd.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|' \
@@ -57,6 +57,6 @@
 
 # vim:set ts=2 sw=2 et:
 sha512sums=('SKIP'
-
'ded168fcb906ad3113f1ceebcd9af884fcd4113bfca0ecce6d940f268ac117590e3534cf03f31918874f91eefd8c9d315a83451fd15f3752da7732fcf918c031'
+
'f45b74699db618fd456b12724ef1c87d05d2bb51fc9d8c7676ff21bbd03f2a026b892c3e00fe89532426f5e01757693cb41014a20873393c496b3dfea1874b79'
 
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
 
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

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

2014-04-07 Thread 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
===
--- PKGBUILD2014-04-07 10:15:52 UTC (rev 108905)
+++ PKGBUILD2014-04-07 10:17:38 UTC (rev 108906)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@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-gevent0.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')

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

2014-03-22 Thread Felix Yan

Date: Saturday, March 22, 2014 @ 17:29:53
  Author: fyan
Revision: 108088

upgpkg: goagent 3.1.6-1

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|9 +
 goagent.install |1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-22 15:16:13 UTC (rev 108087)
+++ PKGBUILD2014-03-22 16:29:53 UTC (rev 108088)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.5
-pkgrel=2
+pkgver=3.1.6
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -12,8 +12,9 @@
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl' 'python2-gevent' 'python2-dnslib')
 conflicts=('python2-gevent0.99')
-optdepends=('python2-crypto: optimization for RC4'
-'python2-pacparser: PAC proxy support')
+optdepends=('python2-crypto: Optimization for RC4'
+'python2-pacparser: PAC proxy support'
+'python2-geoip: To Automatically detect trusted servers')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
 ${pkgname}.user.ini

Modified: goagent.install
===
--- goagent.install 2014-03-22 15:16:13 UTC (rev 108087)
+++ goagent.install 2014-03-22 16:29:53 UTC (rev 108088)
@@ -13,6 +13,7 @@
 pre_upgrade() {
 # Disable certs cleaning until some more issue detected
 #rm -rf /usr/share/goagent/local/certs
+:
 }
 
 pre_remove() {

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

2014-01-28 Thread Felix Yan

Date: Tuesday, January 28, 2014 @ 11:51:31
  Author: fyan
Revision: 104915

upgpkg: goagent 3.1.5-2

- fix: python2-dnslib is hard dependency

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-28 10:51:00 UTC (rev 104914)
+++ PKGBUILD2014-01-28 10:51:31 UTC (rev 104915)
@@ -5,15 +5,14 @@
 
 pkgname=goagent
 pkgver=3.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
-depends=('python2' 'python2-pyopenssl' 'python2-gevent')
+depends=('python2' 'python2-pyopenssl' 'python2-gevent' 'python2-dnslib')
 conflicts=('python2-gevent0.99')
-optdepends=('python2-dnslib: needed for dnsproxy'
-'python2-crypto: optimization for RC4'
+optdepends=('python2-crypto: optimization for RC4'
 'python2-pacparser: PAC proxy support')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;

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

2014-01-24 Thread Felix Yan

Date: Friday, January 24, 2014 @ 16:15:51
  Author: fyan
Revision: 104682

upgpkg: goagent 3.1.5-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-24 15:11:26 UTC (rev 104681)
+++ PKGBUILD2014-01-24 15:15:51 UTC (rev 104682)
@@ -4,15 +4,15 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
-depends=('python2' 'python2-pyopenssl')
+depends=('python2' 'python2-pyopenssl' 'python2-gevent')
 conflicts=('python2-gevent0.99')
-optdepends=('python2-gevent0.99: for better performance'
+optdepends=('python2-dnslib: needed for dnsproxy'
 'python2-crypto: optimization for RC4'
 'python2-pacparser: PAC proxy support')
 makedepends=('git')
@@ -28,6 +28,7 @@
   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
   install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak

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

2014-01-07 Thread Felix Yan

Date: Tuesday, January 7, 2014 @ 16:17:28
  Author: fyan
Revision: 103539

upgpkg: goagent 3.1.4-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-07 13:29:10 UTC (rev 103538)
+++ PKGBUILD2014-01-07 15:17:28 UTC (rev 103539)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.3
+pkgver=3.1.4
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2014-01-05 Thread Felix Yan

Date: Monday, January 6, 2014 @ 03:42:44
  Author: fyan
Revision: 103443

upgpkg: goagent 3.1.3-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-01-06 02:42:01 UTC (rev 103442)
+++ PKGBUILD2014-01-06 02:42:44 UTC (rev 103443)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -13,7 +13,8 @@
 depends=('python2' 'python2-pyopenssl')
 conflicts=('python2-gevent0.99')
 optdepends=('python2-gevent0.99: for better performance'
-'python2-crypto: optimization for RC4')
+'python2-crypto: optimization for RC4'
+'python2-pacparser: PAC proxy support')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
 ${pkgname}.user.ini

[arch-commits] Commit in goagent/trunk (PKGBUILD goagent.install goagent.user.ini)

2013-12-29 Thread Felix Yan

Date: Sunday, December 29, 2013 @ 15:45:44
  Author: fyan
Revision: 103189

upgpkg: goagent 3.1.2-2

Added:
  goagent/trunk/goagent.user.ini
Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|   11 +++
 goagent.install |3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-29 13:15:55 UTC (rev 103188)
+++ PKGBUILD2013-12-29 14:45:44 UTC (rev 103189)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -16,7 +16,8 @@
 'python2-crypto: optimization for RC4')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
-$pkgname.service)
+${pkgname}.user.ini
+${pkgname}.service)
 backup=('etc/goagent')
 install=goagent.install
 
@@ -31,8 +32,9 @@
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
   install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
-  install -Dm640 -g nobody local/proxy.ini $pkgdir/etc/goagent
-  ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/goagent.ini
+  install -Dm644 local/proxy.ini $pkgdir/usr/share/$pkgname/local/goagent.ini
+  install -Dm640 -g nobody ../goagent.user.ini $pkgdir/etc/goagent
+  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
@@ -43,4 +45,5 @@
 
 # vim:set ts=2 sw=2 et:
 sha512sums=('SKIP'
+
'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
 
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

Modified: goagent.install
===
--- goagent.install 2013-12-29 13:15:55 UTC (rev 103188)
+++ goagent.install 2013-12-29 14:45:44 UTC (rev 103189)
@@ -1,6 +1,5 @@
 post_install() {
-echo Please use systemd units to start/stop goagent:
-echo sudo systemctl start/stop goagent
+echo From 3.1.2-2, /etc/goagent becomes user configuration for goagent. 
Put any customization there, not the default settings. For details, please 
refer to wiki: 
https://wiki.archlinux.org/index.php?title=GoAgent_(%E7%AE%80%E4%BD%93%E4%B8%AD%E6%96%87)
 
 #cd /opt/goagent/local
 #python2 -c 'from proxy import CertUtil; CertUtil.check_ca()'

Added: goagent.user.ini
===

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

2013-12-23 Thread Felix Yan

Date: Tuesday, December 24, 2013 @ 05:21:59
  Author: fyan
Revision: 102919

upgpkg: goagent 3.1.2-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-12-24 03:15:56 UTC (rev 102918)
+++ PKGBUILD2013-12-24 04:21:59 UTC (rev 102919)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;

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

2013-12-19 Thread Felix Yan

Date: Friday, December 20, 2013 @ 05:49:39
  Author: fyan
Revision: 102791

upgpkg: goagent 3.1.1-2

update permissions for /etc/goagent, and executable name changed to goagent

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.service

-+
 PKGBUILD|   10 +-
 goagent.service |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-20 03:19:02 UTC (rev 102790)
+++ PKGBUILD2013-12-20 04:49:39 UTC (rev 102791)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -25,14 +25,14 @@
 
   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/proxy.py
+  install -Dm755 local/proxy.py $pkgdir/usr/share/$pkgname/local/goagent
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
   install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
   install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
-  install -Dm644 local/proxy.ini $pkgdir/etc/goagent
-  ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
+  install -Dm640 -g nobody local/proxy.ini $pkgdir/etc/goagent
+  ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/goagent.ini
   
   cp -r server $pkgdir/usr/share/$pkgname/
   rm $pkgdir/usr/share/$pkgname/server/uploader.bat
@@ -43,4 +43,4 @@
 
 # vim:set ts=2 sw=2 et:
 sha512sums=('SKIP'
-
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')
+
'4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

Modified: goagent.service
===
--- goagent.service 2013-12-20 03:19:02 UTC (rev 102790)
+++ goagent.service 2013-12-20 04:49:39 UTC (rev 102791)
@@ -5,7 +5,7 @@
 [Service]
 Type=simple
 User=nobody
-ExecStart=/usr/share/goagent/local/proxy.py
+ExecStart=/usr/share/goagent/local/goagent
 
 [Install]
 WantedBy=multi-user.target

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

2013-12-17 Thread Felix Yan

Date: Tuesday, December 17, 2013 @ 09:19:07
  Author: fyan
Revision: 102649

upgpkg: goagent 3.1.1-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-17 06:53:56 UTC (rev 102648)
+++ PKGBUILD2013-12-17 08:19:07 UTC (rev 102649)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2013-12-11 Thread Felix Yan

Date: Wednesday, December 11, 2013 @ 14:29:18
  Author: fyan
Revision: 102441

upgpkg: goagent 3.1.0-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-11 11:35:15 UTC (rev 102440)
+++ PKGBUILD2013-12-11 13:29:18 UTC (rev 102441)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.9
+pkgver=3.1.0
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2013-12-04 Thread Felix Yan

Date: Wednesday, December 4, 2013 @ 13:49:19
  Author: fyan
Revision: 102039

upgpkg: goagent 3.0.9-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-12-04 12:45:20 UTC (rev 102038)
+++ PKGBUILD2013-12-04 12:49:19 UTC (rev 102039)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.8
-pkgrel=2
+pkgver=3.0.9
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;

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

2013-11-26 Thread Felix Yan

Date: Wednesday, November 27, 2013 @ 03:52:37
  Author: fyan
Revision: 101532

upgpkg: goagent 3.0.8-2

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-11-27 02:32:12 UTC (rev 101531)
+++ PKGBUILD2013-11-27 02:52:37 UTC (rev 101532)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -12,7 +12,7 @@
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl')
 conflicts=('python2-gevent0.99')
-optdepends=('python2-gevent-beta: for better performance'
+optdepends=('python2-gevent0.99: for better performance'
 'python2-crypto: optimization for RC4')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;

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

2013-11-11 Thread Felix Yan

Date: Monday, November 11, 2013 @ 10:30:47
  Author: fyan
Revision: 100801

upgpkg: goagent 3.0.8-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-11 09:25:24 UTC (rev 100800)
+++ PKGBUILD2013-11-11 09:30:47 UTC (rev 100801)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.7
+pkgver=3.0.8
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)

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

2013-11-09 Thread Felix Yan

Date: Sunday, November 10, 2013 @ 03:15:08
  Author: fyan
Revision: 100749

upgpkg: goagent 3.0.7-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-11-10 00:24:37 UTC (rev 100748)
+++ PKGBUILD2013-11-10 02:15:08 UTC (rev 100749)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.6
-pkgrel=2
+pkgver=3.0.7
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;

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

2013-11-05 Thread Felix Yan

Date: Tuesday, November 5, 2013 @ 18:02:34
  Author: fyan
Revision: 100536

upgpkg: goagent 3.0.6-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-05 17:02:10 UTC (rev 100535)
+++ PKGBUILD2013-11-05 17:02:34 UTC (rev 100536)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.5
-pkgrel=4
+pkgver=3.0.6
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -13,14 +13,14 @@
 depends=('python2' 'python2-pyopenssl')
 conflicts=('python2-gevent0.99')
 optdepends=('python2-gevent-beta: for better performance')
-source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
-$pkgname.service
-
https://raw.github.com/goagent/goagent/881cd53efba5aff4f94f5a9f69d1b4259786e705/local/proxy.ini)
+makedepends=('git')
+source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
+$pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
 
 package() {
-  cd $pkgbase-$pkgver
+  cd $pkgname
 
   sed -i -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| local/proxy.py
   
@@ -30,8 +30,7 @@
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
   install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
-  #install -Dm644 local/proxy.ini $pkgdir/etc/goagent
-  install -Dm644 ../proxy.ini $pkgdir/etc/goagent
+  install -Dm644 local/proxy.ini $pkgdir/etc/goagent
   ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
   
   cp -r server $pkgdir/usr/share/$pkgname/
@@ -42,6 +41,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('0b9fc8dd0867cbddd7cda7162c544b6ea4919e0e34815f109b0a3b3a58b9f588dcdbdb89c01bd49cc87052e370a72bc8ac5d868514ca77a3e73952fcadd3e6ca'
-
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2'
-
'9903977f348101f76accaecc83bbec68daf87d9626a981d0bc42274d13c468d909513cd147910871173949d86395f702b689aab296c97a72ef9be73bddfd2a8a')
+sha512sums=('SKIP'
+
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')

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

2013-11-05 Thread Felix Yan

Date: Tuesday, November 5, 2013 @ 18:11:15
  Author: fyan
Revision: 100538

upgpkg: goagent 3.0.6-2

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-11-05 17:03:23 UTC (rev 100537)
+++ PKGBUILD2013-11-05 17:11:15 UTC (rev 100538)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -12,7 +12,8 @@
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl')
 conflicts=('python2-gevent0.99')
-optdepends=('python2-gevent-beta: for better performance')
+optdepends=('python2-gevent-beta: for better performance'
+'python2-crypto: optimization for RC4')
 makedepends=('git')
 source=(git+https://github.com/goagent/goagent.git#tag=v$pkgver;
 $pkgname.service)

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

2013-11-02 Thread Felix Yan

Date: Saturday, November 2, 2013 @ 14:10:29
  Author: fyan
Revision: 100344

upgpkg: goagent 3.0.5-4 hotfix for youtube

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-11-02 13:03:15 UTC (rev 100343)
+++ PKGBUILD2013-11-02 13:10:29 UTC (rev 100344)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -14,12 +14,13 @@
 conflicts=('python2-gevent0.99')
 optdepends=('python2-gevent-beta: for better performance')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
-$pkgname.service)
+$pkgname.service
+
https://raw.github.com/goagent/goagent/881cd53efba5aff4f94f5a9f69d1b4259786e705/local/proxy.ini)
 backup=('etc/goagent')
 install=goagent.install
 
 package() {
-  cd $srcdir/$pkgbase-$pkgver
+  cd $pkgbase-$pkgver
 
   sed -i -e s|^#!/usr/bin/env python|#!/usr/bin/env python2| local/proxy.py
   
@@ -29,7 +30,8 @@
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
   install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
-  install -Dm644 local/proxy.ini $pkgdir/etc/goagent
+  #install -Dm644 local/proxy.ini $pkgdir/etc/goagent
+  install -Dm644 ../proxy.ini $pkgdir/etc/goagent
   ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
   
   cp -r server $pkgdir/usr/share/$pkgname/
@@ -41,4 +43,5 @@
 
 # vim:set ts=2 sw=2 et:
 
sha512sums=('0b9fc8dd0867cbddd7cda7162c544b6ea4919e0e34815f109b0a3b3a58b9f588dcdbdb89c01bd49cc87052e370a72bc8ac5d868514ca77a3e73952fcadd3e6ca'
-
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')
+
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2'
+
'9903977f348101f76accaecc83bbec68daf87d9626a981d0bc42274d13c468d909513cd147910871173949d86395f702b689aab296c97a72ef9be73bddfd2a8a')

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

2013-10-27 Thread Felix Yan

Date: Monday, October 28, 2013 @ 03:47:07
  Author: fyan
Revision: 99375

upgpkg: goagent 3.0.5-3 fix: gevent 0.13 still causes problems

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 23:46:33 UTC (rev 99374)
+++ PKGBUILD2013-10-28 02:47:07 UTC (rev 99375)
@@ -5,14 +5,14 @@
 
 pkgname=goagent
 pkgver=3.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl')
-optdepends=('python2-gevent: for better performance'
-'python2-gevent-beta: for better performance')
+conflicts=('python2-gevent0.99')
+optdepends=('python2-gevent-beta: for better performance')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
 $pkgname.service)
 backup=('etc/goagent')

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

2013-10-26 Thread Felix Yan

Date: Saturday, October 26, 2013 @ 13:49:14
  Author: fyan
Revision: 99240

upgpkg: goagent 3.0.5-2

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-26 11:48:48 UTC (rev 99239)
+++ PKGBUILD2013-10-26 11:49:14 UTC (rev 99240)
@@ -5,13 +5,14 @@
 
 pkgname=goagent
 pkgver=3.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
-depends=('python' 'python-pyopenssl')
-optdepends=('python2: if you want to use uploader.zip to upload server')
+depends=('python2' 'python2-pyopenssl')
+optdepends=('python2-gevent: for better performance'
+'python2-gevent-beta: for better performance')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
 $pkgname.service)
 backup=('etc/goagent')
@@ -19,6 +20,8 @@
 
 package() {
   cd $srcdir/$pkgbase-$pkgver
+
+  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/proxy.py
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac

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

2013-10-25 Thread Felix Yan

Date: Friday, October 25, 2013 @ 19:05:49
  Author: fyan
Revision: 99207

upgpkg: goagent 3.0.5-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 16:17:55 UTC (rev 99206)
+++ PKGBUILD2013-10-25 17:05:49 UTC (rev 99207)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -37,5 +37,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('46502c9a01d36a69309db8c841ace1b1'
- '97942151b98573b150a0c6e4f664aa95')
+sha512sums=('0b9fc8dd0867cbddd7cda7162c544b6ea4919e0e34815f109b0a3b3a58b9f588dcdbdb89c01bd49cc87052e370a72bc8ac5d868514ca77a3e73952fcadd3e6ca'
+
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')

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

2013-08-13 Thread Felix Yan

Date: Tuesday, August 13, 2013 @ 17:52:59
  Author: fyan
Revision: 95545

upgpkg: goagent 3.0.4-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-08-13 15:43:12 UTC (rev 95544)
+++ PKGBUILD2013-08-13 15:52:59 UTC (rev 95545)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -37,5 +37,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('d33887d2cea935403c13a3f9c9640fa9d39aef8e823f668af06e57e88d7496d232300dca9f666d3dece17fba826722134f201a85cb37ff0fbbb5416bbc2b3a3b'
-
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')
+md5sums=('46502c9a01d36a69309db8c841ace1b1'
+ '97942151b98573b150a0c6e4f664aa95')

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

2013-08-11 Thread Felix Yan

Date: Monday, August 12, 2013 @ 05:24:07
  Author: fyan
Revision: 95415

upgpkg: goagent 3.0.3-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-12 01:37:57 UTC (rev 95414)
+++ PKGBUILD2013-08-12 03:24:07 UTC (rev 95415)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -12,8 +12,8 @@
 license=(GPL2)
 depends=('python' 'python-pyopenssl')
 optdepends=('python2: if you want to use uploader.zip to upload server')
-source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz
-$pkgname.service)
+source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
+$pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
 
@@ -24,7 +24,7 @@
   install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
   install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
   install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
-  install -Dm644 local/SwitchySharp_1_9_52.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
+  install -Dm644 local/SwitchySharp.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
   install -Dm644 local/proxy.ini $pkgdir/etc/goagent
   ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
@@ -37,5 +37,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('aa3e3466a47ca62a86f733c11decd822'
- '97942151b98573b150a0c6e4f664aa95')
+sha512sums=('d33887d2cea935403c13a3f9c9640fa9d39aef8e823f668af06e57e88d7496d232300dca9f666d3dece17fba826722134f201a85cb37ff0fbbb5416bbc2b3a3b'
+
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')

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

2013-07-15 Thread Felix Yan

Date: Monday, July 15, 2013 @ 09:18:54
  Author: fyan
Revision: 94156

upgpkg: goagent 3.0.2-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-15 07:14:16 UTC (rev 94155)
+++ PKGBUILD2013-07-15 07:18:54 UTC (rev 94156)
@@ -4,8 +4,8 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.2
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -30,7 +30,6 @@
   ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
   
   cp -r server $pkgdir/usr/share/$pkgname/
-  rm $pkgdir/usr/share/$pkgname/server/uploader.exe
   rm $pkgdir/usr/share/$pkgname/server/uploader.bat
 
   # systemd service
@@ -38,5 +37,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('ad2f3f67a411172f395979b2bf849393044a3b2eb60dd4d212f1993e8a4dea432e9909c668994fa497cd4e75ce3a1b52d3ca5e7ae545a8928b98ea072b7191df'
-
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')
+md5sums=('aa3e3466a47ca62a86f733c11decd822'
+ '97942151b98573b150a0c6e4f664aa95')

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

2013-05-25 Thread Felix Yan

Date: Sunday, May 26, 2013 @ 04:32:44
  Author: fyan
Revision: 91637

upgpkg: goagent 3.0.1-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-05-26 02:12:32 UTC (rev 91636)
+++ PKGBUILD2013-05-26 02:32:44 UTC (rev 91637)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=3.0.0
+pkgver=3.0.1
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -37,5 +37,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('bb51be21fea89c84d1466c3a2a629b7b86dfd814a81f2eaedb653a7ddaa060c859d343daf3057cdc77244fd276593dbdab46cebeef6f005ad1fd145cda15aa45'
+sha512sums=('ad2f3f67a411172f395979b2bf849393044a3b2eb60dd4d212f1993e8a4dea432e9909c668994fa497cd4e75ce3a1b52d3ca5e7ae545a8928b98ea072b7191df'
 
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')

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

2013-05-25 Thread Felix Yan

Date: Sunday, May 26, 2013 @ 04:49:41
  Author: fyan
Revision: 91639

upgpkg: goagent 3.0.1-2 remove .bat file

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-26 02:33:58 UTC (rev 91638)
+++ PKGBUILD2013-05-26 02:49:41 UTC (rev 91639)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=3.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -31,6 +31,7 @@
   
   cp -r server $pkgdir/usr/share/$pkgname/
   rm $pkgdir/usr/share/$pkgname/server/uploader.exe
+  rm $pkgdir/usr/share/$pkgname/server/uploader.bat
 
   # systemd service
   install -Dm644 ${srcdir}/goagent.service 
${pkgdir}/usr/lib/systemd/system/goagent.service

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

2013-05-22 Thread Felix Yan

Date: Thursday, May 23, 2013 @ 04:32:24
  Author: fyan
Revision: 91473

upgpkg: goagent 3.0.0-1

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install
  goagent/trunk/goagent.service

-+
 PKGBUILD|   46 --
 goagent.install |8 +---
 goagent.service |2 +-
 3 files changed, 22 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-23 01:19:04 UTC (rev 91472)
+++ PKGBUILD2013-05-23 02:32:24 UTC (rev 91473)
@@ -4,52 +4,38 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.17
+pkgver=3.0.0
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
-depends=('python2' 'python2-pyopenssl' 'python2-gevent-beta')
+depends=('python' 'python-pyopenssl')
+optdepends=('python2: if you want to use uploader.zip to upload server')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz
 $pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgbase-$pkgver
+  
+  install -Dm755 local/proxy.py $pkgdir/usr/share/$pkgname/local/proxy.py
+  install -Dm644 local/proxy.pac $pkgdir/usr/share/$pkgname/local/proxy.pac
+  install -Dm644 local/cacert.pem $pkgdir/usr/share/$pkgname/local/cacert.pem
+  install -Dm644 local/SwitchyOptions.bak 
$pkgdir/usr/share/$pkgname/local/SwitchyOptions.bak
+  install -Dm644 local/SwitchySharp_1_9_52.crx 
$pkgdir/usr/share/$pkgname/local/SwitchySharp_1_9_52.crx
 
-  # python2 fix
-  sed -i -re 1s/python2?/python2/ local/*.py
-  chmod +x local/proxy.py
-
-  mkdir -p $pkgdir/opt/goagent
-  cp -r local server $pkgdir/opt/goagent
+  install -Dm644 local/proxy.ini $pkgdir/etc/goagent
+  ln -sf /etc/goagent ${pkgdir}/usr/share/$pkgname/local/proxy.ini
   
-  # remove Windows-only files
-  rm -f $pkgdir/opt/goagent/*/*.{vbs,dll,exe,manifest,bat}
-  rm -f $pkgdir/opt/goagent/local/python27.zip
+  cp -r server $pkgdir/usr/share/$pkgname/
+  rm $pkgdir/usr/share/$pkgname/server/uploader.exe
 
-  # remove Mac-only files
-  rm -f $pkgdir/opt/goagent/local/goagent-osx.py
-
-  # remove goagent-gtk
-  rm -f $pkgdir/opt/goagent/local/goagent-gtk.py
-  rm -f $pkgdir/opt/goagent/local/logo.png
-  rm -f $pkgdir/opt/goagent/local/addto-startup.py
-
-  # remove CA.crt CA.key for security issues
-  rm -f $pkgdir/opt/goagent/local/CA.crt $pkgdir/opt/goagent/local/CA.key
-  rm -rf $pkgdir/opt/goagent/local/certs
-
-  # config file
-  install -Dm644 ${pkgdir}/opt/goagent/local/proxy.ini 
${pkgdir}/etc/goagent
-  ln -sf /etc/goagent ${pkgdir}/opt/goagent/local/proxy.ini
-
   # systemd service
   install -Dm644 ${srcdir}/goagent.service 
${pkgdir}/usr/lib/systemd/system/goagent.service
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('5ee022e802b927531e302f8c9aa83711'
- 'e49aca604fcbf7b64d07460d33669640')
+sha512sums=('bb51be21fea89c84d1466c3a2a629b7b86dfd814a81f2eaedb653a7ddaa060c859d343daf3057cdc77244fd276593dbdab46cebeef6f005ad1fd145cda15aa45'
+
'b8f5f6342303edd520a577d0348deef7017ba79aa5c6f43c4e1c368d7b204f6364f4537f2a5e21f3b63a321bdcf3d407e5dea9883211c11a4d11801b057cddc2')

Modified: goagent.install
===
--- goagent.install 2013-05-23 01:19:04 UTC (rev 91472)
+++ goagent.install 2013-05-23 02:32:24 UTC (rev 91473)
@@ -4,7 +4,7 @@
 
 #cd /opt/goagent/local
 #python2 -c 'from proxy import CertUtil; CertUtil.check_ca()'
-chown -R nobody:daemon /opt/goagent/local
+chown -R nobody:daemon /usr/share/goagent/local
 }
 
 post_upgrade() {
@@ -12,9 +12,11 @@
 }
 
 pre_upgrade() {
-rm -rf /opt/goagent/certs
+rm -rf /opt/goagent/local/certs
+rm -rf /usr/share/goagent/local/certs
 }
 
 pre_remove() {
-rm -rf /opt/goagent/certs
+rm -rf /opt/goagent/local/certs
+rm -rf /usr/share/goagent/local/certs
 }

Modified: goagent.service
===
--- goagent.service 2013-05-23 01:19:04 UTC (rev 91472)
+++ goagent.service 2013-05-23 02:32:24 UTC (rev 91473)
@@ -5,7 +5,7 @@
 [Service]
 Type=simple
 User=nobody
-ExecStart=/opt/goagent/local/proxy.py
+ExecStart=/usr/share/goagent/local/proxy.py
 
 [Install]
 WantedBy=multi-user.target

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

2013-04-20 Thread Felix Yan

Date: Sunday, April 21, 2013 @ 06:41:24
  Author: fyan
Revision: 88645

upgpkg: goagent 2.1.17-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-20 23:03:17 UTC (rev 88644)
+++ PKGBUILD2013-04-21 04:41:24 UTC (rev 88645)
@@ -4,15 +4,14 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.16
-pkgrel=2
+pkgver=2.1.17
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl' 'python2-gevent-beta')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz
-
https://github.com/felixonmars/goagent/commit/1b9b1c3cad7ccfb65407e3f7c411c191c9be9246.patch
 $pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
@@ -20,8 +19,6 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -Np1 -i ../1b9b1c3cad7ccfb65407e3f7c411c191c9be9246.patch
-
   # python2 fix
   sed -i -re 1s/python2?/python2/ local/*.py
   chmod +x local/proxy.py
@@ -29,10 +26,13 @@
   mkdir -p $pkgdir/opt/goagent
   cp -r local server $pkgdir/opt/goagent
   
-  # remove windows-only files
+  # remove Windows-only files
   rm -f $pkgdir/opt/goagent/*/*.{vbs,dll,exe,manifest,bat}
   rm -f $pkgdir/opt/goagent/local/python27.zip
 
+  # remove Mac-only files
+  rm -f $pkgdir/opt/goagent/local/goagent-osx.py
+
   # remove goagent-gtk
   rm -f $pkgdir/opt/goagent/local/goagent-gtk.py
   rm -f $pkgdir/opt/goagent/local/logo.png
@@ -51,6 +51,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('d14742ba0560de95b06bd177759c5139'
- '264c6d29f50b71742c54a985220f117d'
+md5sums=('5ee022e802b927531e302f8c9aa83711'
  'e49aca604fcbf7b64d07460d33669640')

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

2013-04-16 Thread Felix Yan

Date: Wednesday, April 17, 2013 @ 04:22:18
  Author: fyan
Revision: 88397

upgpkg: goagent 2.1.16-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 02:06:15 UTC (rev 88396)
+++ PKGBUILD2013-04-17 02:22:18 UTC (rev 88397)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.15
+pkgver=2.1.16
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -30,12 +30,10 @@
   rm -f $pkgdir/opt/goagent/*/*.{vbs,dll,exe,manifest,bat}
   rm -f $pkgdir/opt/goagent/local/python27.zip
 
-  # remove mac-only files
-  rm -f $pkgdir/opt/goagent/local/addto-startup.py
-
   # remove goagent-gtk
   rm -f $pkgdir/opt/goagent/local/goagent-gtk.py
   rm -f $pkgdir/opt/goagent/local/logo.png
+  rm -f $pkgdir/opt/goagent/local/addto-startup.py
 
   # remove CA.crt CA.key for security issues
   rm -f $pkgdir/opt/goagent/local/CA.crt $pkgdir/opt/goagent/local/CA.key
@@ -50,5 +48,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('cf7c620b57351e62df52100a07acd0b1'
+md5sums=('d14742ba0560de95b06bd177759c5139'
  'e49aca604fcbf7b64d07460d33669640')

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

2013-04-16 Thread Felix Yan

Date: Wednesday, April 17, 2013 @ 06:42:47
  Author: fyan
Revision: 88401

upgpkg: goagent 2.1.16-2 patched to fix first time startup

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|6 +-
 goagent.install |4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 04:06:54 UTC (rev 88400)
+++ PKGBUILD2013-04-17 04:42:47 UTC (rev 88401)
@@ -5,13 +5,14 @@
 
 pkgname=goagent
 pkgver=2.1.16
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl' 'python2-gevent-beta')
 source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz
+
https://github.com/felixonmars/goagent/commit/1b9b1c3cad7ccfb65407e3f7c411c191c9be9246.patch
 $pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
@@ -19,6 +20,8 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
 
+  patch -Np1 -i ../1b9b1c3cad7ccfb65407e3f7c411c191c9be9246.patch
+
   # python2 fix
   sed -i -re 1s/python2?/python2/ local/*.py
   chmod +x local/proxy.py
@@ -49,4 +52,5 @@
 
 # vim:set ts=2 sw=2 et:
 md5sums=('d14742ba0560de95b06bd177759c5139'
+ '264c6d29f50b71742c54a985220f117d'
  'e49aca604fcbf7b64d07460d33669640')

Modified: goagent.install
===
--- goagent.install 2013-04-17 04:06:54 UTC (rev 88400)
+++ goagent.install 2013-04-17 04:42:47 UTC (rev 88401)
@@ -1,7 +1,9 @@
 post_install() {
 echo Please use systemd units to start/stop goagent:
 echo sudo systemctl start/stop goagent
-
+
+#cd /opt/goagent/local
+#python2 -c 'from proxy import CertUtil; CertUtil.check_ca()'
 chown -R nobody:daemon /opt/goagent/local
 }

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

2013-04-03 Thread Felix Yan

Date: Thursday, April 4, 2013 @ 03:08:38
  Author: fyan
Revision: 87599

upgpkg: goagent 2.1.15-1

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-04-03 23:28:26 UTC (rev 87598)
+++ PKGBUILD2013-04-04 01:08:38 UTC (rev 87599)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.14
+pkgver=2.1.15
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -50,5 +50,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('66007be30b411c0fefd570e07ae25cc3'
+md5sums=('cf7c620b57351e62df52100a07acd0b1'
  'e49aca604fcbf7b64d07460d33669640')

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

2013-03-18 Thread Felix Yan

Date: Tuesday, March 19, 2013 @ 02:57:30
  Author: fyan
Revision: 86546

upgpkg: goagent 2.1.14-1

Modified:
  goagent/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-19 01:12:07 UTC (rev 86545)
+++ PKGBUILD2013-03-19 01:57:30 UTC (rev 86546)
@@ -4,19 +4,15 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.13
-pkgrel=2
+pkgver=2.1.14
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
-depends=('python2' 'python2-pyopenssl')
-optdepends=('python2-gevent-beta: Optional Gevent Support')
-conflicts=('python2-gevent=0.99')
-source=(
-  $pkgname.service
-  https://github.com/goagent/goagent/archive/v$pkgver.tar.gz;
-)
+depends=('python2' 'python2-pyopenssl' 'python2-gevent-beta')
+source=(https://github.com/goagent/goagent/archive/v$pkgver.tar.gz
+$pkgname.service)
 backup=('etc/goagent')
 install=goagent.install
 
@@ -54,5 +50,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e49aca604fcbf7b64d07460d33669640'
- '2d9a13fde523a6da4bcbab4f45569260')
+md5sums=('66007be30b411c0fefd570e07ae25cc3'
+ 'e49aca604fcbf7b64d07460d33669640')

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

2013-03-13 Thread Felix Yan

Date: Wednesday, March 13, 2013 @ 09:05:35
  Author: fyan
Revision: 86210

upgpkg: goagent 2.1.13-2 security improvements

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install
  goagent/trunk/goagent.service

-+
 PKGBUILD|4 ++--
 goagent.install |2 ++
 goagent.service |2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-13 05:41:43 UTC (rev 86209)
+++ PKGBUILD2013-03-13 08:05:35 UTC (rev 86210)
@@ -5,7 +5,7 @@
 
 pkgname=goagent
 pkgver=2.1.13
-pkgrel=1
+pkgrel=2
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
@@ -54,5 +54,5 @@
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('a0223e4e436a4d5cc17f76fc1fbbc140'
+md5sums=('e49aca604fcbf7b64d07460d33669640'
  '2d9a13fde523a6da4bcbab4f45569260')

Modified: goagent.install
===
--- goagent.install 2013-03-13 05:41:43 UTC (rev 86209)
+++ goagent.install 2013-03-13 08:05:35 UTC (rev 86210)
@@ -1,6 +1,8 @@
 post_install() {
 echo Please use systemd units to start/stop goagent:
 echo sudo systemctl start/stop goagent
+
+chown -R nobody:daemon /opt/goagent/local
 }
 
 post_upgrade() {

Modified: goagent.service
===
--- goagent.service 2013-03-13 05:41:43 UTC (rev 86209)
+++ goagent.service 2013-03-13 08:05:35 UTC (rev 86210)
@@ -4,8 +4,8 @@
 
 [Service]
 Type=simple
+User=nobody
 ExecStart=/opt/goagent/local/proxy.py
-ExecStop=/bin/kill -15 $MAINPID
 
 [Install]
 WantedBy=multi-user.target

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

2013-03-08 Thread Felix Yan

Date: Saturday, March 9, 2013 @ 06:32:22
  Author: fyan
Revision: 85933

goagent: remove redundant files

Modified:
  goagent/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-09 04:07:22 UTC (rev 85932)
+++ PKGBUILD2013-03-09 05:32:22 UTC (rev 85933)
@@ -34,6 +34,13 @@
   rm -f $pkgdir/opt/goagent/*/*.{vbs,dll,exe,manifest,bat}
   rm -f $pkgdir/opt/goagent/local/python27.zip
 
+  # remove mac-only files
+  rm -f $pkgdir/opt/goagent/local/addto-startup.py
+
+  # remove goagent-gtk
+  rm -f $pkgdir/opt/goagent/local/goagent-gtk.py
+  rm -f $pkgdir/opt/goagent/local/logo.png
+
   # remove CA.crt CA.key for security issues
   rm -f $pkgdir/opt/goagent/local/CA.crt $pkgdir/opt/goagent/local/CA.key
   rm -rf $pkgdir/opt/goagent/local/certs

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

2013-03-05 Thread Felix Yan

Date: Wednesday, March 6, 2013 @ 03:52:21
  Author: fyan
Revision: 85736

upgpkg: goagent 2.1.13-1

Modified:
  goagent/trunk/PKGBUILD
  goagent/trunk/goagent.install

-+
 PKGBUILD|4 ++--
 goagent.install |9 +
 2 files changed, 11 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-06 02:20:18 UTC (rev 85735)
+++ PKGBUILD2013-03-06 02:52:21 UTC (rev 85736)
@@ -4,7 +4,7 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.12
+pkgver=2.1.13
 pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
@@ -48,4 +48,4 @@
 
 # vim:set ts=2 sw=2 et:
 md5sums=('a0223e4e436a4d5cc17f76fc1fbbc140'
- '010db943e1077678f65c9aa962c6c33d')
+ '2d9a13fde523a6da4bcbab4f45569260')

Modified: goagent.install
===
--- goagent.install 2013-03-06 02:20:18 UTC (rev 85735)
+++ goagent.install 2013-03-06 02:52:21 UTC (rev 85736)
@@ -1,3 +1,12 @@
+post_install() {
+echo Please use systemd units to start/stop goagent:
+echo sudo systemctl start/stop goagent
+}
+
+post_upgrade() {
+post_install
+}
+
 pre_upgrade() {
 rm -rf /opt/goagent/certs
 }

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

2013-02-03 Thread Felix Yan

Date: Sunday, February 3, 2013 @ 16:55:19
  Author: fyan
Revision: 83599

upgpkg: goagent 2.1.12-1

Modified:
  goagent/trunk/PKGBUILD(contents, properties)

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-03 15:50:55 UTC (rev 83598)
+++ PKGBUILD2013-02-03 15:55:19 UTC (rev 83599)
@@ -4,13 +4,14 @@
 # Contributor: Guten ywzhai...@gmail.com 
 
 pkgname=goagent
-pkgver=2.1.11
-pkgrel=2
+pkgver=2.1.12
+pkgrel=1
 pkgdesc=A gae proxy forked from gappproxy/wallproxy
 arch=(any)
 url=http://goagent.googlecode.com;
 license=(GPL2)
 depends=('python2' 'python2-pyopenssl')
+optdepends=('python2-gevent-beta: Optional Gevent Support')
 conflicts=('python2-gevent=0.99')
 source=(
   $pkgname.service
@@ -47,4 +48,4 @@
 
 # vim:set ts=2 sw=2 et:
 md5sums=('a0223e4e436a4d5cc17f76fc1fbbc140'
- 'bb6d0d8e2c0d2236050dd6208b89b246')
+ '010db943e1077678f65c9aa962c6c33d')


Property changes on: goagent/trunk/PKGBUILD
___
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property

65 matches

Mail list logo