--- a/components/libpki/Makefile Fri Jun 17 13:33:01 2016 -0700
+++ b/components/libpki/Makefile Mon Jun 20 11:20:50 2016 -0700
@@ -41,6 +41,13 @@
PKG_PROTO_DIRS += $(COMPONENT_SRC)/docs
+# Need to include the path below because not all headers are available in
+# $(BUILD_DIR)/src/libpki.
+CPPFLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/src
+
+# configure.in and Makefile.am patches need configure script recreation.
+COMPONENT_PREP_ACTION +=(cd $(@D); autoreconf);
+
# This is necessary because 'gmake install' tries to install some files under
# /usr/bin without it.
CONFIGURE_ENV += DESTDIR="$(PROTO_DIR)"
--- a/components/libpki/files/setup_test.sh Fri Jun 17 13:33:01 2016 -0700
+++ b/components/libpki/files/setup_test.sh Mon Jun 20 11:20:50 2016 -0700
@@ -28,10 +28,8 @@
export PATH=/bin:$PATH
# Replace the path to that under component build dir
-gsed -i.orig 's|\"etc\"|'\""$BUILD_DIR"'/etc\"|g' $COMPONENT_SRC/src/tests/test6.c
-rm $COMPONENT_SRC/src/tests/test6.c.orig
-gsed -i.orig 's|\"etc\"|'\""$BUILD_DIR"'/etc\"|g' $COMPONENT_SRC/src/tests/test8.c
-rm $COMPONENT_SRC/src/tests/test8.c.orig
+gsed -i 's|\"etc\"|'\""$BUILD_DIR"'/etc\"|g' $COMPONENT_SRC/src/tests/test6.c
+gsed -i 's|\"etc\"|'\""$BUILD_DIR"'/etc\"|g' $COMPONENT_SRC/src/tests/test8.c
# Make dirs under component build dir and copy necessary files under them
rm -rf $BUILD_DIR/etc/hsm.d
@@ -53,3 +51,14 @@
# Make results dir under component build dir
rm -rf $BUILD_DIR/results
mkdir $BUILD_DIR/results
+
+# Build test scripts
+gmake -C $BUILD_DIR/src/tests check-am
+
+# Test scripts need escapes because they are executed indirectly
+for i in {1..9}
+do
+ gsed -i 's|$libtool_install_magic|$$libtool_install_magic|g' $BUILD_DIR/src/tests/test$i
+ gsed -i 's|$libtool_execute_magic|$$libtool_execute_magic|g' $BUILD_DIR/src/tests/test$i
+ gsed -i 's|:$LD_LIBRARY_PATH|:$$LD_LIBRARY_PATH|g' $BUILD_DIR/src/tests/test$i
+done--- a/components/libpki/patches/01-configure.patch Fri Jun 17 13:33:01 2016 -0700
+++ b/components/libpki/patches/01-configure.patch Mon Jun 20 11:20:50 2016 -0700
@@ -2,12 +2,19 @@
Patch status: not Solaris-specific; suitable for upstream
Need to add architectures for Oracle build environments.
+
Need to disable rpath to avoid including 32-bit runpath in 64-bit binary.
-Need to use an appropriate path for ldap.h.
+
+Need to add AC_LANG_SOURCE to resolve autoreconf warnings.
---- libpki-0.8.9/configure 2015-11-10 13:50:26.446036204 -0800
-+++ libpki-0.8.9/configure 2016-06-02 17:47:01.889075071 -0700
[email protected]@ -2529,11 +2529,20 @@
+Need to use an appropriate path for ldap.h.
+On S12, we build with OpenLDAP.
+On S11.3, the default is to build with OpenLDAP, but we can specifiy to build
+with Mozilla LDAP instead by using --enable-openldap=no configure option.
+
+--- libpki-0.8.9/configure.in 2016-06-01 15:47:12.987843577 -0700
++++ libpki-0.8.9/configure.in 2016-06-20 11:13:17.409345800 -0700
[email protected]@ -36,11 +36,20 @@
mybits="64"
mybits_install="64"
;;
@@ -28,76 +35,342 @@
*aix*)
mybits="64"
mybits_install="64"
[email protected]@ -2627,6 +2636,10 @@
-
[email protected]@ -203,11 +212,13 @@
+ *sun*) myarch=solaris
+ shlext=so
+ rpath_opt="-R "
++ enable_rpath=no
+ ;;
+ *solaris*)
+ myarch=solaris
+ shlext=so
+ rpath_opt="-R "
++ enable_rpath=no
+ ;;
+ *hpux*) myarch=hpux
+ shlext=so
[email protected]@ -545,6 +556,7 @@
- enable_rpath=yes
-+if [ "$myarch" = "solaris" ] ; then
-+ enable_rpath=no
-+fi
-+
+ ldap_vendor=
+ ldap="yes"
++openldap="yes"
+ ldap_prefix=""
+ ldap_path=""
+ ldap_cflags=""
[email protected]@ -562,6 +574,11 @@
+ [enable ldap support ( default is yes)]),
+ ldap=$enableval, ldap=yes )
- # Export variables to prevent autoconf to use rpl_malloc instead
- # of malloc (it won't link properly otherwise!) - needed for iPhone
[email protected]@ -14891,26 +14904,37 @@
- $as_echo_n "checking checking for ldap vendor... " >&6; };
++AC_ARG_ENABLE(openldap,
++ AC_HELP_STRING( [--enable-openldap],
++ [enable openldap support on Solaris 11.3 (default is yes)]),
++ openldap=$enableval, openldap=yes )
++
+ if [[ "x$enable_iphone" = "xyes" ]] ; then
+ ldap="no"
+ fi
[email protected]@ -780,12 +797,12 @@
+ LDFLAGS="$mysql_ldflags $mysql_ldadd"
+ ok=0
+
+- AC_RUN_IFELSE( [
++ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <mysql.h>
+ int main(void) {
+ MYSQL *x;
+ return(0);
+- }], [ ok=1 ], [ ok=0 ])
++ }])], [ ok=1 ], [ ok=0 ])
- if ! [ "$_prefix" = "" ] ; then
+ CFLAGS="$OLD_CFLAGS"
+ LDFLAGS="$OLD_LDFLAGS"
[email protected]@ -884,12 +901,12 @@
+ LDFLAGS="$pg_ldflags $pg_ldadd"
+ ok=0
+
+- AC_RUN_IFELSE( [
++ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <libpq-fe.h>
+ int main(void) {
+ PGconn *sql;
+ return(0);
+- }], [ ok=1 ], [ ok=0 ])
++ }])], [ ok=1 ], [ ok=0 ])
+
+ CFLAGS="$OLD_CFLAGS"
+ LDFLAGS="$OLD_LDFLAGS"
+--- libpki-0.8.9/acinclude.m4 2016-06-01 15:47:48.803434658 -0700
++++ libpki-0.8.9/acinclude.m4 2016-06-16 13:16:34.558401470 -0700
[email protected]@ -293,12 +293,12 @@
+
+ dnl AC_MSG_RESULT([LD_LIBRARY_PATH=$library_path]);
+
+-AC_RUN_IFELSE( [
++AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <openssl/x509.h>
+ int main(void) {
+ X509 *x = NULL;
+ return(0);
+-}], [ ok=1 ], [ ok=0 ])
++}])], [ ok=1 ], [ ok=0 ])
+
+ CFLAGS=$old_cflags
+ LDFLAGS=$old_ldflags
[email protected]@ -337,12 +337,12 @@
+
+ AC_MSG_CHECKING([checking for $1 support]);
+
+-AC_RUN_IFELSE( [
++AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdlib.h>
+ int main(void)
+ {
+ return(0);
+-}], [ _supported=yes ], [ _supported=no])
++}])], [ _supported=yes ], [ _supported=no])
+
+ if [[ $_supported = no ]] ; then
+ AC_MSG_RESULT([not supported]);
[email protected]@ -367,84 +367,62 @@
+ AC_MSG_CHECKING([checking for ldap vendor]);
+
+ if ! [[ "$_prefix" = "" ]] ; then
- if $EGREP "Sun" "$_prefix/include/ldap.h" 2>&1 >/dev/null ; then
-- $as_echo "#define LDAP_VENDOR_SUN 1" >>confdefs.h
-+ ldap_include_dir=$_prefix/include
-+ if [ "$myarch" = "solaris" ] ; then
-+ if [ "$DIST_VERSION" = "5.12" ] ; then
-+ ldap_include_dir=$ldap_include_dir/openldap
-+ else
-+ if [ -d $ldap_include_dir/openldap ] ; then
-+ ldap_include_dir=$ldap_include_dir/openldap
-+ fi
-+ fi
-+ fi
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
+- AC_DEFINE(LDAP_VENDOR_SUN)
+- AC_MSG_RESULT([yes])
- ldap_vendor="SUN"
- else
- if $EGREP "OpenLDAP" "$_prefix/include/ldap.h" 2>&1 >/dev/null ; then
-- $as_echo "#define LDAP_VENDOR_OPENLDAP 1" >>confdefs.h
-+ if $EGREP "Sun" "$ldap_include_dir/ldap.h" 2>&1 >/dev/null ; then
-+ $as_echo "#define LDAP_VENDOR_SUN 1" >>confdefs.h
-
+- AC_DEFINE(LDAP_VENDOR_OPENLDAP)
- ldap_vendor="OPENLDAP"
-- library_ldflags=-L$_prefix/lib
-- library_ldadd=-lldap_r
-- else
-- as_fn_error $? "*** LDAP::No supported vendors found in ($_prefix)***" "$LINENO" 5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ ldap_vendor="SUN"
-+ else
-+ if $EGREP "OpenLDAP" "$ldap_include_dir/ldap.h" 2>&1 >/dev/null ; then
-+ $as_echo "#define LDAP_VENDOR_OPENLDAP 1" >>confdefs.h
+- library_ldflags=[-L$_prefix/lib]
+- library_ldadd=[-lldap_r]
++ dnl A directory path where ldap.h exists.
++ dnl The deafult is $_prefix/include, but it can be different depending on
++ dnl operating systems and versions.
++ ldap_include_dir=$_prefix/include
+
++ if [[ "$myarch" = "solaris" ]] ; then
++ if [[ "$DIST_VERSION" = "5.12" ]] ; then
++ dnl On Solaris 12, we force to build with OpenLDAP.
++ AC_DEFINE(LDAP_VENDOR_OPENLDAP)
++ AC_MSG_RESULT([yes])
++ ldap_include_dir=$ldap_include_dir/openldap
+ ldap_vendor="OPENLDAP"
-+ library_ldflags=-L$_prefix/lib
-+ library_ldadd=-lldap_r
++ library_ldflags=[-L$_prefix/lib]
++ library_ldadd=[-lldap_r]
+ else
-+ as_fn_error $? "*** LDAP::No supported vendors found in ($_prefix)***" "$LINENO" 5
++ dnl On Solaris 11.3, the default is to build with OpenLDAP,
++ dnl but when --enable-openldap=no configure option is specified,
++ dnl we build with Mozilla LDAP instead.
++ if [[ "x$openldap" = "xyes" ]] ; then
++ AC_DEFINE(LDAP_VENDOR_OPENLDAP)
++ AC_MSG_RESULT([yes])
++ ldap_include_dir=$ldap_include_dir/openldap
++ ldap_vendor="OPENLDAP"
++ library_ldflags=[-L$_prefix/lib]
++ library_ldadd=[-lldap_r]
++ else
++ AC_DEFINE(LDAP_VENDOR_SUN)
++ AC_MSG_RESULT([yes])
++ ldap_vendor="SUN"
++ ldap_lib=`ls "${_prefix}/lib/libldap.${shlext}" | head -n 1`;
++ if [[ -z "$ldap_lib" ]] ; then
++ AC_MSG_ERROR([*** LDAP: missing $_prefix/lib/libldap.$shlext!])
++ fi
++ library_ldflags=[-L$_prefix/lib]
++ library_ldadd=[-lldap]
++ fi
+ fi
- fi
+ else
+- AC_MSG_ERROR([*** LDAP::No supported vendors found in ($_prefix)***])
+- fi
- fi
-
- if [ "$ldap_vendor" = "SUN" ] ; then
+-
+- if [[ "$ldap_vendor" = "SUN" ]] ; then
- ldap_lib=`ls "${_prefix}/lib/libldap.${shlext}" | head -n 1`;
-+ ldap_lib=`ls "${_prefix}/lib/libldap.${shlext}" | head -n 1`;
- if [ -z "$ldap_lib" ] ; then
- as_fn_error $? "*** LDAP: missing $_prefix/lib/libldap.$shlext!" "$LINENO" 5
+- if [[ -z "$ldap_lib" ]] ; then
+- AC_MSG_ERROR([*** LDAP: missing $_prefix/lib/libldap.$shlext!])
++ if $EGREP "OpenLDAP" "$ldap_include_dir/ldap.h" 2>&1 >/dev/null ; then
++ AC_DEFINE(LDAP_VENDOR_OPENLDAP)
++ AC_MSG_RESULT([yes])
++ ldap_vendor="OPENLDAP"
++ library_ldflags=[-L$_prefix/lib]
++ library_ldadd=[-lldap_r]
++ else
++ AC_MSG_ERROR([*** LDAP::No supported vendors found in ($ldap_include_dir)***])
fi
[email protected]@ -14919,7 +14943,7 @@
+- library_ldflags=[-L$_prefix/lib]
+- library_ldadd=[-lldap]
fi
library_prefix=$_prefix;
-- library_cflags=-I${_prefix}/include
-+ library_cflags=-I$ldap_include_dir
+- library_cflags=[-I${_prefix}/include]
+-
+-old_cflags=$CFLAGS
+-old_ldflags=$LDFLAGS
+-old_ldadd=$LDADD
+-
+-CFLAGS=$library_cflags
+-LDFLAGS=$library_ldflags
+-LDADD=$library_ldadd
+-
+-AC_MSG_RESULT([LDAP SEARCH: CFLAGS: $library_cflags])
+-AC_MSG_RESULT([LDAP SEARCH: LDFLAGS: $library_ldflags])
+-AC_MSG_RESULT([LDAP SEARCH: LDADD: $library_ldadd])
+-
+-dnl AC_MSG_RESULT([LDAP VENDOR ===> searching for Sun])
+- AC_EGREP_CPP( [Sun],
+-[
+-#include <ldap.h>
+-
+-int main(void) {
+- char *p = LDAP_VENDOR_NAME;
+- return(0);
+-}],
+- [
+- AC_DEFINE(LDAP_VENDOR_SUN)
+- ldap_vendor="SUN"
+- ])
+-
+- if ! [[ "$ldap_vendor" = "SUN" ]] ; then
+- dnl AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]);
+- AC_EGREP_CPP( [OpenLDAP],
+-[
+-#include <ldap.h>
+-
+-int main(void) {
+- char *p = LDAP_VENDOR_NAME;
+- return(0);
+-}],
+- [
+- AC_DEFINE(LDAP_VENDOR_OPENLDAP)
+- dnl AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]);
+- ldap_vendor="OPENLDAP"
+- ])
+- fi
+-
+-LDFLAGS=$old_ldflags
+-CFLAGS=$old_cflags
+-LDADD=$old_ldadd
++ library_cflags=[-I$ldap_include_dir]
+
+ else
+
+- AC_MSG_RESULT([LDAP VENDOR ($_prefix) ===> searching for Sun])
+- AC_EGREP_CPP( [Sun],
++ AC_MSG_RESULT([LDAP VENDOR ===> searching for Sun])
++ AC_EGREP_CPP( [Sun],
+ [
+ #include <ldap.h>
+
[email protected]@ -452,15 +430,15 @@
+ char *p = LDAP_VENDOR_NAME;
+ return(0);
+ }],
+- [
+- AC_DEFINE(LDAP_VENDOR_SUN)
+- ldap_vendor="SUN"
++ [
++ AC_DEFINE(LDAP_VENDOR_SUN)
++ ldap_vendor="SUN"
+ library_ldadd="-lldap"
+- ])
++ ])
+
+- if ! [[ "x$ldap_vendor" = "SUN" ]] ; then
+- AC_MSG_CHECKING([checking for OpenLDAP vendor ($_prefix) ]);
+- AC_EGREP_CPP( [OpenLDAP],
++ if ! [[ "x$ldap_vendor" = "SUN" ]] ; then
++ AC_MSG_CHECKING([checking for OpenLDAP vendor]);
++ AC_EGREP_CPP( [OpenLDAP],
+ [
+ #include <ldap.h>
- old_cflags=$CFLAGS
- old_ldflags=$LDFLAGS
[email protected]@ -468,16 +446,13 @@
+ char *p = LDAP_VENDOR_NAME;
+ return(0);
+ }],
+- [
+- AC_DEFINE(LDAP_VENDOR_OPENLDAP)
+- ldap_vendor="OPENLDAP"
++ [
++ AC_DEFINE(LDAP_VENDOR_OPENLDAP)
++ ldap_vendor="OPENLDAP"
+ library_ldadd="-lldap_r"
+ ])
+- fi
++ fi
+ fi
+-
+- AC_MSG_RESULT([LDAP VENDOR: $ldap_vendor]);
+-
+ ])
+
+ AC_DEFUN(CHECK_EC, [
[email protected]@ -548,7 +523,7 @@
+ dnl fi
+ dnl ])
+
+-dnl AC_RUN_IFELSE( [
++dnl AC_RUN_IFELSE([AC_LANG_SOURCE([
+ dnl #include <openssl/ec.h>
+ dnl #include <openssl/ecdsa.h>
+ dnl #include <openssl/opensslconf.h>
[email protected]@ -559,7 +534,7 @@
+ dnl #endif
+ dnl EC_KEY *d = NULL;
+ dnl return(0);
+-dnl }], [
++dnl }])], [
+ dnl AC_DEFINE([ENABLE_ECDSA], 1, [ECC Support for OpenSSL])
+ dnl activate_ecdsa=yes
+ dnl ], [activate_ecdsa=no])
[email protected]@ -576,13 +551,13 @@
+ dnl fi
+
+ AC_DEFUN(AC_OPENSSL_OCSP,
+-[ AC_RUN_IFELSE( [
++[ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <openssl/ocsp.h>
+ int main(void)
+ {
+ OCSP_CERTID *cid = NULL;
+ return(0);
+-}], [ AC_DEFINE(HAVE_OCSP) ], [ocsp_error=1])
++}])], [ AC_DEFINE(HAVE_OCSP) ], [ocsp_error=1])
+
+ if [[ ocsp_error = 1 ]] ; then
+ AC_MSG_RESULT([checking for OpenSSL OCSP support ... no])
[email protected]@ -611,19 +586,19 @@
+ ])
+
+ AC_DEFUN(AC_GCC_CHECK_PRAGMA_IGNORED,
+-[ AC_RUN_IFELSE( [
++[ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #pragma GCC diagnostic ignored "-Wconversion"
+ int main(void)
+ {
+ return(0);
+ }
+-],[ AC_DEFINE(HAVE_GCC_PRAGMA_IGNORED, 1, [GCC pragma ignored]) ], [])
++])],[ AC_DEFINE(HAVE_GCC_PRAGMA_IGNORED, 1, [GCC pragma ignored]) ], [])
+
+ ])
+
+ AC_DEFUN(AC_GCC_CHECK_PRAGMA_POP,
+-[ AC_RUN_IFELSE( [
++[ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <stdio.h>
+ #pragma GCC diagnostic ignored "-Wconversion"
+ int main(void)
[email protected]@ -631,7 +606,7 @@
+ return(0);
+ }
+ #pragma GCC diagnostic pop
+-], [ AC_DEFINE(HAVE_GCC_PRAGMA_POP, 1, [GCC pragma pop]) ], [])
++])], [ AC_DEFINE(HAVE_GCC_PRAGMA_POP, 1, [GCC pragma pop]) ], [])
+
+ ])
+ --- a/components/libpki/patches/02-makefile.patch Fri Jun 17 13:33:01 2016 -0700
+++ b/components/libpki/patches/02-makefile.patch Mon Jun 20 11:20:50 2016 -0700
@@ -9,16 +9,16 @@
Documents should be installed under /usr/share/doc/libpki instead of
/usr/share/libpki.
-Need to include $(top_srcdir)/src because not all headers are available in
-$(top_builddir)src/libpki.
-
Configuration files should be installed under /etc/libpki.
-Test scripts need escapes because they are executed indirectly.
+Need to include $(top_srcdir)/src because not all headers are available in
+$(top_builddir)/src/libpki.
---- libpki-0.8.9/Makefile.in Tue Nov 10 13:50:26 2015
-+++ libpki-0.8.9/Makefile.in Fri Jan 22 15:20:53 2016
[email protected]@ -720,8 +720,6 @@
+The option -ggdb doesn't work with Studio.
+
+--- libpki-0.8.9/Makefile.am 2016-06-01 15:47:17.703517449 -0700
++++ libpki-0.8.9/Makefile.am 2016-06-01 18:14:09.941087309 -0700
[email protected]@ -89,8 +89,6 @@
src/tests/test4 \
src/tests/test5 \
src/tests/test6 \
@@ -26,10 +26,10 @@
- src/tests/test8 \
src/tests/test9
- MAKEFILE = Makefile
---- libpki-0.8.9/docs/Makefile.in 2015-11-10 13:50:26.216743764 -0800
-+++ libpki-0.8.9/docs/Makefile.in 2016-04-15 10:52:12.325254362 -0700
[email protected]@ -550,10 +550,11 @@
+ rebuild::
+--- libpki-0.8.9/docs/Makefile.am 2016-06-01 15:47:48.571731471 -0700
++++ libpki-0.8.9/docs/Makefile.am 2016-06-01 18:16:44.901744754 -0700
[email protected]@ -36,10 +36,11 @@
install-data-am: install-man
@$(NORMAL_INSTALL) ; \
$(mkinstalldirs) $(DESTDIR)$(exec_prefix)/share; \
@@ -43,270 +43,16 @@
fi \
done
---- libpki-0.8.9/src/drivers/openssl/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/drivers/openssl/Makefile.in Fri Nov 13 11:47:48 2015
[email protected]@ -123,7 +123,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/drivers/engine/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/drivers/engine/Makefile.in Fri Nov 13 11:48:47 2015
[email protected]@ -121,7 +121,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/drivers/pkcs11/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/drivers/pkcs11/Makefile.in Fri Nov 13 11:50:19 2015
[email protected]@ -122,7 +122,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/drivers/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/drivers/Makefile.in Fri Nov 13 11:51:56 2015
[email protected]@ -120,7 +120,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/openssl/Makefile.in Tue Nov 10 13:50:29 2015
-+++ libpki-0.8.9/src/openssl/Makefile.in Fri Nov 13 11:53:25 2015
[email protected]@ -140,7 +140,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/io/Makefile.in Tue Nov 10 13:50:29 2015
-+++ libpki-0.8.9/src/io/Makefile.in Fri Nov 13 11:56:27 2015
[email protected]@ -127,7 +127,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/net/Makefile.in Tue Nov 10 13:50:29 2015
-+++ libpki-0.8.9/src/net/Makefile.in Fri Nov 13 11:58:14 2015
[email protected]@ -122,7 +122,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/scep/Makefile.in Tue Nov 10 13:50:26 2015
-+++ libpki-0.8.9/src/scep/Makefile.in Fri Nov 13 12:00:02 2015
[email protected]@ -122,7 +122,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/cms/Makefile.in Tue Nov 10 13:50:26 2015
-+++ libpki-0.8.9/src/cms/Makefile.in Fri Nov 13 12:01:44 2015
[email protected]@ -119,7 +119,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/prqp/Makefile.in Tue Nov 10 13:50:26 2015
-+++ libpki-0.8.9/src/prqp/Makefile.in Fri Nov 13 12:03:37 2015
[email protected]@ -122,7 +122,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/lirt/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/lirt/Makefile.in Fri Nov 13 12:05:33 2015
[email protected]@ -120,7 +120,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/src/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/Makefile.in Fri Nov 13 12:58:39 2015
[email protected]@ -84,7 +84,7 @@
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/build/mkinstalldirs $(srcdir)/global-vars.in \
-- $(top_srcdir)/build/depcomp $(nobase_include_HEADERS)
-+ $(top_srcdir)/build/depcomp $(include_HEADERS)
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
[email protected]@ -200,7 +200,7 @@
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
--HEADERS = $(nobase_include_HEADERS)
-+HEADERS = $(include_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
- am__recursive_targets = \
[email protected]@ -487,22 +487,26 @@
- -I$(top_srcdir)/src/libpki \
- $(COND_INCLUDES)
-
--nobase_include_HEADERS = \
-- libpki/*.h \
-- libpki/net/*.h \
-- libpki/io/*.h \
-- libpki/scep/*.h \
-- libpki/prqp/*.h \
-- libpki/lirt/*.h \
-- libpki/cms/*.h \
-- libpki/openssl/*.h \
-- libpki/drivers/*.h \
-- libpki/drivers/openssl/*.h \
-- libpki/drivers/engine/*.h \
-- libpki/drivers/pkcs11/*.h \
-- libpki/drivers/pkcs11/rsa/*.h \
-- libpki/drivers/kmf/*.h
-+include_HEADERS = $(nobase_include_HEADERS) $(src_include_HEADERS)
-
-+nobase_include_HEADERS = libpki/*.h
-+
-+src_include_HEADERS = \
-+ $(top_srcdir)/src/libpki/*.h \
-+ $(top_srcdir)/src/libpki/net/*.h \
-+ $(top_srcdir)/src/libpki/io/*.h \
-+ $(top_srcdir)/src/libpki/scep/*.h \
-+ $(top_srcdir)/src/libpki/prqp/*.h \
-+ $(top_srcdir)/src/libpki/lirt/*.h \
-+ $(top_srcdir)/src/libpki/cms/*.h \
-+ $(top_srcdir)/src/libpki/openssl/*.h \
-+ $(top_srcdir)/src/libpki/drivers/*.h \
-+ $(top_srcdir)/src/libpki/drivers/openssl/*.h \
-+ $(top_srcdir)/src/libpki/drivers/engine/*.h \
-+ $(top_srcdir)/src/libpki/drivers/pkcs11/*.h \
-+ $(top_srcdir)/src/libpki/drivers/pkcs11/rsa/*.h \
-+ $(top_srcdir)/src/libpki/drivers/kmf/*.h
-+
- SRCS = \
- pki_init.c \
- stack.c \
[email protected]@ -848,9 +852,9 @@
-
- clean-libtool:
- -rm -rf .libs _libs
--install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-+install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
-- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
[email protected]@ -867,9 +871,9 @@
- $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
- done
-
--uninstall-nobase_includeHEADERS:
-+uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
-- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
-+ @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
- $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
[email protected]@ -1088,7 +1092,7 @@
-
- info-am:
-
--install-data-am: install-nobase_includeHEADERS
-+install-data-am: install-includeHEADERS
-
- install-dvi: install-dvi-recursive
-
[email protected]@ -1135,7 +1139,7 @@
- ps-am:
-
- uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
-- uninstall-nobase_includeHEADERS
-+ uninstall-includeHEADERS
-
- .MAKE: $(am__recursive_targets) install-am install-strip
-
[email protected]@ -1148,13 +1152,13 @@
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
-- install-nobase_includeHEADERS install-pdf install-pdf-am \
-+ install-includeHEADERS install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-binSCRIPTS \
-- uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
-+ uninstall-libLTLIBRARIES uninstall-includeHEADERS
-
- include $(TOP)/global-vars
-
---- libpki-0.8.9/src/tools/Makefile.in Tue Nov 10 13:50:28 2015
-+++ libpki-0.8.9/src/tools/Makefile.in Fri Nov 13 13:02:54 2015
[email protected]@ -186,7 +186,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
---- libpki-0.8.9/etc/Makefile.in 2015-11-10 13:50:29.721576908 -0800
-+++ libpki-0.8.9/etc/Makefile.in 2016-03-03 16:52:45.825183809 -0800
[email protected]@ -340,7 +340,7 @@
- HSMS = hsm.d/*.xml
- STORES = store.d/*.xml
- CONFIGS = *.xml
+--- libpki-0.8.9/etc/Makefile.am 2016-06-01 15:47:16.927275667 -0700
++++ libpki-0.8.9/etc/Makefile.am 2016-06-07 14:20:52.853719021 -0700
[email protected]@ -12,42 +12,42 @@
+ HSMS = hsm.d/*.xml
+ STORES = store.d/*.xml
+ CONFIGS = *.xml
-PKI_CONFIG = pki.conf
+PKI_CONFIG = $(srcdir)/pki.conf
+
EXTRA_DIST = $(PROFILES) $(TOKENS) $(HSMS) $(STORES) $(CONFIGS) $(PKI_CONFIG)
- all: all-am
-
[email protected]@ -536,37 +536,37 @@
install-data-local:
@$(NORMAL_INSTALL) ; \
@@ -353,91 +99,48 @@
- @$(INSTALL_DATA) $(PKI_CONFIG) $(DESTDIR)$(exec_prefix)/etc
+ @$(INSTALL_DATA) $(PKI_CONFIG) $(DESTDIR)/etc
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- libpki-0.8.9/src/tests/Makefile.in 2015-11-10 13:50:26.783174638 -0800
-+++ libpki-0.8.9/src/tests/Makefile.in 2016-02-05 14:22:47.657049798 -0800
[email protected]@ -166,7 +166,7 @@
- am__v_at_ = $([email protected][email protected])
- am__v_at_0 = @
- am__v_at_1 =
--DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki
-+DEFAULT_INCLUDES = [email protected][email protected] -I$(top_builddir)/src/libpki -I$(top_srcdir)/src
- depcomp = $(SHELL) $(top_srcdir)/build/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
[email protected]@ -522,7 +522,7 @@
+
+--- libpki-0.8.9/src/Makefile.am 2016-06-01 15:47:17.732926831 -0700
++++ libpki-0.8.9/src/Makefile.am 2016-06-09 14:49:11.713859300 -0700
[email protected]@ -27,19 +27,20 @@
+
+ nobase_include_HEADERS = \
+ libpki/*.h \
+- libpki/net/*.h \
+- libpki/io/*.h \
+- libpki/scep/*.h \
+- libpki/prqp/*.h \
+- libpki/lirt/*.h \
+- libpki/cms/*.h \
+- libpki/openssl/*.h \
+- libpki/drivers/*.h \
+- libpki/drivers/openssl/*.h \
+- libpki/drivers/engine/*.h \
+- libpki/drivers/pkcs11/*.h \
+- libpki/drivers/pkcs11/rsa/*.h \
+- libpki/drivers/kmf/*.h
++ $(top_srcdir)/src/libpki/*.h \
++ $(top_srcdir)/src/libpki/net/*.h \
++ $(top_srcdir)/src/libpki/io/*.h \
++ $(top_srcdir)/src/libpki/scep/*.h \
++ $(top_srcdir)/src/libpki/prqp/*.h \
++ $(top_srcdir)/src/libpki/lirt/*.h \
++ $(top_srcdir)/src/libpki/cms/*.h \
++ $(top_srcdir)/src/libpki/openssl/*.h \
++ $(top_srcdir)/src/libpki/drivers/*.h \
++ $(top_srcdir)/src/libpki/drivers/openssl/*.h \
++ $(top_srcdir)/src/libpki/drivers/engine/*.h \
++ $(top_srcdir)/src/libpki/drivers/pkcs11/*.h \
++ $(top_srcdir)/src/libpki/drivers/pkcs11/rsa/*.h \
++ $(top_srcdir)/src/libpki/drivers/kmf/*.h
+
+ SRCS = \
+ pki_init.c \
+--- libpki-0.8.9/src/tests/Makefile.am 2016-06-01 15:47:33.304908175 -0700
++++ libpki-0.8.9/src/tests/Makefile.am 2016-06-07 15:21:44.869944846 -0700
[email protected]@ -73,4 +73,4 @@
test9_SOURCES = test9.c
test9_LDFLAGS = $(testLDFLAGS)
- test9_LDADD = $(testLDADD)
+ test9_LDADD = $(testLDADD)
-test9_CFLAGS = -I$(TOP) $(LIBPKI_CFLAGS) -ggdb
+test9_CFLAGS = -I$(TOP) $(LIBPKI_CFLAGS)
- all: all-recursive
-
- .SUFFIXES:
[email protected]@ -570,38 +570,65 @@
- test1$(EXEEXT): $(test1_OBJECTS) $(test1_DEPENDENCIES) $(EXTRA_test1_DEPENDENCIES)
- @rm -f test1$(EXEEXT)
- $(AM_V_CCLD)$(test1_LINK) $(test1_OBJECTS) $(test1_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test1$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test1$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test1$(EXEEXT)
-
- test2$(EXEEXT): $(test2_OBJECTS) $(test2_DEPENDENCIES) $(EXTRA_test2_DEPENDENCIES)
- @rm -f test2$(EXEEXT)
- $(AM_V_CCLD)$(test2_LINK) $(test2_OBJECTS) $(test2_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test2$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test2$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test2$(EXEEXT)
-
- test3$(EXEEXT): $(test3_OBJECTS) $(test3_DEPENDENCIES) $(EXTRA_test3_DEPENDENCIES)
- @rm -f test3$(EXEEXT)
- $(AM_V_CCLD)$(test3_LINK) $(test3_OBJECTS) $(test3_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test3$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test3$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test3$(EXEEXT)
-
- test4$(EXEEXT): $(test4_OBJECTS) $(test4_DEPENDENCIES) $(EXTRA_test4_DEPENDENCIES)
- @rm -f test4$(EXEEXT)
- $(AM_V_CCLD)$(test4_LINK) $(test4_OBJECTS) $(test4_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test4$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test4$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test4$(EXEEXT)
-
- test5$(EXEEXT): $(test5_OBJECTS) $(test5_DEPENDENCIES) $(EXTRA_test5_DEPENDENCIES)
- @rm -f test5$(EXEEXT)
- $(AM_V_CCLD)$(test5_LINK) $(test5_OBJECTS) $(test5_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test5$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test5$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test5$(EXEEXT)
-
- test6$(EXEEXT): $(test6_OBJECTS) $(test6_DEPENDENCIES) $(EXTRA_test6_DEPENDENCIES)
- @rm -f test6$(EXEEXT)
- $(AM_V_CCLD)$(test6_LINK) $(test6_OBJECTS) $(test6_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test6$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test6$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test6$(EXEEXT)
-
- test7$(EXEEXT): $(test7_OBJECTS) $(test7_DEPENDENCIES) $(EXTRA_test7_DEPENDENCIES)
- @rm -f test7$(EXEEXT)
- $(AM_V_CCLD)$(test7_LINK) $(test7_OBJECTS) $(test7_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test7$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test7$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test7$(EXEEXT)
-
- test8$(EXEEXT): $(test8_OBJECTS) $(test8_DEPENDENCIES) $(EXTRA_test8_DEPENDENCIES)
- @rm -f test8$(EXEEXT)
- $(AM_V_CCLD)$(test8_LINK) $(test8_OBJECTS) $(test8_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test8$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test8$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test8$(EXEEXT)
-
- test9$(EXEEXT): $(test9_OBJECTS) $(test9_DEPENDENCIES) $(EXTRA_test9_DEPENDENCIES)
- @rm -f test9$(EXEEXT)
- $(AM_V_CCLD)$(test9_LINK) $(test9_OBJECTS) $(test9_LDADD) $(LIBS)
-+ @gsed -i 's/$$libtool_install_magic/$$$$libtool_install_magic/g' test9$(EXEEXT)
-+ @gsed -i 's/$$libtool_execute_magic/$$$$libtool_execute_magic/g' test9$(EXEEXT)
-+ @gsed -i 's/:$$LD_LIBRARY_PATH/:$$$$LD_LIBRARY_PATH/g' test9$(EXEEXT)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)