[Pkg-ganeti-devel] [ganeti] 03/09: Drop dsahostkeypub patches merged upstream

[Apollon Oikonomopoulos]

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

apoikos-guest pushed a commit to branch experimental
in repository ganeti.

commit 91ad58e4322319307935c861c7d5b8d2c897efb5
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Sep 17 15:47:49 2013 +0300

    Drop dsahostkeypub patches merged upstream
---
 ...0001-Mark-the-DSA-host-pubkey-as-optional.patch |   37 --------------------
 ...ove-dsahostkeypub-during-config-downgrade.patch |   32 -----------------
 debian/patches/series                              |    2 --
 3 files changed, 71 deletions(-)

diff --git a/debian/patches/0001-Mark-the-DSA-host-pubkey-as-optional.patch b/debian/patches/0001-Mark-the-DSA-host-pubkey-as-optional.patch
deleted file mode 100644
index 763e18c..0000000
--- a/debian/patches/0001-Mark-the-DSA-host-pubkey-as-optional.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c47f416e37104501ab4e9f4240cf9ff844f5764e Mon Sep 17 00:00:00 2001
-Message-Id: <c47f416e37104501ab4e9f4240cf9ff844f5764e.1378067627.git.apoikos at gmail.com>
-In-Reply-To: <cover.1378067627.git.apoikos at gmail.com>
-References: <cover.1378067627.git.apoikos at gmail.com>
-From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Sun, 1 Sep 2013 23:21:08 +0300
-Subject: [PATCH stable-2.8 1/2] Mark the DSA host pubkey as optional
-
-Commit a9542a4 introduced support for DSA SSH keys. However, the dsahostkeypub
-field added to the config is not marked as optional in the Haskell components.
-As a result, luxid thinks the config file is corrupt and refuses to start. We
-fix this by marking the dsahostkeypub as an optionalField.
-
-This fixes issue 560.
-
-Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
----
- src/Ganeti/Objects.hs |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs
-index 3f5b513..57d6f9e 100644
---- a/src/Ganeti/Objects.hs
-+++ b/src/Ganeti/Objects.hs
-@@ -669,7 +669,8 @@ type UidPool = [(Int, Int)]
- -- * Cluster definitions
- $(buildObject "Cluster" "cluster" $
-   [ simpleField "rsahostkeypub"           [t| String           |]
--  , simpleField "dsahostkeypub"           [t| String           |]
-+  , optionalField $
-+    simpleField "dsahostkeypub"           [t| String           |]
-   , simpleField "highest_used_port"       [t| Int              |]
-   , simpleField "tcpudp_port_pool"        [t| [Int]            |]
-   , simpleField "mac_prefix"              [t| String           |]
--- 
-1.7.10.4
-
diff --git a/debian/patches/0002-Remove-dsahostkeypub-during-config-downgrade.patch b/debian/patches/0002-Remove-dsahostkeypub-during-config-downgrade.patch
deleted file mode 100644
index 3fefbc4..0000000
--- a/debian/patches/0002-Remove-dsahostkeypub-during-config-downgrade.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 41eef0937af2425ecd5316e9057fd61ef6416e06 Mon Sep 17 00:00:00 2001
-Message-Id: <41eef0937af2425ecd5316e9057fd61ef6416e06.1378067627.git.apoikos at gmail.com>
-In-Reply-To: <cover.1378067627.git.apoikos at gmail.com>
-References: <cover.1378067627.git.apoikos at gmail.com>
-From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Sun, 1 Sep 2013 23:27:45 +0300
-Subject: [PATCH stable-2.8 2/2] Remove dsahostkeypub during config downgrade
-
-Remove the newly-added DSA host public key field from the configuration file
-when downgrading to 2.7, if present. Otherwise masterd will refuse to start.
-
-Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
----
- tools/cfgupgrade |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tools/cfgupgrade b/tools/cfgupgrade
-index 14b2685..6a8d5a4 100755
---- a/tools/cfgupgrade
-+++ b/tools/cfgupgrade
-@@ -307,6 +307,8 @@ def DowngradeCluster(config_data):
-   ipolicy = cluster.get("ipolicy", None)
-   if ipolicy:
-     DowngradeIPolicy(ipolicy, "cluster")
-+  if "dsahostkeypub" in cluster:
-+    del cluster["dsahostkeypub"]
- 
- 
- def DowngradeDisk(disk):
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 1aec394..7011cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
-0001-Mark-the-DSA-host-pubkey-as-optional.patch
-0002-Remove-dsahostkeypub-during-config-downgrade.patch

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