[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Mon Oct 3 16:36:56 UTC 2016
debian/changelog | 12 ++++++++++++
debian/control | 5 +++++
debian/patches/debian-support.diff | 30 +++++++++++++++++++-----------
debian/pki-server.postinst | 2 +-
debian/rules | 1 +
debian/tests/control | 8 ++++++++
debian/tests/deploy.cfg | 36 ++++++++++++++++++++++++++++++++++++
debian/tests/pkispawn | 22 ++++++++++++++++++++++
8 files changed, 104 insertions(+), 12 deletions(-)
New commits:
commit 31c302affe017bdf84d25060fc3d28727247b162
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 19:30:23 2016 +0300
releasing package dogtag-pki version 10.3.5-4
diff --git a/debian/changelog b/debian/changelog
index 944f684..beb8ca3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
+dogtag-pki (10.3.5-4) unstable; urgency=medium
* tests: Add simple autopkgtest that runs setup-ds and pkispawn.
* server.postinst: Tell pki-server migrate to migrate to tomcat8.
@@ -8,7 +8,7 @@ dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
libcommons-pool-java, libjboss-logging-java, libsymkey-java to pki-
server Depends.
- -- Timo Aaltonen <tjaalton at debian.org> Sat, 01 Oct 2016 00:01:55 +0300
+ -- Timo Aaltonen <tjaalton at debian.org> Mon, 03 Oct 2016 19:30:15 +0300
dogtag-pki (10.3.5-3) unstable; urgency=medium
commit 2ac5a10d3b36043799a9f396ac595cca91d19de7
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 18:33:21 2016 +0300
control: Add libcommons-collections3-java, libcommons-dbcp-java, libcommons-pool-java, libjboss-logging-java, libsymkey-java to pki- server Depends.
diff --git a/debian/changelog b/debian/changelog
index 34c42cf..944f684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
* server.postinst: Tell pki-server migrate to migrate to tomcat8.
* debian-support.diff: Fix some jar symlinks, and drop extra / from
config dirs.
+ * control: Add libcommons-collections3-java, libcommons-dbcp-java,
+ libcommons-pool-java, libjboss-logging-java, libsymkey-java to pki-
+ server Depends.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 01 Oct 2016 00:01:55 +0300
diff --git a/debian/control b/debian/control
index 73edb98..7360ccf 100644
--- a/debian/control
+++ b/debian/control
@@ -159,11 +159,16 @@ Depends:
dogtag-pki-server-theme (>= ${source:Version}),
ldap-utils,
libatk-wrapper-java,
+ libcommons-collections3-java,
+ libcommons-dbcp-java,
+ libcommons-pool-java,
libjackson-json-java,
libjackson2-annotations-java,
libjackson2-jaxrs-providers-java,
+ libjboss-logging-java,
libjs-jquery,
libjs-underscore,
+ libsymkey-java (= ${source:Version}),
libtomcatjss-java (>= 7.1.4-2),
libnuxwdog-java,
libxml-commons-external-java,
commit 105d12c5887e96e14e3f4a2abb3c87a5b38810da
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 18:31:19 2016 +0300
debian-support.diff: Fix some jar symlinks, and drop extra / from config dirs.
diff --git a/debian/changelog b/debian/changelog
index f86d3f1..34c42cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
* tests: Add simple autopkgtest that runs setup-ds and pkispawn.
* server.postinst: Tell pki-server migrate to migrate to tomcat8.
+ * debian-support.diff: Fix some jar symlinks, and drop extra / from
+ config dirs.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 01 Oct 2016 00:01:55 +0300
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 2d5a65f..44b9476 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -106,12 +106,12 @@ Description: changes for Debian
if [ -f /etc/debian_version ]; then
debian=true
+ . /lib/lsb/init-functions
-+ ETC_SYSCONFIG_DIR=/etc/default/
-+ SYSCONFIG_PKI=/etc/dogtag/
++ ETC_SYSCONFIG_DIR=/etc/default
++ SYSCONFIG_PKI=/etc/dogtag
else
debian=false
-+ ETC_SYSCONFIG_DIR=/etc/sysconfig/
-+ SYSCONFIG_PKI=/etc/sysconfig/pki/
++ ETC_SYSCONFIG_DIR=/etc/sysconfig
++ SYSCONFIG_PKI=/etc/sysconfig/pki
fi
case $command in
@@ -362,7 +362,7 @@ Description: changes for Debian
PKI_LIB=/usr/share/pki/lib
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
-@@ -24,21 +24,21 @@ add_custom_command(
+@@ -24,29 +24,29 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-io.jar lib/commons-io.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-lang.jar lib/commons-lang.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-logging.jar lib/commons-logging.jar
@@ -397,8 +397,9 @@ Description: changes for Debian
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-atom-provider.jar lib/resteasy-atom-provider.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-client.jar lib/resteasy-client.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jackson-provider.jar lib/resteasy-jackson-provider.jar
-@@ -46,7 +46,7 @@ add_custom_command(
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/jaxrs-api.jar lib/resteasy-jaxrs-api.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxb-provider.jar lib/resteasy-jaxb-provider.jar
+- COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/jaxrs-api.jar lib/resteasy-jaxrs-api.jar
++ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/javax.ws.rs-api.jar lib/javax.ws.rs-api.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxrs-jandex.jar lib/resteasy-jaxrs-jandex.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxrs.jar lib/resteasy-jaxrs.jar
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/servlet.jar lib/servlet.jar
@@ -408,7 +409,12 @@ Description: changes for Debian
install(
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
-@@ -33,19 +33,19 @@ add_custom_command(
+@@ -29,36 +29,37 @@ add_custom_command(
+ TARGET pki-server-common-lib
+ COMMAND ${CMAKE_COMMAND} -E make_directory common/lib
+ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-codec.jar common/lib/commons-codec.jar
+- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-collections.jar common/lib/commons-collections.jar
++ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-collections3.jar common/lib/commons-collections.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-io.jar common/lib/commons-io.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-lang.jar common/lib/commons-lang.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/commons-logging.jar common/lib/commons-logging.jar
@@ -430,6 +436,7 @@ Description: changes for Debian
+ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jackson-xc.jar common/lib/jackson-xc.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/javassist.jar common/lib/javassist.jar
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/lib/java/jss4.jar common/lib/jss4.jar
++ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jboss-logging.jar common/lib/jboss-logging.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/jss4.jar common/lib/jss4.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/ldapjdk.jar common/lib/ldapjdk.jar
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/lib/java/nuxwdog.jar common/lib/nuxwdog.jar
@@ -439,12 +446,13 @@ Description: changes for Debian
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-atom-provider.jar common/lib/resteasy-atom-provider.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-client.jar common/lib/resteasy-client.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jackson-provider.jar common/lib/resteasy-jackson-provider.jar
-@@ -53,12 +53,12 @@ add_custom_command(
- COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/jaxrs-api.jar common/lib/resteasy-jaxrs-api.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxb-provider.jar common/lib/resteasy-jaxb-provider.jar
+- COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/jaxrs-api.jar common/lib/resteasy-jaxrs-api.jar
++ COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/javax.ws.rs-api.jar common/lib/javax.ws.rs-api.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxrs.jar common/lib/resteasy-jaxrs.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/scannotation.jar common/lib/scannotation.jar
- COMMAND /usr/bin/ln -sf /usr/lib/java/symkey.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/symkey.jar
-+ COMMAND ln -sf /usr/lib/java/symkey.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/symkey.jar
++ COMMAND ln -sf /usr/share/java/symkey.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/symkey.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/tomcatjss.jar common/lib/tomcatjss.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/velocity.jar common/lib/velocity.jar
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xerces-j2.jar common/lib/xerces-j2.jar
commit 83e6fd972dfa1abedd127bfc600ece7ac52e1461
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Mon Oct 3 18:02:56 2016 +0300
server.postinst: Tell pki-server migrate to migrate to tomcat8.
diff --git a/debian/changelog b/debian/changelog
index 8e06b1f..f86d3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
* tests: Add simple autopkgtest that runs setup-ds and pkispawn.
+ * server.postinst: Tell pki-server migrate to migrate to tomcat8.
-- Timo Aaltonen <tjaalton at debian.org> Sat, 01 Oct 2016 00:01:55 +0300
diff --git a/debian/pki-server.postinst b/debian/pki-server.postinst
index 28d403b..d23a875 100644
--- a/debian/pki-server.postinst
+++ b/debian/pki-server.postinst
@@ -19,7 +19,7 @@ if [ "$1" = configure ]; then
echo >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
# Migrate Tomcat configuration
- pki-server migrate >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
+ pki-server migrate --tomcat 8 >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
echo >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
fi
fi
commit 3fb341f6707cdc26d83500ac61c1907563b053a6
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Sep 30 23:41:50 2016 +0300
tests: Add simple autopkgtest that runs setup-ds and pkispawn.
diff --git a/debian/changelog b/debian/changelog
index a730df7..8e06b1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dogtag-pki (10.3.5-4) UNRELEASED; urgency=medium
+
+ * tests: Add simple autopkgtest that runs setup-ds and pkispawn.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Sat, 01 Oct 2016 00:01:55 +0300
+
dogtag-pki (10.3.5-3) unstable; urgency=medium
* rules: Fix path to tomcat8 catalina and util jars, add api and
diff --git a/debian/rules b/debian/rules
index bc5d2a0..0047ba1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,7 @@ confflags-dogtag-pki-theme = \
override_dh_auto_clean:
rm -rf $(CURDIR)/build
+ rm -f $(CURDIR)/base/common/python/pki/*.pyc
override_dh_auto_configure:
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..cdc1f26
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,8 @@
+Tests: pkispawn
+Depends:
+ @,
+ 389-ds-base,
+ procps,
+Restrictions:
+ allow-stderr,
+ needs-root,
diff --git a/debian/tests/deploy.cfg b/debian/tests/deploy.cfg
new file mode 100644
index 0000000..b499308
--- /dev/null
+++ b/debian/tests/deploy.cfg
@@ -0,0 +1,36 @@
+[DEFAULT]
+pki_client_pkcs12_password=Secret123
+pki_ds_password=Secret123
+pki_security_domain_password=Secret123
+pki_client_database_password=Secret123
+
+[CA]
+pki_admin_name=caadmin
+pki_admin_nickname=caadmin
+pki_admin_password=Secret123
+pki_admin_uid=caadmin
+
+[KRA]
+pki_admin_name=kraadmin
+pki_admin_nickname=kraadmin
+pki_admin_password=Secret123
+pki_admin_uid=kraadmin
+
+[OCSP]
+pki_admin_name=ocspadmin
+pki_admin_nickname=ocspadmin
+pki_admin_password=Secret123
+pki_admin_uid=ocspadmin
+
+[TKS]
+pki_admin_name=tksadmin
+pki_admin_nickname=tksadmin
+pki_admin_password=Secret123
+pki_admin_uid=tksadmin
+
+[TPS]
+pki_admin_name=tpsadmin
+pki_admin_nickname=tpsadmin
+pki_admin_password=Secret123
+pki_admin_uid=tpsadmin
+pki_authdb_basedn=dc=debci
diff --git a/debian/tests/pkispawn b/debian/tests/pkispawn
new file mode 100644
index 0000000..7013190
--- /dev/null
+++ b/debian/tests/pkispawn
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# hack for lxc
+IP=`ip route get 1.1.1.1 | awk '{print $NF; exit}'`
+HOSTNAME=`cat /etc/hosts| grep '127.0.1.1' | awk '{print $NF; exit}'`
+echo "$IP $HOSTNAME.test $HOSTNAME" >> /etc/hosts
+
+setup-ds --silent --\
+ General.FullMachineName=$HOSTNAME.test\
+ General.SuiteSpotUserID=dirsrv\
+ General.SuiteSpotGroup=dirsrv\
+ slapd.ServerPort=389\
+ slapd.ServerIdentifier=pki-tomcat\
+ slapd.Suffix=dc=example,dc=com\
+ slapd.RootDN="cn=Directory Manager"\
+ slapd.RootDNPwd=Secret123
+
+pkispawn -s CA -f debian/tests/deploy.cfg
+pkispawn -s KRA -f debian/tests/deploy.cfg
+pkispawn -s OCSP -f debian/tests/deploy.cfg
+pkispawn -s TKS -f debian/tests/deploy.cfg
+pkispawn -s TPS -f debian/tests/deploy.cfg
More information about the Pkg-freeipa-devel
mailing list