[Pkg-haskell-commits] darcs: haskell-system-fileio: Merge 0.3.8-2 release branch into main branch.

[John Millikin]

Sun Mar 24 21:27:11 UTC 2013  John Millikin <jmillikin at gmail.com>
  * Merge 0.3.8-2 release branch into main branch.
  Ignore-this: cd16fd1a40a753eb4ca453fdc4297d5f

    M ./changelog +23
    R ./patches/
    R ./patches/series
    R ./patches/use-native-openfile.diff
    R ./patches/use-posix-bytestring-stat.diff

Sun Mar 24 21:27:11 UTC 2013  John Millikin <jmillikin at gmail.com>
  * Merge 0.3.8-2 release branch into main branch.
  Ignore-this: cd16fd1a40a753eb4ca453fdc4297d5f
diff -rN -u old-haskell-system-fileio//changelog new-haskell-system-fileio//changelog
--- old-haskell-system-fileio//changelog	2013-03-24 21:28:17.233536135 +0000
+++ new-haskell-system-fileio//changelog	2013-03-24 21:28:17.237536703 +0000
@@ -1,3 +1,26 @@
+haskell-system-fileio (0.3.10-1) experimental; urgency=low
+
+  * Depend on haskell-devscripts 0.8.13 to ensure this packages is built
+    against experimental
+  * Bump standards version, no change
+  * New upstream release
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 17 Oct 2012 21:01:50 +0200
+
+haskell-system-fileio (0.3.8-2) unstable; urgency=low
+
+  * patches/use-posix-bytestring-stat.diff
+    * Use ByteString-based System.Posix; fixes hang when isFile is called
+      with a path to a pipe or socket.
+    * Backported from upstream release 0.3.11.
+  * patches/use-native-openfile.diff
+    * Use GHC's implementation of openFile if GHC version is 7.4 or later;
+      fixes potentially incorrect behavior of Handle values when built
+      with GHC 7.4 or 7.6.
+    * Backported from upstream release 0.3.11.
+
+ -- John Millikin <jmillikin at gmail.com>  Sun, 24 Mar 2013 13:48:46 -0700
+
 haskell-system-fileio (0.3.8-1) unstable; urgency=low
 
   * Initial release.
diff -rN -u old-haskell-system-fileio//patches/series new-haskell-system-fileio//patches/series
--- old-haskell-system-fileio//patches/series	2013-03-24 21:28:17.237536703 +0000
+++ new-haskell-system-fileio//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-use-posix-bytestring-stat.diff
-use-native-openfile.diff
diff -rN -u old-haskell-system-fileio//patches/use-native-openfile.diff new-haskell-system-fileio//patches/use-native-openfile.diff
--- old-haskell-system-fileio//patches/use-native-openfile.diff	2013-03-24 21:28:17.237536703 +0000
+++ new-haskell-system-fileio//patches/use-native-openfile.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
---- a/lib/Filesystem.hs
-+++ b/lib/Filesystem.hs
-@@ -73,12 +73,6 @@
- 	, rename
- 	) where
- 
--#ifndef CABAL_OS_WINDOWS
--#if MIN_VERSION_base(4,2,0)
--#define SYSTEMFILEIO_LOCAL_OPEN_FILE
--#endif
--#endif
--
- import           Prelude hiding (FilePath, readFile, writeFile, appendFile)
- 
- import qualified Control.Exception as Exc
---- a/system-fileio.cabal
-+++ b/system-fileio.cabal
-@@ -65,6 +65,8 @@
-     build-depends:
-         unix >= 2.3 && < 2.6
-     c-sources: lib/hssystemfileio-unix.c
-+    if impl(ghc >= 7.2.0) && impl(ghc < 7.4.0)
-+      cpp-options: -DSYSTEMFILEIO_LOCAL_OPEN_FILE
- 
-   exposed-modules:
-     Filesystem
---- a/tests/system-fileio-tests.cabal
-+++ b/tests/system-fileio-tests.cabal
-@@ -40,3 +40,5 @@
-     build-depends:
-         unix >= 2.3 && < 2.6
-     c-sources: ../lib/hssystemfileio-unix.c
-+    if impl(ghc >= 7.2.0) && impl(ghc < 7.4.0)
-+      cpp-options: -DSYSTEMFILEIO_LOCAL_OPEN_FILE
diff -rN -u old-haskell-system-fileio//patches/use-posix-bytestring-stat.diff new-haskell-system-fileio//patches/use-posix-bytestring-stat.diff
--- old-haskell-system-fileio//patches/use-posix-bytestring-stat.diff	2013-03-24 21:28:17.233536135 +0000
+++ new-haskell-system-fileio//patches/use-posix-bytestring-stat.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
---- a/lib/Filesystem.hs
-+++ b/lib/Filesystem.hs
-@@ -118,6 +118,9 @@
- import           Data.Time.Clock.POSIX (posixSecondsToUTCTime)
- import qualified System.Posix as Posix
- import qualified System.Posix.Error as Posix
-+#if MIN_VERSION_unix(2,5,1)
-+import qualified System.Posix.Files.ByteString
-+#endif
- 
- #endif
- 
-@@ -952,6 +955,12 @@
- 	_ <- throwErrnoPathIfRetry failed loc path io
- 	return ()
- 
-+posixStat :: String -> FilePath -> IO Posix.FileStatus
-+#if MIN_VERSION_unix(2,5,1)
-+posixStat _ path = System.Posix.Files.ByteString.getFileStatus (R.encode R.posix path)
-+#else
-+posixStat loc path = withFd loc path Posix.getFdStatus
-+
- withFd :: String -> FilePath -> (Posix.Fd -> IO a) -> IO a
- withFd fnName path = Exc.bracket open close where
- 	open = withFilePath path $ \cpath -> do
-@@ -959,12 +968,11 @@
- 		return (Posix.Fd fd)
- 	close = Posix.closeFd
- 
--posixStat :: String -> FilePath -> IO Posix.FileStatus
--posixStat loc path = withFd loc path Posix.getFdStatus
--
- foreign import ccall unsafe "open"
- 	c_open :: CString -> CInt -> IO CInt
- 
-+#endif
-+
- foreign import ccall unsafe "free"
- 	c_free :: Ptr a -> IO ()
-