Bug#990390: prepproval: unblock: nfs-utils/1:1.3.4-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: carnil@debian.org,883194@bugs.debian.org,dparsons@debian.org
Hi Release team,
Please unblock package nfs-utils, or rather this is a pre-approval
request for it.
It was requested that we fix #883194 for python2 removal for the
nfs-utils package. I'm including as well a longstanding resource leak
fix (#513284).
[ Reason ]
Main reason is the python2 -> python3 switch, allowing to have systems
without the python2 interpreter to be installed.
[ Impact ]
Systems will keep the python binary package around and so the
python2.7 interpreter.
[ Tests ]
None specifically. We take the switch from upstream and switch the
recommentes from python to python3.
[ Risks ]
Low, user have tested the python3 compatiblity according to the
#883194 buglog. The patc hfor #513284 was upstreamed and applied
upstream.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
None
Okay to upload?
unblock nfs-utils/1:1.3.4-6
Regards,
Salvatore
diff -Nru nfs-utils-1.3.4/debian/changelog nfs-utils-1.3.4/debian/changelog
--- nfs-utils-1.3.4/debian/changelog 2021-03-09 17:17:42.000000000 +0100
+++ nfs-utils-1.3.4/debian/changelog 2021-06-28 09:15:06.000000000 +0200
@@ -1,3 +1,12 @@
+nfs-utils (1:1.3.4-6) unstable; urgency=medium
+
+ * mountstats: Remove a shebang
+ * Convert remaining python scripts to python3 (Closes: #883194)
+ * debian/control: Switch Recommends from python to python3
+ * Removed a resource leak from mountd/fsloc.c (Closes: #513284)
+
+ -- Salvatore Bonaccorso <carnil@debian.org> Mon, 28 Jun 2021 09:15:06 +0200
+
nfs-utils (1:1.3.4-5) unstable; urgency=medium
[ Felix Lechner ]
diff -Nru nfs-utils-1.3.4/debian/control nfs-utils-1.3.4/debian/control
--- nfs-utils-1.3.4/debian/control 2021-03-09 17:17:42.000000000 +0100
+++ nfs-utils-1.3.4/debian/control 2021-06-28 09:14:54.000000000 +0200
@@ -31,7 +31,7 @@
Package: nfs-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), keyutils
-Recommends: python
+Recommends: python3
Suggests: open-iscsi, watchdog
Provides: nfs-client
Conflicts: nfs-client
diff -Nru nfs-utils-1.3.4/debian/patches/Convert-remaining-python-scripts-to-python3.patch nfs-utils-1.3.4/debian/patches/Convert-remaining-python-scripts-to-python3.patch
--- nfs-utils-1.3.4/debian/patches/Convert-remaining-python-scripts-to-python3.patch 1970-01-01 01:00:00.000000000 +0100
+++ nfs-utils-1.3.4/debian/patches/Convert-remaining-python-scripts-to-python3.patch 2021-06-28 09:14:54.000000000 +0200
@@ -0,0 +1,44 @@
+From: "Signed-off-by: NeilBrown" <neilb@suse.de>
+Date: Mon, 31 Aug 2020 10:48:04 -0400
+Subject: Convert remaining python scripts to python3
+Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=d1683f356bd920d93f2db007902b2c46f97a2e49
+Bug-Debian: https://bugs.debian.org/883194
+
+nfs-utils contains 4 python scripts, two request
+ /usr/bin/python3
+in their shebang line, two request
+ /usr/bin/python
+
+Those latter two run perfectly well with python3 and as python2 is on the
+way out, change them so they requrest /usr/bin/python3.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ tools/mountstats/mountstats.py | 2 +-
+ tools/nfs-iostat/nfs-iostat.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
+index 1054f698c8e3..00adc96bafeb 100755
+--- a/tools/mountstats/mountstats.py
++++ b/tools/mountstats/mountstats.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- python-mode -*-
+ """Parse /proc/self/mountstats and display it in human readable form
+ """
+diff --git a/tools/nfs-iostat/nfs-iostat.py b/tools/nfs-iostat/nfs-iostat.py
+index 50fd6a92977b..4f5e8a664ae8 100755
+--- a/tools/nfs-iostat/nfs-iostat.py
++++ b/tools/nfs-iostat/nfs-iostat.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # -*- python-mode -*-
+ """Emulate iostat for NFS mount points using /proc/self/mountstats
+ """
+--
+2.32.0
+
diff -Nru nfs-utils-1.3.4/debian/patches/Removed-a-resource-leak-from-mountd-fsloc.c.patch nfs-utils-1.3.4/debian/patches/Removed-a-resource-leak-from-mountd-fsloc.c.patch
--- nfs-utils-1.3.4/debian/patches/Removed-a-resource-leak-from-mountd-fsloc.c.patch 1970-01-01 01:00:00.000000000 +0100
+++ nfs-utils-1.3.4/debian/patches/Removed-a-resource-leak-from-mountd-fsloc.c.patch 2021-06-28 09:14:54.000000000 +0200
@@ -0,0 +1,29 @@
+From: Steve Dickson <steved@redhat.com>
+Date: Fri, 26 Apr 2019 13:40:54 -0400
+Subject: Removed a resource leak from mountd/fsloc.c
+Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=26b84f73adc2ff9011bea307c47a4c0cdf4a3031
+Bug-Debian: https://bugs.debian.org/513284
+
+mountd/fsloc.c:97: overwrite_var: Overwriting "mp" in
+ "mp = calloc(1UL, 16UL)" leaks the storage that "mp" points to.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/mountd/fsloc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c
+index bc737d191cf8..cf42944fa9a6 100644
+--- a/utils/mountd/fsloc.c
++++ b/utils/mountd/fsloc.c
+@@ -102,6 +102,7 @@ static struct servers *parse_list(char **list)
+ cp = strchr(list[i], '@');
+ if ((!cp) || list[i][0] != '/') {
+ xlog(L_WARNING, "invalid entry '%s'", list[i]);
++ free(mp);
+ continue; /* XXX Need better error handling */
+ }
+ res->h_mp[i] = mp;
+--
+2.27.0
+
diff -Nru nfs-utils-1.3.4/debian/patches/mountstats-Remove-a-shebang.patch nfs-utils-1.3.4/debian/patches/mountstats-Remove-a-shebang.patch
--- nfs-utils-1.3.4/debian/patches/mountstats-Remove-a-shebang.patch 1970-01-01 01:00:00.000000000 +0100
+++ nfs-utils-1.3.4/debian/patches/mountstats-Remove-a-shebang.patch 2021-06-28 09:14:54.000000000 +0200
@@ -0,0 +1,26 @@
+From: Steve Dickson <steved@redhat.com>
+Date: Thu, 27 Jul 2017 10:35:55 -0400
+Subject: mountstats: Remove a shebang
+Origin: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=caa59a30b78dedea99a2317da95bb86810360645
+
+There might be an issue that the script is executed with unwanted
+version of <lang>.
+
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ tools/mountstats/mountstats.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/mountstats/mountstats.py b/tools/mountstats/mountstats.py
+index 88ccdae78c9f..a68d70225769 100644
+--- a/tools/mountstats/mountstats.py
++++ b/tools/mountstats/mountstats.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # -*- python-mode -*-
+ """Parse /proc/self/mountstats and display it in human readable form
+ """
+--
+2.32.0
+
diff -Nru nfs-utils-1.3.4/debian/patches/series nfs-utils-1.3.4/debian/patches/series
--- nfs-utils-1.3.4/debian/patches/series 2021-03-09 17:17:42.000000000 +0100
+++ nfs-utils-1.3.4/debian/patches/series 2021-06-28 09:14:54.000000000 +0200
@@ -18,3 +18,6 @@
nfsiostat-replace-list-reserved-word.patch
statd-take-user-id-from-var-lib-nfs-sm.patch
Allow-compilation-to-succeed-with-fno-common.patch
+mountstats-Remove-a-shebang.patch
+Convert-remaining-python-scripts-to-python3.patch
+Removed-a-resource-leak-from-mountd-fsloc.c.patch
Reply to: