diff options
| author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-01-05 16:31:00 +0000 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2017-01-05 16:33:14 +0000 |
| commit | a05019d9343d0fde153d75a8e61fb6f99d1d3ff3 (patch) | |
| tree | 954c42fba88061279fa01df428a734b1d876efef | |
| parent | 3dabfff02300b37853dcef1172415b8fc7c090de (diff) | |
| parent | e2553fc62549954e6e1ceb65eaa7b3f6bd65c086 (diff) | |
| download | vyos-walinuxagent-a05019d9343d0fde153d75a8e61fb6f99d1d3ff3.tar.gz vyos-walinuxagent-a05019d9343d0fde153d75a8e61fb6f99d1d3ff3.zip | |
Import patches-applied version 2.1.5-0ubuntu6 to applied/ubuntu/zesty-proposed
Imported using git-ubuntu import.
Changelog parent: 3dabfff02300b37853dcef1172415b8fc7c090de
Unapplied parent: e2553fc62549954e6e1ceb65eaa7b3f6bd65c086
New changelog entries:
* Revert 2.1.5-0ubuntu5, insecure.
| -rw-r--r-- | config/ubuntu/waagent.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/lp-1650522-reenable-auto-update.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 7 insertions, 22 deletions
diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf index ca68044..cb31824 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -82,5 +82,5 @@ OS.OpensslPath=None # OS.EnableRDMA=y # Enable or disable self-update, default is enabled -AutoUpdate.Enabled=y +AutoUpdate.Enabled=n AutoUpdate.GAFamily=Prod 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 |