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

[Felix Yan]

    Date: Wednesday, July 31, 2019 @ 03:44:36
  Author: felixonmars
Revision: 495449

upgpkg: git-annex 7.20190730-1

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

-----------------+
 PKGBUILD        |   15 ++++-----------
 socks-0.6.patch |   13 -------------
 2 files changed, 4 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-31 03:34:23 UTC (rev 495448)
+++ PKGBUILD	2019-07-31 03:44:36 UTC (rev 495449)
@@ -2,8 +2,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=git-annex
-pkgver=7.20190708
-pkgrel=9
+pkgver=7.20190730
+pkgrel=1
 pkgdesc="Manage files with git, without checking their contents into git"
 url="https://git-annex.branchable.com/"
 license=("AGPL3")
@@ -28,16 +28,9 @@
          '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"
-        socks-0.6.patch)
-sha512sums=('SKIP'
-            '572cfde516ac8efd7c7b7b734d7de2276e7fa4143d8ed66de101d987a81ac71b911161454979f5a6b3d89f0080423f5086eb73aa02e9ebfdde63f0167bcac608')
+source=("git+https://git.joeyh.name/git/git-annex.git#tag=$pkgver")
+sha512sums=('SKIP')
 
-prepare() {
-  cd git-annex
-  patch -p1 -i ../socks-0.6.patch
-}
-
 build() {
   cd git-annex
 

Deleted: socks-0.6.patch
===================================================================
--- socks-0.6.patch	2019-07-31 03:34:23 UTC (rev 495448)
+++ socks-0.6.patch	2019-07-31 03:44:36 UTC (rev 495449)
@@ -1,13 +0,0 @@
-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)
-