This is an automated email from the git hooks/post-receive script. locutusofborg-guest pushed a commit to branch master in repository hedgewars.
commit 9bfdcb69191c369aad14b30755e3d950f55fae45 Author: Gianfranco Costamagna <costamagnagianfra...@yahoo.it> Date: Fri Oct 28 08:38:52 2016 +0200 Upload to unstable --- debian/changelog | 7 +-- debian/control | 2 +- debian/patches/ad435d95ca4b.patch | 110 ++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 117 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd50bdd..a6d303f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -hedgewars (0.9.23-dfsg-1) UNRELEASED; urgency=medium +hedgewars (0.9.22-dfsg-8) unstable; urgency=medium * Remove workardound for game0.log dump, useless. * Remove bytestring-show references - * Closes: #836686 (dataenc needs to be removed in next release, - upstream is aware of that) + * debian/patches/ad435d95ca4b.patch: + - Closes: #836686 (dataenc needs to be removed in next release, + upstream is aware of that) -- Gianfranco Costamagna <locutusofb...@debian.org> Tue, 19 Apr 2016 13:18:42 +0200 diff --git a/debian/control b/debian/control index 7f9a156..1cbc720 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: clang [hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64e imagemagick, libavcodec-dev, libavformat-dev, - libghc-dataenc-dev, + libghc-sandi-dev, libghc-entropy-dev, libghc-hslogger-dev, libghc-mtl-dev, diff --git a/debian/patches/ad435d95ca4b.patch b/debian/patches/ad435d95ca4b.patch new file mode 100644 index 0000000..593c21a --- /dev/null +++ b/debian/patches/ad435d95ca4b.patch @@ -0,0 +1,110 @@ +# HG changeset patch +# User unc0rr +# Date 1475346425 -10800 +# Node ID ad435d95ca4b5fbffb88a440ea28548d6784d8cf +# Parent 0b8f2116aa26e68d262fb812e6d441c1a3dec145 + - Use sandi instead of dataenc (bugs.debian.org/836686) + - Only try to import module from the package being tested + (sometimes packages have modules with equal names, so a test + for module presence could succeed when you have one package + installed instead of another) + +Index: hedgewars/cmake_modules/CheckHaskellModuleExists.cmake +=================================================================== +--- hedgewars.orig/cmake_modules/CheckHaskellModuleExists.cmake ++++ hedgewars/cmake_modules/CheckHaskellModuleExists.cmake +@@ -28,6 +28,9 @@ + "-DMODULE=${MODULE}" + "-DFUNCTION=${FUNCTION}" + "-DPARAMETERS=${PARAMETERS}" ++ -hide-all-packages ++ -package ${LIBRARY} ++ -package base + -cpp + -c "${CMAKE_MODULE_PATH}/checkModule.hs" + RESULT_VARIABLE COMMAND_RESULT +Index: hedgewars/gameServer/CMakeLists.txt +=================================================================== +--- hedgewars.orig/gameServer/CMakeLists.txt ++++ hedgewars/gameServer/CMakeLists.txt +@@ -13,7 +13,7 @@ + check_haskell_module_exists("Network.BSD" getHostName 0 network) + check_haskell_module_exists("Data.Time" getCurrentTime 0 time) + check_haskell_module_exists("Control.Monad.State" fix 1 mtl) +-check_haskell_module_exists("Codec.Binary.Base64" encode 1 dataenc) ++check_haskell_module_exists("Codec.Binary.Base64" encode 1 sandi) + check_haskell_module_exists("System.Log.Logger" warningM 1 hslogger) + check_haskell_module_exists("System.Process" createProcess 3 process) + check_haskell_module_exists("Data.ByteString.Lazy.UTF8" decode 1 utf8-string) +Index: hedgewars/gameServer/EngineInteraction.hs +=================================================================== +--- hedgewars.orig/gameServer/EngineInteraction.hs ++++ hedgewars/gameServer/EngineInteraction.hs +@@ -59,7 +59,7 @@ + #endif + + toEngineMsg :: B.ByteString -> B.ByteString +-toEngineMsg msg = B.pack $ Base64.encode (fromIntegral (BW.length msg) : BW.unpack msg) ++toEngineMsg msg = Base64.encode (fromIntegral (BW.length msg) `BW.cons` msg) + + + {-fromEngineMsg :: B.ByteString -> Maybe B.ByteString +@@ -81,15 +81,15 @@ + checkNetCmd :: B.ByteString -> (B.ByteString, B.ByteString, Maybe (Maybe B.ByteString)) + checkNetCmd msg = check decoded + where +- decoded = liftM (splitMessages . BW.pack) $ Base64.decode $ B.unpack msg +- check Nothing = (B.empty, B.empty, Nothing) +- check (Just msgs) = let (a, b) = (filter isLegal msgs, filter isNonEmpty a) in (encode a, encode b, lft a) +- encode = B.pack . Base64.encode . BW.unpack . B.concat ++ decoded = liftM splitMessages $ Base64.decode msg ++ check (Left _) = (B.empty, B.empty, Nothing) ++ check (Right msgs) = let (a, b) = (filter isLegal msgs, filter isNonEmpty a) in (encode a, encode b, lft a) ++ encode = Base64.encode . B.concat + isLegal m = (B.length m > 1) && (flip Set.member legalMessages . B.head . B.tail $ m) + lft = foldr l Nothing + l m n = let m' = B.head $ B.tail m; tst = flip Set.member in + if not $ tst timedMessages m' then n +- else if '+' /= m' then Just Nothing else Just . Just . B.pack . Base64.encode . BW.unpack $ m ++ else if '+' /= m' then Just Nothing else Just . Just . Base64.encode $ m + isNonEmpty = (/=) '+' . B.head . B.tail + legalMessages = Set.fromList $ "M#+LlRrUuDdZzAaSjJ,sNpPwtgfhbc12345" ++ slotMessages + slotMessages = "\128\129\130\131\132\133\134\135\136\137\138" +Index: hedgewars/gameServer/NetRoutines.hs +=================================================================== +--- hedgewars.orig/gameServer/NetRoutines.hs ++++ hedgewars/gameServer/NetRoutines.hs +@@ -25,11 +25,8 @@ + import Control.Monad + import Data.Unique + import qualified Codec.Binary.Base64 as Base64 +-import qualified Data.ByteString as BW +-import qualified Data.ByteString.Char8 as B + import qualified Control.Exception as E + import System.Entropy +-import Data.Either + ----------------------------- + import CoreTypes + import Utils +@@ -48,7 +45,7 @@ + sendChan' <- newChan + + uid <- newUnique +- salt <- liftM (B.pack . Base64.encode . BW.unpack) $ hGetEntropy ch 18 ++ salt <- liftM Base64.encode $ hGetEntropy ch 18 + + let newClient = + (ClientInfo +Index: hedgewars/gameServer/hedgewars-server.cabal +=================================================================== +--- hedgewars.orig/gameServer/hedgewars-server.cabal ++++ hedgewars/gameServer/hedgewars-server.cabal +@@ -26,7 +26,7 @@ + random, + time, + mtl >= 2, +- dataenc, ++ sandi, + hslogger, + process, + deepseq, diff --git a/debian/patches/series b/debian/patches/series index 6283151..48ed1c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,5 @@ a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch ce3a58617e5732376b4ef5d47fc2be73b705a154.patch 93292d80924aeadfda9f327ba78891cc4bab6c3c.patch f121e6c350a041a429a57ba4748ad673aa8420ea.patch +ad435d95ca4b.patch +ad435d95ca4b.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits