[Pkg-freeipa-devel] certmonger: Changes to 'upstream'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Mon Aug 7 14:59:24 UTC 2017
Rebased ref, commits from common ancestor:
commit 6a8d4299d97ad907696791b176636156ddb7ffac
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Tue Feb 28 00:56:00 2017 -0500
Tag 0.79.3
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/certmonger.spec b/certmonger.spec
index 343d9d4..7c81d94 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -25,7 +25,7 @@
%endif
Name: certmonger
-Version: 0.79.2
+Version: 0.79.3
Release: 1%{?dist}
Summary: Certificate status monitor and PKI enrollment client
@@ -33,7 +33,7 @@ Group: System Environment/Daemons
License: GPLv3+
URL: http://pagure.io/certmonger/
Source0: http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz
-Source1: http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz.sig
+#Source1: http://releases.pagure.org/certmonger/certmonger-%{version}.tar.gz.sig
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: openldap-devel
@@ -220,7 +220,7 @@ exit 0
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc README LICENSE STATUS doc/*.txt
+%doc README.md LICENSE STATUS doc/*.txt
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/*
%{_datadir}/dbus-1/services/*
%dir %{_sysconfdir}/certmonger
@@ -243,6 +243,13 @@ exit 0
%endif
%changelog
+* Tue Feb 27 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.3-1
+- update to 0.79.3:
+ - fix self-signing self-test cases that used DSA or EC keys
+
+* Mon Feb 27 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.2-2
+- update %%docs list because README is now README.md
+
* Mon Feb 27 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.2-1
- update to 0.79.2:
- fix 'make distcheck' target
@@ -274,6 +281,12 @@ exit 0
- resync .spec file with Fedora
- upstream project migrated from fedorahosted.org to pagure.io
+* Fri Feb 10 2017 Fedora Release Engineering <releng at fedoraproject.org> - 0.78.6-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Jan 21 2017 Igor Gnatenko <ignatenko at redhat.com> - 0.78.6-5
+- Rebuild for xmlrpc-c
+
* Wed Jul 6 2016 Nalin Dahyabhai <nalin at redhat.com> 0.78.6-4
- add backported fix to wait a reasonable amount of time after calling the
'resubmit' method for a new certificate to be issued when we're exercising
diff --git a/configure.ac b/configure.ac
index 5e4dfb2..1be5eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(certmonger,0.79.2)
+AC_INIT(certmonger,0.79.3)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_MACRO_DIR(m4)
AM_MAINTAINER_MODE([disable])
commit dd537bcc644dea163b4c8f3de08d73a60876449d
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Tue Feb 28 00:53:42 2017 -0500
Fix conversions of bit lengths to byte lengths
Fix a number of places where we weren't correctly converting from length
in bits to length in bytes, and one in the self-tests where the newest
version of NSS complains if the size of a signature was too large
because it was not converted at all.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/src/certext.c b/src/certext.c
index be610da..a872443 100644
--- a/src/certext.c
+++ b/src/certext.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009,2011,2012,2013,2014,2015 Red Hat, Inc.
+ * Copyright (C) 2009,2011,2012,2013,2014,2015,2017 Red Hat, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1311,7 +1311,7 @@ cm_certext_build_self_akid(struct cm_store_entry *entry, PLArenaPool *arena)
spki = SECKEY_DecodeDERSubjectPublicKeyInfo(&pubkeyinfo);
}
if (spki != NULL) {
- pubkey.len = spki->subjectPublicKey.len / 8;
+ pubkey.len = howmany(spki->subjectPublicKey.len, 8);
pubkey.data = PORT_ArenaZAlloc(arena,
pubkey.len);
if (pubkey.data != NULL) {
@@ -1384,7 +1384,7 @@ cm_certext_build_skid(struct cm_store_entry *entry, PLArenaPool *arena)
spki = SECKEY_DecodeDERSubjectPublicKeyInfo(&pubkeyinfo);
}
if (spki != NULL) {
- pubkey.len = spki->subjectPublicKey.len / 8;
+ pubkey.len = howmany(spki->subjectPublicKey.len, 8);
pubkey.data = PORT_ArenaZAlloc(arena,
pubkey.len);
if (pubkey.data != NULL) {
diff --git a/src/keygen-n.c b/src/keygen-n.c
index 0733968..08f0049 100644
--- a/src/keygen-n.c
+++ b/src/keygen-n.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009,2010,2011,2012,2013,2014,2015 Red Hat, Inc.
+ * Copyright (C) 2009,2010,2011,2012,2013,2014,2015,2017 Red Hat, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -707,7 +707,7 @@ retry_gen:
if (pubkeyinfo != NULL) {
pubhex = cm_store_hex_from_bin(NULL,
pubkeyinfo->subjectPublicKey.data,
- pubkeyinfo->subjectPublicKey.len / 8);
+ howmany(pubkeyinfo->subjectPublicKey.len, 8));
SECKEY_DestroySubjectPublicKeyInfo(pubkeyinfo);
} else {
pubhex = "";
diff --git a/src/keyiread-n.c b/src/keyiread-n.c
index eec4cdf..89913aa 100644
--- a/src/keyiread-n.c
+++ b/src/keyiread-n.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009,2010,2011,2012,2013,2014,2015 Red Hat, Inc.
+ * Copyright (C) 2009,2010,2011,2012,2013,2014,2015,2017 Red Hat, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
#include "config.h"
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/wait.h>
#include <errno.h>
#include <fcntl.h>
@@ -531,7 +532,7 @@ cm_keyiread_n_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
spki = SECKEY_DecodeDERSubjectPublicKeyInfo(info);
pubhex = cm_store_hex_from_bin(NULL,
spki->subjectPublicKey.data,
- spki->subjectPublicKey.len / 8);
+ howmany(spki->subjectPublicKey.len, 8));
fprintf(fp, "%s/%d/%s/%s%s%s\n", alg, size,
pubihex,
pubhex,
@@ -575,7 +576,7 @@ cm_keyiread_n_main(int fd, struct cm_store_ca *ca, struct cm_store_entry *entry,
spki = SECKEY_DecodeDERSubjectPublicKeyInfo(info);
pubhex = cm_store_hex_from_bin(NULL,
spki->subjectPublicKey.data,
- spki->subjectPublicKey.len / 8);
+ howmany(spki->subjectPublicKey.len, 8));
fprintf(fp, "%s/%d/%s/%s\n", alg, size,
pubihex,
pubhex);
diff --git a/tests/tools/checksig.c b/tests/tools/checksig.c
index e690911..810174d 100644
--- a/tests/tools/checksig.c
+++ b/tests/tools/checksig.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014,2017 Red Hat, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
#include "../../src/config.h"
#include <sys/types.h>
+#include <sys/param.h>
#include <sys/select.h>
#include <errno.h>
#include <limits.h>
@@ -101,6 +102,7 @@ main(int argc, char **argv)
printf("error finding public key\n");
return 1;
}
+ signed_data.signature.len = howmany(signed_data.signature.len, 8);
if (VFY_VerifyDataWithAlgorithmID(signed_data.data.data,
signed_data.data.len,
pubkey,
commit ea5183fa5a308fbf4a76368e33f157e741ae546b
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 15:08:56 2017 -0500
Tag 0.79.2
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/certmonger.spec b/certmonger.spec
index 733945d..343d9d4 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -25,7 +25,7 @@
%endif
Name: certmonger
-Version: 0.79.1
+Version: 0.79.2
Release: 1%{?dist}
Summary: Certificate status monitor and PKI enrollment client
@@ -243,8 +243,12 @@ exit 0
%endif
%changelog
+* Mon Feb 27 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.2-1
+- update to 0.79.2:
+ - fix 'make distcheck' target
+
* Sun Feb 19 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.1-1
-- update to 0.79:
+- update to 0.79.1:
- update translations
- fix 'make archive' target
diff --git a/configure.ac b/configure.ac
index c6b68fd..5e4dfb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(certmonger,0.79.1)
+AC_INIT(certmonger,0.79.2)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_MACRO_DIR(m4)
AM_MAINTAINER_MODE([disable])
commit d06a47310e69de30a4af78027953222fb507698e
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Mon Feb 27 18:03:23 2017 -0500
Make 'make archive' default to cloning 'origin'
Make 'make archive' default to cloning from the remote repo named
'origin', instead of hard-coding the main repository.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 2a7c0f3..16d103e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,8 @@ tag: all-gmo
force-tag: all-gmo
git tag -f $(GITTAG)
-ORIGIN=ssh://git@pagure.io/certmonger.git
+GITREMOTE=origin
+ORIGIN=$(shell git config remote.$(GITREMOTE).url 2> /dev/null || /bin/pwd)
ARCHIVEOUTDIR=$(shell cd $(top_srcdir) && pwd)
local-archive:
commit f44d0ec4bd67c63662185a43a969e59892c5b495
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Mon Feb 27 19:09:54 2017 -0500
Make 'distcheck' in containers, not just 'check'
The 'distcheck' target catches things that need to be included in
tarballs that we might otherwise forget, so prefer it.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/docker/build-and-test.sh b/tests/docker/build-and-test.sh
index 8f02a77..d298789 100755
--- a/tests/docker/build-and-test.sh
+++ b/tests/docker/build-and-test.sh
@@ -19,6 +19,4 @@ echo '['"${PRETTY_NAME}"']'
export CFLAGS="-Wall -Wextra -Wno-unused-parameter"
./configure --prefix=/usr --sysconfdir=/etc --with-tmpdir=/var/run/certmonger --localstatedir=/var --disable-maintainer-mode --enable-srv-location --disable-systemd --disable-sysvinit
echo '['"${PRETTY_NAME}"']'
-make all
-echo '['"${PRETTY_NAME}"']'
-make check
+make distcheck
commit 758ba898a2464760fe8a1cf01fb17c17c5324899
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Mon Feb 27 19:00:12 2017 -0500
Package alternate correct 028 output for non-DSA
Forgot to add the alternate output to the list of files picked up by
'make dist'.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 963a7a5..5888dc0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -275,7 +275,7 @@ EXTRA_DIST = \
026-local/run.sh \
027-hooks/expected.out \
027-hooks/run.sh \
- 028-dbus/expected.out \
+ 028-dbus/expected.out 028-dbus/expected.out.nodsa \
028-dbus/entry 028-dbus/bogus-entry \
028-dbus/prequal.sh \
028-dbus/run.sh \
commit 60a6662622042056fef77fa43df08dff1483e8fb
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Mon Feb 27 18:04:06 2017 -0500
Have 'make clean' remove tests results
The 'distcheck' target complains if 'distclean' leaves things behind, so
we clean test results on 'clean'.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46de8cd..963a7a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,131 @@
SUBDIRS = tools
+CLEANFILES = \
+ 001-keyiread/actual.out \
+ 001-keyiread/actual.err \
+ 001-keyiread-dsa/actual.out \
+ 001-keyiread-dsa/actual.err \
+ 001-keyiread-ec/actual.out \
+ 001-keyiread-ec/actual.err \
+ 001-keyiread-rsa/actual.out \
+ 001-keyiread-rsa/actual.err \
+ 002-keygen/actual.out \
+ 002-keygen/actual.err \
+ 002-keygen-dsa/actual.out \
+ 002-keygen-dsa/actual.err \
+ 002-keygen-ec/actual.out \
+ 002-keygen-ec/actual.err \
+ 002-keygen-rsa/actual.out \
+ 002-keygen-rsa/actual.err \
+ 003-csrgen/actual.out \
+ 003-csrgen/actual.err \
+ 003-csrgen-dsa/actual.out \
+ 003-csrgen-dsa/actual.err \
+ 003-csrgen-ec/actual.out \
+ 003-csrgen-ec/actual.err \
+ 003-csrgen-rsa/actual.out \
+ 003-csrgen-rsa/actual.err \
+ 004-selfsign/actual.out \
+ 004-selfsign/actual.err \
+ 004-selfsign-dsa/actual.out \
+ 004-selfsign-dsa/actual.err \
+ 004-selfsign-ec/actual.out \
+ 004-selfsign-ec/actual.err \
+ 004-selfsign-rsa/actual.out \
+ 004-selfsign-rsa/actual.err \
+ 005-dbusm/actual.out \
+ 005-dbusm/actual.err \
+ 006-serial/actual.out \
+ 006-serial/actual.err \
+ 007-certsave/actual.out \
+ 007-certsave/actual.err \
+ 007-certsave-dbm/actual.out \
+ 007-certsave-dbm/actual.err \
+ 007-certsave-sql/actual.out \
+ 007-certsave-sql/actual.err \
+ 008-certread/actual.out \
+ 008-certread/actual.err \
+ 009-oiddict/actual.out \
+ 009-oiddict/actual.err \
+ 010-iterate/actual.out \
+ 010-iterate/actual.err \
+ 011-dbinit/actual.out \
+ 011-dbinit/actual.err \
+ 011-dbinit-dbm/actual.out \
+ 011-dbinit-dbm/actual.err \
+ 011-dbinit-sql/actual.out \
+ 011-dbinit-sql/actual.err \
+ 012-dbadd/actual.out \
+ 012-dbadd/actual.err \
+ 012-dbadd-dbm/actual.out \
+ 012-dbadd-dbm/actual.err \
+ 012-dbadd-sql/actual.out \
+ 012-dbadd-sql/actual.err \
+ 013-enckey/actual.out \
+ 013-enckey/actual.err \
+ 013-enckey-dbm/actual.out \
+ 013-enckey-dbm/actual.err \
+ 013-enckey-sql/actual.out \
+ 013-enckey-sql/actual.err \
+ 014-prefs/actual.out \
+ 014-prefs/actual.err \
+ 015-lockedkey/actual.out \
+ 015-lockedkey/actual.err \
+ 015-lockedkey-dbm/actual.out \
+ 015-lockedkey-dbm/actual.err \
+ 015-lockedkey-sql/actual.out \
+ 015-lockedkey-sql/actual.err \
+ 016-dates/actual.out \
+ 016-dates/actual.err \
+ 017-notoken/actual.out \
+ 017-notoken/actual.err \
+ 017-notoken-dbm/actual.out \
+ 017-notoken-dbm/actual.err \
+ 017-notoken-sql/actual.out \
+ 017-notoken-sql/actual.err \
+ 018-pembase/actual.out \
+ 018-pembase/actual.err \
+ 019-dparse/actual.out \
+ 019-dparse/actual.err \
+ 020-xparse/actual.out \
+ 020-xparse/actual.err \
+ 021-resume/actual.out \
+ 021-resume/actual.err \
+ 022-base64/actual.out \
+ 022-base64/actual.err \
+ 023-cadata/actual.out \
+ 023-cadata/actual.err \
+ 024-citerate/actual.out \
+ 024-citerate/actual.err \
+ 025-casave/actual.out \
+ 025-casave/actual.err \
+ 026-local/actual.out \
+ 026-local/actual.err \
+ 027-hooks/actual.out \
+ 027-hooks/actual.err \
+ 028-dbus/actual.out \
+ 028-dbus/actual.err \
+ 029-canonize/actual.out \
+ 029-canonize/actual.err \
+ 030-rekey/actual.out \
+ 030-rekey/actual.err \
+ 031-pkcs7/actual.out \
+ 031-pkcs7/actual.err \
+ 032-chain/actual.out \
+ 032-chain/actual.err \
+ 033-scep/actual.out \
+ 033-scep/actual.err \
+ 034-perms/actual.out \
+ 034-perms/actual.err \
+ 034-perms-dbm/actual.out \
+ 034-perms-dbm/actual.err \
+ 034-perms-sql/actual.out \
+ 034-perms-sql/actual.err \
+ 035-json/actual.out \
+ 035-json/actual.err \
+ 036-getcert/actual.out \
+ 036-getcert/actual.err \
+ 037-rekey2/actual.out \
+ 037-rekey2/actual.err
EXTRA_DIST = \
run-tests.sh functions certmonger.conf tools/cachain.sh \
001-keyiread/run.sh \
commit d6e58daf7f15fb5bcb689aab21aa312101642c9f
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Mon Feb 27 18:02:39 2017 -0500
Work around .deps in subdirs confusing distcheck
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index d79c944..b2c42ce 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(DBUS_CFLAGS) $(KRB5_CFLAGS) \
$(XMLRPC_CFLAGS) $(IDN_CFLAGS) $(UUID_CFLAGS) $(LDAP_CFLAGS) \
- $(POPT_CFLAGS) -I$(builddir)/../../src -I$(srcdir)/../../src
-LDADD = libtools.a $(builddir)/../../src/libcm.a $(srcdir)/../../src/env-system.c \
+ $(POPT_CFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/src
+LDADD = libtools.a $(top_builddir)/src/libcm.a $(top_srcdir)/src/env-system.c \
libtools.a $(OPENSSL_LIBS) $(CERTMONGER_LIBS) $(KRB5_LIBS) $(IDN_LIBS) \
$(GMP_LIBS) $(UUID_LIBS) $(RESOLV_LIBS) $(POPT_LIBS) $(LTLIBICONV)
@@ -21,7 +21,7 @@ if HAVE_OPENSSL
noinst_PROGRAMS += pk7parse pk7env scepgen pk7verify pk7decrypt
endif
-libtools_a_SOURCES = $(srcdir)/../../src/tm.h tm.c tools.h tools.c
+libtools_a_SOURCES = $(top_srcdir)/src/tm.h tm.c tools.h tools.c
listnicks_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
payload_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
@@ -29,10 +29,11 @@ checksig_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
addcinfo_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
dparse_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS)
-dparse_SOURCES = dparse.c $(srcdir)/../../src/submit-d.c
-dparse_LDADD = $(LDADD) $(XML_LIBS)
+dparse_SOURCES = dparse.c
+dparse_LDADD = $(top_srcdir)/src/submit-d.c $(LDADD) $(XML_LIBS)
-citerate_SOURCES = citerate.c $(srcdir)/../../src/store-gen.c
+citerate_SOURCES = citerate.c
+citerate_LDADD = $(top_srcdir)/src/store-gen.c $(LDADD)
-srv_SOURCES = srv.c $(srcdir)/../../src/srvloc.c
-srv_LDADD = $(LDADD)
+srv_SOURCES = srv.c
+srv_LDADD = $(top_srcdir)/src/srvloc.c $(LDADD)
commit f9ca13980468771aa8136e9e95845e591b6b2fed
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 18:06:47 2017 -0500
Fix 'make dist' in tools when builddir != srcdir
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
index 9988b8c..d79c944 100644
--- a/tests/tools/Makefile.am
+++ b/tests/tools/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(DBUS_CFLAGS) $(KRB5_CFLAGS) \
$(XMLRPC_CFLAGS) $(IDN_CFLAGS) $(UUID_CFLAGS) $(LDAP_CFLAGS) \
- $(POPT_CFLAGS) -I$(builddir)/../../src
-LDADD = libtools.a ../../src/libcm.a $(srcdir)/../../src/env-system.c \
+ $(POPT_CFLAGS) -I$(builddir)/../../src -I$(srcdir)/../../src
+LDADD = libtools.a $(builddir)/../../src/libcm.a $(srcdir)/../../src/env-system.c \
libtools.a $(OPENSSL_LIBS) $(CERTMONGER_LIBS) $(KRB5_LIBS) $(IDN_LIBS) \
$(GMP_LIBS) $(UUID_LIBS) $(RESOLV_LIBS) $(POPT_LIBS) $(LTLIBICONV)
@@ -21,7 +21,7 @@ if HAVE_OPENSSL
noinst_PROGRAMS += pk7parse pk7env scepgen pk7verify pk7decrypt
endif
-libtools_a_SOURCES = ../../src/tm.h tm.c tools.h tools.c
+libtools_a_SOURCES = $(srcdir)/../../src/tm.h tm.c tools.h tools.c
listnicks_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
payload_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
@@ -29,10 +29,10 @@ checksig_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
addcinfo_CFLAGS = $(AM_CFLAGS) $(NSS_CFLAGS)
dparse_CFLAGS = $(AM_CFLAGS) $(XML_CFLAGS)
-dparse_SOURCES = dparse.c ../../src/submit-d.c
+dparse_SOURCES = dparse.c $(srcdir)/../../src/submit-d.c
dparse_LDADD = $(LDADD) $(XML_LIBS)
-citerate_SOURCES = citerate.c ../../src/store-gen.c
+citerate_SOURCES = citerate.c $(srcdir)/../../src/store-gen.c
-srv_SOURCES = srv.c ../../src/srvloc.c
+srv_SOURCES = srv.c $(srcdir)/../../src/srvloc.c
srv_LDADD = $(LDADD)
commit ec7d4ae664ef5899161c2a7fb1e1a585e1764835
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 17:13:57 2017 -0500
Don't use wildcards in EXTRA_DIST
It confuses 'make distcheck'.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/Makefile.am b/tests/Makefile.am
index df5ee9c..46de8cd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -103,9 +103,37 @@ EXTRA_DIST = \
018-pembase/run.sh \
019-dparse/expected.out \
019-dparse/run.sh \
- 019-dparse/good.* \
- 019-dparse/bad.* \
- 020-xparse/*.xml \
+ 019-dparse/bad.checkRequest.nosuch \
+ 019-dparse/bad.displayCertFromRequest.incomplete \
+ 019-dparse/bad.displayCertFromRequest.no-such-request \
+ 019-dparse/bad.displayCertFromRequest.rejected \
+ 019-dparse/bad.profileProcess.bad-property \
+ 019-dparse/bad.profileProcess.no-agent-cert \
+ 019-dparse/bad.profileProcess.no-ca-cert \
+ 019-dparse/bad.profileProcess.no-property \
+ 019-dparse/bad.profileProcess.not-pending \
+ 019-dparse/bad.profileReview.no-such-request \
+ 019-dparse/bad.profileReview.unauthorized-cert \
+ 019-dparse/bad.profileReview.wrong-nssdb \
+ 019-dparse/bad.profileSubmit.csr.empty \
+ 019-dparse/bad.profileSubmit.csr.subject-mismatch \
+ 019-dparse/bad.profileSubmit.serial.empty \
+ 019-dparse/bad.profileSubmit.serial.invalid \
+ 019-dparse/bad.profileSubmit.serial.out-of-range \
+ 019-dparse/good.checkRequest.complete \
+ 019-dparse/good.checkRequest.pending \
+ 019-dparse/good.displayCertFromRequest \
+ 019-dparse/good.profileList \
+ 019-dparse/good.profileReview \
+ 019-dparse/good.profileSubmit.issued \
+ 019-dparse/good.profileSubmit.serial.in-range \
+ 020-xparse/certmaster-fault.xml \
+ 020-xparse/certmaster-rep1.xml \
+ 020-xparse/certmaster-rep2.xml \
+ 020-xparse/certmaster-req.xml \
+ 020-xparse/ipa-fault.xml \
+ 020-xparse/ipa-rep-new.xml \
+ 020-xparse/ipa-req.xml \
021-resume/expected.out \
021-resume/run.sh \
022-base64/expected.out \
@@ -146,8 +174,45 @@ EXTRA_DIST = \
034-perms-sql/run.sh \
035-json/expected.out \
035-json/run.sh \
- 035-json/good.* \
- 035-json/bad.* \
+ 035-json/bad.1 \
+ 035-json/bad.15 \
+ 035-json/bad.1a \
+ 035-json/bad.1b \
+ 035-json/bad.1c \
+ 035-json/bad.1d \
+ 035-json/bad.1e \
+ 035-json/bad.2 \
+ 035-json/bad.3 \
+ 035-json/bad.4 \
+ 035-json/bad.5 \
+ 035-json/bad.6 \
+ 035-json/bad.8 \
+ 035-json/bad.9 \
+ 035-json/good.1 \
+ 035-json/good.10 \
+ 035-json/good.11 \
+ 035-json/good.12 \
+ 035-json/good.13 \
+ 035-json/good.14 \
+ 035-json/good.15 \
+ 035-json/good.16 \
+ 035-json/good.17 \
+ 035-json/good.18 \
+ 035-json/good.19 \
+ 035-json/good.2 \
+ 035-json/good.20 \
+ 035-json/good.21 \
+ 035-json/good.22 \
+ 035-json/good.2a \
+ 035-json/good.2b \
+ 035-json/good.2c \
+ 035-json/good.3 \
+ 035-json/good.4 \
+ 035-json/good.5 \
+ 035-json/good.6 \
+ 035-json/good.7 \
+ 035-json/good.8 \
+ 035-json/good.9 \
036-getcert/expected.out \
036-getcert/run.sh \
037-rekey2/expected.out \
commit df944a180be4e92d5f85652447651518bcf018ab
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 15:31:04 2017 -0500
Make installation of D-Bus configs optional
Make it possible to skip installing D-Bus configuration by setting the
installation location to "no" (or using the equivalent --without flag
with configure). Use this to sidestep some 'make install' errors that
we'd hit during 'make distcheck'.
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index b6a14a7..2a7c0f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = po src dbus systemd sysvinit tests
EXTRA_DIST = config.rpath \
certmonger.spec LICENSE README.md STATUS doc src/certmonger.conf.in
-DISTCHECK_CONFIGURE_FLAGS = --enable-systemd --enable-sysvinit=/etc/rc.d/init.d --with-tmpdir=/var/run/certmonger
+DISTCHECK_CONFIGURE_FLAGS = --disable-systemd --disable-sysvinit --with-tmpdir=/var/run/certmonger --without-system-bus-services-dir --without-session-bus-services-dir
VERSION=$(PACKAGE_VERSION)
RELEASE=
diff --git a/configure.ac b/configure.ac
index bef2355..c6b68fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,10 +172,18 @@ if ! ${configure_dist_target_only:-false} ; then
PKG_CHECK_MODULES(TALLOC,talloc)
PKG_CHECK_MODULES(TEVENT,tevent)
PKG_CHECK_MODULES(DBUS,dbus-1 >= 1.0)
- SESSIONBUSSERVICESDIR=`pkg-config --variable=session_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`
+ AC_ARG_WITH(session-bus-services-dir,
+ AS_HELP_STRING([--with-session-bus-services-dir=],[directory to install session bus configuration]),
+ SESSIONBUSSERVICESDIR=$withval,
+ SESSIONBUSSERVICESDIR=`pkg-config --variable=session_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
AC_SUBST(SESSIONBUSSERVICESDIR)
- SYSTEMBUSSERVICESDIR=`pkg-config --variable=system_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`
+ AM_CONDITIONAL(SESSIONBUS,test x$SESSIONBUSSERVICESDIR != xno)
+ AC_ARG_WITH(system-bus-services-dir,
+ AS_HELP_STRING([--with-system-bus-services-dir=],[directory to install system bus configuration]),
+ SESSIONBUSSERVICESDIR=$withval,
+ SYSTEMBUSSERVICESDIR=`pkg-config --variable=system_bus_services_dir dbus-1 2> /dev/null | sed -e "s|^${datadir}|\${datadir}|g" -e "s|^${datarootdir}|\${datarootdir}|g" -e "s|^${prefix}/share|\${datadir}|g"`)
AC_SUBST(SYSTEMBUSSERVICESDIR)
+ AM_CONDITIONAL(SYSTEMBUS,test x$SYSTEMBUSSERVICESDIR != xno)
AC_CHECK_FUNCS(clearenv)
AC_CHECK_DECLS(strtold,,,[
@@ -834,6 +842,8 @@ if ! ${configure_dist_target_only:-false} ; then
AC_SUBST(POPT_CFLAGS)
AC_SUBST(POPT_LIBS)
else
+ AM_CONDITIONAL(SESSIONBUS,false)
+ AM_CONDITIONAL(SYSTEMBUS,false)
AM_CONDITIONAL(HAVE_OPENSSL,false)
AM_CONDITIONAL(HAVE_NSS,false)
AM_CONDITIONAL(HAVE_SQL_NSSDB,false)
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index ef1ed51..036a1ef 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,4 +1,8 @@
+if SESSIONBUS
servicedir = @SESSIONBUSSERVICESDIR@
service_DATA = certmonger.service
+endif
+if SYSTEMBUS
systemdbusdir = $(sysconfdir)/dbus-1/system.d
systemdbus_DATA = certmonger.conf
+endif
commit c323b7d0cc418b5cab8e372f3ad54469f85f4697
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 15:00:43 2017 -0500
Fix test 033 when builddir != srcdir
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/033-scep/run.sh b/tests/033-scep/run.sh
index 15480ac..567e610 100755
--- a/tests/033-scep/run.sh
+++ b/tests/033-scep/run.sh
@@ -10,7 +10,7 @@ SCEP_MSGTYPE_GETCRL="22"
CERTMONGER_CONFIG_DIR="$tmpdir"
export CERTMONGER_CONFIG_DIR
-$toolsdir/cachain.sh 0 2> /dev/null
+$srcdir/tools/cachain.sh 0 2> /dev/null
cat > ca << EOF
id=SCEP
commit 97eee91ba3d77cb1ff8281f2f82393da02f7efcf
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 14:53:44 2017 -0500
Fix test 032 when builddir != srcdir
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/032-chain/run.sh b/tests/032-chain/run.sh
index 0b5ad9c..faa61db 100755
--- a/tests/032-chain/run.sh
+++ b/tests/032-chain/run.sh
@@ -1,6 +1,6 @@
#!/bin/bash
cd "$tmpdir"
-$toolsdir/cachain.sh 5 2> /dev/null
+$srcdir/tools/cachain.sh 5 2> /dev/null
for c0 in ca0 ca1 ca2 ca3 ca4 ca5 ee ; do
for c1 in ca0 ca1 ca2 ca3 ca4 ca5 ee ; do
if test $c1 = $c0 ; then
commit a89b977555c62678c0809041770893c601224973
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 14:36:39 2017 -0500
Fix test 028 when builddir != srcdir
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/028-dbus/run.sh b/tests/028-dbus/run.sh
index f453d13..c468d51 100755
--- a/tests/028-dbus/run.sh
+++ b/tests/028-dbus/run.sh
@@ -9,8 +9,8 @@ export CERTMONGER_LOCAL_CA_DIR="$tmpdir/local"
libexecdir=`$toolsdir/libexecdir`
cp ../certmonger.conf "$tmpdir"/config/
cp prequal.sh runsub.sh *.py "$tmpdir"/
-ln -s `pwd`/../../src/getcert "$tmpdir"/
-ln -s `pwd`/../../src/local-submit "$tmpdir"/
+ln -s "$toolsdir"/../../src/getcert "$tmpdir"/
+ln -s "$toolsdir"/../../src/local-submit "$tmpdir"/
for entry in entry bogus-entry ; do
sed "s|@tmpdir@|$tmpdir|g" $entry > "$tmpdir"/requests/$entry
done
commit de246a60d3f2be8a0d47d9012da6c305f14abf5a
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 12:41:15 2017 -0500
Fix saving of test results when builddir != srcdir
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index a0f7c2d..7490e75 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -65,6 +65,7 @@ for testid in "$@" $subdirs ; do
fi
if test -x "$srcdir"/"$testid"/run.sh ; then
pushd "$srcdir"/"$testid" > /dev/null
+ mkdir -p "$builddir"/"$testid"
rm -fr "$tmpdir"/*
mkdir -m 500 "$tmpdir"/rosubdir
mkdir -m 700 "$tmpdir"/rwsubdir
commit 8934130eba2c3ae13ed4ef1f3fee1e3cba439ec6
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 12:21:42 2017 -0500
Tag 0.79.1
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/certmonger.spec b/certmonger.spec
index 33ab46b..733945d 100644
--- a/certmonger.spec
+++ b/certmonger.spec
@@ -25,7 +25,7 @@
%endif
Name: certmonger
-Version: 0.79
+Version: 0.79.1
Release: 1%{?dist}
Summary: Certificate status monitor and PKI enrollment client
@@ -243,6 +243,11 @@ exit 0
%endif
%changelog
+* Sun Feb 19 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79.1-1
+- update to 0.79:
+ - update translations
+ - fix 'make archive' target
+
* Sun Feb 19 2017 Nalin Dahyabhai <nalin at redhat.com> 0.79-1
- update to 0.79:
- getcert now offers an option (-X) for requesting processing by a particular
diff --git a/configure.ac b/configure.ac
index 67780e4..bef2355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(certmonger,0.79)
+AC_INIT(certmonger,0.79.1)
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_MACRO_DIR(m4)
AM_MAINTAINER_MODE([disable])
commit 08d4be3dfc5705101f8748933bf1776510ac11c4
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 12:21:04 2017 -0500
Fix the 'archive' target
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/Makefile.am b/Makefile.am
index 38a08a7..b6a14a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_FILES = doc/*.txt
SUBDIRS = po src dbus systemd sysvinit tests
EXTRA_DIST = config.rpath \
- certmonger.spec LICENSE README STATUS doc src/certmonger.conf.in
+ certmonger.spec LICENSE README.md STATUS doc src/certmonger.conf.in
DISTCHECK_CONFIGURE_FLAGS = --enable-systemd --enable-sysvinit=/etc/rc.d/init.d --with-tmpdir=/var/run/certmonger
commit 3fad9ee89b726d5460e919c6ec2b520d61e60ac7
Author: Nalin Dahyabhai <nalin at redhat.com>
Date: Sun Feb 26 02:21:17 2017 -0500
Update translations
Signed-off-by: Nalin Dahyabhai <nalin at redhat.com>
diff --git a/po/ach.po b/po/ach.po
index beb0d58..680b692 100644
--- a/po/ach.po
+++ b/po/ach.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: certmonger\n"
"Report-Msgid-Bugs-To: certmonger-devel at lists.fedorahosted.org\n"
-"POT-Creation-Date: 2015-08-18 13:32-0400\n"
+"POT-Creation-Date: 2017-02-26 02:20-0500\n"
"PO-Revision-Date: 2014-11-11 10:00+0000\n"
"Last-Translator: Nalin Dahyabhai <nalin at fedoraproject.org>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/certmonger/"
@@ -29,27 +29,32 @@ msgstr ""
msgid "Unable to determine hostname of CA.\n"
msgstr ""
-#: src/certmaster.c:152 src/dogtag.c:520 src/ipa.c:756 src/local.c:552
+#: src/certmaster.c:153 src/dogtag.c:521 src/ipa.c:796
#, c-format
-msgid "Unable to read signing request.\n"
+msgid "Unable to read signing request from file \"%s\".\n"
+msgstr ""
+
+#: src/certmaster.c:156 src/dogtag.c:524 src/ipa.c:799
+#, c-format
+msgid "Unable to read signing request from environment variable \"%s\".\n"
msgstr ""
-#: src/certmaster.c:177
+#: src/certmaster.c:184
#, c-format
msgid "Error setting up for XMLRPC.\n"
msgstr ""
-#: src/certmaster.c:199 src/getcert.c:470 src/getcert.c:489 src/getcert.c:508
-#: src/getcert.c:527 src/getcert.c:545 src/getcert.c:638 src/getcert.c:1329
-#: src/getcert.c:1698 src/getcert.c:2240 src/getcert.c:2325 src/getcert.c:2880
-#: src/getcert.c:3102 src/getcert.c:3130 src/getcert.c:3351 src/getcert.c:3455
-#: src/getcert.c:3490 src/getcert.c:3525 src/getcert.c:3562 src/getcert.c:3813
-#: src/getcert.c:4266 src/getcert.c:4383 src/getcert.c:4576
+#: src/certmaster.c:206 src/getcert.c:526 src/getcert.c:545 src/getcert.c:564
+#: src/getcert.c:583 src/getcert.c:601 src/getcert.c:694 src/getcert.c:1409
+#: src/getcert.c:1796 src/getcert.c:2354 src/getcert.c:2440 src/getcert.c:3021
+#: src/getcert.c:3244 src/getcert.c:3272 src/getcert.c:3499 src/getcert.c:3603
+#: src/getcert.c:3638 src/getcert.c:3673 src/getcert.c:3710 src/getcert.c:3973
+#: src/getcert.c:4429 src/getcert.c:4547 src/getcert.c:4742
#, c-format
msgid "Error parsing server response.\n"
msgstr ""
-#: src/certmaster.c:203
+#: src/certmaster.c:210
#, c-format
msgid "Server error.\n"
msgstr ""
@@ -79,7 +84,7 @@ msgstr ""
msgid "No end-entity URL (-E) given, and no default known.\n"
msgstr ""
-#: src/dogtag.c:427 src/dogtag.c:437 src/dogtag.c:588
+#: src/dogtag.c:427 src/dogtag.c:437 src/dogtag.c:594
#, c-format
msgid "No agent URL (-A) given, and no default known.\n"
msgstr ""
@@ -94,27 +99,27 @@ msgstr ""
msgid "Error shutting down NSS.\n"
msgstr ""
-#: src/dogtag.c:487 src/dogtag.c:771
+#: src/dogtag.c:487 src/dogtag.c:777
#, c-format
msgid "Internal error: unknown state.\n"
msgstr ""
-#: src/dogtag.c:594
+#: src/dogtag.c:600
#, c-format
msgid "No agent credentials (-n) given, but they are needed.\n"
msgstr ""
-#: src/dogtag.c:751 src/scep.c:614
+#: src/dogtag.c:757 src/scep.c:619
#, c-format
msgid "Error %d connecting to %s: %s.\n"
msgstr ""
-#: src/dogtag.c:756 src/scep.c:619
+#: src/dogtag.c:762 src/scep.c:624
#, c-format
msgid "Error %d connecting to %s.\n"
More information about the Pkg-freeipa-devel
mailing list