hunk ./changelog 1 +haskell-network (4) unstable; urgency=low + + * Rev from 2.2.1.7 to 2.2.1.8 + + -- David Fox Sun, 26 Sep 2010 22:05:21 -0700 + addfile ./network-2.2.1.7-2.2.1.8.diff hunk ./network-2.2.1.7-2.2.1.8.diff 1 +diff -ruN network-2.2.1.7/configure network-2.2.1.8/configure +--- network-2.2.1.7/configure 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/configure 2010-09-22 23:24:53.000000000 -0700 +@@ -3334,7 +3334,7 @@ + else + ac_cv_header_stdc=no + fi +-rm -f conftest* ++rm -f -r conftest* + + fi + +@@ -3355,7 +3355,7 @@ + else + ac_cv_header_stdc=no + fi +-rm -f conftest* ++rm -f -r conftest* + + fi + +@@ -4287,7 +4287,7 @@ + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi +-rm -f conftest* ++rm -f -r conftest* + + + { echo "$as_me:$LINENO: checking for SO_PEERCRED and struct ucred in sys/socket.h" >&5 +@@ -4976,7 +4976,7 @@ + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi +-rm -f conftest* ++rm -f -r conftest* + + + { echo "$as_me:$LINENO: checking for sendfile in sys/socket.h" >&5 +@@ -5002,7 +5002,7 @@ + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + fi +-rm -f conftest* ++rm -f -r conftest* + + + +diff -ruN network-2.2.1.7/include/HsNetworkConfig.h network-2.2.1.8/include/HsNetworkConfig.h +--- network-2.2.1.7/include/HsNetworkConfig.h 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/include/HsNetworkConfig.h 2010-09-22 23:24:53.000000000 -0700 +@@ -17,7 +17,7 @@ + + /* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if + you don't. */ +-#define HAVE_DECL_AI_NUMERICSERV 0 ++#define HAVE_DECL_AI_NUMERICSERV 1 + + /* Define to 1 if you have the declaration of `AI_V4MAPPED', and to 0 if you + don't. */ +diff -ruN network-2.2.1.7/Network/BSD.hsc network-2.2.1.8/Network/BSD.hsc +--- network-2.2.1.7/Network/BSD.hsc 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/Network/BSD.hsc 2010-09-22 23:24:53.000000000 -0700 +@@ -1,4 +1,4 @@ +-{-# OPTIONS -fglasgow-exts -cpp #-} ++{-# LANGUAGE CPP, ForeignFunctionInterface #-} + ----------------------------------------------------------------------------- + -- | + -- Module : Network.BSD +diff -ruN network-2.2.1.7/Network/Socket/Internal.hsc network-2.2.1.8/Network/Socket/Internal.hsc +--- network-2.2.1.7/Network/Socket/Internal.hsc 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/Network/Socket/Internal.hsc 2010-09-22 23:24:53.000000000 -0700 +@@ -1,4 +1,4 @@ +-{-# OPTIONS -fglasgow-exts -cpp #-} ++{-# LANGUAGE CPP, ForeignFunctionInterface #-} + ----------------------------------------------------------------------------- + -- | + -- Module : Network.Socket.Internal +diff -ruN network-2.2.1.7/Network/URI.hs network-2.2.1.8/Network/URI.hs +--- network-2.2.1.7/Network/URI.hs 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/Network/URI.hs 2010-09-22 23:24:53.000000000 -0700 +@@ -1,4 +1,4 @@ +-{-# OPTIONS_GHC -fglasgow-exts -cpp #-} ++{-# LANGUAGE CPP #-} + -------------------------------------------------------------------------------- + -- | + -- Module : Network.URI +@@ -1070,6 +1070,7 @@ + , uriQuery = "" + } + where ++ diff :: Eq b => (a -> b) -> a -> a -> Bool + diff sel u1 u2 = sel u1 /= sel u2 + -- Remove dot segments except the final segment + removeBodyDotSegments p = removeDotSegments p1 ++ p2 +diff -ruN network-2.2.1.7/network.cabal network-2.2.1.8/network.cabal +--- network-2.2.1.7/network.cabal 2009-12-27 03:11:01.000000000 -0800 ++++ network-2.2.1.8/network.cabal 2010-09-22 23:24:53.000000000 -0700 +@@ -1,12 +1,12 @@ + name: network +-version: 2.2.1.7 ++version: 2.2.1.8 + license: BSD3 + license-file: LICENSE + maintainer: Johan Tibell + synopsis: Networking-related facilities + category: Network + build-type: Configure +-cabal-version: >=1.2 ++cabal-version: >=1.2.3 + extra-tmp-files: + config.log config.status autom4te.cache + network.buildinfo include/HsNetworkConfig.h +@@ -29,12 +29,13 @@ + build-depends: base < 5, parsec + + if flag(base4) +- build-depends: base>=4 ++ build-depends: base >= 4 && < 4.4 + cpp-options: -DBASE4 + else + build-depends: base<4 + +- extensions: CPP ++ extensions: CPP, DeriveDataTypeable, ForeignFunctionInterface, ++ TypeSynonymInstances + include-dirs: include + includes: HsNet.h + install-includes: hunk ./series 1 +network-2.2.1.7-2.2.1.8.diff