Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
07283e6306
!9 Replace openeuler with vendor
From: @starlet-dx 
Reviewed-by: @gitee-cmd 
Signed-off-by: @gitee-cmd
2022-11-18 10:31:18 +00:00
starlet-dx
7ec7565a5d Replace openeuler with vendor 2022-11-18 17:13:45 +08:00
openeuler-ci-bot
0ba3bb82b5 !8 [sync] PR-5: delete help package providing certmonger to solve conlifcts
From: @openeuler-sync-bot
Reviewed-by: @zhujianwei001
Signed-off-by: @zhujianwei001
2021-10-26 07:02:51 +00:00
jackie_wu
7655c3fd34 delete help package providing certmonger to solve conflicts
(cherry picked from commit dcae6574bf478466db6bccc720d9ef0f0968ef0f)
2021-10-25 16:23:06 +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
openeuler-ci-bot
9d1da6cd95 !2 Update to 0.79.11
Merge pull request !2 from ultra_planet/master
2020-08-07 17:01:07 +08:00
lingsheng
bb4eeb8573 Update to 0.79.11 2020-08-07 16:18:39 +08:00
4 changed files with 58 additions and 9 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,16 +1,24 @@
%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler}
%if "%{vendor}" == "openEuler"
%define vendor openeuler
%endif
Name: certmonger
Version: 0.79.8
Release: 3
Version: 0.79.11
Release: 5
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
Requires: dbus
Requires(post): %{_bindir}/dbus-send systemd-units
Requires(preun): systemd-units dbus sed
@ -23,13 +31,12 @@ 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
autoreconf -i -f
@ -56,12 +63,12 @@ if test $1 -eq 1 ; then
fi
%triggerin -- certmonger < 0.58
if test $1 -gt 1 ; then
objpath=`dbus-send --system --reply-timeout=10000 --dest=org.openeulerhosted.certmonger \
--print-reply=o /org/openeulerhosted/certmonger org.openeulerhosted.certmonger.find_ca_by_nickname \
objpath=`dbus-send --system --reply-timeout=10000 --dest=org.%{vendor}hosted.certmonger \
--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`
if test -n "$objpath" ; then
dbus-send --system --dest=org.openeulerhosted.certmonger --print-reply /org/openeulerhosted/certmonger \
org.openeulerhosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
dbus-send --system --dest=org.%{vendor}hosted.certmonger --print-reply /org/%{vendor}hosted/certmonger \
org.%{vendor}hosted.certmonger.remove_known_ca objpath:"$objpath" >/dev/null 2> /dev/null
fi
for cafile in %{_localstatedir}/lib/certmonger/cas/* ; do
if grep -q '^id=dogtag-ipa-renew-agent$' "$cafile" ; then
@ -106,5 +113,20 @@ fi
%{_mandir}/man*/*
%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
- Package init