Compare commits
10 Commits
e199ff755a
...
07283e6306
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
07283e6306 | ||
|
|
7ec7565a5d | ||
|
|
0ba3bb82b5 | ||
|
|
7655c3fd34 | ||
|
|
725a5cba44 | ||
|
|
31a2c56872 | ||
|
|
271e09c7da | ||
|
|
2825654f76 | ||
|
|
9d1da6cd95 | ||
|
|
bb4eeb8573 |
27
Don-t-free-soptions-while-it-is-still-needed.patch
Normal file
27
Don-t-free-soptions-while-it-is-still-needed.patch
Normal 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);
|
||||||
|
|
||||||
BIN
certmonger-certmonger-0.79.11.tar.gz
Normal file
BIN
certmonger-certmonger-0.79.11.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -1,16 +1,24 @@
|
|||||||
|
%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
|
||||||
|
%if "%{vendor}" == "openEuler"
|
||||||
|
%define vendor openeuler
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: certmonger
|
Name: certmonger
|
||||||
Version: 0.79.8
|
Version: 0.79.11
|
||||||
Release: 3
|
Release: 5
|
||||||
Summary: Certificate status monitor and PKI enrollment client
|
Summary: Certificate status monitor and PKI enrollment client
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://pagure.io/certmonger/
|
URL: http://pagure.io/certmonger/
|
||||||
Source0: https://pagure.io/certmonger/archive/certmonger-%{version}/certmonger-certmonger-%{version}.tar.gz
|
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: autoconf automake gettext-devel gcc openldap-devel krb5-devel
|
||||||
BuildRequires: libidn2-devel dbus-devel nspr-devel nss-devel openssl-devel
|
BuildRequires: libidn2-devel dbus-devel nspr-devel nss-devel openssl-devel
|
||||||
BuildRequires: libuuid-devel libtalloc-devel libtevent-devel libcurl-devel
|
BuildRequires: libuuid-devel libtalloc-devel libtevent-devel libcurl-devel
|
||||||
BuildRequires: libxml2-devel xmlrpc-c-devel systemd-units diffutils expect
|
BuildRequires: libxml2-devel xmlrpc-c-devel systemd-units diffutils expect
|
||||||
BuildRequires: nss-tools openssl /usr/bin/dbus-launch /usr/bin/dos2unix
|
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
|
||||||
Requires: dbus
|
Requires: dbus
|
||||||
Requires(post): %{_bindir}/dbus-send systemd-units
|
Requires(post): %{_bindir}/dbus-send systemd-units
|
||||||
Requires(preun): systemd-units dbus sed
|
Requires(preun): systemd-units dbus sed
|
||||||
@ -23,13 +31,12 @@ system enrolled with a certificate authority (CA) and keeping it enrolled.
|
|||||||
|
|
||||||
%package help
|
%package help
|
||||||
Summary: Documentation for help using certmonger
|
Summary: Documentation for help using certmonger
|
||||||
provides: certmonger = %{version}-%{release}
|
|
||||||
|
|
||||||
%description help
|
%description help
|
||||||
This package provides docs for user of certmonger.
|
This package provides docs for user of certmonger.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n certmonger-certmonger-%{version} -p1 -S git
|
%autosetup -n certmonger-certmonger-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -i -f
|
autoreconf -i -f
|
||||||
@ -56,12 +63,12 @@ if test $1 -eq 1 ; then
|
|||||||
fi
|
fi
|
||||||
%triggerin -- certmonger < 0.58
|
%triggerin -- certmonger < 0.58
|
||||||
if test $1 -gt 1 ; then
|
if test $1 -gt 1 ; then
|
||||||
objpath=`dbus-send --system --reply-timeout=10000 --dest=org.openeulerhosted.certmonger \
|
objpath=`dbus-send --system --reply-timeout=10000 --dest=org.%{vendor}hosted.certmonger \
|
||||||
--print-reply=o /org/openeulerhosted/certmonger org.openeulerhosted.certmonger.find_ca_by_nickname \
|
--print-reply=o /org/%{vendor}hosted/certmonger org.%{vendor}hosted.certmonger.find_ca_by_nickname \
|
||||||
string:dogtag-ipa-renew-agent 2> /dev/null | sed -r 's,^ +,,g' || true`
|
string:dogtag-ipa-renew-agent 2> /dev/null | sed -r 's,^ +,,g' || true`
|
||||||
if test -n "$objpath" ; then
|
if test -n "$objpath" ; then
|
||||||
dbus-send --system --dest=org.openeulerhosted.certmonger --print-reply /org/openeulerhosted/certmonger \
|
dbus-send --system --dest=org.%{vendor}hosted.certmonger --print-reply /org/%{vendor}hosted/certmonger \
|
||||||
org.openeulerhosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
|
org.%{vendor}hosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
|
||||||
fi
|
fi
|
||||||
for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do
|
for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do
|
||||||
if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then
|
if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then
|
||||||
@ -106,5 +113,20 @@ fi
|
|||||||
%{_mandir}/man*/*
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 18 2022 yaoxin <yaoxin30@h-partners.com> - 0.79.11-5
|
||||||
|
- Replace openeuler with vendor
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
* Thu May 14 2020 Jeffery.Gao <gaojianxing@huawei.com> - 0.79.8-3
|
* Thu May 14 2020 Jeffery.Gao <gaojianxing@huawei.com> - 0.79.8-3
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user