Merge ~chris.macnaughton/ubuntu/+source/nfs-ganesha:ubuntu/jammy into ubuntu/+source/nfs-ganesha:ubuntu/jammy-devel

[Chris MacNaughton]

[James Page (james-page)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index db1fdd6..8b1697d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nfs-ganesha (3.5-1ubuntu1) jammy; urgency=medium
+
+  * d/p/fix-size-issue-on-arm64.patch: Cherry-pick upstream patch to
+    resolve size issue on ARM64 (LP: #1994699).
+
+ -- Chris MacNaughton <[e-mail]>  Wed, 26 Oct 2022 16:16:57 +0000
+
 nfs-ganesha (3.5-1build1) jammy; urgency=medium
 
   * No-change rebuild with new libnfsidmap from src:nfs-utils
diff --git a/debian/patches/fix-size-issue-on-arm64.patch b/debian/patches/fix-size-issue-on-arm64.patch
new file mode 100644
index 0000000..94fe519
--- /dev/null
+++ b/debian/patches/fix-size-issue-on-arm64.patch
@@ -0,0 +1,22 @@
+From: Chris MacNaughton
+Description:  ganesha-rados-grace: use int type for getopt retval
+ the implicit conversion of a -1 retval from getopt is interpreted as a
+ value of 255 on an aarch64 platform, which then causes the default case
+ of the switch statement to always print a usage message and exit.
+
+Origin: upstream, https://github.com/nfs-ganesha/nfs-ganesha/commit/3db6bc0cb75fa85ffcebeda1276d195915b84579
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nfs-ganesha/+bug/1994699
+
+Index: nfs-ganesha-3.5/src/tools/ganesha-rados-grace.c
+===================================================================
+--- nfs-ganesha-3.5.orig/src/tools/ganesha-rados-grace.c
++++ nfs-ganesha-3.5/src/tools/ganesha-rados-grace.c
+@@ -108,7 +108,7 @@ int main(int argc, char * const *argv)
+ 	char			*pool = DEFAULT_RADOS_GRACE_POOL;
+ 	char			*oid = DEFAULT_RADOS_GRACE_OID;
+ 	char			*ns = NULL;
+-	char			c;
++	int			c;
+ 	const char * const	*nodeids;
+ 	bool			do_add;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 50ac51f..ad8c5e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ CMakeLists-LIB_INSTALL_DIR.patch
 add-latomic-linking-as-needed.patch
 referral-xattr-refresh.patch
 spelling.patch
+fix-size-issue-on-arm64.patch