diff options
Diffstat (limited to 'app-forensics')
16 files changed, 29 insertions, 404 deletions
diff --git a/app-forensics/quickfuzz/Manifest b/app-forensics/quickfuzz/Manifest index ae9940cde1a7..3a5044484b20 100644 --- a/app-forensics/quickfuzz/Manifest +++ b/app-forensics/quickfuzz/Manifest @@ -1 +1 @@ -DIST quickfuzz-0.1_p20160909.tar.bz2 32556776 SHA256 a0ea0b0b46e8b123afa0f3b71ceaf44b233185dd8d310e9472055aea3abe8442 SHA512 4408e1a06c178c5963a8897204615e96dfce59e98a4403e20b364d9b5200cb690209e85a1542ecd3d562f39c6117ae022877b2cea46a6be0ca1bde5a7c72800c WHIRLPOOL f923858987058b96f06c07cf3e18908dc4a156a61d1cbb91859af63b78014ad573aa3ff818c9375b3a971ba9926d070f58a5d9d2b4d8ff3d68c849818e7cbe7d +DIST quickfuzz-0.1_p20160920.tar.gz 1073894 SHA256 141d50c58f104ff9a35c649a7fa21fb18b4501a81bed1e56551067af8f7fedb7 SHA512 52068c35cef580e4719f1b7128ae069a80581f176adc4a2abbbdfc7fc48849e4ff1c228d342b7eaddc780e5b50eabb285b398c334753fca0dc70d3d3ec9f55f8 WHIRLPOOL a60fadaeb3e5e1ac8664865ea797dafe539e053370a30973a0ab785ee3401d6c5d5e40ecdef7cf85a1842f190bc0f7770cf9f0f1ef8c659444ad815e878d634a diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch deleted file mode 100644 index 1cbf88deecc7..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1-QC-2.9.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/Misc.hs b/src/Misc.hs -index 1aa0699..c514ae9 100644 ---- a/src/Misc.hs -+++ b/src/Misc.hs -@@ -1,9 +1,12 @@ -+{-# LANGUAGE CPP #-} - module Misc where - - import Test.QuickCheck - import Data.Map - import Data.Monoid - -+#if ! MIN_VERSION_QuickCheck(2,9,0) -+ - instance Arbitrary a => Arbitrary (Last a) where - arbitrary = do - ga <- arbitrary -@@ -43,3 +46,5 @@ instance (Arbitrary a, Arbitrary b, Arbitrary c, Arbitrary d, Arbitrary e, Arbit - x6 <- arbitrary - x7 <- arbitrary - return (x1,x2,x3,x4,x5,x6,x7) -+ -+#endif diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch deleted file mode 100644 index a9ce21b4cbe8..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-better-erroro.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index ad1782c..2f39336 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -82,3 +82,3 @@ simpleConView tyName c = - ForallC _ _ innerCon -> simpleConView tyName innerCon -- -+ _ -> error $ "simpleConView: failed on " ++ show c - diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch deleted file mode 100644 index 87d7cf24c8a3..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8-gadt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index 2f39336..7911bc3 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -82,2 +82,7 @@ simpleConView tyName c = - ForallC _ _ innerCon -> simpleConView tyName innerCon -+#if MIN_VERSION_template_haskell(2,11,0) -+ -- handling: GadtC [Codec.Picture.Metadata.Gamma] [] (AppT (ConT Codec.Picture.Metadata.Keys) (ConT GHC.Types.Double)) -+ GadtC [n] sts _ -> let ts = map snd sts -+ in SimpleCon n (count ts) ts -+#endif - _ -> error $ "simpleConView: failed on " ++ show c diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch deleted file mode 100644 index 68219db2928d..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-megadeth-ghc-8.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index eb969a5..ad1782c 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE ViewPatterns #-} -+{-# LANGUAGE CPP #-} - module Megadeth.Prim where -@@ -137,3 +138,7 @@ getDeps t ban = do - case tip of -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (DataD _ _ _ _mkind constructors _) -> do -+#else - TyConI (DataD _ _ _ constructors _) -> do -+#endif - let innerTypes = nub $ concat [ findLeafTypes ty | (simpleConView t -> SimpleCon _ _ tys) <- constructors, ty <- tys, not (isVarT ty) ] -@@ -146,3 +151,7 @@ getDeps t ban = do - mapM_ getDeps' hof -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (NewtypeD _ nm _ _mkind constructor _) -> do -+#else - TyConI (NewtypeD _ nm _ constructor _) -> do -+#endif - let (SimpleCon _ 0 ts )= simpleConView nm constructor -@@ -187,4 +196,9 @@ isinsName className n = do - case inf of -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (DataD _ _ preq _mkind _ _) -> doPreq className n preq -+ TyConI (NewtypeD _ _ preq _mkind _ _) -> doPreq className n preq -+#else - TyConI (DataD _ _ preq _ _) -> doPreq className n preq - TyConI (NewtypeD _ _ preq _ _) -> doPreq className n preq -+#endif - TyConI (TySynD _ preq _ ) -> doPreq className n preq diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch deleted file mode 100644 index 436df0e85e35..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs -index d42b896..fc94945 100644 ---- a/src/DeriveArbitrary.hs -+++ b/src/DeriveArbitrary.hs -@@ -26,7 +26,7 @@ import Data.List.Split - import Data.Maybe - -- Gen - import Language.Haskell.TH --import Language.Haskell.TH.Syntax -+import Language.Haskell.TH.Syntax as TH - import Test.QuickCheck - import GHC.Exts - import GHC.Types -@@ -38,7 +38,7 @@ import Control.Applicative - import Data.List - - -- | Build the arbitrary function with makeArbs --chooseExpQ :: Name -> Name -> Name -> Integer -> Type -> ExpQ -+chooseExpQ :: Name -> Name -> Name -> Integer -> TH.Type -> ExpQ - chooseExpQ g n t bf (AppT ListT ty) = [| listOf $ resize ($(varE n) `div` 10) arbitrary |] - chooseExpQ g n t bf ty | headOf ty /= t = [| resize (max 0 ($(varE n) - 1)) arbitrary |] - chooseExpQ g n t bf ty = diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch deleted file mode 100644 index 5ac7f4de719d..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-th-2.11-2.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs -index fc94945..6f2d77f 100644 ---- a/src/DeriveArbitrary.hs -+++ b/src/DeriveArbitrary.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE LambdaCase #-} -+{-# LANGUAGE CPP #-} - module DeriveArbitrary ( -@@ -39,2 +40,8 @@ import Data.List - -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - -- | Build the arbitrary function with makeArbs -@@ -80,3 +87,3 @@ deriveArbitrary t = do - case inf of -- TyConI (DataD _ _ params constructors _) -> do -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> do - let ns = map varT $ paramNames params -@@ -111,3 +118,3 @@ deriveArbitrary t = do - where go n = $(gos 'go 'n)|] -- TyConI (NewtypeD _ _ params con _) -> do -+ TyConI (NewtypeD _ _ params TH211MBKIND con _) -> do - let ns = map varT $ paramNames params -@@ -281,3 +288,3 @@ customG name = do - -- TyConI (DataD _ _ params constructors _) -> -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> - let fnm = mkName "prob_gen" -- "customGen_" ++ (map (\x -> if x == '.' then '_' else -diff --git a/src/DeriveFixable.hs b/src/DeriveFixable.hs -index ec8b8be..83593e6 100644 ---- a/src/DeriveFixable.hs -+++ b/src/DeriveFixable.hs -@@ -1,2 +1,3 @@ - {-# Language TemplateHaskell, ConstraintKinds, FlexibleInstances, FlexibleContexts, IncoherentInstances, MultiParamTypeClasses #-} -+{-# Language CPP #-} - -@@ -15,2 +16,8 @@ import Control.Monad.Trans.State - -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - --The state is composed of identifiers -@@ -147,3 +154,3 @@ mkFix i v a t = do ti <- reify t - case ti of -- TyConI (DataD _ _ params tcons _) -> do -+ TyConI (DataD _ _ params TH211MBKIND tcons _) -> do - let cstuff = map getStuff tcons -@@ -155,3 +162,3 @@ mkFix i v a t = do ti <- reify t - case ii of -- TyConI (DataD _ _ ip _ _) -> do -+ TyConI (DataD _ _ ip TH211MBKIND _ _) -> do - let ivars = map (varT . getParName) ip -@@ -180,3 +187,3 @@ mkFix i v a t = do ti <- reify t - gg = $(mkFixBody matches) |] -- TyConI (NewtypeD _ _ ip _ _) -> do -+ TyConI (NewtypeD _ _ ip TH211MBKIND _ _) -> do - let ivars = map (varT . getParName) ip -diff --git a/src/DeriveMutation.hs b/src/DeriveMutation.hs -index ae58345..7494c50 100644 ---- a/src/DeriveMutation.hs -+++ b/src/DeriveMutation.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE FlexibleInstances,UndecidableInstances#-} -+{-# LANGUAGE CPP #-} - module DeriveMutation where -@@ -17,2 +18,9 @@ import Data.List - import Megadeth.Prim -+ -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - --import Mutation -@@ -100,3 +108,3 @@ devMutation name customGen = do - TyConI (TySynD _ _ ty) -> return [] -- devMutation (headOf ty) Nothing -- TyConI (DataD _ _ params constructors _) -> do -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> do - let fnm = mkName $ "mutt" -- ++ (showName name) diff --git a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch b/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch deleted file mode 100644 index b66ea1a5c95b..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-0.1_p20160909-ttasm-layout.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/bundled/ttasm/TTFInstructions.hs b/bundled/ttasm/TTFInstructions.hs -index 6eb9378..8db99cd 100644 ---- a/bundled/ttasm/TTFInstructions.hs -+++ b/bundled/ttasm/TTFInstructions.hs -@@ -128,4 +128,4 @@ tableChecksum table = - let tc = do -- e <- remaining -- if e < 4 -+ e <- remaining -+ if e < 4 - then return 0 diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch deleted file mode 100644 index a9ce21b4cbe8..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-better-erroro.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index ad1782c..2f39336 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -82,3 +82,3 @@ simpleConView tyName c = - ForallC _ _ innerCon -> simpleConView tyName innerCon -- -+ _ -> error $ "simpleConView: failed on " ++ show c - diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch deleted file mode 100644 index 87d7cf24c8a3..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8-gadt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index 2f39336..7911bc3 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -82,2 +82,7 @@ simpleConView tyName c = - ForallC _ _ innerCon -> simpleConView tyName innerCon -+#if MIN_VERSION_template_haskell(2,11,0) -+ -- handling: GadtC [Codec.Picture.Metadata.Gamma] [] (AppT (ConT Codec.Picture.Metadata.Keys) (ConT GHC.Types.Double)) -+ GadtC [n] sts _ -> let ts = map snd sts -+ in SimpleCon n (count ts) ts -+#endif - _ -> error $ "simpleConView: failed on " ++ show c diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch deleted file mode 100644 index 68219db2928d..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-megadeth-ghc-8.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Megadeth/Prim.hs b/Megadeth/Prim.hs -index eb969a5..ad1782c 100644 ---- a/bundled/megadeth/Megadeth/Prim.hs -+++ b/bundled/megadeth/Megadeth/Prim.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE ViewPatterns #-} -+{-# LANGUAGE CPP #-} - module Megadeth.Prim where -@@ -137,3 +138,7 @@ getDeps t ban = do - case tip of -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (DataD _ _ _ _mkind constructors _) -> do -+#else - TyConI (DataD _ _ _ constructors _) -> do -+#endif - let innerTypes = nub $ concat [ findLeafTypes ty | (simpleConView t -> SimpleCon _ _ tys) <- constructors, ty <- tys, not (isVarT ty) ] -@@ -146,3 +151,7 @@ getDeps t ban = do - mapM_ getDeps' hof -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (NewtypeD _ nm _ _mkind constructor _) -> do -+#else - TyConI (NewtypeD _ nm _ constructor _) -> do -+#endif - let (SimpleCon _ 0 ts )= simpleConView nm constructor -@@ -187,4 +196,9 @@ isinsName className n = do - case inf of -+#if MIN_VERSION_template_haskell(2,11,0) -+ TyConI (DataD _ _ preq _mkind _ _) -> doPreq className n preq -+ TyConI (NewtypeD _ _ preq _mkind _ _) -> doPreq className n preq -+#else - TyConI (DataD _ _ preq _ _) -> doPreq className n preq - TyConI (NewtypeD _ _ preq _ _) -> doPreq className n preq -+#endif - TyConI (TySynD _ preq _ ) -> doPreq className n preq diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch deleted file mode 100644 index 436df0e85e35..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs -index d42b896..fc94945 100644 ---- a/src/DeriveArbitrary.hs -+++ b/src/DeriveArbitrary.hs -@@ -26,7 +26,7 @@ import Data.List.Split - import Data.Maybe - -- Gen - import Language.Haskell.TH --import Language.Haskell.TH.Syntax -+import Language.Haskell.TH.Syntax as TH - import Test.QuickCheck - import GHC.Exts - import GHC.Types -@@ -38,7 +38,7 @@ import Control.Applicative - import Data.List - - -- | Build the arbitrary function with makeArbs --chooseExpQ :: Name -> Name -> Name -> Integer -> Type -> ExpQ -+chooseExpQ :: Name -> Name -> Name -> Integer -> TH.Type -> ExpQ - chooseExpQ g n t bf (AppT ListT ty) = [| listOf $ resize ($(varE n) `div` 10) arbitrary |] - chooseExpQ g n t bf ty | headOf ty /= t = [| resize (max 0 ($(varE n) - 1)) arbitrary |] - chooseExpQ g n t bf ty = diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch deleted file mode 100644 index 5ac7f4de719d..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-th-2.11-2.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/src/DeriveArbitrary.hs b/src/DeriveArbitrary.hs -index fc94945..6f2d77f 100644 ---- a/src/DeriveArbitrary.hs -+++ b/src/DeriveArbitrary.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE LambdaCase #-} -+{-# LANGUAGE CPP #-} - module DeriveArbitrary ( -@@ -39,2 +40,8 @@ import Data.List - -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - -- | Build the arbitrary function with makeArbs -@@ -80,3 +87,3 @@ deriveArbitrary t = do - case inf of -- TyConI (DataD _ _ params constructors _) -> do -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> do - let ns = map varT $ paramNames params -@@ -111,3 +118,3 @@ deriveArbitrary t = do - where go n = $(gos 'go 'n)|] -- TyConI (NewtypeD _ _ params con _) -> do -+ TyConI (NewtypeD _ _ params TH211MBKIND con _) -> do - let ns = map varT $ paramNames params -@@ -281,3 +288,3 @@ customG name = do - -- TyConI (DataD _ _ params constructors _) -> -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> - let fnm = mkName "prob_gen" -- "customGen_" ++ (map (\x -> if x == '.' then '_' else -diff --git a/src/DeriveFixable.hs b/src/DeriveFixable.hs -index ec8b8be..83593e6 100644 ---- a/src/DeriveFixable.hs -+++ b/src/DeriveFixable.hs -@@ -1,2 +1,3 @@ - {-# Language TemplateHaskell, ConstraintKinds, FlexibleInstances, FlexibleContexts, IncoherentInstances, MultiParamTypeClasses #-} -+{-# Language CPP #-} - -@@ -15,2 +16,8 @@ import Control.Monad.Trans.State - -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - --The state is composed of identifiers -@@ -147,3 +154,3 @@ mkFix i v a t = do ti <- reify t - case ti of -- TyConI (DataD _ _ params tcons _) -> do -+ TyConI (DataD _ _ params TH211MBKIND tcons _) -> do - let cstuff = map getStuff tcons -@@ -155,3 +162,3 @@ mkFix i v a t = do ti <- reify t - case ii of -- TyConI (DataD _ _ ip _ _) -> do -+ TyConI (DataD _ _ ip TH211MBKIND _ _) -> do - let ivars = map (varT . getParName) ip -@@ -180,3 +187,3 @@ mkFix i v a t = do ti <- reify t - gg = $(mkFixBody matches) |] -- TyConI (NewtypeD _ _ ip _ _) -> do -+ TyConI (NewtypeD _ _ ip TH211MBKIND _ _) -> do - let ivars = map (varT . getParName) ip -diff --git a/src/DeriveMutation.hs b/src/DeriveMutation.hs -index ae58345..7494c50 100644 ---- a/src/DeriveMutation.hs -+++ b/src/DeriveMutation.hs -@@ -3,2 +3,3 @@ - {-# LANGUAGE FlexibleInstances,UndecidableInstances#-} -+{-# LANGUAGE CPP #-} - module DeriveMutation where -@@ -17,2 +18,9 @@ import Data.List - import Megadeth.Prim -+ -+#if MIN_VERSION_template_haskell(2,11,0) -+# define TH211MBKIND _maybe_kind -+#else -+# define TH211MBKIND -+#endif -+ - --import Mutation -@@ -100,3 +108,3 @@ devMutation name customGen = do - TyConI (TySynD _ _ ty) -> return [] -- devMutation (headOf ty) Nothing -- TyConI (DataD _ _ params constructors _) -> do -+ TyConI (DataD _ _ params TH211MBKIND constructors _) -> do - let fnm = mkName $ "mutt" -- ++ (showName name) diff --git a/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch b/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch deleted file mode 100644 index b66ea1a5c95b..000000000000 --- a/app-forensics/quickfuzz/files/quickfuzz-9999-ttasm-layout.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/bundled/ttasm/TTFInstructions.hs b/bundled/ttasm/TTFInstructions.hs -index 6eb9378..8db99cd 100644 ---- a/bundled/ttasm/TTFInstructions.hs -+++ b/bundled/ttasm/TTFInstructions.hs -@@ -128,4 +128,4 @@ tableChecksum table = - let tc = do -- e <- remaining -- if e < 4 -+ e <- remaining -+ if e < 4 - then return 0 diff --git a/app-forensics/quickfuzz/quickfuzz-0.1_p20160909.ebuild b/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild index 748df18bb436..0ef11d6480bf 100644 --- a/app-forensics/quickfuzz/quickfuzz-0.1_p20160909.ebuild +++ b/app-forensics/quickfuzz/quickfuzz-0.1_p20160920.ebuild @@ -14,7 +14,7 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="An experimental grammar fuzzer in Haskell using QuickCheck" HOMEPAGE="http://quickfuzz.org/" -SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2" +SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -95,19 +95,16 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.18.1.3 " -PATCHES=( - # bundled libs: - "${FILESDIR}"/${PN}-0.1_p20160909-megadeth-ghc-8.patch - "${FILESDIR}"/${PN}-0.1_p20160909-megadeth-better-erroro.patch - "${FILESDIR}"/${PN}-0.1_p20160909-megadeth-ghc-8-gadt.patch - - "${FILESDIR}"/${PN}-0.1_p20160909-ttasm-layout.patch - - # package itself: - "${FILESDIR}"/${PN}-0.1-QC-2.9.patch - "${FILESDIR}"/${PN}-0.1_p20160909-th-2.11-1.patch - "${FILESDIR}"/${PN}-0.1_p20160909-th-2.11-2.patch -) +# $1 - target tarball name (not including extension) +make_snapshot() { + ln -s "${S}" "${WORKDIR}"/"$1" || die + tar \ + --dereference \ + --directory="${WORKDIR}" \ + --exclude="$1"/bundled/Juicy.Pixels/tests \ + -zcvvf \ + "${WORKDIR}"/"$1".tar.gz "$1"/ || die +} # As of 2016-09-10 QuickFuzz forks a few hackage packages # without renames: @@ -115,7 +112,7 @@ PATCHES=( # - hogg: more functions are exported directly # - juicypixels: more functions and modules are exported, # unsafe functions are changed to safe -# - svg-tree: expose internal modules +# - svg-tree: upstream, build agains patched juicypixels # - x509: stabilised handling of corrupterd data # - megadeth: not a fork but has no releases # - ttasm: cabalised, renamed module diff --git a/app-forensics/quickfuzz/quickfuzz-9999.ebuild b/app-forensics/quickfuzz/quickfuzz-9999.ebuild index 8e47d5c453a0..8703bac831ce 100644 --- a/app-forensics/quickfuzz/quickfuzz-9999.ebuild +++ b/app-forensics/quickfuzz/quickfuzz-9999.ebuild @@ -94,19 +94,16 @@ DEPEND="${RDEPEND} >=dev-haskell/cabal-1.18.1.3 " -PATCHES=( - # bundled libs: - "${FILESDIR}"/${P}-megadeth-ghc-8.patch - "${FILESDIR}"/${P}-megadeth-better-erroro.patch - "${FILESDIR}"/${P}-megadeth-ghc-8-gadt.patch - - "${FILESDIR}"/${P}-ttasm-layout.patch - - # package itself: - "${FILESDIR}"/${PN}-0.1-QC-2.9.patch - "${FILESDIR}"/${P}-th-2.11-1.patch - "${FILESDIR}"/${P}-th-2.11-2.patch -) +# $1 - target tarball name (not including extension) +make_snapshot() { + ln -s "${S}" "${WORKDIR}"/"$1" || die + tar \ + --dereference \ + --directory="${WORKDIR}" \ + --exclude="$1"/bundled/Juicy.Pixels/tests \ + -zcvvf \ + "${WORKDIR}"/"$1".tar.gz "$1"/ || die +} # As of 2016-09-10 QuickFuzz forks a few hackage packages # without renames: @@ -114,7 +111,7 @@ PATCHES=( # - hogg: more functions are exported directly # - juicypixels: more functions and modules are exported, # unsafe functions are changed to safe -# - svg-tree: expose internal modules +# - svg-tree: upstream, build agains patched juicypixels # - x509: stabilised handling of corrupterd data # - megadeth: not a fork but has no releases # - ttasm: cabalised, renamed module @@ -129,7 +126,6 @@ src_unpack() { hogg hs-asn1-encoding hs-certificate-x509 - svg-tree ttasm # not exactly fork. just unreleased upstream library @@ -143,6 +139,11 @@ src_unpack() { git-r3_fetch https://github.com/CIFASIS/${repo_name}.git git-r3_checkout https://github.com/CIFASIS/${repo_name}.git "${repo_subdir}/${repo_name}" done + + git-r3_fetch https://github.com/Twinside/svg-tree.git + git-r3_checkout https://github.com/Twinside/svg-tree.git "${repo_subdir}/svg-tree" + + make_snapshot quickfuzz-0.1_p$(date "+%Y%m%d") } src_prepare() { |