Compare commits

..

No commits in common. "180c43040eed8aa8194ed6df657facbaf1b2c2d8" and "9d1da6cd95224d1d333cb367aa01f7a68a70c194" have entirely different histories.

4 changed files with 34 additions and 23 deletions

View File

@ -0,0 +1,27 @@
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);

Binary file not shown.

Binary file not shown.

View File

@ -1,18 +1,19 @@
Name: certmonger
Version: 0.79.15
Release: 2
Version: 0.79.11
Release: 1
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 python3-dbus popt-devel
BuildRequires: jansson jansson-devel
BuildRequires: /usr/bin/unix2dos /usr/bin/which python2-dbus popt-devel
Requires: dbus
Requires(post): %{_bindir}/dbus-send systemd-units
Requires(preun): systemd-units dbus sed
@ -25,17 +26,15 @@ 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
%autosetup -n certmonger-certmonger-%{version} -p1 -S git
%build
%if "%toolchain" == "clang"
CFLAGS="$CFLAGS -Wno-error=int-conversion"
%endif
autoreconf -i -f
%configure \
--enable-systemd --enable-tmpfiles --with-homedir=/var/run/certmonger \
@ -110,21 +109,6 @@ 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