!13 修复 clang 构建错误

From: @jammyjellyfish Reviewed-by: @wang--ge, @wk333 Signed-off-by: @wang--ge, @wk333
Fix clang build error
2023-05-26 07:24:31 +00:00 · 2023-04-21 16:52:53 +08:00 · 2023-02-06 06:48:52 +00:00 · 2023-02-06 11:20:12 +08:00 · 2021-09-11 03:31:19 +00:00 · 2021-09-11 11:04:10 +08:00
4 changed files with 23 additions and 34 deletions
--- a/Don-t-free-soptions-while-it-is-still-needed.patch
+++ b/Don-t-free-soptions-while-it-is-still-needed.patch
@ -1,27 +0,0 @@
 From c5270bde4dab84f18c347e82376ef00733865247 Mon Sep 17 00:00:00 2001
 From: Rob Crittenden <rcritten@redhat.com>
 Date: Jul 01 2020 15:58:11 +0000
 Subject: Don't free soptions while it is still needed
 Introduced in fbcf03dd44007a9b231e9396cc418a00e1a4b49a trying
 to avoid leaking soptions and aoptions.
 https://pagure.io/certmonger/issue/163
 Signed-off-by: Rob Crittenden <rcritten@redhat.com>
 ---
 diff --git a/src/dogtag.c b/src/dogtag.c
 index 91c9c58..faf81f9 100644
 --- a/src/dogtag.c
 +++ b/src/dogtag.c
@@ -579,7 +579,6 @@ main(int argc, const char **argv)
 				pin = NULL;
 			}
 		}
 -		free(soptions);
 		/* Add client creds. */
 		if (uid != NULL) {
 			uid = cm_submit_u_url_encode(uid);
--- a/certmonger-certmonger-0.79.11.tar.gz
+++ b/certmonger-certmonger-0.79.11.tar.gz
--- a/certmonger-certmonger-0.79.15.tar.gz
+++ b/certmonger-certmonger-0.79.15.tar.gz
--- a/certmonger.spec
+++ b/certmonger.spec
@ -1,19 +1,18 @@
 Name:                   certmonger
-Version:                0.79.11
+Version:                0.79.15
-Release:                1
+Release:                2
 Summary:                Certificate status monitor and PKI enrollment client
 License:                GPLv3+
 URL:                    http://pagure.io/certmonger/
 Source0:                https://pagure.io/certmonger/archive/certmonger-%{version}/certmonger-certmonger-%{version}.tar.gz
 Patch0001:              Don-t-free-soptions-while-it-is-still-needed.patch
 BuildRequires:          autoconf automake gettext-devel gcc openldap-devel krb5-devel
 BuildRequires:          libidn2-devel dbus-devel nspr-devel nss-devel openssl-devel
 BuildRequires:          libuuid-devel libtalloc-devel libtevent-devel libcurl-devel
 BuildRequires:          libxml2-devel xmlrpc-c-devel systemd-units diffutils expect
 BuildRequires:          nss-tools openssl /usr/bin/dbus-launch /usr/bin/dos2unix
-BuildRequires:          /usr/bin/unix2dos /usr/bin/which python2-dbus popt-devel
+BuildRequires:          /usr/bin/unix2dos /usr/bin/which python3-dbus popt-devel
 BuildRequires:          jansson jansson-devel
 Requires:               dbus
 Requires(post):         %{_bindir}/dbus-send systemd-units
 Requires(preun):        systemd-units dbus sed
@ -26,15 +25,17 @@ system enrolled with a certificate authority (CA) and keeping it enrolled.
 %package help
 Summary:             Documentation for help using certmonger
 provides:            certmonger = %{version}-%{release}
 %description help
 This package provides docs for user of certmonger.
 %prep
-%autosetup -n certmonger-certmonger-%{version} -p1 -S git
+%autosetup -n certmonger-certmonger-%{version} -p1
 %build
 %if "%toolchain" == "clang"
    CFLAGS="$CFLAGS -Wno-error=int-conversion"
 %endif
 autoreconf -i -f
 %configure \
    --enable-systemd --enable-tmpfiles --with-homedir=/var/run/certmonger \
@ -109,6 +110,21 @@ fi
 %{_mandir}/man*/*
 %changelog
 * Fri Apr 21 2023 jammyjellyfish <jammyjellyfish255@outlook.com> - 0.79.15-2
 - Fix clang build error
 * Mon Feb 06 2023 Ge Wang<wangge20@h-partners.com> -0.79.15-1
 - Update to 0.79.15 due to openssl update to version 3.0.7
 * Sat Sep 11 2021 wutao <wutao61@huawei.com> - 0.79.11-4
 - delete help package provides certmonger to solve conflicts
 * Mon May 31 2021 baizhonggui <baizhonggui@huawei.com> - 0.79.11-3
 - %prep no longer patch with git
 * Tue Oct 27 2020 leiju <leiju4@huawei.com> - 0.79.11-2
 - Modify BuildRequires from python2-dbus to python3-dbus
 * Thu Aug 06 2020 lingsheng <lingsheng@huawei.com> - 0.79.11-1
 - Update to 0.79.11
Author	SHA1	Message	Date
openeuler-ci-bot	180c43040e	!13 修复 clang 构建错误 From: @jammyjellyfish Reviewed-by: @wang--ge, @wk333 Signed-off-by: @wang--ge, @wk333	2023-05-26 07:24:31 +00:00
jammyjellyfish	a5f8879cdc	Fix clang build error	2023-04-21 16:52:53 +08:00
openeuler-ci-bot	1eddab7ee7	!12 update to version 0.79.15 From: @wang--ge Reviewed-by: @gitee-cmd Signed-off-by: @gitee-cmd	2023-02-06 06:48:52 +00:00
wang--ge	f9139bcb7f	update to version 0.79.15 due to openssl update to version 3.0.7	2023-02-06 11:20:12 +08:00
openeuler-ci-bot	c6b1611802	!5 delete help package providing certmonger to solve conlifcts From: @jackie_wu123 Reviewed-by: @zhujianwei001 Signed-off-by: @zhujianwei001	2021-09-11 03:31:19 +00:00
jackie_wu	dcae6574bf	delete help package providing certmonger to solve conflicts	2021-09-11 11:04:10 +08:00
openeuler-ci-bot	725a5cba44	!4 解除git依赖，避免冗余依赖缺失导致的error From: @bzg1107 Reviewed-by: @zhujianwei001 Signed-off-by: @zhujianwei001	2021-06-16 10:11:40 +00:00
baizg1107	31a2c56872	resolving building error of git.	2021-06-16 14:58:53 +08:00
openeuler-ci-bot	271e09c7da	!3 Modify BuildRequires from python2-dbus to python3-dbus From: @lei_ju Reviewed-by: @zhujianwei001 Signed-off-by: @zhujianwei001	2020-10-30 16:20:46 +08:00
lei_ju	2825654f76	Modify BuildRequires from python2-dbus to python3-dbus	2020-10-30 09:33:04 +08:00