commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2020-08-28 21:38:23
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new.3399 (New)
Package is "ghc-socks"
Fri Aug 28 21:38:23 2020 rev:12 rq:829424 version:0.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2020-06-19
17:18:30.467072647 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new.3399/ghc-socks.changes
2020-08-28 21:38:27.784811494 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:46:04 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.zL3X6u/_old 2020-08-28 21:38:28.364811769 +0200
+++ /var/tmp/diff_new_pack.zL3X6u/_new 2020-08-28 21:38:28.368811771 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-socks
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,7 @@
This package provides the Haskell %{pkg_name} library development files.
%prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
%build
%ghc_lib_build
commit ghc-socks for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-socks for openSUSE:Factory checked in at 2020-06-19 17:18:25 Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old) and /work/SRC/openSUSE:Factory/.ghc-socks.new.3606 (New) Package is "ghc-socks" Fri Jun 19 17:18:25 2020 rev:11 rq:815177 version:0.6.1 Changes: --- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2019-12-27 13:57:33.724779884 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-socks.new.3606/ghc-socks.changes 2020-06-19 17:18:30.467072647 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 11:14:36 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +--- Other differences: -- ++ ghc-socks.spec ++ --- /var/tmp/diff_new_pack.bphvnK/_old 2020-06-19 17:18:32.879079480 +0200 +++ /var/tmp/diff_new_pack.bphvnK/_new 2020-06-19 17:18:32.879079480 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-socks # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2019-12-27 13:57:31
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new.6675 (New)
Package is "ghc-socks"
Fri Dec 27 13:57:31 2019 rev:10 rq:759512 version:0.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2019-10-18
14:35:11.599964392 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new.6675/ghc-socks.changes
2019-12-27 13:57:33.724779884 +0100
@@ -1,0 +2,5 @@
+Fri Nov 8 16:14:47 UTC 2019 - Peter Simons
+
+- Drop obsolete group attributes.
+
+---
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.H5McHq/_old 2019-12-27 13:57:34.376780199 +0100
+++ /var/tmp/diff_new_pack.H5McHq/_new 2019-12-27 13:57:34.380780201 +0100
@@ -22,7 +22,6 @@
Release:0
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
BuildRequires: ghc-Cabal-devel
@@ -37,7 +36,6 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2019-10-18 14:35:10
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new.2352 (New)
Package is "ghc-socks"
Fri Oct 18 14:35:10 2019 rev:9 rq:737221 version:0.6.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2019-04-28
20:13:45.738406960 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new.2352/ghc-socks.changes
2019-10-18 14:35:11.599964392 +0200
@@ -1,0 +2,6 @@
+Tue Oct 1 02:01:54 UTC 2019 - psim...@suse.com
+
+- Update socks to version 0.6.1.
+ Upstream does not provide a change log file.
+
+---
Old:
socks-0.6.0.tar.gz
New:
socks-0.6.1.tar.gz
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.JFVD6d/_old 2019-10-18 14:35:12.119963038 +0200
+++ /var/tmp/diff_new_pack.JFVD6d/_new 2019-10-18 14:35:12.119963038 +0200
@@ -18,7 +18,7 @@
%global pkg_name socks
Name: ghc-%{pkg_name}
-Version:0.6.0
+Version:0.6.1
Release:0
Summary:Socks proxy (ver 5)
License:BSD-3-Clause
++ socks-0.6.0.tar.gz -> socks-0.6.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socks-0.6.0/Network/Socks5/Parse.hs
new/socks-0.6.1/Network/Socks5/Parse.hs
--- old/socks-0.6.0/Network/Socks5/Parse.hs 2019-01-20 23:01:56.0
+0100
+++ new/socks-0.6.1/Network/Socks5/Parse.hs 2019-09-30 10:02:08.0
+0200
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE Rank2Types #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE OverloadedStrings #-}
@@ -71,10 +72,13 @@
{ runParser :: forall r . ByteString -> Failure r -> Success a r -> Result
r }
instance Monad Parser where
-fail errorMsg = Parser $ \buf err _ -> err buf ("failed: " ++ errorMsg)
return v = Parser $ \buf _ ok -> ok buf v
m >>= k = Parser $ \buf err ok ->
runParser m buf err (\buf' a -> runParser (k a) buf' err ok)
+#if MIN_VERSION_base(4,13,0)
+instance MonadFail Parser where
+#endif
+fail errorMsg = Parser $ \buf err _ -> err buf ("failed: " ++ errorMsg)
instance MonadPlus Parser where
mzero = fail "Parser.MonadPlus.mzero"
mplus f g = Parser $ \buf err ok ->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socks-0.6.0/socks.cabal new/socks-0.6.1/socks.cabal
--- old/socks-0.6.0/socks.cabal 2019-04-22 11:59:29.0 +0200
+++ new/socks-0.6.1/socks.cabal 2019-09-30 12:36:43.0 +0200
@@ -1,5 +1,5 @@
Name:socks
-Version: 0.6.0
+Version: 0.6.1
Synopsis:Socks proxy (ver 5)
Description: Socks proxy (version 5) implementation.
License: BSD3
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2019-04-28 20:13:41
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new.5536 (New)
Package is "ghc-socks"
Sun Apr 28 20:13:41 2019 rev:8 rq:698560 version:0.6.0
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2018-10-25
09:04:57.678555309 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new.5536/ghc-socks.changes
2019-04-28 20:13:45.738406960 +0200
@@ -1,0 +2,6 @@
+Tue Apr 23 02:01:53 UTC 2019 - psim...@suse.com
+
+- Update socks to version 0.6.0.
+ Upstream does not provide a change log file.
+
+---
Old:
socks-0.5.6.tar.gz
New:
socks-0.6.0.tar.gz
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.2k2I0H/_old 2019-04-28 20:13:48.134405472 +0200
+++ /var/tmp/diff_new_pack.2k2I0H/_new 2019-04-28 20:13:48.134405472 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-socks
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,7 +18,7 @@
%global pkg_name socks
Name: ghc-%{pkg_name}
-Version:0.5.6
+Version:0.6.0
Release:0
Summary:Socks proxy (ver 5)
License:BSD-3-Clause
@@ -26,6 +26,7 @@
URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-basement-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cereal-devel
BuildRequires: ghc-network-devel
++ socks-0.5.6.tar.gz -> socks-0.6.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socks-0.5.6/Example.hs new/socks-0.6.0/Example.hs
--- old/socks-0.5.6/Example.hs 2017-08-13 17:24:15.0 +0200
+++ new/socks-0.6.0/Example.hs 2019-04-22 11:58:42.0 +0200
@@ -1,9 +1,10 @@
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE TypeApplications #-}
import Network.Socks5
-import Network.Socket hiding (recv, sClose)
+import Network.Socket hiding (recv, close)
import Network.Socket.ByteString
+import Network.Socket (close)
import Network.BSD
-import Network
import Data.ByteString.Char8 ()
import qualified Data.ByteString.Char8 as BC
@@ -24,32 +25,22 @@
example1 socksServerAddr destinationName
example2 socksServerAddr destinationName
-example3 serverName serverPort destinationName 80
-
where
-- connect to @destName on port 80 through the socks server
-- www.google.com get resolve on the client here and then the sockaddr
is
-- passed to socksConnectAddr
example1 socksServerAddr destName = do
-socket <- socket AF_INET Stream defaultProtocol
-socksConnectWithSocket socket (defaultSocksConfFromSockAddr
socksServerAddr)
+(socket, _) <- socksConnect (defaultSocksConf socksServerAddr)
(SocksAddress (SocksAddrDomainName $ BC.pack destName)
80)
sendAll socket "GET / HTTP/1.0\r\n\r\n"
recv socket 4096 >>= putStrLn . show
-sClose socket
+close socket
-- connect to @destName on port 80 through the socks server
-- the server is doing the resolution itself
example2 socksServerAddr destName = do
socket <- socket AF_INET Stream defaultProtocol
-socksConnectName socket socksServerAddr destName 80
+socksConnectName socket (defaultSocksConf socksServerAddr)
destName 80
sendAll socket "GET / HTTP/1.0\r\n\r\n"
recv socket 4096 >>= putStrLn . show
-sClose socket
-
-example3 sname sport dname dport = do
-handle <- socksConnectTo sname (PortNumber sport) dname
(PortNumber dport)
-BC.hPut handle "GET / HTTP/1.0\r\n\r\n"
-hFlush handle
-BC.hGet handle 1024 >>= putStrLn . show
-hClose handle
+close socket
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socks-0.5.6/LICENSE new/socks-0.6.0/LICENSE
--- old/socks-0.5.6/LICENSE 2017-08-13 17:24:15.0 +0200
+++ new/socks-0.6.0/LICENSE 2019-01-27 12:59:59.0 +0100
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2011 Vincent Hanquez
+Copyright (c) 2010-2019 Vincent
commit ghc-socks for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-socks for openSUSE:Factory checked in at 2018-10-25 09:04:55 Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old) and /work/SRC/openSUSE:Factory/.ghc-socks.new (New) Package is "ghc-socks" Thu Oct 25 09:04:55 2018 rev:7 rq:643459 version:0.5.6 Changes: --- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2018-07-21 10:23:11.878986792 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2018-10-25 09:04:57.678555309 +0200 @@ -1,0 +2,5 @@ +Sat Oct 20 11:32:01 UTC 2018 - Peter Simons + +- Use https URL to refer to bugs.opensuse.org. + +--- Other differences: -- ++ ghc-socks.spec ++ --- /var/tmp/diff_new_pack.5hea2V/_old 2018-10-25 09:04:58.410554860 +0200 +++ /var/tmp/diff_new_pack.5hea2V/_new 2018-10-25 09:04:58.410554860 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ #
commit ghc-socks for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-socks for openSUSE:Factory checked in at 2018-07-21 10:23:08 Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old) and /work/SRC/openSUSE:Factory/.ghc-socks.new (New) Package is "ghc-socks" Sat Jul 21 10:23:08 2018 rev:6 rq:623857 version:0.5.6 Changes: --- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2018-05-30 12:27:16.598340413 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2018-07-21 10:23:11.878986792 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:41 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -35 +40,0 @@ - Other differences: --
commit ghc-socks for openSUSE:Factory
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 - psim...@suse.com
+
+- 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.0 +0200
+++ new/socks-0.5.6/Example.hs 2017-08-13 17:24:15.0 +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.0
+0200
+++ new/socks-0.5.6/Network/Socks5/Parse.hs 2017-08-13 17:24:15.0
+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'
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2017-09-15 21:10:08
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new (New)
Package is "ghc-socks"
Fri Sep 15 21:10:08 2017 rev:4 rq:523886 version:0.5.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2016-07-27
16:10:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2017-09-15
21:10:09.489368809 +0200
@@ -1,0 +2,5 @@
+Thu Aug 3 15:38:38 UTC 2017 - psim...@suse.com
+
+- Updated with latest spec-cleaner version 0.9.8-8-geadfbbf.
+
+---
Old:
1.cabal
New:
socks.cabal
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.Rl25D6/_old 2017-09-15 21:10:10.713196977 +0200
+++ /var/tmp/diff_new_pack.Rl25D6/_new 2017-09-15 21:10:10.717196415 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-socks
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,25 +22,22 @@
Release:0
Summary:Socks proxy (version 5) implementation
License:BSD-3-Clause
-Group: System/Libraries
-Url:https://hackage.haskell.org/package/%{pkg_name}
+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
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cereal-devel
BuildRequires: ghc-network-devel
BuildRequires: ghc-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# End cabal-rpm deps
%description
Socks proxy (version 5) implementation.
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -53,15 +50,12 @@
%setup -q -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%post devel
%ghc_pkg_recache
@@ -69,11 +63,9 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
%doc LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%doc Example.hs README.md
%changelog
++ socks.cabal ++
Name:socks
Version: 0.5.5
x-revision: 1
Description: Socks proxy (version 5) implementation.
License: BSD3
License-file:LICENSE
Copyright: Vincent Hanquez
Author: Vincent Hanquez
Maintainer: Vincent Hanquez
Synopsis:Socks proxy (version 5) implementation.
Build-Type: Simple
Category:Network
stability: experimental
Cabal-Version: >=1.6
Homepage:http://github.com/vincenthz/hs-socks
extra-doc-files: README.md, Example.hs
Library
-- Needs IsString Lazy.ByteString instance
Build-Depends: base >= 3 && < 5
, bytestring >=0.10 && <0.11
, cereal >= 0.3.1
, network >= 2.3
Exposed-modules: Network.Socks5
Network.Socks5.Lowlevel
Network.Socks5.Types
Other-modules: Network.Socks5.Wire
Network.Socks5.Conf
Network.Socks5.Command
Network.Socks5.Parse
ghc-options: -Wall -fno-warn-missing-signatures -fwarn-tabs
source-repository head
type: git
location: git://github.com/vincenthz/hs-socks
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2016-07-27 16:10:44
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new (New)
Package is "ghc-socks"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2016-05-17
17:14:44.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2016-07-27
16:10:45.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:28:41 UTC 2016 - psim...@suse.com
+
+- Update to version 0.5.5 revision 1 with cabal2obs.
+
+---
New:
1.cabal
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.vTi7J3/_old 2016-07-27 16:10:46.0 +0200
+++ /var/tmp/diff_new_pack.vTi7J3/_new 2016-07-27 16:10:46.0 +0200
@@ -15,45 +15,43 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-%global pkg_name socks
+%global pkg_name socks
Name: ghc-%{pkg_name}
Version:0.5.5
Release:0
Summary:Socks proxy (version 5) implementation
-Group: System/Libraries
-
License:BSD-3-Clause
+Group: System/Libraries
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cereal-devel
BuildRequires: ghc-network-devel
+BuildRequires: ghc-rpm-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# End cabal-rpm deps
%description
Socks proxy (version 5) implementation.
-
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
-
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
@@ -67,19 +65,15 @@
%post devel
%ghc_pkg_recache
-
%postun devel
%ghc_pkg_recache
-
%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
-
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%doc Example.hs README.md
-
%changelog
++ 1.cabal ++
Name:socks
Version: 0.5.5
x-revision: 1
Description: Socks proxy (version 5) implementation.
License: BSD3
License-file:LICENSE
Copyright: Vincent Hanquez
Author: Vincent Hanquez
Maintainer: Vincent Hanquez
Synopsis:Socks proxy (version 5) implementation.
Build-Type: Simple
Category:Network
stability: experimental
Cabal-Version: >=1.6
Homepage:http://github.com/vincenthz/hs-socks
extra-doc-files: README.md, Example.hs
Library
-- Needs IsString Lazy.ByteString instance
Build-Depends: base >= 3 && < 5
, bytestring >=0.10 && <0.11
, cereal >= 0.3.1
, network >= 2.3
Exposed-modules: Network.Socks5
Network.Socks5.Lowlevel
Network.Socks5.Types
Other-modules: Network.Socks5.Wire
Network.Socks5.Conf
Network.Socks5.Command
Network.Socks5.Parse
ghc-options: -Wall -fno-warn-missing-signatures -fwarn-tabs
source-repository head
type: git
location: git://github.com/vincenthz/hs-socks
commit ghc-socks for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-socks for openSUSE:Factory
checked in at 2016-05-17 17:14:43
Comparing /work/SRC/openSUSE:Factory/ghc-socks (Old)
and /work/SRC/openSUSE:Factory/.ghc-socks.new (New)
Package is "ghc-socks"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-socks/ghc-socks.changes 2015-05-27
12:46:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-socks.new/ghc-socks.changes 2016-05-17
17:14:44.0 +0200
@@ -1,0 +2,6 @@
+Sat May 7 06:33:56 UTC 2016 - mimi...@gmail.com
+
+- update to 0.5.5
+- remove uselees _service
+
+---
Old:
_service
socks-0.5.4.tar.gz
New:
socks-0.5.5.tar.gz
Other differences:
--
++ ghc-socks.spec ++
--- /var/tmp/diff_new_pack.rIgGbh/_old 2016-05-17 17:14:45.0 +0200
+++ /var/tmp/diff_new_pack.rIgGbh/_new 2016-05-17 17:14:45.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-socks
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -15,60 +15,71 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%global pkg_name socks
-Name: ghc-socks
-Version:0.5.4
+
+Name: ghc-%{pkg_name}
+Version:0.5.5
Release:0
Summary:Socks proxy (version 5) implementation
-License:BSD-3-Clause
Group: System/Libraries
-Url:http://hackage.haskell.org/package/%{pkg_name}
-Source0:
http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+
+License:BSD-3-Clause
+Url:https://hackage.haskell.org/package/%{pkg_name}
+Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
BuildRequires: ghc-Cabal-devel
+BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-cereal-devel
BuildRequires: ghc-network-devel
-BuildRequires: ghc-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
# End cabal-rpm deps
%description
-Socks proxy (version 5) implementation for Haskell.
+Socks proxy (version 5) implementation.
+
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
-Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
-Provides: %{name}-static = %{version}-%{release}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires: %{name} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
+
%prep
%setup -q -n %{pkg_name}-%{version}
+
%build
-%{ghc_lib_build}
+%ghc_lib_build
+
%install
-%{ghc_lib_install}
+%ghc_lib_install
+
%post devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
+
%postun devel
-%{ghc_pkg_recache}
+%ghc_pkg_recache
+
%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
-%{_datadir}/%{pkg_name}-%{version}
+
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
%doc Example.hs README.md
+
%changelog
++ socks-0.5.4.tar.gz -> socks-0.5.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/socks-0.5.4/Network/Socks5/Parse.hs
new/socks-0.5.5/Network/Socks5/Parse.hs
--- old/socks-0.5.4/Network/Socks5/Parse.hs 1970-01-01 01:00:00.0
+0100
+++ new/socks-0.5.5/Network/Socks5/Parse.hs 2016-05-05 07:30:40.0
+0200
@@ -0,0 +1,217 @@
+{-# LANGUAGE Rank2Types #-}
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE OverloadedStrings #-}
+-- |
+-- Module : Network.Socks5.Parse
+-- License : BSD-style
+-- Maintainer : Vincent Hanquez
+-- Stability : experimental
+-- Portability : portable
+--
+-- A very simple bytestring parser related to Parsec and Attoparsec
+--
+-- Simple example:
+--
+-- > > parse ((,) <$> take 2 <*> byte 0x20 <*> (bytes "abc" *> anyByte)) "xx
abctest"
+-- > ParseOK "est" ("xx", 116)
+--
+module Network.Socks5.Parse
+( Parser
+, Result(..)
+-- * run the Parser
+, parse
+, parseFeed
+-- * Parser methods
+, byte
+, anyByte
+, bytes
+, take
+, takeWhile
+, takeAll
+, skip
+, skipWhile
+, skipAll
+, takeStorable
+) where
+
+import Control.Applicative
+import Control.Monad
