[Pkg-ganeti-devel] [ganeti] 06/09: Refresh all patches for 2.11

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 5a5139e5ec2b174036f679e55461f2e6244fb044
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Apr 29 12:56:15 2014 +0300

    Refresh all patches for 2.11
---
 .../0003-Disable-local-checks-during-build.patch       |  2 +-
 debian/patches/cfgupgrade12-remove-old-ssconf.patch    |  2 +-
 debian/patches/pass-ghc-linker-flags.patch             | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0003-Disable-local-checks-during-build.patch b/debian/patches/0003-Disable-local-checks-during-build.patch
index e5f5a4e..cd94986 100644
--- a/debian/patches/0003-Disable-local-checks-during-build.patch
+++ b/debian/patches/0003-Disable-local-checks-during-build.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-07-12
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -3142,7 +3142,7 @@
+@@ -3226,7 +3226,7 @@
  	       exit 1; } >&2
  check-am: all-am
  	$(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS)
diff --git a/debian/patches/cfgupgrade12-remove-old-ssconf.patch b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
index fced23d..46dcc36 100644
--- a/debian/patches/cfgupgrade12-remove-old-ssconf.patch
+++ b/debian/patches/cfgupgrade12-remove-old-ssconf.patch
@@ -8,7 +8,7 @@ Last-Update: 2010-10-24
 +++ b/tools/cfgupgrade12
 @@ -407,6 +407,10 @@
          logging.debug("Writing RAPI certificate to %s", options.RAPI_CERT_FILE)
-         utils.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE)
+         utils.GenerateSelfSignedSslCert(options.RAPI_CERT_FILE, 1)
  
 +      ss_hyp = SsconfName('hypervisor')
 +      if os.path.exists(ss_hyp):
diff --git a/debian/patches/pass-ghc-linker-flags.patch b/debian/patches/pass-ghc-linker-flags.patch
index 17696f6..6536cda 100644
--- a/debian/patches/pass-ghc-linker-flags.patch
+++ b/debian/patches/pass-ghc-linker-flags.patch
@@ -6,11 +6,13 @@ Forwarded: no
 Last-Update: 2013-11-01
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -904,6 +904,7 @@
- 	-O -Wall -Werror -isrc \
- 	-fwarn-monomorphism-restriction \
- 	-fwarn-tabs \
-+        -optl -Wl,-z,relro -optl -Wl,--as-needed \
- 	$(GHC_BYVERSION_FLAGS)
- 
- 
+@@ -926,7 +926,8 @@
+ HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_DEFAULT_PROGS)) src/mon-collector.hs
+ HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
+ HFLAGS = -O -Wall -Werror -isrc -fwarn-monomorphism-restriction \
+-	-fwarn-tabs $(GHC_BYVERSION_FLAGS) $(am__append_5) \
++	-fwarn-tabs -optl -Wl,-z,relro -optl -Wl,--as-needed \
++	$(GHC_BYVERSION_FLAGS) $(am__append_5) \
+ 	$(am__append_6) $(am__append_7)
+ HTEST_SUFFIX = hpc
+ HTEST_FLAGS = $(HFLAGS) -fhpc -itest/hs \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git