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

[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
===================================================================
--- PKGBUILD	2014-09-11 07:08:59 UTC (rev 118808)
+++ PKGBUILD	2014-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"