From ebt15b at my.fsu.edu Sat Dec 3 04:23:09 2016 From: ebt15b at my.fsu.edu (Elizabeth murphy) Date: Fri, 2 Dec 2016 20:23:09 -0800 Subject: [Pkg-ganeti-devel] Hello..Urgent Pls Message-ID: My name is Elizabeth murphy I am 63 years old, I am a dying woman who have decided to donate what I have to you/churches/mosque/ motherless babies/less privileged/widows.I was diagnosed for cancer for about 2 years ago. I have been touched by God to donate from what I have inherited from my late husband to you for good work of God. Please if you are ready to assit me distribute my funds of Twenty million Dollars to charity . kindly reply me to my private email: elizabeth.murphyme at gmail.com Elizabeth murphy. From Ckp13c at my.fsu.edu Sat Dec 3 20:50:32 2016 From: Ckp13c at my.fsu.edu (Elizabeth murphy) Date: Sat, 3 Dec 2016 12:50:32 -0800 Subject: [Pkg-ganeti-devel] Hello..Urgent Pls Message-ID: My name is Elizabeth murphy I am 63 years old, I am a dying woman who have decided to donate what I have to you/churches/mosque/ motherless babies/less privileged/widows.I was diagnosed for cancer for about 2 years ago. I have been touched by God to donate from what I have inherited from my late husband to you for good work of God. Please if you are ready to assit me distribute my funds of Twenty million Dollars to charity . kindly reply me to my private email: elizabeth.murphyme at gmail.com Elizabeth murphy. From ben at decadent.org.uk Wed Dec 7 00:19:25 2016 From: ben at decadent.org.uk (Ben Hutchings) Date: Wed, 07 Dec 2016 00:19:25 +0000 Subject: [Pkg-ganeti-devel] Bug#847290: Recommends wrong Xen meta-packages Message-ID: <148106996591.12670.10263754337945111809.reportbug@deadeye.wl.decadent.org.uk> Source: ganeti Version: 2.15.2-6 Severity: important ganetic currently recommends: qemu-kvm | xen-linux-system-amd64 | xen-linux-system-686-pae xen-linux-system-amd64 was accidentally removed a while ago and has just been restored to the archive, but it will be a transitional package in stretch. ganeti should recommend xen-system-amd64 instead. xen-linux-system-686-pae exists in wheezy only. Ben. -- System Information: Debian Release: stretch/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'stable-updates'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) From o.ovchinnikova at pkf.perm.ru Fri Dec 9 07:33:08 2016 From: o.ovchinnikova at pkf.perm.ru (Mrs Rachel Watson) Date: Fri, 09 Dec 2016 13:03:08 +0530 Subject: [Pkg-ganeti-devel] I WILL HELP YOU. Message-ID: <20161209063249.A66C41C763A@mail.pkf.perm.ru> Hello, My name is Rachel Watson. Am 75 yrs old of age and I stay in New York City, New York USA. I am a good merchant, I have several industrial companies and good share in various banks in the world. I spend all my life on investment and corporate business. All the way I lost my husband and two beautiful kids in fatal accident that occurred in November the 2003. Since I hard an experience of my families death, its difficult to sleep and give rest, later in the year 2004 February I was sent a letter of medical check up, as my personal doctor testify that I have a lung cancer, which can easily take off my life soon. I found it uneasy to survive myself, because a lot of investment cannot be run and manage by me again. I quickly call up a pastor/prophet to give me positive thinking on this solution as my adviser. He minister to me to share my properties, wealth, to motherless baby/orphanage homes/people that need money for survivor both student that need money for schooling, business woman and man for their investment and for future rising. So therefore I am writing this letter to people who are really in need of help from me both student in college to contact me urgently, so that I can make an available preparation on that. The amount of money for the charity project is $12 million US Dollar. Especially women of the day, who are divorced by their husband, who cannot survive the mist of feeding themselves, please contact me and stop weeping. Probably let me now what you really need the money for and if you can still help me to distribute money to nearest orphanage homes near your town. May the lord bless you as you reach me, I am willing to offer you %30 of the money for your assistance in this charity project. Do send me your full name and contact address when replying okay I will give you more information as I await your response immediately. Remain blessed. Mrs Rachel Watson EMAIL ME: rachel_wat at aol.com From kel-jatimulyo at malangkota.go.id Fri Dec 9 10:32:49 2016 From: kel-jatimulyo at malangkota.go.id (Brigitte MEYER) Date: Fri, 9 Dec 2016 17:32:49 +0700 (WIB) Subject: [Pkg-ganeti-devel] Mes salutations Message-ID: <113953332.19408.1481279569554.JavaMail.zimbra@malangkota.go.id> Bonjour, Tout en vous remerciant de l'attention que vous accorder ? mon v?u le plus cher, j'aimerais que vous sachiez que je ne m'?tais pas tromp?e de personne en vous adressant ce message. Mon souhait ardent a toujours ?t? de rencontrer une personne physique anonyme afin que cette derni?re m?ne des actions sociales ? travers une fondation. Toutefois, je comprendrais votre ?tonnement quant ? ma fa?on de proc?der. Je me nomme Brigitte MEYER, n?e le 27 Mars 1944 de nationalit? Canadienne mais actuellement en sous observation m?dicale dans un h?pital sise au Royaume Uni. J'ai d? vous contacter de cette sorte parce que je souhaite prendre par vous pour faire don d'une somme de 1.000.000? dans le souci d'aid? des personnes en besoin, rendre heureuse les familles pauvres, les orphelins, aider les jeunes entrepreneurs ? la recherche de financement pour faire grandir leurs secteurs d'activit?s de votre entourage. Ma vie professionnelle a ?t? un v?ritable tourisme d'autant plus que j'ai toujours v?cu loin de mon pays. D'abord au Kowe?t, o? j'ai travaill? dans le secteur p?trolier pendant deux ann?es. Ensuite j'ai ?t? en R?publique du B?nin (ann?e 2001) o? j'ai mise en place plusieurs entreprises immobili?res, Ing?nieur.. C'est dans ce pays si accueillant que j'ai connu le vrai bonheur, celui du mariage avec un Canadien qui travaillait aussi dans ce pays. Malheureusement nous n'avons pas eu la chance d'avoir d'enfants. Apr?s Cinq (05) ann?es de vie commune, mon ?poux a perdu la vie suite a une longue maladie. Ainsi je suis rest?e ? nouveau seule avec un majordome ? ma disposition et un chien jusqu'? ce que ce cancer vienne limiter ma vie. Cela fera bient?t quatre ans que je me bats contre cette maladie et la m?decine ne peut plus rien suite aux r?sultats des examens m?dicaux dont mes jours sont compt?s selon l'investigation de mon Docteur traitant. J'avais bloqu? cette somme si importante dans l'une des BANQUES du BENIN pour un projet de construction. Je serai gr?e ? vous confi? cet argent pour que mon projet de donation abouti. Je vous pris d'accepter cela, car c'est un don venant d'une femme mourante et cela sans rien demander en retour. Veuillez me r?pondre le plus vite possible ? mon adresse e-mail que voici : brigittemeyer1944 at gmail.com Mme Brigitte MEYER From apoikos at moszumanska.debian.org Mon Dec 12 13:57:38 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:38 +0000 Subject: [Pkg-ganeti-devel] [ganeti] branch ghc8 created (now ee7faec) Message-ID: <20161212135738.5388.54683@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. apoikos pushed a change to branch ghc8 in repository ganeti. at ee7faec WiP This branch includes the following new commits: new fe1a01c Drop dependency on MonadCatchIO-transformers new 25aaa59 Release 2.15.2-7 new 91661bd Relax the dependency on snap-{core,server} new 0645da6 use-proper-cabal-dev.patch: match newer cabal output new 8034641 Fix build with GHC8 new ee7faec WiP The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 01/06: Drop dependency on MonadCatchIO-transformers In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit fe1a01c729d9c4468af0d70ba52a534888c1ddce Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:23:53 2016 +0200 Drop dependency on MonadCatchIO-transformers It has been deprecated upstream[1] and is no longer part of Debian unstable. Drop the dependency and patch the code to use Control.Exception.catch instead. [1] https://hackage.haskell.org/package/MonadCatchIO-transformers-0.3.1.3/docs/Control-Monad-CatchIO.html Closes: #844970 --- ...p-dependency-on-MonadCatchIO-transformers.patch | 51 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 52 insertions(+) diff --git a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch new file mode 100644 index 0000000..7674da1 --- /dev/null +++ b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch @@ -0,0 +1,51 @@ +From 42512bbf83b74e12bfb05f619645a99528680d0a Mon Sep 17 00:00:00 2001 +From: Apollon Oikonomopoulos +Date: Mon, 21 Nov 2016 12:21:19 +0200 +Subject: [PATCH] Drop dependency on MonadCatchIO-transformers + +MonadCatchIO-transformers is deprecated and has been removed from Debian +unstable. Replace it with Control.Exception. +--- + cabal/ganeti.template.cabal | 1 - + src/Ganeti/Metad/WebServer.hs | 6 +++--- + 2 files changed, 3 insertions(+), 4 deletions(-) + +--- a/cabal/ganeti.template.cabal ++++ b/cabal/ganeti.template.cabal +@@ -65,7 +65,6 @@ + , lens >= 3.10 + , lifted-base >= 0.2.0.3 && < 0.3 + , monad-control >= 0.3.1.3 && < 1.1 +- , MonadCatchIO-transformers >= 0.3.0.0 && < 0.4 + , network >= 2.3.0.13 && < 2.7 + , parallel >= 3.2.0.2 && < 3.3 + , regex-pcre >= 0.94.2 && < 0.95 +--- a/src/Ganeti/Metad/WebServer.hs ++++ b/src/Ganeti/Metad/WebServer.hs +@@ -39,7 +39,7 @@ + import Control.Concurrent (MVar, readMVar) + import Control.Monad.Error.Class (MonadError, catchError, throwError) + import Control.Monad.IO.Class (liftIO) +-import qualified Control.Monad.CatchIO as CatchIO (catch) ++import qualified Control.Exception as Exception (catch) + import qualified Data.CaseInsensitive as CI + import Data.List (intercalate) + import Data.Map (Map) +@@ -105,7 +105,7 @@ + maybeResult (JSON.readJSON instParams >>= + Config.getPublicOsParams >>= + getOsPackage) $ \package -> +- serveFile package `CatchIO.catch` \err -> ++ serveFile package `Exception.catch` \err -> + throwError $ "Could not serve OS package: " ++ show (err :: IOError) + where getOsPackage osParams = + case lookup key (JSON.fromJSObject osParams) of +@@ -130,7 +130,7 @@ + throwError $ "Could not find OS script " ++ show (os script) + serveScript os (d:ds) = + serveFile (d os script) +- `CatchIO.catch` ++ `Exception.catch` + \err -> do let _ = err :: IOError + serveScript os ds + diff --git a/debian/patches/series b/debian/patches/series index 0dfc233..65c8990 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ zlib-0.6-compatibility fix_FTBFS_with_sphinx-1.3.5 fix_ftbfs_with_sphinx_1.4 use-proper-cabal-dev.patch +0001-Drop-dependency-on-MonadCatchIO-transformers.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:43 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:43 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 02/06: Release 2.15.2-7 In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit 25aaa59ce9bcb1599ab9e47eaf5e8c92064bad20 Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:26:17 2016 +0200 Release 2.15.2-7 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index de97f68..7a454d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ganeti (2.15.2-7) unstable; urgency=medium + + * Drop dependency on MonadCatchIO-transformers (Closes: #844970) + + -- Apollon Oikonomopoulos Mon, 21 Nov 2016 12:26:05 +0200 + ganeti (2.15.2-6) unstable; urgency=medium * Auto-detect the cabal library version used by cabal and force the exact -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:43 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:43 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 03/06: Relax the dependency on snap-{core, server} In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit 91661bdae35bae5193918a2f2547c2d848807ee0 Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:34:39 2016 +0200 Relax the dependency on snap-{core,server} --- debian/patches/relax-deps | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/patches/relax-deps b/debian/patches/relax-deps index 8ad0e28..26b5d8b 100644 --- a/debian/patches/relax-deps +++ b/debian/patches/relax-deps @@ -39,3 +39,21 @@ Last-Update: 2015-07-21 -- Executables: -- , happy +@@ -90,13 +90,13 @@ + if flag(mond) + build-depends: + PSQueue >= 1.1 && < 1.2 +- , snap-core >= 0.8.1 && < 0.10 +- , snap-server >= 0.8.1 && < 0.10 ++ , snap-core >= 0.8.1 ++ , snap-server >= 0.8.1 + + if flag(metad) + build-depends: +- snap-core >= 0.8.1 && < 0.10 +- , snap-server >= 0.8.1 && < 0.10 ++ snap-core >= 0.8.1 ++ , snap-server >= 0.8.1 + + hs-source-dirs: + src, test/hs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:43 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:43 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 04/06: use-proper-cabal-dev.patch: match newer cabal output In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit 0645da6bc5eb5af3ead1b9280c8b6ace90ec7c30 Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:44:35 2016 +0200 use-proper-cabal-dev.patch: match newer cabal output --- debian/patches/use-proper-cabal-dev.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/use-proper-cabal-dev.patch b/debian/patches/use-proper-cabal-dev.patch index 13622d3..5b0d3be 100644 --- a/debian/patches/use-proper-cabal-dev.patch +++ b/debian/patches/use-proper-cabal-dev.patch @@ -25,7 +25,7 @@ Forwarded: not-needed (debian-specific) +# dist/setup-config with the same library as that used by the cabal binary that +# created the file. +DEBIAN_CABAL_DEV_VERSION = \ -+ $(shell $(CABAL) -V | $(AWK) '/^using version .* of the Cabal library/ { print $$3 }') ++ $(shell $(CABAL) -V | $(AWK) '/^(compiled )?using version .* of the Cabal library/ { gsub(/^compiled/, ""); print $$3 }') + $(HASKELL_PACKAGE_VERSIONS_FILE): Makefile ganeti.cabal \ cabal/CabalDependenciesMacros.hs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:43 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:43 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 05/06: Fix build with GHC8 In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit 8034641736d3ce321d6e8d7da4a03a97845b71b2 Author: Apollon Oikonomopoulos Date: Mon Nov 21 13:11:59 2016 +0200 Fix build with GHC8 --- debian/patches/0001-GHC-8-support.patch | 121 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 122 insertions(+) diff --git a/debian/patches/0001-GHC-8-support.patch b/debian/patches/0001-GHC-8-support.patch new file mode 100644 index 0000000..a8ca000 --- /dev/null +++ b/debian/patches/0001-GHC-8-support.patch @@ -0,0 +1,121 @@ +From feda79f89c5fb07b8a048f4c589ec14fecbe1ce6 Mon Sep 17 00:00:00 2001 +From: Apollon Oikonomopoulos +Date: Mon, 21 Nov 2016 13:25:21 +0200 +Subject: [PATCH] GHC 8 support + +commit 33259158fd5bee89c761d7475bf4fab173454d65 +Author: Apollon Oikonomopoulos +Date: Mon Nov 21 13:23:17 2016 +0200 + + GHC 8 compatibility + +commit 16b9154edda729fb93335500cb467a194573025a +Author: Bhimanavajjula Aditya +Date: Wed Sep 9 12:10:27 2015 +0200 + + Use explicit forall quantification for types + + Implict quantifications will give an error from ghc 7.12 + + Signed-off-by: Bhimanavajjula Aditya + Signed-off-by: Petr Pudlak + Reviewed-by: Petr Pudlak +--- + src/Ganeti/Query/Filter.hs | 2 +- + src/Ganeti/THH.hs | 23 +++++++++++++++-------- + 2 files changed, 16 insertions(+), 9 deletions(-) + +--- a/src/Ganeti/Query/Filter.hs ++++ b/src/Ganeti/Query/Filter.hs +@@ -136,7 +136,7 @@ + -- | A type synonim for a rank-2 comparator function. This is used so + -- that we can pass the usual '<=', '>', '==' functions to 'binOpFilter' + -- and for them to be used in multiple contexts. +-type Comparator = (Eq a, Ord a) => a -> a -> Bool ++type Comparator = forall a . (Eq a, Ord a) => a -> a -> Bool + + -- | Equality checker. + -- +--- a/src/Ganeti/THH.hs ++++ b/src/Ganeti/THH.hs +@@ -1,4 +1,4 @@ +-{-# LANGUAGE ParallelListComp, TemplateHaskell #-} ++{-# LANGUAGE ParallelListComp, TemplateHaskell, RankNTypes #-} + + {-| TemplateHaskell helper for Ganeti Haskell code. + +@@ -105,6 +105,8 @@ + import Ganeti.PyValue + import Ganeti.THH.PyType + ++myNotStrict :: Bang ++myNotStrict = Bang NoSourceUnpackedness NoSourceStrictness + + -- * Exported types + +@@ -417,7 +419,7 @@ + buildConsField :: Q Type -> StrictTypeQ + buildConsField ftype = do + ftype' <- ftype +- return (NotStrict, ftype') ++ return (myNotStrict, ftype') + + -- | Builds a constructor based on a simple definition (not field-based). + buildSimpleCons :: Name -> SimpleObject -> Q Dec +@@ -425,7 +427,7 @@ + decl_d <- mapM (\(cname, fields) -> do + fields' <- mapM (buildConsField . snd) fields + return $ NormalC (mkName cname) fields') cons +- return $ DataD [] tname [] decl_d [''Show, ''Eq] ++ return $ DataD [] tname [] Nothing decl_d <$> mapM conT [''Show, ''Eq] + + -- | Generate the save function for a given type. + genSaveSimpleObj :: Name -- ^ Object type +@@ -482,7 +484,7 @@ + genFromRaw :: Name -> Name -> Name -> [(String, Either String Name)] -> Q [Dec] + genFromRaw traw fname tname constructors = do + -- signature of form (Monad m) => String -> m $name +- sigt <- [t| (Monad m) => $(conT traw) -> m $(conT tname) |] ++ sigt <- [t| forall m. (Monad m) => $(conT traw) -> m $(conT tname) |] + -- clauses for a guarded pattern + let varp = mkName "s" + varpe = varE varp +@@ -911,7 +913,7 @@ + decl_d <- mapM (\(cname, fields) -> do + -- we only need the type of the field, without Q + fields' <- mapM actualFieldType fields +- let fields'' = zip (repeat NotStrict) fields' ++ let fields'' = zip (repeat myNotStrict) fields' + return $ NormalC (mkName cname) fields'') + cons + let declD = DataD [] (mkName name) [] decl_d [''Show, ''Eq] +@@ -949,7 +951,7 @@ + fieldTypeInfo field_pfx fd = do + t <- actualFieldType fd + let n = mkName . (field_pfx ++) . fieldRecordName $ fd +- return (n, NotStrict, t) ++ return (n, myNotStrict, t) + + -- | Build an object declaration. + buildObject :: String -> String -> [Field] -> Q [Dec] +@@ -1056,9 +1058,9 @@ + (map makeOptional fields) + let name = mkName sname + real_d = NormalC (mkName real_nm) +- [(NotStrict, ConT (mkName real_data_nm))] ++ [(myNotStrict, ConT (mkName real_data_nm))] + forth_d = NormalC (mkName forth_nm) +- [(NotStrict, ConT (mkName forth_data_nm))] ++ [(myNotStrict, ConT (mkName forth_data_nm))] + declD = DataD [] name [] [real_d, forth_d] [''Show, ''Eq] + + read_body <- [| branchOnField "forthcoming" +@@ -1324,7 +1326,7 @@ + paramFieldTypeInfo :: String -> Field -> VarStrictTypeQ + paramFieldTypeInfo field_pfx fd = do + t <- actualFieldType fd +- return (snd $ paramFieldNames field_pfx fd, NotStrict, AppT (ConT ''Maybe) t) ++ return (snd $ paramFieldNames field_pfx fd, myNotStrict, AppT (ConT ''Maybe) t) + + -- | Build a parameter declaration. + -- diff --git a/debian/patches/series b/debian/patches/series index 65c8990..9cf0382 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ fix_FTBFS_with_sphinx-1.3.5 fix_ftbfs_with_sphinx_1.4 use-proper-cabal-dev.patch 0001-Drop-dependency-on-MonadCatchIO-transformers.patch +0001-GHC-8-support.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Mon Dec 12 13:57:43 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Mon, 12 Dec 2016 13:57:43 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 06/06: WiP In-Reply-To: <20161212135738.5388.54683@moszumanska.debian.org> References: <20161212135738.5388.54683@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch ghc8 in repository ganeti. commit ee7faec481ca009edba8862fac08349cb1798888 Author: Apollon Oikonomopoulos Date: Thu Nov 24 18:01:06 2016 +0200 WiP --- ...p-dependency-on-MonadCatchIO-transformers.patch | 29 --- debian/patches/0001-GHC-8-support.patch | 66 ----- debian/patches/ghc8-fixes | 280 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 281 insertions(+), 95 deletions(-) diff --git a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch index 7674da1..27a1c11 100644 --- a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch +++ b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch @@ -20,32 +20,3 @@ unstable. Replace it with Control.Exception. , network >= 2.3.0.13 && < 2.7 , parallel >= 3.2.0.2 && < 3.3 , regex-pcre >= 0.94.2 && < 0.95 ---- a/src/Ganeti/Metad/WebServer.hs -+++ b/src/Ganeti/Metad/WebServer.hs -@@ -39,7 +39,7 @@ - import Control.Concurrent (MVar, readMVar) - import Control.Monad.Error.Class (MonadError, catchError, throwError) - import Control.Monad.IO.Class (liftIO) --import qualified Control.Monad.CatchIO as CatchIO (catch) -+import qualified Control.Exception as Exception (catch) - import qualified Data.CaseInsensitive as CI - import Data.List (intercalate) - import Data.Map (Map) -@@ -105,7 +105,7 @@ - maybeResult (JSON.readJSON instParams >>= - Config.getPublicOsParams >>= - getOsPackage) $ \package -> -- serveFile package `CatchIO.catch` \err -> -+ serveFile package `Exception.catch` \err -> - throwError $ "Could not serve OS package: " ++ show (err :: IOError) - where getOsPackage osParams = - case lookup key (JSON.fromJSObject osParams) of -@@ -130,7 +130,7 @@ - throwError $ "Could not find OS script " ++ show (os script) - serveScript os (d:ds) = - serveFile (d os script) -- `CatchIO.catch` -+ `Exception.catch` - \err -> do let _ = err :: IOError - serveScript os ds - diff --git a/debian/patches/0001-GHC-8-support.patch b/debian/patches/0001-GHC-8-support.patch index a8ca000..05fbfdf 100644 --- a/debian/patches/0001-GHC-8-support.patch +++ b/debian/patches/0001-GHC-8-support.patch @@ -44,33 +44,6 @@ Date: Wed Sep 9 12:10:27 2015 +0200 {-| TemplateHaskell helper for Ganeti Haskell code. -@@ -105,6 +105,8 @@ - import Ganeti.PyValue - import Ganeti.THH.PyType - -+myNotStrict :: Bang -+myNotStrict = Bang NoSourceUnpackedness NoSourceStrictness - - -- * Exported types - -@@ -417,7 +419,7 @@ - buildConsField :: Q Type -> StrictTypeQ - buildConsField ftype = do - ftype' <- ftype -- return (NotStrict, ftype') -+ return (myNotStrict, ftype') - - -- | Builds a constructor based on a simple definition (not field-based). - buildSimpleCons :: Name -> SimpleObject -> Q Dec -@@ -425,7 +427,7 @@ - decl_d <- mapM (\(cname, fields) -> do - fields' <- mapM (buildConsField . snd) fields - return $ NormalC (mkName cname) fields') cons -- return $ DataD [] tname [] decl_d [''Show, ''Eq] -+ return $ DataD [] tname [] Nothing decl_d <$> mapM conT [''Show, ''Eq] - - -- | Generate the save function for a given type. - genSaveSimpleObj :: Name -- ^ Object type @@ -482,7 +484,7 @@ genFromRaw :: Name -> Name -> Name -> [(String, Either String Name)] -> Q [Dec] genFromRaw traw fname tname constructors = do @@ -80,42 +53,3 @@ Date: Wed Sep 9 12:10:27 2015 +0200 -- clauses for a guarded pattern let varp = mkName "s" varpe = varE varp -@@ -911,7 +913,7 @@ - decl_d <- mapM (\(cname, fields) -> do - -- we only need the type of the field, without Q - fields' <- mapM actualFieldType fields -- let fields'' = zip (repeat NotStrict) fields' -+ let fields'' = zip (repeat myNotStrict) fields' - return $ NormalC (mkName cname) fields'') - cons - let declD = DataD [] (mkName name) [] decl_d [''Show, ''Eq] -@@ -949,7 +951,7 @@ - fieldTypeInfo field_pfx fd = do - t <- actualFieldType fd - let n = mkName . (field_pfx ++) . fieldRecordName $ fd -- return (n, NotStrict, t) -+ return (n, myNotStrict, t) - - -- | Build an object declaration. - buildObject :: String -> String -> [Field] -> Q [Dec] -@@ -1056,9 +1058,9 @@ - (map makeOptional fields) - let name = mkName sname - real_d = NormalC (mkName real_nm) -- [(NotStrict, ConT (mkName real_data_nm))] -+ [(myNotStrict, ConT (mkName real_data_nm))] - forth_d = NormalC (mkName forth_nm) -- [(NotStrict, ConT (mkName forth_data_nm))] -+ [(myNotStrict, ConT (mkName forth_data_nm))] - declD = DataD [] name [] [real_d, forth_d] [''Show, ''Eq] - - read_body <- [| branchOnField "forthcoming" -@@ -1324,7 +1326,7 @@ - paramFieldTypeInfo :: String -> Field -> VarStrictTypeQ - paramFieldTypeInfo field_pfx fd = do - t <- actualFieldType fd -- return (snd $ paramFieldNames field_pfx fd, NotStrict, AppT (ConT ''Maybe) t) -+ return (snd $ paramFieldNames field_pfx fd, myNotStrict, AppT (ConT ''Maybe) t) - - -- | Build a parameter declaration. - -- diff --git a/debian/patches/ghc8-fixes b/debian/patches/ghc8-fixes new file mode 100644 index 0000000..fe99364 --- /dev/null +++ b/debian/patches/ghc8-fixes @@ -0,0 +1,280 @@ +--- a/src/Ganeti/Metad/WebServer.hs ++++ b/src/Ganeti/Metad/WebServer.hs +@@ -39,7 +39,7 @@ + import Control.Concurrent (MVar, readMVar) + import Control.Monad.Error.Class (MonadError, catchError, throwError) + import Control.Monad.IO.Class (liftIO) +-import qualified Control.Monad.CatchIO as CatchIO (catch) ++import Control.Exception.Lifted (catch) + import qualified Data.CaseInsensitive as CI + import Data.List (intercalate) + import Data.Map (Map) +@@ -105,7 +105,7 @@ + maybeResult (JSON.readJSON instParams >>= + Config.getPublicOsParams >>= + getOsPackage) $ \package -> +- serveFile package `CatchIO.catch` \err -> ++ serveFile package `catch` \err -> + throwError $ "Could not serve OS package: " ++ show (err :: IOError) + where getOsPackage osParams = + case lookup key (JSON.fromJSObject osParams) of +@@ -130,7 +130,7 @@ + throwError $ "Could not find OS script " ++ show (os script) + serveScript os (d:ds) = + serveFile (d os script) +- `CatchIO.catch` ++ `catch` + \err -> do let _ = err :: IOError + serveScript os ds + +--- a/src/Ganeti/THH.hs ++++ b/src/Ganeti/THH.hs +@@ -105,6 +105,8 @@ + import Ganeti.PyValue + import Ganeti.THH.PyType + ++myNotStrict :: Bang ++myNotStrict = Bang NoSourceUnpackedness NoSourceStrictness + + -- * Exported types + +@@ -417,15 +419,16 @@ + buildConsField :: Q Type -> StrictTypeQ + buildConsField ftype = do + ftype' <- ftype +- return (NotStrict, ftype') ++ return (myNotStrict, ftype') + + -- | Builds a constructor based on a simple definition (not field-based). + buildSimpleCons :: Name -> SimpleObject -> Q Dec + buildSimpleCons tname cons = do ++ names <- mapM conT [''Show, ''Eq] + decl_d <- mapM (\(cname, fields) -> do + fields' <- mapM (buildConsField . snd) fields + return $ NormalC (mkName cname) fields') cons +- return $ DataD [] tname [] decl_d [''Show, ''Eq] ++ return $ DataD [] tname [] Nothing decl_d names + + -- | Generate the save function for a given type. + genSaveSimpleObj :: Name -- ^ Object type +@@ -444,11 +447,11 @@ + -- | Generates a data type declaration. + -- + -- The type will have a fixed list of instances. +-strADTDecl :: Name -> [String] -> Dec +-strADTDecl name constructors = +- DataD [] name [] ++strADTDecl :: Name -> [String] -> Q Dec ++strADTDecl name constructors = do ++ DataD [] name [] Nothing + (map (flip NormalC [] . mkName) constructors) +- [''Show, ''Eq, ''Enum, ''Bounded, ''Ord] ++ <$> mapM conT [''Show, ''Eq, ''Enum, ''Bounded, ''Ord] + + -- | Generates a toRaw function. + -- +@@ -522,9 +525,9 @@ + :: (a -> Either String Name) -> Name -> String -> [(String, a)] -> Q [Dec] + declareADT fn traw sname cons = do + let name = mkName sname +- ddecl = strADTDecl name (map fst cons) + -- process cons in the format expected by genToRaw + cons' = map (second fn) cons ++ ddecl <- strADTDecl (mkName sname) (map fst cons) + toraw <- genToRaw traw (toRawName sname) name cons' + fromraw <- genFromRaw traw (fromRawName sname) name cons' + return $ ddecl:toraw ++ fromraw +@@ -592,7 +595,7 @@ + let base = nameBase name + showJ <- genShowJSON base + readJ <- genReadJSON base +- return [InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) [readJ,showJ]] ++ return [InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) [readJ,showJ]] + + -- * Template code for opcodes + +@@ -617,7 +620,7 @@ + reifyConsNames name = do + reify_result <- reify name + case reify_result of +- TyConI (DataD _ _ _ cons _) -> mapM (liftM nameBase . constructorName) cons ++ TyConI (DataD _ _ _ Nothing cons _) -> mapM (liftM nameBase . constructorName) cons + o -> fail $ "Unhandled name passed to reifyConsNames, expected\ + \ type constructor but got '" ++ show o ++ "'" + +@@ -766,7 +769,7 @@ + genOpCodeDictObject tname savefn loadfn cons = do + tdclauses <- genSaveOpCode cons savefn + fdclauses <- genLoadOpCode cons loadfn +- return [ InstanceD [] (AppT (ConT ''DictObject) (ConT tname)) ++ return [ InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT tname)) + [ FunD 'toDict tdclauses + , FunD 'fromDictWKeys fdclauses + ]] +@@ -787,7 +790,7 @@ + fields' <- mapM (fieldTypeInfo "op") fields + return $ RecC (mkName cname) fields') + cons +- let declD = DataD [] tname [] decl_d [''Show, ''Eq] ++ declD <- DataD [] tname [] Nothing decl_d <$> mapM conT [''Show, ''Eq] + let (allfsig, allffn) = genAllOpFields "allOpFields" cons + -- DictObject + let luxiCons = map opcodeConsToLuxiCons cons +@@ -911,10 +914,10 @@ + decl_d <- mapM (\(cname, fields) -> do + -- we only need the type of the field, without Q + fields' <- mapM actualFieldType fields +- let fields'' = zip (repeat NotStrict) fields' ++ let fields'' = zip (repeat myNotStrict) fields' + return $ NormalC (mkName cname) fields'') + cons +- let declD = DataD [] (mkName name) [] decl_d [''Show, ''Eq] ++ declD <- DataD [] (mkName name) [] Nothing decl_d <$> mapM conT [''Show, ''Eq] + -- generate DictObject instance + dictObjInst <- genOpCodeDictObject tname saveLuxiConstructor + loadOpConstructor cons +@@ -949,7 +952,7 @@ + fieldTypeInfo field_pfx fd = do + t <- actualFieldType fd + let n = mkName . (field_pfx ++) . fieldRecordName $ fd +- return (n, NotStrict, t) ++ return (n, myNotStrict, t) + + -- | Build an object declaration. + buildObject :: String -> String -> [Field] -> Q [Dec] +@@ -961,7 +964,7 @@ + let name = mkName sname + fields_d <- mapM (fieldTypeInfo field_pfx) fields + let decl_d = RecC name fields_d +- let declD = DataD [] name [] [decl_d] [''Show, ''Eq] ++ declD <- DataD [] name [] Nothing [decl_d] <$> mapM conT [''Show, ''Eq] + ser_decls <- buildObjectSerialisation sname fields + return $ declD:ser_decls + +@@ -1056,10 +1059,10 @@ + (map makeOptional fields) + let name = mkName sname + real_d = NormalC (mkName real_nm) +- [(NotStrict, ConT (mkName real_data_nm))] ++ [(myNotStrict, ConT (mkName real_data_nm))] + forth_d = NormalC (mkName forth_nm) +- [(NotStrict, ConT (mkName forth_data_nm))] +- declD = DataD [] name [] [real_d, forth_d] [''Show, ''Eq] ++ [(myNotStrict, ConT (mkName forth_data_nm))] ++ declD <- DataD [] name [] Nothing [real_d, forth_d] <$> mapM conT [''Show, ''Eq] + + read_body <- [| branchOnField "forthcoming" + (liftM $(conE $ mkName forth_nm) . JSON.readJSON) +@@ -1075,7 +1078,7 @@ + , Clause [ConP (mkName forth_nm) [VarP x]] + (NormalB show_forth_body) [] + ] +- instJSONdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ instJSONdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + accessors <- liftM concat . flip mapM fields + $ buildAccessor (mkName forth_nm) forth_pfx +@@ -1100,7 +1103,7 @@ + ] + fromdict = FunD 'fromDictWKeys [ Clause [VarP xs] + (NormalB fromDictWKeysbody) [] ] +- instDict = InstanceD [] (AppT (ConT ''DictObject) (ConT name)) ++ instDict = InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT name)) + [todict, fromdict] + instArray <- genArrayObjectInstance name + (simpleField "forthcoming" [t| Bool |] : fields) +@@ -1127,7 +1130,7 @@ + (loadsig, loadfn) <- genLoadObject sname + shjson <- objectShowJSON sname + rdjson <- objectReadJSON sname +- let instdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ let instdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + return $ dictdecls ++ savedecls ++ [loadsig, loadfn, instdecl] + +@@ -1193,7 +1196,7 @@ + -- the ArrayObject instance generated from DictObject + arrdec <- genArrayObjectInstance name fields + -- the final instance +- return $ [InstanceD [] (AppT (ConT ''DictObject) (ConT name)) ++ return $ [InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT name)) + [ FunD 'toDict [tdclause] + , FunD 'fromDictWKeys [fdclause] + ]] +@@ -1324,7 +1327,7 @@ + paramFieldTypeInfo :: String -> Field -> VarStrictTypeQ + paramFieldTypeInfo field_pfx fd = do + t <- actualFieldType fd +- return (snd $ paramFieldNames field_pfx fd, NotStrict, AppT (ConT ''Maybe) t) ++ return (snd $ paramFieldNames field_pfx fd, myNotStrict, AppT (ConT ''Maybe) t) + + -- | Build a parameter declaration. + -- +@@ -1343,8 +1346,8 @@ + fields_p <- mapM (paramFieldTypeInfo field_pfx) fields + let decl_f = RecC name_f fields_f + decl_p = RecC name_p fields_p +- let declF = DataD [] name_f [] [decl_f] [''Show, ''Eq] +- declP = DataD [] name_p [] [decl_p] [''Show, ''Eq] ++ declF <- DataD [] name_f [] Nothing [decl_f] <$> mapM conT [''Show, ''Eq] ++ declP <- DataD [] name_p [] Nothing [decl_p] <$> mapM conT [''Show, ''Eq] + ser_decls_f <- buildObjectSerialisation sname_f fields + ser_decls_p <- buildPParamSerialisation sname_p fields + fill_decls <- fillParam sname field_pfx fields +@@ -1368,7 +1371,7 @@ + (loadsig, loadfn) <- genLoadObject sname + shjson <- objectShowJSON sname + rdjson <- objectReadJSON sname +- let instdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ let instdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + return $ dictdecls ++ savedecls ++ [loadsig, loadfn, instdecl] + +@@ -1438,12 +1441,12 @@ + mappendClause = Clause [pConP, pConP2] (NormalB mappendExp) [] + let monoidType = AppT (ConT ''Monoid) (ConT name_p) + -- the instances combined +- return [ InstanceD [] instType ++ return [ InstanceD Nothing [] instType + [ FunD 'fillParams [fclause] + , FunD 'toPartial [tpclause] + , FunD 'toFilled [tfclause] + ] +- , InstanceD [] monoidType ++ , InstanceD Nothing [] monoidType + [ FunD 'mempty [memptyClause] + , FunD 'mappend [mappendClause] + ]] +--- a/src/Ganeti/THH/HsRPC.hs ++++ b/src/Ganeti/THH/HsRPC.hs +@@ -73,7 +73,7 @@ + #if MIN_VERSION_monad_control(1,0,0) + -- Needs Undecidable instances + type StM RpcClientMonad b = StM (ReaderT Client ResultG) b +- liftBaseWith f = RpcClientMonad . liftBaseWith ++ liftBaseWith f = RpcClientMonad $ liftBaseWith + $ \r -> f (r . runRpcClientMonad) + restoreM = RpcClientMonad . restoreM + #else +--- a/src/Ganeti/THH/Types.hs ++++ b/src/Ganeti/THH/Types.hs +@@ -68,7 +68,7 @@ + typeOfFun name = reify name >>= args + where + args :: Info -> Q Type +- args (VarI _ tp _ _) = return tp ++ args (VarI _ tp _) = return tp + args _ = fail $ "Not a function: " ++ show name + + -- | Splits a function type into the types of its arguments and the result. +--- a/src/Ganeti/WConfd/Monad.hs ++++ b/src/Ganeti/WConfd/Monad.hs +@@ -181,7 +181,7 @@ + #if MIN_VERSION_monad_control(1,0,0) + -- Needs Undecidable instances + type StM WConfdMonadInt b = StM WConfdMonadIntType b +- liftBaseWith f = WConfdMonadInt . liftBaseWith ++ liftBaseWith f = WConfdMonadInt $ liftBaseWith + $ \r -> f (r . getWConfdMonadInt) + restoreM = WConfdMonadInt . restoreM + #else diff --git a/debian/patches/series b/debian/patches/series index 9cf0382..e82fd23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ fix_ftbfs_with_sphinx_1.4 use-proper-cabal-dev.patch 0001-Drop-dependency-on-MonadCatchIO-transformers.patch 0001-GHC-8-support.patch +ghc8-fixes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:41 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:41 +0000 Subject: [Pkg-ganeti-devel] [ganeti] branch master updated (82511be -> 8c1048b) Message-ID: <20161213155938.8943.19703@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. apoikos pushed a change to branch master in repository ganeti. from 82511be Release 2.15.2-6 adds fe1a01c Drop dependency on MonadCatchIO-transformers new d37fec3 Relax the dependency on snap-{core,server} new 87a3475 use-proper-cabal-dev.patch: match newer cabal output new c7acf4f Fix build with GHC8 new 075e99c Fix build against snap-server 1.0 new 85ddc05 Recommend xen-system-amd64 new 8c1048b Release 2.15.2-7 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 + debian/control | 4 +- ...p-dependency-on-MonadCatchIO-transformers.patch | 22 ++ debian/patches/0001-GHC-8-support.patch | 55 ++++ debian/patches/ghc8-fixes | 285 +++++++++++++++++++++ debian/patches/relax-deps | 18 ++ debian/patches/series | 4 + debian/patches/snap-server-1.0-compat | 103 ++++++++ debian/patches/use-proper-cabal-dev.patch | 2 +- 9 files changed, 502 insertions(+), 3 deletions(-) create mode 100644 debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch create mode 100644 debian/patches/0001-GHC-8-support.patch create mode 100644 debian/patches/ghc8-fixes create mode 100644 debian/patches/snap-server-1.0-compat -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 01/06: Relax the dependency on snap-{core, server} In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit d37fec35d68ea415efe66dd786bc16d8b745222a Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:34:39 2016 +0200 Relax the dependency on snap-{core,server} --- debian/patches/relax-deps | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/patches/relax-deps b/debian/patches/relax-deps index 8ad0e28..26b5d8b 100644 --- a/debian/patches/relax-deps +++ b/debian/patches/relax-deps @@ -39,3 +39,21 @@ Last-Update: 2015-07-21 -- Executables: -- , happy +@@ -90,13 +90,13 @@ + if flag(mond) + build-depends: + PSQueue >= 1.1 && < 1.2 +- , snap-core >= 0.8.1 && < 0.10 +- , snap-server >= 0.8.1 && < 0.10 ++ , snap-core >= 0.8.1 ++ , snap-server >= 0.8.1 + + if flag(metad) + build-depends: +- snap-core >= 0.8.1 && < 0.10 +- , snap-server >= 0.8.1 && < 0.10 ++ snap-core >= 0.8.1 ++ , snap-server >= 0.8.1 + + hs-source-dirs: + src, test/hs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 02/06: use-proper-cabal-dev.patch: match newer cabal output In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit 87a34754e772893955d66d45af3394f5fe3984cb Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:44:35 2016 +0200 use-proper-cabal-dev.patch: match newer cabal output --- debian/patches/use-proper-cabal-dev.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/use-proper-cabal-dev.patch b/debian/patches/use-proper-cabal-dev.patch index 13622d3..5b0d3be 100644 --- a/debian/patches/use-proper-cabal-dev.patch +++ b/debian/patches/use-proper-cabal-dev.patch @@ -25,7 +25,7 @@ Forwarded: not-needed (debian-specific) +# dist/setup-config with the same library as that used by the cabal binary that +# created the file. +DEBIAN_CABAL_DEV_VERSION = \ -+ $(shell $(CABAL) -V | $(AWK) '/^using version .* of the Cabal library/ { print $$3 }') ++ $(shell $(CABAL) -V | $(AWK) '/^(compiled )?using version .* of the Cabal library/ { gsub(/^compiled/, ""); print $$3 }') + $(HASKELL_PACKAGE_VERSIONS_FILE): Makefile ganeti.cabal \ cabal/CabalDependenciesMacros.hs -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 03/06: Fix build with GHC8 In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit c7acf4f6431852e886111b530af6c10816b9898e Author: Apollon Oikonomopoulos Date: Mon Nov 21 13:11:59 2016 +0200 Fix build with GHC8 --- ...p-dependency-on-MonadCatchIO-transformers.patch | 29 --- debian/patches/0001-GHC-8-support.patch | 55 ++++ debian/patches/ghc8-fixes | 285 +++++++++++++++++++++ debian/patches/series | 2 + 4 files changed, 342 insertions(+), 29 deletions(-) diff --git a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch index 7674da1..27a1c11 100644 --- a/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch +++ b/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch @@ -20,32 +20,3 @@ unstable. Replace it with Control.Exception. , network >= 2.3.0.13 && < 2.7 , parallel >= 3.2.0.2 && < 3.3 , regex-pcre >= 0.94.2 && < 0.95 ---- a/src/Ganeti/Metad/WebServer.hs -+++ b/src/Ganeti/Metad/WebServer.hs -@@ -39,7 +39,7 @@ - import Control.Concurrent (MVar, readMVar) - import Control.Monad.Error.Class (MonadError, catchError, throwError) - import Control.Monad.IO.Class (liftIO) --import qualified Control.Monad.CatchIO as CatchIO (catch) -+import qualified Control.Exception as Exception (catch) - import qualified Data.CaseInsensitive as CI - import Data.List (intercalate) - import Data.Map (Map) -@@ -105,7 +105,7 @@ - maybeResult (JSON.readJSON instParams >>= - Config.getPublicOsParams >>= - getOsPackage) $ \package -> -- serveFile package `CatchIO.catch` \err -> -+ serveFile package `Exception.catch` \err -> - throwError $ "Could not serve OS package: " ++ show (err :: IOError) - where getOsPackage osParams = - case lookup key (JSON.fromJSObject osParams) of -@@ -130,7 +130,7 @@ - throwError $ "Could not find OS script " ++ show (os script) - serveScript os (d:ds) = - serveFile (d os script) -- `CatchIO.catch` -+ `Exception.catch` - \err -> do let _ = err :: IOError - serveScript os ds - diff --git a/debian/patches/0001-GHC-8-support.patch b/debian/patches/0001-GHC-8-support.patch new file mode 100644 index 0000000..05fbfdf --- /dev/null +++ b/debian/patches/0001-GHC-8-support.patch @@ -0,0 +1,55 @@ +From feda79f89c5fb07b8a048f4c589ec14fecbe1ce6 Mon Sep 17 00:00:00 2001 +From: Apollon Oikonomopoulos +Date: Mon, 21 Nov 2016 13:25:21 +0200 +Subject: [PATCH] GHC 8 support + +commit 33259158fd5bee89c761d7475bf4fab173454d65 +Author: Apollon Oikonomopoulos +Date: Mon Nov 21 13:23:17 2016 +0200 + + GHC 8 compatibility + +commit 16b9154edda729fb93335500cb467a194573025a +Author: Bhimanavajjula Aditya +Date: Wed Sep 9 12:10:27 2015 +0200 + + Use explicit forall quantification for types + + Implict quantifications will give an error from ghc 7.12 + + Signed-off-by: Bhimanavajjula Aditya + Signed-off-by: Petr Pudlak + Reviewed-by: Petr Pudlak +--- + src/Ganeti/Query/Filter.hs | 2 +- + src/Ganeti/THH.hs | 23 +++++++++++++++-------- + 2 files changed, 16 insertions(+), 9 deletions(-) + +--- a/src/Ganeti/Query/Filter.hs ++++ b/src/Ganeti/Query/Filter.hs +@@ -136,7 +136,7 @@ + -- | A type synonim for a rank-2 comparator function. This is used so + -- that we can pass the usual '<=', '>', '==' functions to 'binOpFilter' + -- and for them to be used in multiple contexts. +-type Comparator = (Eq a, Ord a) => a -> a -> Bool ++type Comparator = forall a . (Eq a, Ord a) => a -> a -> Bool + + -- | Equality checker. + -- +--- a/src/Ganeti/THH.hs ++++ b/src/Ganeti/THH.hs +@@ -1,4 +1,4 @@ +-{-# LANGUAGE ParallelListComp, TemplateHaskell #-} ++{-# LANGUAGE ParallelListComp, TemplateHaskell, RankNTypes #-} + + {-| TemplateHaskell helper for Ganeti Haskell code. + +@@ -482,7 +484,7 @@ + genFromRaw :: Name -> Name -> Name -> [(String, Either String Name)] -> Q [Dec] + genFromRaw traw fname tname constructors = do + -- signature of form (Monad m) => String -> m $name +- sigt <- [t| (Monad m) => $(conT traw) -> m $(conT tname) |] ++ sigt <- [t| forall m. (Monad m) => $(conT traw) -> m $(conT tname) |] + -- clauses for a guarded pattern + let varp = mkName "s" + varpe = varE varp diff --git a/debian/patches/ghc8-fixes b/debian/patches/ghc8-fixes new file mode 100644 index 0000000..bf57ca1 --- /dev/null +++ b/debian/patches/ghc8-fixes @@ -0,0 +1,285 @@ +Author: Apollon Oikonomopoulos +Description: Fix compilation with GHC8 (part 1) + Mostly changes in Template Haskell and a first take at patching Metad. +Forwarded: https://groups.google.com/forum/#!topic/ganeti-devel/MaNaxQHr2BA +Last-Update: 2016-12-13 +--- a/src/Ganeti/Metad/WebServer.hs ++++ b/src/Ganeti/Metad/WebServer.hs +@@ -39,7 +39,7 @@ + import Control.Concurrent (MVar, readMVar) + import Control.Monad.Error.Class (MonadError, catchError, throwError) + import Control.Monad.IO.Class (liftIO) +-import qualified Control.Monad.CatchIO as CatchIO (catch) ++import Control.Exception.Lifted (catch) + import qualified Data.CaseInsensitive as CI + import Data.List (intercalate) + import Data.Map (Map) +@@ -105,7 +105,7 @@ + maybeResult (JSON.readJSON instParams >>= + Config.getPublicOsParams >>= + getOsPackage) $ \package -> +- serveFile package `CatchIO.catch` \err -> ++ serveFile package `catch` \err -> + throwError $ "Could not serve OS package: " ++ show (err :: IOError) + where getOsPackage osParams = + case lookup key (JSON.fromJSObject osParams) of +@@ -130,7 +130,7 @@ + throwError $ "Could not find OS script " ++ show (os script) + serveScript os (d:ds) = + serveFile (d os script) +- `CatchIO.catch` ++ `catch` + \err -> do let _ = err :: IOError + serveScript os ds + +--- a/src/Ganeti/THH.hs ++++ b/src/Ganeti/THH.hs +@@ -105,6 +105,8 @@ + import Ganeti.PyValue + import Ganeti.THH.PyType + ++myNotStrict :: Bang ++myNotStrict = Bang NoSourceUnpackedness NoSourceStrictness + + -- * Exported types + +@@ -417,15 +419,16 @@ + buildConsField :: Q Type -> StrictTypeQ + buildConsField ftype = do + ftype' <- ftype +- return (NotStrict, ftype') ++ return (myNotStrict, ftype') + + -- | Builds a constructor based on a simple definition (not field-based). + buildSimpleCons :: Name -> SimpleObject -> Q Dec + buildSimpleCons tname cons = do ++ names <- mapM conT [''Show, ''Eq] + decl_d <- mapM (\(cname, fields) -> do + fields' <- mapM (buildConsField . snd) fields + return $ NormalC (mkName cname) fields') cons +- return $ DataD [] tname [] decl_d [''Show, ''Eq] ++ return $ DataD [] tname [] Nothing decl_d names + + -- | Generate the save function for a given type. + genSaveSimpleObj :: Name -- ^ Object type +@@ -444,11 +447,11 @@ + -- | Generates a data type declaration. + -- + -- The type will have a fixed list of instances. +-strADTDecl :: Name -> [String] -> Dec +-strADTDecl name constructors = +- DataD [] name [] ++strADTDecl :: Name -> [String] -> Q Dec ++strADTDecl name constructors = do ++ DataD [] name [] Nothing + (map (flip NormalC [] . mkName) constructors) +- [''Show, ''Eq, ''Enum, ''Bounded, ''Ord] ++ <$> mapM conT [''Show, ''Eq, ''Enum, ''Bounded, ''Ord] + + -- | Generates a toRaw function. + -- +@@ -522,9 +525,9 @@ + :: (a -> Either String Name) -> Name -> String -> [(String, a)] -> Q [Dec] + declareADT fn traw sname cons = do + let name = mkName sname +- ddecl = strADTDecl name (map fst cons) + -- process cons in the format expected by genToRaw + cons' = map (second fn) cons ++ ddecl <- strADTDecl (mkName sname) (map fst cons) + toraw <- genToRaw traw (toRawName sname) name cons' + fromraw <- genFromRaw traw (fromRawName sname) name cons' + return $ ddecl:toraw ++ fromraw +@@ -592,7 +595,7 @@ + let base = nameBase name + showJ <- genShowJSON base + readJ <- genReadJSON base +- return [InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) [readJ,showJ]] ++ return [InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) [readJ,showJ]] + + -- * Template code for opcodes + +@@ -617,7 +620,7 @@ + reifyConsNames name = do + reify_result <- reify name + case reify_result of +- TyConI (DataD _ _ _ cons _) -> mapM (liftM nameBase . constructorName) cons ++ TyConI (DataD _ _ _ Nothing cons _) -> mapM (liftM nameBase . constructorName) cons + o -> fail $ "Unhandled name passed to reifyConsNames, expected\ + \ type constructor but got '" ++ show o ++ "'" + +@@ -766,7 +769,7 @@ + genOpCodeDictObject tname savefn loadfn cons = do + tdclauses <- genSaveOpCode cons savefn + fdclauses <- genLoadOpCode cons loadfn +- return [ InstanceD [] (AppT (ConT ''DictObject) (ConT tname)) ++ return [ InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT tname)) + [ FunD 'toDict tdclauses + , FunD 'fromDictWKeys fdclauses + ]] +@@ -787,7 +790,7 @@ + fields' <- mapM (fieldTypeInfo "op") fields + return $ RecC (mkName cname) fields') + cons +- let declD = DataD [] tname [] decl_d [''Show, ''Eq] ++ declD <- DataD [] tname [] Nothing decl_d <$> mapM conT [''Show, ''Eq] + let (allfsig, allffn) = genAllOpFields "allOpFields" cons + -- DictObject + let luxiCons = map opcodeConsToLuxiCons cons +@@ -911,10 +914,10 @@ + decl_d <- mapM (\(cname, fields) -> do + -- we only need the type of the field, without Q + fields' <- mapM actualFieldType fields +- let fields'' = zip (repeat NotStrict) fields' ++ let fields'' = zip (repeat myNotStrict) fields' + return $ NormalC (mkName cname) fields'') + cons +- let declD = DataD [] (mkName name) [] decl_d [''Show, ''Eq] ++ declD <- DataD [] (mkName name) [] Nothing decl_d <$> mapM conT [''Show, ''Eq] + -- generate DictObject instance + dictObjInst <- genOpCodeDictObject tname saveLuxiConstructor + loadOpConstructor cons +@@ -949,7 +952,7 @@ + fieldTypeInfo field_pfx fd = do + t <- actualFieldType fd + let n = mkName . (field_pfx ++) . fieldRecordName $ fd +- return (n, NotStrict, t) ++ return (n, myNotStrict, t) + + -- | Build an object declaration. + buildObject :: String -> String -> [Field] -> Q [Dec] +@@ -961,7 +964,7 @@ + let name = mkName sname + fields_d <- mapM (fieldTypeInfo field_pfx) fields + let decl_d = RecC name fields_d +- let declD = DataD [] name [] [decl_d] [''Show, ''Eq] ++ declD <- DataD [] name [] Nothing [decl_d] <$> mapM conT [''Show, ''Eq] + ser_decls <- buildObjectSerialisation sname fields + return $ declD:ser_decls + +@@ -1056,10 +1059,10 @@ + (map makeOptional fields) + let name = mkName sname + real_d = NormalC (mkName real_nm) +- [(NotStrict, ConT (mkName real_data_nm))] ++ [(myNotStrict, ConT (mkName real_data_nm))] + forth_d = NormalC (mkName forth_nm) +- [(NotStrict, ConT (mkName forth_data_nm))] +- declD = DataD [] name [] [real_d, forth_d] [''Show, ''Eq] ++ [(myNotStrict, ConT (mkName forth_data_nm))] ++ declD <- DataD [] name [] Nothing [real_d, forth_d] <$> mapM conT [''Show, ''Eq] + + read_body <- [| branchOnField "forthcoming" + (liftM $(conE $ mkName forth_nm) . JSON.readJSON) +@@ -1075,7 +1078,7 @@ + , Clause [ConP (mkName forth_nm) [VarP x]] + (NormalB show_forth_body) [] + ] +- instJSONdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ instJSONdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + accessors <- liftM concat . flip mapM fields + $ buildAccessor (mkName forth_nm) forth_pfx +@@ -1100,7 +1103,7 @@ + ] + fromdict = FunD 'fromDictWKeys [ Clause [VarP xs] + (NormalB fromDictWKeysbody) [] ] +- instDict = InstanceD [] (AppT (ConT ''DictObject) (ConT name)) ++ instDict = InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT name)) + [todict, fromdict] + instArray <- genArrayObjectInstance name + (simpleField "forthcoming" [t| Bool |] : fields) +@@ -1127,7 +1130,7 @@ + (loadsig, loadfn) <- genLoadObject sname + shjson <- objectShowJSON sname + rdjson <- objectReadJSON sname +- let instdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ let instdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + return $ dictdecls ++ savedecls ++ [loadsig, loadfn, instdecl] + +@@ -1193,7 +1196,7 @@ + -- the ArrayObject instance generated from DictObject + arrdec <- genArrayObjectInstance name fields + -- the final instance +- return $ [InstanceD [] (AppT (ConT ''DictObject) (ConT name)) ++ return $ [InstanceD Nothing [] (AppT (ConT ''DictObject) (ConT name)) + [ FunD 'toDict [tdclause] + , FunD 'fromDictWKeys [fdclause] + ]] +@@ -1324,7 +1327,7 @@ + paramFieldTypeInfo :: String -> Field -> VarStrictTypeQ + paramFieldTypeInfo field_pfx fd = do + t <- actualFieldType fd +- return (snd $ paramFieldNames field_pfx fd, NotStrict, AppT (ConT ''Maybe) t) ++ return (snd $ paramFieldNames field_pfx fd, myNotStrict, AppT (ConT ''Maybe) t) + + -- | Build a parameter declaration. + -- +@@ -1343,8 +1346,8 @@ + fields_p <- mapM (paramFieldTypeInfo field_pfx) fields + let decl_f = RecC name_f fields_f + decl_p = RecC name_p fields_p +- let declF = DataD [] name_f [] [decl_f] [''Show, ''Eq] +- declP = DataD [] name_p [] [decl_p] [''Show, ''Eq] ++ declF <- DataD [] name_f [] Nothing [decl_f] <$> mapM conT [''Show, ''Eq] ++ declP <- DataD [] name_p [] Nothing [decl_p] <$> mapM conT [''Show, ''Eq] + ser_decls_f <- buildObjectSerialisation sname_f fields + ser_decls_p <- buildPParamSerialisation sname_p fields + fill_decls <- fillParam sname field_pfx fields +@@ -1368,7 +1371,7 @@ + (loadsig, loadfn) <- genLoadObject sname + shjson <- objectShowJSON sname + rdjson <- objectReadJSON sname +- let instdecl = InstanceD [] (AppT (ConT ''JSON.JSON) (ConT name)) ++ let instdecl = InstanceD Nothing [] (AppT (ConT ''JSON.JSON) (ConT name)) + [rdjson, shjson] + return $ dictdecls ++ savedecls ++ [loadsig, loadfn, instdecl] + +@@ -1438,12 +1441,12 @@ + mappendClause = Clause [pConP, pConP2] (NormalB mappendExp) [] + let monoidType = AppT (ConT ''Monoid) (ConT name_p) + -- the instances combined +- return [ InstanceD [] instType ++ return [ InstanceD Nothing [] instType + [ FunD 'fillParams [fclause] + , FunD 'toPartial [tpclause] + , FunD 'toFilled [tfclause] + ] +- , InstanceD [] monoidType ++ , InstanceD Nothing [] monoidType + [ FunD 'mempty [memptyClause] + , FunD 'mappend [mappendClause] + ]] +--- a/src/Ganeti/THH/HsRPC.hs ++++ b/src/Ganeti/THH/HsRPC.hs +@@ -73,7 +73,7 @@ + #if MIN_VERSION_monad_control(1,0,0) + -- Needs Undecidable instances + type StM RpcClientMonad b = StM (ReaderT Client ResultG) b +- liftBaseWith f = RpcClientMonad . liftBaseWith ++ liftBaseWith f = RpcClientMonad $ liftBaseWith + $ \r -> f (r . runRpcClientMonad) + restoreM = RpcClientMonad . restoreM + #else +--- a/src/Ganeti/THH/Types.hs ++++ b/src/Ganeti/THH/Types.hs +@@ -68,7 +68,7 @@ + typeOfFun name = reify name >>= args + where + args :: Info -> Q Type +- args (VarI _ tp _ _) = return tp ++ args (VarI _ tp _) = return tp + args _ = fail $ "Not a function: " ++ show name + + -- | Splits a function type into the types of its arguments and the result. +--- a/src/Ganeti/WConfd/Monad.hs ++++ b/src/Ganeti/WConfd/Monad.hs +@@ -181,7 +181,7 @@ + #if MIN_VERSION_monad_control(1,0,0) + -- Needs Undecidable instances + type StM WConfdMonadInt b = StM WConfdMonadIntType b +- liftBaseWith f = WConfdMonadInt . liftBaseWith ++ liftBaseWith f = WConfdMonadInt $ liftBaseWith + $ \r -> f (r . getWConfdMonadInt) + restoreM = WConfdMonadInt . restoreM + #else diff --git a/debian/patches/series b/debian/patches/series index 65c8990..e82fd23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,5 @@ fix_FTBFS_with_sphinx-1.3.5 fix_ftbfs_with_sphinx_1.4 use-proper-cabal-dev.patch 0001-Drop-dependency-on-MonadCatchIO-transformers.patch +0001-GHC-8-support.patch +ghc8-fixes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 04/06: Fix build against snap-server 1.0 In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit 075e99c457b41824107702ae179251b544b65fe9 Author: Apollon Oikonomopoulos Date: Tue Dec 13 16:49:34 2016 +0200 Fix build against snap-server 1.0 --- debian/patches/series | 1 + debian/patches/snap-server-1.0-compat | 103 ++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/debian/patches/series b/debian/patches/series index e82fd23..8d35762 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ use-proper-cabal-dev.patch 0001-Drop-dependency-on-MonadCatchIO-transformers.patch 0001-GHC-8-support.patch ghc8-fixes +snap-server-1.0-compat diff --git a/debian/patches/snap-server-1.0-compat b/debian/patches/snap-server-1.0-compat new file mode 100644 index 0000000..c80deb0 --- /dev/null +++ b/debian/patches/snap-server-1.0-compat @@ -0,0 +1,103 @@ +Author: Yannis Tsiouris +Description: Make MetaD build against snap-server 1.0 + Rework the error handling logic to reflect snap's move to the IO Monad. +Forwarded: no +Last-Update: 2016-12-13 +diff --git a/src/Ganeti/Metad/ConfigCore.hs b/src/Ganeti/Metad/ConfigCore.hs +index 7211c7e71..bba0b209f 100644 +--- a/src/Ganeti/Metad/ConfigCore.hs ++++ b/src/Ganeti/Metad/ConfigCore.hs +@@ -1,5 +1,6 @@ + {-# LANGUAGE TupleSections, TemplateHaskell, CPP, UndecidableInstances, +- MultiParamTypeClasses, TypeFamilies, GeneralizedNewtypeDeriving #-} ++ MultiParamTypeClasses, TypeFamilies, GeneralizedNewtypeDeriving, ++ ImpredicativeTypes #-} + {-| Functions of the metadata daemon exported for RPC + + -} +diff --git a/src/Ganeti/Metad/WebServer.hs b/src/Ganeti/Metad/WebServer.hs +index 56876f7ee..4e8315ef2 100644 +--- a/src/Ganeti/Metad/WebServer.hs ++++ b/src/Ganeti/Metad/WebServer.hs +@@ -37,9 +37,10 @@ module Ganeti.Metad.WebServer (start) where + + import Control.Applicative + import Control.Concurrent (MVar, readMVar) +-import Control.Monad.Error.Class (MonadError, catchError, throwError) + import Control.Monad.IO.Class (liftIO) +-import Control.Exception.Lifted (catch) ++import Data.Typeable (Typeable) ++import Control.Exception.Base (Exception) ++import Control.Exception.Lifted (catch, throwIO) + import qualified Data.CaseInsensitive as CI + import Data.List (intercalate) + import Data.Map (Map) +@@ -63,13 +64,19 @@ import Ganeti.Metad.Types (InstanceParams) + + type MetaM = Snap () + ++data MetaMExc = MetaMExc String deriving (Show, Typeable) ++instance Exception MetaMExc ++ ++throwError :: String -> Snap a ++throwError = throwIO . MetaMExc ++ + split :: String -> [String] + split str = + case span (/= '/') str of + (x, []) -> [x] + (x, _:xs) -> x:split xs + +-lookupInstanceParams :: MonadError String m => String -> Map String b -> m b ++lookupInstanceParams :: String -> Map String b -> Snap b + lookupInstanceParams inst params = + case Map.lookup inst params of + Nothing -> throwError $ "Could not get instance params for " ++ show inst +@@ -87,7 +94,7 @@ error405 ms = modifyResponse $ + addHeader (CI.mk "Allow") (ByteString.pack . intercalate ", " $ map show ms) + . setResponseStatus 405 "Method not allowed" + +-maybeResult :: MonadError String m => Result t -> (t -> m a) -> m a ++maybeResult :: Result t -> (t -> Snap a) -> Snap a + maybeResult (Error err) _ = throwError err + maybeResult (Ok x) f = f x + +@@ -144,10 +151,11 @@ handleMetadata params GET "ganeti" "latest" "os/os-install-package" = + Logging.logInfo $ "OS install package for " ++ show remoteAddr + readMVar params + serveOsPackage remoteAddr instanceParams "os-install-package" +- `catchError` ++ `catch` + \err -> do ++ let MetaMExc e = err + liftIO . +- Logging.logWarning $ "Could not serve OS install package: " ++ err ++ Logging.logWarning $ "Could not serve OS install package: " ++ e + error404 + handleMetadata params GET "ganeti" "latest" "os/package" = + do remoteAddr <- ByteString.unpack . rqRemoteAddr <$> getRequest +@@ -160,18 +168,20 @@ handleMetadata params GET "ganeti" "latest" "os/parameters.json" = + instanceParams <- liftIO $ do + Logging.logInfo $ "OS parameters for " ++ show remoteAddr + readMVar params +- serveOsParams remoteAddr instanceParams `catchError` ++ serveOsParams remoteAddr instanceParams `catch` + \err -> do +- liftIO . Logging.logWarning $ "Could not serve OS parameters: " ++ err ++ let MetaMExc e = err ++ liftIO . Logging.logWarning $ "Could not serve OS parameters: " ++ e + error404 + handleMetadata params GET "ganeti" "latest" script | isScript script = + do remoteAddr <- ByteString.unpack . rqRemoteAddr <$> getRequest + instanceParams <- liftIO $ do + Logging.logInfo $ "OS package for " ++ show remoteAddr + readMVar params +- serveOsScript remoteAddr instanceParams (last $ split script) `catchError` ++ serveOsScript remoteAddr instanceParams (last $ split script) `catch` + \err -> do +- liftIO . Logging.logWarning $ "Could not serve OS scripts: " ++ err ++ let MetaMExc e = err ++ liftIO . Logging.logWarning $ "Could not serve OS scripts: " ++ e + error404 + where isScript = + (`elem` [ "os/scripts/create" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 05/06: Recommend xen-system-amd64 In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit 85ddc051ada2024a8f46bd870c9e8d88139264f5 Author: Apollon Oikonomopoulos Date: Tue Dec 13 17:55:49 2016 +0200 Recommend xen-system-amd64 Replace Recommends: xen-linux-system-amd64 | xen-linux-system-686-pae with xen-system-amd64. Closes: #847290 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 2ba6c26..df17bf8 100644 --- a/debian/control +++ b/debian/control @@ -76,8 +76,8 @@ Depends: ganeti-2.15 (= ${source:Version}), ganeti-htools-2.15 (>= ${source:Version}), ganeti-htools-2.15 (<< ${source:Version}.1~), adduser, ${misc:Depends}, python -Recommends: drbd-utils | drbd8-utils (>= 8.0.7), qemu-kvm | - xen-linux-system-amd64 | xen-linux-system-686-pae, +Recommends: drbd-utils | drbd8-utils (>= 8.0.7), + qemu-kvm | xen-system-amd64, ganeti-instance-debootstrap, ndisc6 Suggests: ganeti-doc, blktap-dkms, molly-guard Conflicts: ganeti-htools -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 06/06: Release 2.15.2-7 In-Reply-To: <20161213155938.8943.19703@moszumanska.debian.org> References: <20161213155938.8943.19703@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit 8c1048bc680147937daf1ce3c253787a5ff47255 Author: Apollon Oikonomopoulos Date: Mon Nov 21 12:26:17 2016 +0200 Release 2.15.2-7 --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index de97f68..c985093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +ganeti (2.15.2-7) unstable; urgency=medium + + * Drop dependency on MonadCatchIO-transformers (Closes: #844970) + * d/patches/ghc8-fixes: fix FTBFS with GHC 8. + * d/patches/snap-server-1.0-compat: patch MetaD to fix FTBFS with + snap-server 1.0. Thanks to Yannis Tsiouris for the patch! + * Fix cabal masking logic to work with newer cabal-install versions. + * ganeti: Recommend xen-system-amd64 instead of xen-linux-system-amd64 | + xen-linux-system-686-pae (Closes: #847290) + + -- Apollon Oikonomopoulos Tue, 13 Dec 2016 17:40:29 +0200 + ganeti (2.15.2-6) unstable; urgency=medium * Auto-detect the cabal library version used by cabal and force the exact -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 15:59:42 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 15:59:42 +0000 Subject: [Pkg-ganeti-devel] [ganeti] annotated tag debian/2.15.2-7 created (now bff2d85) Message-ID: <20161213155938.8943.29271@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. apoikos pushed a change to annotated tag debian/2.15.2-7 in repository ganeti. at bff2d85 (tag) tagging 8c1048bc680147937daf1ce3c253787a5ff47255 (commit) replaces debian/2.15.2-6 tagged by Apollon Oikonomopoulos on Tue Dec 13 17:58:54 2016 +0200 - Log ----------------------------------------------------------------- ganeti Debian release 2.15.2-7 -----BEGIN PGP SIGNATURE----- iQJHBAABCAAxFiEEPgL9ZlYpWVIRC6uZ9RsYxyAkgiQFAlhQGr4THGFwb2lrb3NA ZGViaWFuLm9yZwAKCRD1GxjHICSCJAWQD/96YdyA3H1q/g6JfWkgGGoq1n35lIqF DYQJIju1ya5U8RW5EEb9ez7zCPVy5qxvjDR/TSAWj/m3L15sRf6227wDxj9jA9Cl RqVGaaeLqRc8cv2+P3kjhhitlxWEh3g7sxuKMriLlT9ytPcJg5h9fVfjwGt7wvMD JFAP0RLMgMDsLSBWOnivpauUBfadiNcVZMV0XxzV2EDC/NqsT7FPBTSIL70MEV6+ sdLtFhziD5VT+jeBnZoCJShKnhUZXmAyA9UIHVw8SzqSw7tIUYbB8Zai8zYbM76Q xF/lmOg0xDDn9ldUEIFj/AXcS+2EGohPqVjQe+ayGF5Cz7lGgeUMZtbv1eVv91wv A7L3H5+mYEvE8NpJeDccrrP23iBrp5YeBCmFHCuQL11GchC2Ww1hpdymfnmzb8Ad 7C26L/8Rd9yhkHMn/Oygpm5hMHlFUx088ybvZBDfQPoXhMInUDFe+Nqy5jMfaDD0 A/Ne01KVgIJktJHgbLb94JfBDu8FyENQT9Wy9YtrV4p+IDQHfQLekR3ZcpxsBoDg Y1kvMPk2e0oeyswk0gq04sMiQ7SqDWF2Jr/eWU/Wn1UYoTTZ3clwLcrzhBjwx0g9 YHs8/vWDxglkASKKpXQy0nNX5NWC8lul6VFsik0lEPxpAtIU5Bw/6WEqC7HpZ6Nr wzkHOuHMaO72rw== =wsec -----END PGP SIGNATURE----- Apollon Oikonomopoulos (7): Drop dependency on MonadCatchIO-transformers Relax the dependency on snap-{core,server} use-proper-cabal-dev.patch: match newer cabal output Fix build with GHC8 Fix build against snap-server 1.0 Recommend xen-system-amd64 Release 2.15.2-7 ----------------------------------------------------------------------- This annotated tag includes the following new commits: new d37fec3 Relax the dependency on snap-{core,server} new 87a3475 use-proper-cabal-dev.patch: match newer cabal output new c7acf4f Fix build with GHC8 new 075e99c Fix build against snap-server 1.0 new 85ddc05 Recommend xen-system-amd64 new 8c1048b Release 2.15.2-7 The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 16:04:38 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 16:04:38 +0000 Subject: [Pkg-ganeti-devel] [ganeti] branch master updated (8c1048b -> 804567a) Message-ID: <20161213160438.21909.15325@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. apoikos pushed a change to branch master in repository ganeti. from 8c1048b Release 2.15.2-7 new e9cab5d Bump Standards to 3.9.8; no changes needed new 804567a ganeti: Depend on lsb-base for init-functions The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 16:04:38 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 16:04:38 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 01/02: Bump Standards to 3.9.8; no changes needed In-Reply-To: <20161213160438.21909.15325@moszumanska.debian.org> References: <20161213160438.21909.15325@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit e9cab5d046ea47eaf3df5a2476cf515e710d390b Author: Apollon Oikonomopoulos Date: Tue Dec 13 18:04:08 2016 +0200 Bump Standards to 3.9.8; no changes needed --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index df17bf8..28af425 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, iproute2 | iproute, bash-completion, po-debconf -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 X-Python-Version: >= 2.6 Homepage: https://code.google.com/p/ganeti/ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ganeti/ganeti.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From apoikos at moszumanska.debian.org Tue Dec 13 16:04:39 2016 From: apoikos at moszumanska.debian.org (Apollon Oikonomopoulos) Date: Tue, 13 Dec 2016 16:04:39 +0000 Subject: [Pkg-ganeti-devel] [ganeti] 02/02: ganeti: Depend on lsb-base for init-functions In-Reply-To: <20161213160438.21909.15325@moszumanska.debian.org> References: <20161213160438.21909.15325@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. apoikos pushed a commit to branch master in repository ganeti. commit 804567ae2ba182b8b4ea3452c76e0d0c11d4163b Author: Apollon Oikonomopoulos Date: Tue Dec 13 18:04:21 2016 +0200 ganeti: Depend on lsb-base for init-functions --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 28af425..7117b79 100644 --- a/debian/control +++ b/debian/control @@ -75,7 +75,8 @@ Depends: ganeti-2.15 (= ${source:Version}), ganeti-haskell-2.15 (<< ${source:Version}.1~), ganeti-htools-2.15 (>= ${source:Version}), ganeti-htools-2.15 (<< ${source:Version}.1~), - adduser, ${misc:Depends}, python + adduser, ${misc:Depends}, python, lsb-base (>= 3.0-6) + Recommends: drbd-utils | drbd8-utils (>= 8.0.7), qemu-kvm | xen-system-amd64, ganeti-instance-debootstrap, ndisc6 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git From ftpmaster at ftp-master.debian.org Tue Dec 13 16:08:46 2016 From: ftpmaster at ftp-master.debian.org (Debian FTP Masters) Date: Tue, 13 Dec 2016 16:08:46 +0000 Subject: [Pkg-ganeti-devel] Processing of ganeti_2.15.2-7_source.changes Message-ID: ganeti_2.15.2-7_source.changes uploaded successfully to localhost along with the files: ganeti_2.15.2-7.dsc ganeti_2.15.2-7.debian.tar.xz Greetings, Your Debian queue daemon (running on host usper.debian.org) From ftpmaster at ftp-master.debian.org Tue Dec 13 16:18:38 2016 From: ftpmaster at ftp-master.debian.org (Debian FTP Masters) Date: Tue, 13 Dec 2016 16:18:38 +0000 Subject: [Pkg-ganeti-devel] ganeti_2.15.2-7_source.changes ACCEPTED into unstable Message-ID: Accepted: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Tue, 13 Dec 2016 17:40:29 +0200 Source: ganeti Binary: ganeti2 ganeti ganeti-2.15 ganeti-haskell-2.15 ganeti-htools ganeti-htools-2.15 ganeti-doc python-ganeti-rapi Architecture: source Version: 2.15.2-7 Distribution: unstable Urgency: medium Maintainer: Debian Ganeti Team Changed-By: Apollon Oikonomopoulos Description: ganeti - cluster virtualization manager ganeti-2.15 - cluster virtualization manager - Python components ganeti-doc - cluster virtualization manager - documentation ganeti-haskell-2.15 - cluster virtualization manager - Haskell components ganeti-htools - cluster virtualization manager - tools (stand-alone) ganeti-htools-2.15 - cluster virtualization manager - tools for Ganeti 2.15 ganeti2 - transitional dummy package python-ganeti-rapi - cluster virtualization manager - RAPI client library Closes: 844970 847290 Changes: ganeti (2.15.2-7) unstable; urgency=medium . * Drop dependency on MonadCatchIO-transformers (Closes: #844970) * d/patches/ghc8-fixes: fix FTBFS with GHC 8. * d/patches/snap-server-1.0-compat: patch MetaD to fix FTBFS with snap-server 1.0. Thanks to Yannis Tsiouris for the patch! * Fix cabal masking logic to work with newer cabal-install versions. * ganeti: Recommend xen-system-amd64 instead of xen-linux-system-amd64 | xen-linux-system-686-pae (Closes: #847290) Checksums-Sha1: d20eda8d9569e9aa6bff8e2cc0a76b8c53d8f6bc 3431 ganeti_2.15.2-7.dsc 17e34220bde96c0eff13ba5b0a17e77791e1624b 48188 ganeti_2.15.2-7.debian.tar.xz Checksums-Sha256: de588213a2e66348a1d041d05dd2eff09766b0e6c0af0711464e64823acaa25b 3431 ganeti_2.15.2-7.dsc 41e1db2d370cf7ef9bef2c9420c5fb2819a92ec6291eb17060e10d384df7969a 48188 ganeti_2.15.2-7.debian.tar.xz Files: 45b56de4edfdce7ba7295d3786dab9c3 3431 admin extra ganeti_2.15.2-7.dsc 187255085be8248b74a177a0bf86ddc5 48188 admin extra ganeti_2.15.2-7.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQJHBAEBCAAxFiEEPgL9ZlYpWVIRC6uZ9RsYxyAkgiQFAlhQGp0THGFwb2lrb3NA ZGViaWFuLm9yZwAKCRD1GxjHICSCJJIMD/wKk8KyjVuVSGtsUHO17ruGjCfZzbxs 20J6xQqqiusumk0XAXwsndFFvpxpSb+thfAgNKO3gD4g1YsZXbmOF0DIe7+gfhCZ fjUMTLmMDZKWEIHcG9FpQeJpnAooTK4PirfYvmiGE/uIPApvMPrAh3L1o1HhUAKm O32Ew4/Fk32tjEh0N9G29Dukqzs3E4OKaj4soYAmjbNLgc6RIZ2PzU5l1+DdOda3 p9LiLwNsjPecJueZTwoX/0kaL/0HLRy5nJVz4Vbwe78038kV6D+NJf6ApTD4efzt BE5cWNvTPJ2mvTD64ocgWx636UYF/VFwuwekqkQ19Nv4pDdzEZD9ObS1d2gzBPIP hMhNH/uc2J31ZQHJVH52EeQcZ0AAnjmU7Q+C9SA9yJyT9gwtbylqBzkOx+T4d0xl FVbsQolcWhVOy/um3LV/A6S0K6KNmdPBNzfzMu5sA/yFSDjHqkQ4VInkEOSdOgR/ JS8umwpRzQW+zrVZvHiLM9TGYmYpcL1Zt/BCCY7dwCASfZOyrXpMffwMl6x1OZPU 9vi6/HCjMi905aUdMHNxtDT+SCs6Nb6of3I3jCYbBsKEluZ3HbeaVNGWKUGFhnKq kIAJAYPpr5BjEn0y42WZJTQb1BiraqyWiUYsMlwPj6C54UHT2TiMmWKSOaWbjOP7 JrLkO8kz7y2Hqg== =93sv -----END PGP SIGNATURE----- Thank you for your contribution to Debian. From owner at bugs.debian.org Tue Dec 13 16:21:10 2016 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 13 Dec 2016 16:21:10 +0000 Subject: [Pkg-ganeti-devel] Bug#847290: marked as done (Recommends wrong Xen meta-packages) References: <148106996591.12670.10263754337945111809.reportbug@deadeye.wl.decadent.org.uk> Message-ID: Your message dated Tue, 13 Dec 2016 16:18:38 +0000 with message-id and subject line Bug#847290: fixed in ganeti 2.15.2-7 has caused the Debian Bug report #847290, regarding Recommends wrong Xen meta-packages to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 847290: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=847290 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Ben Hutchings Subject: Recommends wrong Xen meta-packages Date: Wed, 07 Dec 2016 00:19:25 +0000 Size: 2865 URL: -------------- next part -------------- An embedded message was scrubbed... From: Apollon Oikonomopoulos Subject: Bug#847290: fixed in ganeti 2.15.2-7 Date: Tue, 13 Dec 2016 16:18:38 +0000 Size: 5897 URL: From owner at bugs.debian.org Tue Dec 13 16:21:08 2016 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Tue, 13 Dec 2016 16:21:08 +0000 Subject: [Pkg-ganeti-devel] Bug#844970: marked as done (ganeti: FTBFS: Makefile:4386: Makefile.ghc: No such file or directory) References: <20161119070944.vlr6kxjy6ezxsyg3@xanadu.blop.info> Message-ID: Your message dated Tue, 13 Dec 2016 16:18:38 +0000 with message-id and subject line Bug#844970: fixed in ganeti 2.15.2-7 has caused the Debian Bug report #844970, regarding ganeti: FTBFS: Makefile:4386: Makefile.ghc: No such file or directory to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 844970: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=844970 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Lucas Nussbaum Subject: ganeti: FTBFS: Makefile:4386: Makefile.ghc: No such file or directory Date: Sat, 19 Nov 2016 08:09:44 +0100 Size: 6045 URL: -------------- next part -------------- An embedded message was scrubbed... From: Apollon Oikonomopoulos Subject: Bug#844970: fixed in ganeti 2.15.2-7 Date: Tue, 13 Dec 2016 16:18:38 +0000 Size: 5842 URL: From root at fssprus.ru Tue Dec 13 14:21:56 2016 From: root at fssprus.ru (Mr;Chris Eze) Date: Tue, 13 Dec 2016 15:21:56 +0100 Subject: [Pkg-ganeti-devel] FROM; Mr; Chris Eze. &&& Sat, Dec 13, 2016 at 12:37 PM Message-ID: <2f251d5fed3b9f23532677b496d60b42@r65.fssprus.ru> Dec 13, 2016 Dear Friend, You may not understand why this email came to you. But if you do not remember me, you might have receive an email from me in the past regarding business proposal which we never concluded. I want to use this opportunity to thank you very much for your past efforts to assist me with this transaction which failed due to one reason or the other. And also to inform you that the transaction has been concluded with the assistance of another partner from Thailand who financed the transaction to a logical conclusion. Due to your past effort, sincerity, and trust you showed during the course of the transaction. I want to compensate you and show my gratitude to you with the sum of $1,200,000.00 , as a sign of appreciation. I have left a certified international bank draft for you worth of $1,200,000.00 ,cash able anywhere in the world. I would like you to contact my secretary Mr. Foxton Richard, on his direct email address at:(foxtonrichard at yandex.com ) for the collection of the bank draft. I authorized him to release the Bank draft to you whenever you contact him. At this moment, I'm very busy because of the investment projects and charity organization which I want to run with my new partner. CONTACT: Mr. Foxton Richard, My Secretary, and forward to him your full name, Postal address and your telephone number to open contact with him. His email address :( foxtonrichard at yandex.com ) Yours Sincerely Mr;Chris Eze. From noreply at release.debian.org Mon Dec 19 04:39:04 2016 From: noreply at release.debian.org (Debian testing autoremoval watch) Date: Mon, 19 Dec 2016 04:39:04 +0000 Subject: [Pkg-ganeti-devel] ganeti is marked for autoremoval from testing Message-ID: ganeti 2.15.2-6 is marked for autoremoval from testing on 2017-01-02 It is affected by these RC bugs: 844970: ganeti: FTBFS: Makefile:4386: Makefile.ghc: No such file or directory From owner at bugs.debian.org Fri Dec 23 08:39:09 2016 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Fri, 23 Dec 2016 08:39:09 +0000 Subject: [Pkg-ganeti-devel] Processed: tagging 834404, fixed 834404 in 0.15-1 References: <1482482195-580-bts-apoikos@debian.org> Message-ID: Processing commands for control at bugs.debian.org: > tags 834404 + upstream fixed-upstream Bug #834404 [ganeti-instance-debootstrap] ganeti-instance-debootstrap - uses unsupported losetup -s in default config Added tag(s) fixed-upstream and upstream. > fixed 834404 0.15-1 Bug #834404 [ganeti-instance-debootstrap] ganeti-instance-debootstrap - uses unsupported losetup -s in default config Marked as fixed in versions ganeti-instance-debootstrap/0.15-1. > thanks Stopping processing here. Please contact me if you need assistance. -- 834404: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834404 Debian Bug Tracking System Contact owner at bugs.debian.org with problems From zidi.gazalbah at brisyariah.co.id Fri Dec 23 22:21:18 2016 From: zidi.gazalbah at brisyariah.co.id (Brigitte MEYER) Date: Sat, 24 Dec 2016 05:21:18 +0700 (WIB) Subject: [Pkg-ganeti-devel] Receive my greetings Message-ID: <1516692622.4423476.1482531678801.JavaMail.zimbra@brisyariah.co.id> Goodmorning, While thanking you for the attention you give to my dearest wish, I want you to know that Im not wrong sending you this message. My ardent wish has always been to meet an anonymous individual so that he will lead social actions through a foundation. My name is Brigitte MEYER, born 27 March 1944 nationality French but currently in a medical observation in a hospital located in the United Kingdom. I had to contact you in this way because I want to take you to donate a sum of $2.000.000 in order to help people in need, make happy poor families, orphans, helping young entrepreneurs looking for financing to grow their sectors by the means of some acquaintances. My professional life has been a real tourism as much as I have always lived away from my country. First to Kuwait, where I worked in the oil industry for two years. Then I was in the Republic of Benin (year 2001) where I implemented several companies (real estate, engineer). It is in this country so welcoming that I have experienced true happiness, that of marriage with a Belgian who also worked in this country. Unfortunately we did not have the chance to have children. After five (05) years of common life, my husband lost his life following a long illness. So I stayed again alone with a Butler at my disposal and a dog until this cancer came to limit my life. It will be almost four years now that I have been fighting this disease and medicine can no longer anything. following the results of the medical examinations that my days are numbered according to the investigation of my treating doctor. I had blocked this important sum in one of the banks of BENIN for a construction project. I will be rigged given to you this money to ensure that my donation projectwill geta positive resulte. I want you to accept this because it is a gift from a dying woman and this without asking anything in return. Please answer me quiqly to my email address as follows: brigittemeyer1944 at gmail.com Ms Brigitte MEYER From info at famci.net Tue Dec 20 01:03:48 2016 From: info at famci.net (ALICIC ELVIR) Date: Tue, 20 Dec 2016 02:03:48 +0100 Subject: [Pkg-ganeti-devel] LOAN OFFER APPLY NOW. Message-ID: <20161220020348.6a2jqspn48cwww0k@mail.palex.org> Do you need financial to settle your situation and start a good life if yes and you are very serious to get loan kindly contact the company with your Name Phone Number and your Email id for more details Contact; loan.company114 at gmail.com ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program. From noreply at release.debian.org Sat Dec 24 16:39:16 2016 From: noreply at release.debian.org (Debian testing watch) Date: Sat, 24 Dec 2016 16:39:16 +0000 Subject: [Pkg-ganeti-devel] ganeti 2.15.2-7 MIGRATED to testing Message-ID: FYI: The status of the ganeti source package in Debian's testing distribution has changed. Previous version: 2.15.2-6 Current version: 2.15.2-7 -- This email is automatically generated once a day. As the installation of new packages into testing happens multiple times a day you will receive later changes on the next day. See https://release.debian.org/testing-watch/ for more information. From ftpmaster at ftp-master.debian.org Sat Dec 24 21:21:00 2016 From: ftpmaster at ftp-master.debian.org (Debian FTP Masters) Date: Sat, 24 Dec 2016 21:21:00 +0000 Subject: [Pkg-ganeti-devel] Processing of ganeti-instance-debootstrap_0.14-2+deb8u1_amd64.changes Message-ID: ganeti-instance-debootstrap_0.14-2+deb8u1_amd64.changes uploaded successfully to localhost along with the files: ganeti-instance-debootstrap_0.14-2+deb8u1.dsc ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb Greetings, Your Debian queue daemon (running on host usper.debian.org) From ftpmaster at ftp-master.debian.org Sat Dec 24 21:33:27 2016 From: ftpmaster at ftp-master.debian.org (Debian FTP Masters) Date: Sat, 24 Dec 2016 21:33:27 +0000 Subject: [Pkg-ganeti-devel] ganeti-instance-debootstrap_0.14-2+deb8u1_amd64.changes ACCEPTED into proposed-updates->stable-new Message-ID: Mapping jessie to stable. Mapping stable to proposed-updates. Accepted: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 23 Dec 2016 10:48:28 +0200 Source: ganeti-instance-debootstrap Binary: ganeti-instance-debootstrap Architecture: source all Version: 0.14-2+deb8u1 Distribution: jessie Urgency: medium Maintainer: Debian Ganeti Team Changed-By: Apollon Oikonomopoulos Description: ganeti-instance-debootstrap - debootstrap-based instance OS definition for ganeti Closes: 834404 Changes: ganeti-instance-debootstrap (0.14-2+deb8u1) jessie; urgency=medium . * Replace losetup -s with losetup --show (Closes: #834404) Checksums-Sha1: 84fcbc4cb39551fdf460381df53e5fa2a3d352d3 2167 ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 28ccff64027eebe58b70455dad524e818a737a51 4448 ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz 10176ed758ccfc6d71e420137989450c08c3869e 18570 ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb Checksums-Sha256: 1c5e59bae17a68a189be455cc5255583356888a49b7a20f0e91e021f5f10bb15 2167 ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 2b79fa5fce8741c2a90027bc0c06d307492e20f49b5d08e66eb145580700ed64 4448 ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz edeeb8ff53766be147372dee832a27b38834540d5657b19d05a3f3eaa809ea83 18570 ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb Files: c15b4c981107a9cb44c7f10fe4b55fd6 2167 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 9636cabd33509e20ee74919446bfdc2b 4448 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz 4942ecc8466112eaf93f8197ad987a41 18570 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEPgL9ZlYpWVIRC6uZ9RsYxyAkgiQFAlhe5GIACgkQ9RsYxyAk giRaLxAAjQCHZEaVm5yWdYRyT0vSQFX3Q70j1CsQ1KsH2QoPNPnzUeKzbMuwN+Cu RkIaxhGmfulLjk1L4U+Zs17OXBEwmIFloSuJdNi95B4nTNy74Ji0zetkM9UCaS4E h2MBgqAjglyMZNEScEhV/LdMqh4dFYmCkbRzEqJqzlezhjopGjGgR7t6LMneD735 3RMqh4qXyXrQy/DNpnM958Pm5RmXRgkA7acNUOUz8NefCrhahSxtHIgjD98loV78 6KhgGpKqukPH8WMCf83hPbtWkQHtgQPnAwUT5mE+9vriZxqUqgAFaD0uk62Qu/ql QBs5aZod1d3Zo+jI5bTXm4PWnYEzzkoEzh7+/lrrnp25kcgDW5qGuGwfnoXpxdqj RGWMpuM39RBtVf/hlJrBNL+xKUr7feUE/QoewO46JpmRGzndYivFs11gw7Fok4UV xFZt7a07ySAjcSV599mwJ5xeP8zzcJU598JC+lscBRc16/2vG9W62hd8ASAWAj7W tTFv2Spa4jNCQb/3I3sYkE4FVRtTGAElfEA8I1U38b/ww2BByTVEK6wHtF+lfGio q8D1jSmP471TKZuA/07mlggZeYPsWoFw6lYpm5PgKqdSTQnCO8J10n1y7KC7AvZL G7mujExdXOM0hga1K+XqPx0VXlcUwVFhZDiYEGadOLZiu4xM/+U= =bn+q -----END PGP SIGNATURE----- Thank you for your contribution to Debian. From caterina.costantini at mail.aslbenevento1.it Wed Dec 28 19:49:14 2016 From: caterina.costantini at mail.aslbenevento1.it (Brigitte MEYER) Date: Wed, 28 Dec 2016 20:49:14 +0100 (CET) Subject: [Pkg-ganeti-devel] Good morning Message-ID: <1623109733.681278.1482954554328.JavaMail.zimbra@mail.aslbenevento1.it> Goodmorning, While thanking you for the attention you give to my dearest wish, I want you to know that Im not wrong sending you this message. My ardent wish has always been to meet an anonymous individual so that he will lead social actions through a foundation. My name is Brigitte MEYER, born 27 March 1944 nationality French but currently in a medical observation in a hospital located in the Canada. I had to contact you in this way because I want to take you to donate a sum of $2.000.000 in order to help people in need, make happy poor families, orphans, helping young entrepreneurs looking for financing to grow their sectors by the means of some acquaintances. My professional life has been a real tourism as much as I have always lived away from my country. First to Kuwait, where I worked in the oil industry for two years. Then I was in the Republic of Benin (year 2001) where I implemented several companies (real estate, engineer). It is in this country so welcoming that I have experienced true happiness, that of marriage with a Belgian who also worked in this country. Unfortunately we did not have the chance to have children. After five (05) years of common life, my husband lost his life following a long illness. So I stayed again alone with a Butler at my disposal and a dog until this cancer came to limit my life. It will be almost four years now that I have been fighting this disease and medicine can no longer anything. following the results of the medical examinations that my days are numbered according to the investigation of my treating doctor. I had blocked this important sum in one of the banks of BENIN for a construction project. I will be rigged given to you this money to ensure that my donation projectwill geta positive resulte. I want you to accept this because it is a gift from a dying woman and this without asking anything in return. Please answer me quiqly to my email address as follows: brigittemeyer1944 at gmail.com Ms Brigitte MEYER From ldb12d at my.fsu.edu Sat Dec 31 09:11:51 2016 From: ldb12d at my.fsu.edu (Elizabeth) Date: Sat, 31 Dec 2016 01:11:51 -0800 Subject: [Pkg-ganeti-devel] Hello.. Message-ID: Dear, My name is Mrs. Elizabeth murphy I am 63 years old, I am a dying woman who have decided to donate what I have to you/churches/ mosque/ motherless babies/less privileged/widows.I was diagnosed for cancer for about 2 years ago. I have been touched by God to donate from what I have inherited from my late husband to you for good work of God. Please if you are ready to assit me distribute my funds of Twenty million Dollars to charity . kindly reply me to my private email: elizabeth.murphyme2 at gmail.com Elizabeth murphy. From Nmm09c at my.fsu.edu Sat Dec 31 10:52:18 2016 From: Nmm09c at my.fsu.edu (Elizabeth) Date: Sat, 31 Dec 2016 02:52:18 -0800 Subject: [Pkg-ganeti-devel] Hello.. Message-ID: Dear, My name is Mrs. Elizabeth murphy I am 63 years old, I am a dying woman who have decided to donate what I have to you/churches/ mosque/ motherless babies/less privileged/widows.I was diagnosed for cancer for about 2 years ago. I have been touched by God to donate from what I have inherited from my late husband to you for good work of God. Please if you are ready to assit me distribute my funds of Twenty million Dollars to charity . kindly reply me to my private email: elizabeth.murphyme2 at gmail.com Elizabeth murphy. From ftpmaster at ftp-master.debian.org Sat Dec 31 21:02:25 2016 From: ftpmaster at ftp-master.debian.org (Debian FTP Masters) Date: Sat, 31 Dec 2016 21:02:25 +0000 Subject: [Pkg-ganeti-devel] ganeti-instance-debootstrap_0.14-2+deb8u1_amd64.changes ACCEPTED into proposed-updates->stable-new, proposed-updates Message-ID: Accepted: -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 23 Dec 2016 10:48:28 +0200 Source: ganeti-instance-debootstrap Binary: ganeti-instance-debootstrap Architecture: source all Version: 0.14-2+deb8u1 Distribution: jessie Urgency: medium Maintainer: Debian Ganeti Team Changed-By: Apollon Oikonomopoulos Description: ganeti-instance-debootstrap - debootstrap-based instance OS definition for ganeti Closes: 834404 Changes: ganeti-instance-debootstrap (0.14-2+deb8u1) jessie; urgency=medium . * Replace losetup -s with losetup --show (Closes: #834404) Checksums-Sha1: 84fcbc4cb39551fdf460381df53e5fa2a3d352d3 2167 ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 28ccff64027eebe58b70455dad524e818a737a51 4448 ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz 10176ed758ccfc6d71e420137989450c08c3869e 18570 ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb Checksums-Sha256: 1c5e59bae17a68a189be455cc5255583356888a49b7a20f0e91e021f5f10bb15 2167 ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 2b79fa5fce8741c2a90027bc0c06d307492e20f49b5d08e66eb145580700ed64 4448 ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz edeeb8ff53766be147372dee832a27b38834540d5657b19d05a3f3eaa809ea83 18570 ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb Files: c15b4c981107a9cb44c7f10fe4b55fd6 2167 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1.dsc 9636cabd33509e20ee74919446bfdc2b 4448 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1.debian.tar.xz 4942ecc8466112eaf93f8197ad987a41 18570 admin extra ganeti-instance-debootstrap_0.14-2+deb8u1_all.deb -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEPgL9ZlYpWVIRC6uZ9RsYxyAkgiQFAlhe5GIACgkQ9RsYxyAk giRaLxAAjQCHZEaVm5yWdYRyT0vSQFX3Q70j1CsQ1KsH2QoPNPnzUeKzbMuwN+Cu RkIaxhGmfulLjk1L4U+Zs17OXBEwmIFloSuJdNi95B4nTNy74Ji0zetkM9UCaS4E h2MBgqAjglyMZNEScEhV/LdMqh4dFYmCkbRzEqJqzlezhjopGjGgR7t6LMneD735 3RMqh4qXyXrQy/DNpnM958Pm5RmXRgkA7acNUOUz8NefCrhahSxtHIgjD98loV78 6KhgGpKqukPH8WMCf83hPbtWkQHtgQPnAwUT5mE+9vriZxqUqgAFaD0uk62Qu/ql QBs5aZod1d3Zo+jI5bTXm4PWnYEzzkoEzh7+/lrrnp25kcgDW5qGuGwfnoXpxdqj RGWMpuM39RBtVf/hlJrBNL+xKUr7feUE/QoewO46JpmRGzndYivFs11gw7Fok4UV xFZt7a07ySAjcSV599mwJ5xeP8zzcJU598JC+lscBRc16/2vG9W62hd8ASAWAj7W tTFv2Spa4jNCQb/3I3sYkE4FVRtTGAElfEA8I1U38b/ww2BByTVEK6wHtF+lfGio q8D1jSmP471TKZuA/07mlggZeYPsWoFw6lYpm5PgKqdSTQnCO8J10n1y7KC7AvZL G7mujExdXOM0hga1K+XqPx0VXlcUwVFhZDiYEGadOLZiu4xM/+U= =bn+q -----END PGP SIGNATURE----- Thank you for your contribution to Debian. From owner at bugs.debian.org Sat Dec 31 21:03:07 2016 From: owner at bugs.debian.org (Debian Bug Tracking System) Date: Sat, 31 Dec 2016 21:03:07 +0000 Subject: [Pkg-ganeti-devel] Bug#834404: marked as done (ganeti-instance-debootstrap - uses unsupported losetup -s in default config) References: <20160815110528.GA8493@lacehammer.credativ.lan> Message-ID: Your message dated Sat, 31 Dec 2016 21:02:25 +0000 with message-id and subject line Bug#834404: fixed in ganeti-instance-debootstrap 0.14-2+deb8u1 has caused the Debian Bug report #834404, regarding ganeti-instance-debootstrap - uses unsupported losetup -s in default config to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner at bugs.debian.org immediately.) -- 834404: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834404 Debian Bug Tracking System Contact owner at bugs.debian.org with problems -------------- next part -------------- An embedded message was scrubbed... From: Bastian Blank Subject: ganeti-instance-debootstrap - uses unsupported losetup -s in default config Date: Mon, 15 Aug 2016 13:05:28 +0200 Size: 3944 URL: -------------- next part -------------- An embedded message was scrubbed... From: Apollon Oikonomopoulos Subject: Bug#834404: fixed in ganeti-instance-debootstrap 0.14-2+deb8u1 Date: Sat, 31 Dec 2016 21:02:25 +0000 Size: 5502 URL: