Date: Thursday, April 10, 2014 @ 04:01:57 Author: fyan Revision: 109064
archrelease: copy trunk to community-any Added: goagent/repos/community-any/PKGBUILD (from rev 109063, goagent/trunk/PKGBUILD) goagent/repos/community-any/goagent.install (from rev 109063, goagent/trunk/goagent.install) goagent/repos/community-any/goagent.service (from rev 109063, goagent/trunk/goagent.service) goagent/repos/community-any/goagent.user.ini (from rev 109063, 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-04-10 02:00:42 UTC (rev 109063) +++ PKGBUILD 2014-04-10 02:01:57 UTC (rev 109064) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@gmail.com> -# Contributor: cuihao <cuihao dot leo at gmail dot com> -# Contributor: Guten <ywzhai...@gmail.com> - -pkgname=goagent -pkgver=3.1.7 -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') -conflicts=('python2-gevent<0.99') -optdepends=('python2-crypto: Optimization for RC4' - 'python2-pacparser: PAC proxy support' - 'python2-pygeoip: for GAE Regions mode support & DNS region auto detect') -makedepends=('git') -source=("git+https://github.com/goagent/goagent.git#tag=v$pkgver" - 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 - - 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" - 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" - - # systemd service - install -Dm644 "${srcdir}/goagent.service" "${pkgdir}/usr/lib/systemd/system/goagent.service" -} - -# vim:set ts=2 sw=2 et: -sha512sums=('SKIP' - 'ded168fcb906ad3113f1ceebcd9af884fcd4113bfca0ecce6d940f268ac117590e3534cf03f31918874f91eefd8c9d315a83451fd15f3752da7732fcf918c031' - 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' - '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c') Copied: goagent/repos/community-any/PKGBUILD (from rev 109063, goagent/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-04-10 02:01:57 UTC (rev 109064) @@ -0,0 +1,62 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@gmail.com> +# Contributor: cuihao <cuihao dot leo at gmail dot com> +# Contributor: Guten <ywzhai...@gmail.com> + +pkgname=goagent +pkgver=3.1.8 +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') +conflicts=('python2-gevent<0.99') +optdepends=('python2-crypto: Optimization for RC4' + 'python2-pacparser: PAC proxy support' + 'python2-pygeoip: for GAE Regions mode support & DNS region auto detect') +makedepends=('git') +source=("git+https://github.com/goagent/goagent.git#tag=v$pkgver" + https://github.com/goagent/goagent/commit/cc91b381c5bbd43220c36dd74491584cec3f20cd.patch + "${pkgname}.user.ini" + "${pkgname}.service") +backup=('etc/goagent') +install=goagent.install + +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 +} + +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/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/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" + + # systemd service + install -Dm644 "${srcdir}/goagent.service" "${pkgdir}/usr/lib/systemd/system/goagent.service" +} + +# vim:set ts=2 sw=2 et: +sha512sums=('SKIP' + 'f45b74699db618fd456b12724ef1c87d05d2bb51fc9d8c7676ff21bbd03f2a026b892c3e00fe89532426f5e01757693cb41014a20873393c496b3dfea1874b79' + 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e' + '4327d5b874c5150296f9c027a60994853de1b68d4c4e32291a5c41c0e162ffbccf68b6208cbc096d099721b470e1df897ad61596d8ddd705543c15b58e9a0f7c') Deleted: goagent.install =================================================================== --- goagent.install 2014-04-10 02:00:42 UTC (rev 109063) +++ goagent.install 2014-04-10 02:01:57 UTC (rev 109064) @@ -1,21 +0,0 @@ -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)" - - #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 109063, goagent/trunk/goagent.install) =================================================================== --- goagent.install (rev 0) +++ goagent.install 2014-04-10 02:01:57 UTC (rev 109064) @@ -0,0 +1,21 @@ +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)" + + #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-04-10 02:00:42 UTC (rev 109063) +++ goagent.service 2014-04-10 02:01:57 UTC (rev 109064) @@ -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 109063, goagent/trunk/goagent.service) =================================================================== --- goagent.service (rev 0) +++ goagent.service 2014-04-10 02:01:57 UTC (rev 109064) @@ -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 109063, goagent/trunk/goagent.user.ini) ===================================================================