[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 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 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 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 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 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 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 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
 }