[arch-commits] Commit in git-annex/trunk (PKGBUILD socks-0.6.patch)

[Felix Yan]

    Date: Saturday, May 18, 2019 @ 06:31:08
  Author: felixonmars
Revision: 467801

upgpkg: git-annex 7.20190507-11

rebuild with connection 0.3.0, socks 0.6.0

Added:
  git-annex/trunk/socks-0.6.patch
Modified:
  git-annex/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++++---
 socks-0.6.patch |   13 +++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-18 06:31:03 UTC (rev 467800)
+++ PKGBUILD	2019-05-18 06:31:08 UTC (rev 467801)
@@ -3,7 +3,7 @@
 
 pkgname=git-annex
 pkgver=7.20190507
-pkgrel=10
+pkgrel=11
 pkgdesc="Manage files with git, without checking their contents into git"
 url="http://git-annex.branchable.com/"
 license=("AGPL3")
@@ -28,9 +28,16 @@
          'haskell-vector' 'haskell-wai' 'haskell-wai-extra' 'haskell-warp' 'haskell-warp-tls'
          'haskell-yesod' 'haskell-yesod-core' 'haskell-yesod-form' 'haskell-yesod-static')
 makedepends=('chrpath' 'ghc')
-source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver")
-sha512sums=('SKIP')
+source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver"
+        socks-0.6.patch)
+sha512sums=('SKIP'
+            '572cfde516ac8efd7c7b7b734d7de2276e7fa4143d8ed66de101d987a81ac71b911161454979f5a6b3d89f0080423f5086eb73aa02e9ebfdde63f0167bcac608')
 
+prepare() {
+  cd git-annex
+  patch -p1 -i ../socks-0.6.patch
+}
+
 build() {
   cd git-annex
 

Added: socks-0.6.patch
===================================================================
--- socks-0.6.patch	                        (rev 0)
+++ socks-0.6.patch	2019-05-18 06:31:08 UTC (rev 467801)
@@ -0,0 +1,13 @@
+diff --git a/Utility/Tor.hs b/Utility/Tor.hs
+index 427fb100bc..0ee904ca2a 100644
+--- a/Utility/Tor.hs
++++ b/Utility/Tor.hs
+@@ -37,7 +37,7 @@ connectHiddenService (OnionAddress address) port = do
+ 	return s
+   where
+ 	torsocksport = 9050
+-	torsockconf = defaultSocksConf "127.0.0.1" torsocksport
++	torsockconf = defaultSocksConf $ SockAddrInet torsocksport $ tupleToHostAddress (127, 0, 0, 1)
+ 	socksdomain = SocksAddrDomainName (BU8.fromString address)
+ 	socksaddr = SocksAddress socksdomain (fromIntegral port)
+