Merge ~mitchdz/ubuntu/+source/ec2-hibinit-agent:fix-locale-and-quotes-mantic into ubuntu/+source/ec2-hibinit-agent:ubuntu/devel

[Mitchell Dzurick]

PPA: https://launchpad.net/~mitchdz/+archive/ubuntu/ec2-hibinit-agent-locale-and-quotes-fix

[Utkarsh Gupta (utkarsh)]

Hey, thanks for this! It looks good and I've uploaded to Mantic:

$ dput ubuntu ../ec2-hibinit-agent_1.0.0-0ubuntu15_source.changes
Checking signature on .changes
gpg: ../ec2-hibinit-agent_1.0.0-0ubuntu15_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../ec2-hibinit-agent_1.0.0-0ubuntu15.dsc: Valid signature from 823E967606C34B96
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu15.dsc: done.
  Uploading ec2-hibinit-agent_1.0.0.orig.tar.gz: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu15.debian.tar.xz: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu15_source.buildinfo: done.
  Uploading ec2-hibinit-agent_1.0.0-0ubuntu15_source.changes: done.
Successfully uploaded packages.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e3aaae8..0aa68c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ec2-hibinit-agent (1.0.0-0ubuntu15) mantic; urgency=medium
+
+    * debian/patches/lp2023924-remove-quotes-from-state-dir.patch: fixes
+      an issue where a weird directory would be created in root
+      (LP: #2023924)
+    * debian/patches/lp2024505-fix-locale-issue.patch:  fixes an issue where
+      certain locales can cause an error when trying to decode the output of
+      `df -P` (LP: #2024505)
+
+ -- Mitchell Dzurick <[e-mail]>  Tue, 20 Jun 2023 17:01:17 -0700
+
 ec2-hibinit-agent (1.0.0-0ubuntu14) mantic; urgency=medium
 
    * d/p/lp1941785-Add-support-for-IMDSv2.patch: add IMDSv2 support
diff --git a/debian/patches/lp2023924-remove-quotes-from-state-dir.patch b/debian/patches/lp2023924-remove-quotes-from-state-dir.patch
new file mode 100644
index 0000000..d178d21
--- /dev/null
+++ b/debian/patches/lp2023924-remove-quotes-from-state-dir.patch
@@ -0,0 +1,19 @@
+Description: Remove quotes in config file for state_dir value
+It creates strange directory /"
+Author: Anchal Agarwal <[e-mail]>
+Origin: backport, https://github.com/aws/amazon-ec2-hibinit-agent/commit/d87d6365009f1663247fd8595b487c59d9b121f1
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2023924
+Last-Update: 2023-06-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/hibinit-config.cfg
++++ b/etc/hibinit-config.cfg
+@@ -12,7 +12,7 @@
+ touch-swap = False
+ 
+ # Location where to create any state files
+-state-dir = "/var/lib/hibinit-agent"
++state-dir = /var/lib/hibinit-agent
+ 
+ [swap]
+ # If there's no swap then we create it to be equal to the specified
diff --git a/debian/patches/lp2024505-fix-locale-issue.patch b/debian/patches/lp2024505-fix-locale-issue.patch
new file mode 100644
index 0000000..15a0a0d
--- /dev/null
+++ b/debian/patches/lp2024505-fix-locale-issue.patch
@@ -0,0 +1,18 @@
+Description: Change encoding to use the system locale instead of ascii.
+Author: einynot <[e-mail]>
+Origin: backport, https://github.com/aws/amazon-ec2-hibinit-agent/commit/2392e860c7a75c2b61baef749bb90e79a2a3e81e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2024505
+Last-Update: 2023-06-20
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/agent/hibinit-agent
++++ b/agent/hibinit-agent
+@@ -145,7 +145,7 @@
+ 
+ def find_device_for_file(filename):
+     # Find the mount point for the swap file ('df -P /swap')
+-    df_out = check_output(['df', '-P', filename]).decode('ascii')
++    df_out = check_output(['df', '-P', filename]).decode(sys.getfilesystemencoding())
+     dev_str = df_out.split("\n")[1].split()[0]
+     return dev_str
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 043841d..0dce030 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@ detect-hibernate-cmd-by-default.patch
 lp1968805-Swapon-with-maximum-priority-before-hibernation.patch
 fix-setuptools-package-discovery.patch
 lp1941785-Add-support-for-IMDSv2.patch
+lp2023924-remove-quotes-from-state-dir.patch
+lp2024505-fix-locale-issue.patch