summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/lp-1650522-reenable-auto-update.patch20
-rw-r--r--debian/patches/series1
3 files changed, 6 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index 6f5fd83..b8b55d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+walinuxagent (2.1.5-0ubuntu6) zesty; urgency=medium
+
+ * Revert 2.1.5-0ubuntu5, insecure.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 05 Jan 2017 16:31:00 +0000
+
walinuxagent (2.1.5-0ubuntu5) zesty; urgency=medium
* debian/patches/lp-1650522-reenable-auto-update.patch:
diff --git a/debian/patches/lp-1650522-reenable-auto-update.patch b/debian/patches/lp-1650522-reenable-auto-update.patch
deleted file mode 100644
index 576e54c..0000000
--- a/debian/patches/lp-1650522-reenable-auto-update.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: re-enable AutoUpdate at waagent.conf
- After having disabled AutoUpdates it was agreed with Azure that
- the ubuntu package was required to re-enable them by default.
-Author: Jose Vazquez <jose.vazquez@canonical.com>
-Origin: upstream
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1650522
-Forwarded: not-needed
-Last-Update: 2016-12-16
-
-Index: walinuxagent-2.1.5/config/ubuntu/waagent.conf
-===================================================================
---- walinuxagent-2.1.5.orig/config/ubuntu/waagent.conf
-+++ walinuxagent-2.1.5/config/ubuntu/waagent.conf
-@@ -82,5 +82,5 @@ OS.OpensslPath=None
- # OS.EnableRDMA=y
-
- # Enable or disable self-update, default is enabled
--AutoUpdate.Enabled=n
-+AutoUpdate.Enabled=y
- AutoUpdate.GAFamily=Prod
diff --git a/debian/patches/series b/debian/patches/series
index dc77cc2..bc0bd89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ disable_import_test.patch
disable_udev_overrides.patch
lp1623570-adjust-walinuxagent-service-after-and-wants.patch
fix-auto-update.patch
-lp-1650522-reenable-auto-update.patch