From f0a90c4950a0164d2b3fa298c97d480caf62daaa Mon Sep 17 00:00:00 2001 From: laokz Date: Fri, 8 Sep 2023 14:50:00 +0800 Subject: [PATCH] backport upstream patch to fix userproxytest bug (cherry picked from commit 8831295df75d9ff5987ac94712d998bdbd57a6d5) --- ...oxytest-missed-NULL-argument-pointer.patch | 31 +++++++++++++++++++ gssproxy.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch diff --git a/backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch b/backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch new file mode 100644 index 0000000..b0e810d --- /dev/null +++ b/backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch @@ -0,0 +1,31 @@ +From f52e60fad1e202a8f9c06ec6ce8bada69c62c93c Mon Sep 17 00:00:00 2001 +From: Kai Zhang +Date: Wed, 6 Sep 2023 21:41:15 +0800 +Subject: [PATCH] tests: fix userproxytest missed NULL argument pointer + +Execv syscall needs the argument array of pointers must +be terminated by a null pointer, otherwise the garbage +data might break the test. + +Signed-off-by: Kai Zhang +--- + tests/userproxytest.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/userproxytest.c b/tests/userproxytest.c +index d035c8f..8aea41a 100644 +--- a/tests/userproxytest.c ++++ b/tests/userproxytest.c +@@ -17,7 +17,8 @@ char *srv_args[] = { + "-u", "-i", + "-d", "--debug-level=1", + "-s", "./testdir/userproxytest.sock", +- "--idle-timeout=3" ++ "--idle-timeout=3", ++ NULL + }; + + int mock_activation_sockets(void) +-- +2.40.1 + diff --git a/gssproxy.spec b/gssproxy.spec index 97f61fe..53f1b7e 100644 --- a/gssproxy.spec +++ b/gssproxy.spec @@ -7,7 +7,7 @@ Name: gssproxy Version: 0.9.1 -Release: 3 +Release: 4 Summary: GSSAPI Proxy License: MIT URL: https://github.com/gssapi/gssproxy @@ -15,6 +15,7 @@ Source0: https://github.com/gssapi/%{name}/releases/download/v%{version}/%{name} Patch1: backport-Typo-doc-fix.patch Patch2: backport-More-typo-fixes-to-silence-Debian-lintian-typo-in-ma.patch +Patch3: backport-tests-fix-userproxytest-missed-NULL-argument-pointer.patch Requires: krb5 keyutils libverto-module-base libini_config Requires(post): systemd @@ -113,6 +114,9 @@ mkdir -p %{buildroot}%{gpstatedir}/rcache %{_mandir}/man8/gssproxy-mech.8* %changelog +* Fri Sep 8 2023 laokz - 0.9.1-4 +- backport upstream patch to fix userproxytest bug + * Fri Jul 7 2023 yixiangzhike - 0.9.1-3 - enable make check -- Gitee