!37 [sync] PR-36: deal with socket_wrapper splitting

From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen

backport-More-typo-fixes-to-silence-Debian-lintian-typo-in-ma.patch

@@ -1,77 +0,0 @@
-From 159794c918c2e2c0e3d7a1d1a4feadf3151ebc80 Mon Sep 17 00:00:00 2001
-From: Simon Josefsson <simon@josefsson.org>
-Date: Fri, 16 Sep 2022 16:22:25 +0200
-Subject: [PATCH] More typo fixes to silence Debian lintian
- typo-in-manual-page.
-
-Signed-off-by: Simon Josefsson <simon@josefsson.org>
----
- man/gssproxy-mech.8.xml.in | 4 ++--
- man/gssproxy.conf.5.xml    | 8 ++++----
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/man/gssproxy-mech.8.xml.in b/man/gssproxy-mech.8.xml.in
-index 6be38f9..87e5d8e 100644
---- a/man/gssproxy-mech.8.xml.in
-+++ b/man/gssproxy-mech.8.xml.in
-@@ -36,7 +36,7 @@
-             <filename>/etc/gss/mech</filename> configuration file.
-         </para>
-         <para>
--            The interposer plugin allows to intercept the entire GSSAPI
-+            The interposer plugin allows one to intercept the entire GSSAPI
-             communication and detour to the <command>gssproxy</command>
-             daemon. When the interposer plugin is installed two other
-             conditions need to be met in order to activate it:
-@@ -112,7 +112,7 @@
-                 <term>REMOTE_ONLY</term>
-                 <listitem>
-                     <para>This setting is currently not fully implemented and
--                        therefor not supported.
-+                        therefore not supported.
-                     </para>
-                 </listitem>
-             </varlistentry>
-diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml
-index 261c9f6..0e9b3b1 100644
---- a/man/gssproxy.conf.5.xml
-+++ b/man/gssproxy.conf.5.xml
-@@ -98,7 +98,7 @@
-                               option may cause a service definition to mask
-                               access to following services. To avoid issues
-                               change the order of services in your
--                              configuation file so that services with
-+                              configuration file so that services with
-                               allow_any_uid enabled are listed last, or define
-                               a custom socket for other services.</para>
-                         <para>Default: false</para>
-@@ -146,7 +146,7 @@
-                 <varlistentry>
-                     <term>cred_store (string)</term>
-                     <listitem>
--                        <para>This parameter allows to control in which way gssproxy should use the cred_store interface provided by GSSAPI. The parameter can be defined multiple times per service.</para>
-+                        <para>This parameter allows one to control in which way gssproxy should use the cred_store interface provided by GSSAPI. The parameter can be defined multiple times per service.</para>
-                         <para>The syntax of the cred_store parameter is as
-                             follows:
-                             <![CDATA[cred_store = <cred_store_option>:<cred_store_value>]]></para>
-@@ -272,7 +272,7 @@
-                             flag name or value.
-                         </para>
-                         <para>
--                            NOTE: Because often gssproxy is used to withold
-+                            NOTE: Because often gssproxy is used to withhold
-                             access to credentials the Delegate Flag is filtered
-                             by default. To allow a service to delegate
-                             credentials use the first example below.
-@@ -381,7 +381,7 @@
-                 <varlistentry>
-                     <term>socket (string)</term>
-                     <listitem>
--                        <para>This parameter allows to create a per-service socket file over which gssproxy client and server components communicate.
-+                        <para>This parameter allows one to create a per-service socket file over which gssproxy client and server components communicate.
-                         </para>
-                         <para>When this parameter is not set, gssproxy will
-                             use a compiled-in default.</para>
--- 
-2.27.0
-

backport-Remove-from-the-correct-list.patch

