From 3dc66c7230d1961ce08865e9b3f3daf4bf202c90 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Jun 07 2022 13:53:15 +0000
Subject: [PATCH 1/2] Require jansson >= 2.12


The ipa-submit code may include NULL values for some optional
attributes. This is broken in prior jansson releases and was
fixed in https://github.com/akheron/jansson/commit/5df5fc5b13cac5212482d36e7f3a78951782cfb5

The options are for profile and issuer.

---

diff --git a/certmonger.spec b/certmonger.spec
index 6102aff..cede440 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -57,7 +57,7 @@ BuildRequires:	libxml2-devel
 %if %{with xmlrpc}
 BuildRequires:	xmlrpc-c-devel
 %endif
-BuildRequires:	jansson-devel
+BuildRequires:	jansson-devel >= 2.12
 %if 0%{?rhel} && 0%{?rhel} < 6
 BuildRequires:	bind-libbind-devel
 BuildRequires:	mktemp

From 387d418206d046c1bddc6fcbce6289655625e75b Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Jun 07 2022 15:20:24 +0000
Subject: [PATCH 2/2] Mark the current directory as a safe git directory


This was causing failures to build the srpm in CI:

git archive -v --format=tar --prefix=certmonger-0.79.15/ HEAD | gzip > certmonger-0.79.15.tar.gz
fatal: unsafe repository ('/mnt/workdir-xq6ez2vc/certmonger' is owned by someone else)

---

diff --git a/.copr/Makefile b/.copr/Makefile
index 26b2b5b..e5ce716 100644
--- a/.copr/Makefile
+++ b/.copr/Makefile
@@ -1,6 +1,7 @@
 srpm:
 	dnf -y install git
 	$(eval version := $(shell grep AC_INIT configure.ac | cut -d, -f2 | rev | cut -c2- | rev))
+	git config --global --add safe.directory `pwd`
 	git archive -v --format=tar --prefix=certmonger-${version}/ HEAD | gzip > certmonger-${version}.tar.gz
 	rpmbuild \
 		--define "_sourcedir `pwd`" \