Hello community, here is the log from the commit of package ghc-socks for openSUSE:Factory checked in at 2018-05-30 12:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old) and /work/SRC/openSUSE:Factory/.ghc-socks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-socks" Wed May 30 12:13:53 2018 rev:5 rq:607887 version:0.5.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2017-09-15 21:10:09.489368809 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2018-05-30 12:27:16.598340413 +0200 @@ -1,0 +2,6 @@ +Mon May 14 17:02:11 UTC 2018 - [email protected] + +- Update socks to version 0.5.6. + Upstream does not provide a changelog. + +------------------------------------------------------------------- Old: ---- socks-0.5.5.tar.gz socks.cabal New: ---- socks-0.5.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-socks.spec ++++++ --- /var/tmp/diff_new_pack.4vtAoQ/_old 2018-05-30 12:27:17.318315445 +0200 +++ /var/tmp/diff_new_pack.4vtAoQ/_new 2018-05-30 12:27:17.322315307 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-socks # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,13 @@ %global pkg_name socks Name: ghc-%{pkg_name} -Version: 0.5.5 +Version: 0.5.6 Release: 0 -Summary: Socks proxy (version 5) implementation +Summary: Socks proxy (ver 5) License: BSD-3-Clause Group: Development/Libraries/Haskell URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-cereal-devel @@ -48,7 +47,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build @@ -63,7 +61,7 @@ %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc Example.hs README.md ++++++ socks-0.5.5.tar.gz -> socks-0.5.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socks-0.5.5/Example.hs new/socks-0.5.6/Example.hs --- old/socks-0.5.5/Example.hs 2016-05-05 07:30:40.000000000 +0200 +++ new/socks-0.5.6/Example.hs 2017-08-13 17:24:15.000000000 +0200 @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} import Network.Socks5 -import Network.Socket hiding (recv) +import Network.Socket hiding (recv, sClose) import Network.Socket.ByteString import Network.BSD import Network @@ -32,10 +32,8 @@ -- passed to socksConnectAddr example1 socksServerAddr destName = do socket <- socket AF_INET Stream defaultProtocol - - gHost <- getHostByName destName - let destinationAddr = SockAddrInet 80 (head $ hostAddresses gHost) - socksConnectAddr socket socksServerAddr destinationAddr + socksConnectWithSocket socket (defaultSocksConfFromSockAddr socksServerAddr) + (SocksAddress (SocksAddrDomainName $ BC.pack destName) 80) sendAll socket "GET / HTTP/1.0\r\n\r\n" recv socket 4096 >>= putStrLn . show diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socks-0.5.5/Network/Socks5/Parse.hs new/socks-0.5.6/Network/Socks5/Parse.hs --- old/socks-0.5.5/Network/Socks5/Parse.hs 2016-05-05 07:30:40.000000000 +0200 +++ new/socks-0.5.6/Network/Socks5/Parse.hs 2017-08-13 17:24:15.000000000 +0200 @@ -188,7 +188,7 @@ takeWhile :: (Word8 -> Bool) -> Parser ByteString takeWhile predicate = Parser $ \buf err ok -> case B.span predicate buf of - (_, "") -> runParser (getMore >> takeWhile predicate) buf err ok + (_, b2) | B.null b2 -> runParser (getMore >> takeWhile predicate) buf err ok (b1, b2) -> ok b2 b1 -- | Take the remaining bytes from the current position in the stream @@ -209,7 +209,7 @@ skipWhile :: (Word8 -> Bool) -> Parser () skipWhile p = Parser $ \buf err ok -> case B.span p buf of - (_, "") -> runParser (getMore >> skipWhile p) B.empty err ok + (_, b2) | B.null b2 -> runParser (getMore >> skipWhile p) B.empty err ok (_, b2) -> ok b2 () -- | Skip all the remaining bytes from the current position in the stream diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socks-0.5.5/Network/Socks5.hs new/socks-0.5.6/Network/Socks5.hs --- old/socks-0.5.5/Network/Socks5.hs 2016-05-05 07:30:40.000000000 +0200 +++ new/socks-0.5.6/Network/Socks5.hs 2017-12-25 14:52:39.000000000 +0100 @@ -43,7 +43,7 @@ import Control.Monad import Control.Exception import qualified Data.ByteString.Char8 as BC -import Network.Socket ( sClose, Socket, SocketType(..), SockAddr(..), Family(..) +import Network.Socket ( close, Socket, SocketType(..), SockAddr(..), Family(..) , socket, socketToHandle, connect) import Network.BSD import Network (PortID(..)) @@ -78,7 +78,7 @@ -> IO (Socket, (SocksHostAddress, PortNumber)) socksConnect serverConf destAddr = getProtocolNumber "tcp" >>= \proto -> - bracketOnError (socket AF_INET Stream proto) sClose $ \sock -> do + bracketOnError (socket AF_INET Stream proto) close $ \sock -> do ret <- socksConnectWithSocket sock serverConf destAddr return (sock, ret) @@ -114,7 +114,7 @@ socksConnectWith socksConf desthost destport = do dport <- resolvePortID destport proto <- getProtocolNumber "tcp" - bracketOnError (socket AF_INET Stream proto) sClose $ \sock -> do + bracketOnError (socket AF_INET Stream proto) close $ \sock -> do sockaddr <- resolveToSockAddr (socksServer socksConf) socksConnectName sock sockaddr desthost dport return sock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/socks-0.5.5/socks.cabal new/socks-0.5.6/socks.cabal --- old/socks-0.5.5/socks.cabal 2016-05-05 07:30:40.000000000 +0200 +++ new/socks-0.5.6/socks.cabal 2017-12-25 15:06:18.000000000 +0100 @@ -1,16 +1,16 @@ Name: socks -Version: 0.5.5 +Version: 0.5.6 +Synopsis: Socks proxy (ver 5) Description: Socks proxy (version 5) implementation. License: BSD3 License-file: LICENSE Copyright: Vincent Hanquez <[email protected]> Author: Vincent Hanquez <[email protected]> Maintainer: Vincent Hanquez <[email protected]> -Synopsis: Socks proxy (version 5) implementation. Build-Type: Simple Category: Network stability: experimental -Cabal-Version: >=1.6 +Cabal-Version: >=1.18 Homepage: http://github.com/vincenthz/hs-socks extra-doc-files: README.md, Example.hs @@ -18,7 +18,7 @@ Build-Depends: base >= 3 && < 5 , bytestring , cereal >= 0.3.1 - , network >= 2.3 + , network >= 2.4 Exposed-modules: Network.Socks5 Network.Socks5.Lowlevel Network.Socks5.Types @@ -27,6 +27,7 @@ Network.Socks5.Command Network.Socks5.Parse ghc-options: -Wall -fno-warn-missing-signatures -fwarn-tabs + default-language: Haskell2010 source-repository head type: git
