[arch-commits] Commit in goagent/repos/community-any (8 files)

Felix Yan fyan at archlinux.org
Sun Nov 23 07:45:11 UTC 2014


    Date: Sunday, November 23, 2014 @ 08:45:11
  Author: fyan
Revision: 122977

archrelease: copy trunk to community-any

Added:
  goagent/repos/community-any/PKGBUILD
    (from rev 122976, goagent/trunk/PKGBUILD)
  goagent/repos/community-any/goagent.install
    (from rev 122976, goagent/trunk/goagent.install)
  goagent/repos/community-any/goagent.service
    (from rev 122976, goagent/trunk/goagent.service)
  goagent/repos/community-any/goagent.user.ini
    (from rev 122976, goagent/trunk/goagent.user.ini)
Deleted:
  goagent/repos/community-any/PKGBUILD
  goagent/repos/community-any/goagent.install
  goagent/repos/community-any/goagent.service
  goagent/repos/community-any/goagent.user.ini

-----------------+
 PKGBUILD        |  124 +++++++++++++++++++++++++++---------------------------
 goagent.install |   42 +++++++++---------
 goagent.service |   24 +++++-----
 3 files changed, 95 insertions(+), 95 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-23 07:44:47 UTC (rev 122976)
+++ PKGBUILD	2014-11-23 07:45:11 UTC (rev 122977)
@@ -1,62 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at gmail.com>
-# Contributor: cuihao <cuihao dot leo at gmail dot com>
-# Contributor: Guten <ywzhaifei at gmail.com> 
-
-pkgname=goagent
-pkgver=3.2.2
-#_commit=d911497475c516405dde59a968cd506424326b55
-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' 'python2-dnslib')
-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" 
-        "${pkgname}.user.ini"
-        "${pkgname}.service")
-backup=('etc/goagent')
-install=goagent.install
-
-prepare() {
-  cd $pkgname
-
-  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
-  sed -e 's|^.*google_appengine.zip.*$||' \
-      -e 's|sys\.modules\.pop(.google., None)||' \
-      -i server/uploader.py
-}
-
-package() {
-  cd $pkgname
-
-  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/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"
-  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,google_appengine.zip}
-
-  # systemd service
-  install -Dm644 "${srcdir}/goagent.service" "${pkgdir}/usr/lib/systemd/system/goagent.service"
-}
-
-# vim:set ts=2 sw=2 et:
-sha512sums=('SKIP'
-            'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-            '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

Copied: goagent/repos/community-any/PKGBUILD (from rev 122976, goagent/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-11-23 07:45:11 UTC (rev 122977)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at gmail.com>
+# Contributor: cuihao <cuihao dot leo at gmail dot com>
+# Contributor: Guten <ywzhaifei at gmail.com> 
+
+pkgname=goagent
+pkgver=3.2.3
+#_commit=d911497475c516405dde59a968cd506424326b55
+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' 'python2-dnslib')
+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" 
+        "${pkgname}.user.ini"
+        "${pkgname}.service")
+backup=('etc/goagent')
+install=goagent.install
+
+prepare() {
+  cd $pkgname
+
+  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
+  sed -e 's|^.*google_appengine.zip.*$||' \
+      -e 's|sys\.modules\.pop(.google., None)||' \
+      -i server/uploader.py
+}
+
+package() {
+  cd $pkgname
+
+  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/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"
+  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,google_appengine.zip}
+
+  # systemd service
+  install -Dm644 "${srcdir}/goagent.service" "${pkgdir}/usr/lib/systemd/system/goagent.service"
+}
+
+# vim:set ts=2 sw=2 et:
+sha512sums=('SKIP'
+            'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
+            '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c')

Deleted: goagent.install
===================================================================
--- goagent.install	2014-11-23 07:44:47 UTC (rev 122976)
+++ goagent.install	2014-11-23 07:45:11 UTC (rev 122977)
@@ -1,21 +0,0 @@
-post_install() {
-    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()'
-    chown -R nobody:daemon /usr/share/goagent/local
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_upgrade() {
-    # Disable certs cleaning until some more issue detected
-    #rm -rf /usr/share/goagent/local/certs
-    :
-}
-
-pre_remove() {
-    rm -rf /usr/share/goagent/local/certs
-}

Copied: goagent/repos/community-any/goagent.install (from rev 122976, goagent/trunk/goagent.install)
===================================================================
--- goagent.install	                        (rev 0)
+++ goagent.install	2014-11-23 07:45:11 UTC (rev 122977)
@@ -0,0 +1,21 @@
+post_install() {
+    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()'
+    chown -R nobody:daemon /usr/share/goagent/local
+}
+
+post_upgrade() {
+    post_install
+}
+
+pre_upgrade() {
+    # Disable certs cleaning until some more issue detected
+    #rm -rf /usr/share/goagent/local/certs
+    :
+}
+
+pre_remove() {
+    rm -rf /usr/share/goagent/local/certs
+}

Deleted: goagent.service
===================================================================
--- goagent.service	2014-11-23 07:44:47 UTC (rev 122976)
+++ goagent.service	2014-11-23 07:45:11 UTC (rev 122977)
@@ -1,12 +0,0 @@
-[Unit]
-Description=GoAgent Service
-After=network.target
-
-[Service]
-Type=simple
-User=nobody
-ExecStart=/usr/share/goagent/local/goagent
-
-[Install]
-WantedBy=multi-user.target
-

Copied: goagent/repos/community-any/goagent.service (from rev 122976, goagent/trunk/goagent.service)
===================================================================
--- goagent.service	                        (rev 0)
+++ goagent.service	2014-11-23 07:45:11 UTC (rev 122977)
@@ -0,0 +1,12 @@
+[Unit]
+Description=GoAgent Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+ExecStart=/usr/share/goagent/local/goagent
+
+[Install]
+WantedBy=multi-user.target
+

Deleted: goagent.user.ini
===================================================================
Copied: goagent/repos/community-any/goagent.user.ini (from rev 122976, goagent/trunk/goagent.user.ini)
===================================================================


More information about the arch-commits mailing list