Hello community, here is the log from the commit of package cpphs for openSUSE:Factory checked in at 2017-07-06 00:02:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cpphs (Old) and /work/SRC/openSUSE:Factory/.cpphs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpphs" Thu Jul 6 00:02:08 2017 rev:12 rq:508013 version:1.20.8 Changes: -------- --- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes 2017-05-06 18:28:05.244469016 +0200 +++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2017-07-06 00:02:09.984721976 +0200 @@ -1,0 +2,5 @@ +Sun Jun 25 18:41:41 UTC 2017 - [email protected] + +- Update to version 1.20.8. + +------------------------------------------------------------------- Old: ---- cpphs-1.20.5.tar.gz New: ---- cpphs-1.20.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cpphs.spec ++++++ --- /var/tmp/diff_new_pack.Qnx3Jo/_old 2017-07-06 00:02:11.604493791 +0200 +++ /var/tmp/diff_new_pack.Qnx3Jo/_new 2017-07-06 00:02:11.604493791 +0200 @@ -18,7 +18,7 @@ %global pkg_name cpphs Name: %{pkg_name} -Version: 1.20.5 +Version: 1.20.8 Release: 0 Summary: A liberalised re-implementation of cpp, the C pre-processor License: GPL-2.0 AND LGPL-2.1 ++++++ cpphs-1.20.5.tar.gz -> cpphs-1.20.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/CHANGELOG new/cpphs-1.20.8/CHANGELOG --- old/cpphs-1.20.5/CHANGELOG 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/CHANGELOG 2017-06-22 06:50:18.000000000 +0200 @@ -6,6 +6,9 @@ * (1.20.3): detect an absolute windows path with a drive letter in a #include * (1.20.4): more windows path handling * (1.20.5): revert change in 1.20.4 + * (1.20.6): minor bugfix for crash in obscure corner case + * (1.20.7): bugfix for windows drive letter in #include + * (1.20.8): another bugfix for windows drive letter in #include Version 1.19 ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/Language/Preprocessor/Cpphs/CppIfdef.hs new/cpphs-1.20.8/Language/Preprocessor/Cpphs/CppIfdef.hs --- old/cpphs-1.20.5/Language/Preprocessor/Cpphs/CppIfdef.hs 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/Language/Preprocessor/Cpphs/CppIfdef.hs 2017-06-22 06:50:18.000000000 +0200 @@ -74,9 +74,9 @@ cpp p syms path options (Keep ps) (l@('#':x):xs) = let ws = words x cmd = if null ws then "" else head ws - line = tail ws - sym = head (tail ws) - rest = tail (tail ws) + line = if null ws then [] else tail ws + sym = if null line then "" else head line + rest = if null line then [] else tail line def = defineMacro options (sym++" "++ maybe "1" id (un rest)) un v = if null v then Nothing else Just (unwords v) keepIf b = if b then Keep (p:ps) else Drop 1 False (p:ps) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs new/cpphs-1.20.8/Language/Preprocessor/Cpphs/ReadFirst.hs --- old/cpphs-1.20.5/Language/Preprocessor/Cpphs/ReadFirst.hs 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/Language/Preprocessor/Cpphs/ReadFirst.hs 2017-06-22 06:50:18.000000000 +0200 @@ -38,23 +38,29 @@ readFirst name demand path warn = case name of - nm@(c:':':_) -> try nm [""] -- Windows absolute path - '/':nm -> try nm [""] - _ -> try name (cons dd (".":path)) + -- Windows drive in absolute path + c:':':'\\':nm-> try nm (Just (c:':':[])) [""] + c:':':'/':nm -> try nm (Just (c:':':[])) [""] + -- Windows drive in relative path + c:':':nm -> try nm (Just (c:':':[])) (cons dd (".":path)) + -- unix-like absolute path + '/':nm -> try nm Nothing [""] + -- any relative path + _ -> try name Nothing (cons dd (".":path)) where dd = directory demand cons x xs = if null x then xs else x:xs - try name [] = do + try name _ [] = do when warn $ hPutStrLn stderr ("Warning: Can't find file \""++name ++"\" in directories\n\t" ++concat (intersperse "\n\t" (cons dd (".":path))) ++"\n Asked for by: "++show demand) return ("missing file: "++name,"") - try name (p:ps) = do - let file = cleanPath p++'/':cleanPath name + try name drive (p:ps) = do + let file = (maybe id (++) drive) $ cleanPath p++'/':cleanPath name ok <- doesFileExist file - if not ok then try name ps + if not ok then try name drive ps else do content <- readFileUTF8 file return (file,content) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/cpphs.cabal new/cpphs-1.20.8/cpphs.cabal --- old/cpphs-1.20.5/cpphs.cabal 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/cpphs.cabal 2017-06-22 06:50:18.000000000 +0200 @@ -1,5 +1,5 @@ Name: cpphs -Version: 1.20.5 +Version: 1.20.8 Copyright: 2004-2017, Malcolm Wallace License: LGPL License-File: LICENCE-LGPL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/cpphs.hs new/cpphs-1.20.8/cpphs.hs --- old/cpphs-1.20.5/cpphs.hs 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/cpphs.hs 2017-06-22 06:50:18.000000000 +0200 @@ -21,7 +21,7 @@ import Data.List ( isPrefixOf ) version :: String -version = "1.20.5" +version = "1.20.8" main :: IO () main = do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cpphs-1.20.5/docs/index.html new/cpphs-1.20.8/docs/index.html --- old/cpphs-1.20.5/docs/index.html 2017-04-11 15:22:48.000000000 +0200 +++ new/cpphs-1.20.8/docs/index.html 2017-06-22 06:50:18.000000000 +0200 @@ -198,11 +198,11 @@ <b>Current stable version:</b> <p> -cpphs-1.20.5, release date 2017-04-11<br> +cpphs-1.20.8, release date 2017-06-22<br> By HTTP: <a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>. <ul> -<li> (1.20.5) reverts the changes in 1.20.4 +<li> (1.20.8) another bugfix for windows drive letters in #includes. </ul> <p> @@ -226,6 +226,16 @@ <b>Older versions:</b> <p> +cpphs-1.20.8, release date 2017-06-22<br> +By HTTP: +<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>. +<ul> +<li> (1.20.8) another bugfix for windows drive letters in #includes. +<li> (1.20.7) bugfix for windows drive letters in #includes. +<li> (1.20.6) minor bugfix to avoid a crash in an obscure corner case +</ul> + +<p> cpphs-1.20.5, release date 2017-04-11<br> By HTTP: <a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>.