@@ -0,0 +1,28 @@
+From a9f3b002da2405eb93876610608f968d8108a2b6 Mon Sep 17 00:00:00 2001
+From: Simo Sorce <simo@redhat.com>
+Date: Mon, 11 Mar 2024 17:17:00 -0400
+Subject: [PATCH] Remove from the correct list
+
+Fixes #92
+
+Signed-off-by: Simo Sorce <simo@redhat.com>
+---
+ src/gp_workers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gp_workers.c b/src/gp_workers.c
+index 78e8347..0519777 100644
+--- a/src/gp_workers.c
++++ b/src/gp_workers.c
+@@ -189,7 +189,7 @@ void gp_workers_free(struct gp_workers *w)
+     while (w->busy_list) {
+         /* pick threads one by one */
+         t = w->busy_list;
+-        LIST_DEL(w->free_list, t);
++        LIST_DEL(w->busy_list, t);
+ 
+         /* wake up threads, then join them */
+         /* ======> COND_MUTEX */
+-- 
+2.33.0
+

backport-Typo-doc-fix.patch

@@ -1,28 +0,0 @@
-From 090aa9442c141e967e6e86455d50bccd2142ab0a Mon Sep 17 00:00:00 2001
-From: Simon Josefsson <simon@josefsson.org>
-Date: Tue, 13 Sep 2022 17:12:51 +0200
-Subject: [PATCH] Typo doc fix.
-
-Silences Debian lintian typo-in-manual-page.
-
-Signed-off-by: Simon Josefsson <simon@josefsson.org>
----
- man/gssproxy.conf.5.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml
-index e778583..261c9f6 100644
---- a/man/gssproxy.conf.5.xml
-+++ b/man/gssproxy.conf.5.xml
-@@ -186,7 +186,7 @@
-                 <varlistentry>
-                     <term>cred_usage (string)</term>
-                     <listitem>
--                        <para>Allow to restrict the kind of operations permitted for this service.</para>
-+                        <para>Allow one to restrict the kind of operations permitted for this service.</para>
-                         <para>The allowed options are: initiate, accept, both</para>
-                         <para>Default: cred_usage = both </para>
-                     </listitem>
--- 
-2.27.0
-

gssproxy.spec

@@ -1,22 +1,22 @@
+%bcond_without  enable_check
+%bcond_with     use_valgrind
+
 %global servicename gssproxy
 %global pubconfpath %{_sysconfdir}/gssproxy
 %global gpstatedir %{_localstatedir}/lib/gssproxy
 
 Name:		gssproxy
-Version:	0.9.1
-Release:	2
+Version:	0.9.2
+Release:	3
 Summary:	GSSAPI Proxy
 License:	MIT
 URL:		https://github.com/gssapi/gssproxy
 Source0:	https://github.com/gssapi/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
-Patch1:    backport-Typo-doc-fix.patch
-Patch2:    backport-More-typo-fixes-to-silence-Debian-lintian-typo-in-ma.patch
+Patch1:    backport-Remove-from-the-correct-list.patch
 
 Requires: krb5 keyutils libverto-module-base libini_config
-Requires(post): systemd
-Requires(preun): systemd
-Requires(postun): systemd
+%{?systemd_requires}
 
 Conflicts: selinux-policy < 3.13.1-283.5
 
@@ -25,13 +25,18 @@ BuildRequires: gettext-devel pkgconfig krb5-devel >= 1.12.0 libselinux-devel key
 # for gssuserproxy.service --idle-timeout
 BuildRequires: systemd-devel
 
+%if %{with enable_check}
+# for make check
+BuildRequires: krb5-client krb5-server openldap-clients openldap-servers pkgconfig(socket_wrapper) nss_wrapper
+%if %{with use_valgrind}
+BuildRequires: valgrind glibc-debuginfo glibc
+%endif
+%endif
+
 %description
 This is a proxy for GSSAPI which deals with credential handling
 
-%package        help
-Summary:        Help files for %{name}
-%description    help
-Help files for %{name}.
+%package_help
 
 %prep
 %autosetup -n  %{name}-%{version} -p1
@@ -45,11 +50,10 @@ autoreconf -f -i
     --disable-rpath \
     --with-gpp-default-behavior=REMOTE_FIRST
 
-make %{?_smp_mflags} all
+%make_build
 make test_proxymech
 
 %install
-rm -rf %{buildroot}
 %make_install
 rm -f %{buildroot}%{_libdir}/gssproxy/proxymech.la
 install -d -m755 %{buildroot}%{_sysconfdir}/gssproxy
@@ -59,6 +63,17 @@ install -D -m644 examples/proxymech.conf %{buildroot}%{_sysconfdir}/gss/mech.d/p
 install -m644 examples/24-nfs-server.conf %{buildroot}%{_sysconfdir}/gssproxy/24-nfs-server.conf
 mkdir -p %{buildroot}%{gpstatedir}/rcache
 
+%check
+%if %{with enable_check}
+# set timeout 60s
+# enough time to execute
+%if %{with use_valgrind}
+%make_build check CHECKARGS=' --timeout=60'
+%else
+%make_build check CHECKARGS=' --timeout=60 --valgrind-cmd="" '
+%endif
+%endif
+
 %post
 %systemd_post gssproxy.service
 
@@ -91,6 +106,21 @@ mkdir -p %{buildroot}%{gpstatedir}/rcache
 %{_mandir}/man8/gssproxy-mech.8*
 
 %changelog
+* Sat Jan 25 2025 Funda Wang <fundawang@yeah.net> - 0.9.2-3
+- deal with socket_wrapper splitting
+
+* Tue Mar 12 2024 yixiangzhike <yixiangzhike007@163.com> - 0.9.2-2
+- backport upstream patch to remove node from the correct list
+
+* Fri Dec 22 2023 yixiangzhike <yixiangzhike007@163.com> - 0.9.2-1
+- update to 0.9.2
+
+* Fri Sep 8 2023 laokz <zhangkai@iscas.ac.cn> - 0.9.1-4
+- backport upstream patch to fix userproxytest bug
+
+* Fri Jul 7 2023 yixiangzhike <yixiangzhike007@163.com> - 0.9.1-3
+- enable make check
+
 * Mon Apr 10 2023 yixiangzhike <yixiangzhike007@163.com> - 0.9.1-2
 - add BuildRequires:systemd-devel for option idle-timeout