diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2013-07-23 09:43:40 -0600 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-07-23 16:43:22 +0000 |
| commit | 12520fe4c648baf8d1cf7e0bec49146d7d380144 (patch) | |
| tree | d5bbdce7d747c49de781e624a177aec0e770b2e0 | |
| parent | 474773864dfda468f9e344ecdd0d5abdcdefb60d (diff) | |
| parent | f94af20dd768db422f095b57c200a47e9632ddc0 (diff) | |
| download | vyos-walinuxagent-12520fe4c648baf8d1cf7e0bec49146d7d380144.tar.gz vyos-walinuxagent-12520fe4c648baf8d1cf7e0bec49146d7d380144.zip | |
Import patches-applied version 1.3.2-0ubuntu4 to applied/ubuntu/saucy-proposed
Imported using git-ubuntu import.
Changelog parent: 474773864dfda468f9e344ecdd0d5abdcdefb60d
Unapplied parent: f94af20dd768db422f095b57c200a47e9632ddc0
New changelog entries:
* debian/patches/shadow_permissions.patch: apply the appropriate
permissions to /etc/shadow (LP: #1188820).
* debian/patches/verbose_logging.patch: use the appropriate log
faculty when using verbose logging (LP: #1193404).
* Mark bugs fixed in 1.3.2-0ubuntu3:
debian/patches/config_for_cloud-init.patch:
- fix for race condition between cloud-init and waagent (LP: #1195524)
- mount resource disk on /mnt (LP: #1193380)
- move walinuxagent init functionality to cloud-init (LP: #1037723)
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rw-r--r-- | debian/patches/shadow_permissions.patch | 15 | ||||
| -rw-r--r-- | debian/patches/verbose_logging.patch | 16 | ||||
| -rw-r--r-- | waagent | 4 |
5 files changed, 49 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 62edfb2..68ace8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +walinuxagent (1.3.2-0ubuntu4) saucy; urgency=low + + * debian/patches/shadow_permissions.patch: apply the appropriate + permissions to /etc/shadow (LP: #1188820). + * debian/patches/verbose_logging.patch: use the appropriate log + faculty when using verbose logging (LP: #1193404). + * Mark bugs fixed in 1.3.2-0ubuntu3: + debian/patches/config_for_cloud-init.patch: + - fix for race condition between cloud-init and waagent (LP: #1195524) + - mount resource disk on /mnt (LP: #1193380) + - move walinuxagent init functionality to cloud-init (LP: #1037723) + + -- Ben Howard <ben.howard@ubuntu.com> Tue, 23 Jul 2013 09:43:40 -0600 + walinuxagent (1.3.2-0ubuntu3) saucy; urgency=low [ Ben Howard ] diff --git a/debian/patches/series b/debian/patches/series index 939d7ef..d355c91 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ no_udev_rule_removal.patch config_for_cloud-init.patch +verbose_logging.patch +shadow_permissions.patch diff --git a/debian/patches/shadow_permissions.patch b/debian/patches/shadow_permissions.patch new file mode 100644 index 0000000..d6731e4 --- /dev/null +++ b/debian/patches/shadow_permissions.patch @@ -0,0 +1,15 @@ +Description: Use the proper permissions on /etc/shadow (LP: #1188820). +Bug: https://bugs.launchpad.net/ubuntu/+source/walinuxagent/+bug/1188820 +Author: Ben Howard +Last-Update: 2013-07-23 +--- a/waagent ++++ b/waagent +@@ -2423,7 +2423,7 @@ def DeleteRootPassword(): + ReplaceFileContentsAtomic(filepath, "root:*LOCK*:14600::::::\n" + "\n".join(filter(lambda a: not + a.startswith("root:"), + GetFileContents(filepath).split('\n')))) +- os.chmod(filepath, 0000) ++ os.chmod(filepath, 0640) + if IsRedHat(): + Run("chcon system_u:object_r:shadow_t:s0 " + filepath) + Log("Root password deleted.") diff --git a/debian/patches/verbose_logging.patch b/debian/patches/verbose_logging.patch new file mode 100644 index 0000000..23422eb --- /dev/null +++ b/debian/patches/verbose_logging.patch @@ -0,0 +1,16 @@ +Description: Use the proper log faculty for verbose logging (LP: #1193404). +Bug: https://bugs.launchpad.net/ubuntu/+source/walinuxagent/+bug/1193404 +Author: Ben Howard +Last-Update: 2013-07-23 + +--- a/waagent ++++ b/waagent +@@ -456,7 +456,7 @@ def NoLog(message): + + def LogIfVerbose(message): + if Verbose == True: +- LogFileWithPrefix('',message) ++ LogWithPrefix('',message) + + def LogWithPrefixIfVerbose(prefix, message): + if Verbose == True: @@ -456,7 +456,7 @@ def NoLog(message): def LogIfVerbose(message): if Verbose == True: - LogFileWithPrefix('',message) + LogWithPrefix('',message) def LogWithPrefixIfVerbose(prefix, message): if Verbose == True: @@ -2423,7 +2423,7 @@ def DeleteRootPassword(): ReplaceFileContentsAtomic(filepath, "root:*LOCK*:14600::::::\n" + "\n".join(filter(lambda a: not a.startswith("root:"), GetFileContents(filepath).split('\n')))) - os.chmod(filepath, 0000) + os.chmod(filepath, 0640) if IsRedHat(): Run("chcon system_u:object_r:shadow_t:s0 " + filepath) Log("Root password deleted.") |