[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Wed Sep 23 15:55:41 UTC 2015
Rebased ref, commits from common ancestor:
commit 54c17e965181f311d2fe3410343841c1f3841ab3
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Sep 23 18:29:20 2015 +0300
releasing package dogtag-pki version 10.2.6-1
diff --git a/debian/changelog b/debian/changelog
index bc193c3..1196686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
+dogtag-pki (10.2.6-1) unstable; urgency=medium
* New upstream release based on DOGTAG_10_2_6_FEDORA_22_23_20150718 tag.
* Refresh patches, drop upstreamed ones.
@@ -26,7 +26,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* use-dot-instead-of-source.diff: Fix bashisms.
* debian-support.diff: Fix JNI_JAR_DIR.
- -- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
+ -- Timo Aaltonen <tjaalton at debian.org> Wed, 23 Sep 2015 18:29:12 +0300
dogtag-pki (10.2.0-4) unstable; urgency=medium
commit db03c150a6490408ed4991a9fe328e4119c2ea6d
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Sep 23 02:41:38 2015 +0300
debian-support.diff: Fix JNI_JAR_DIR.
diff --git a/debian/changelog b/debian/changelog
index c7bb42b..bc193c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* rules, patches: Explicitly build using tomcat7, and add a dummy
method. (Closes: #789138)
* use-dot-instead-of-source.diff: Fix bashisms.
+ * debian-support.diff: Fix JNI_JAR_DIR.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 7205216..c2646ce 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -289,3 +289,9 @@ Description: changes for Debian
else:
command = ["systemctl", "enable", "pki-tomcatd.target"]
+--- a/base/common/share/etc/pki.conf
++++ b/base/common/share/etc/pki.conf
+@@ -1,2 +1,2 @@
+ # JNI jar file location
+-JNI_JAR_DIR=/usr/lib/java
++JNI_JAR_DIR=/usr/share/java
commit dd0506fc113ef149706847aa15f53026f91832e1
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Sep 23 02:23:10 2015 +0300
use-dot-instead-of-source.diff: Fix bashisms.
diff --git a/debian/changelog b/debian/changelog
index b8fb295..c7bb42b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
server-upgrade snippets.
* rules, patches: Explicitly build using tomcat7, and add a dummy
method. (Closes: #789138)
+ * use-dot-instead-of-source.diff: Fix bashisms.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/patches/series b/debian/patches/series
index b340766..9dc5406 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ fix-format-security-warnings.patch
fix-junit-jar.diff
dont-install-deleted-files.diff
tomcat7-build-fix.diff
+use-dot-instead-of-source.diff
diff --git a/debian/patches/use-dot-instead-of-source.diff b/debian/patches/use-dot-instead-of-source.diff
new file mode 100644
index 0000000..b0ea9ea
--- /dev/null
+++ b/debian/patches/use-dot-instead-of-source.diff
@@ -0,0 +1,52 @@
+diff --git a/base/java-tools/templates/pki_java_command_wrapper.in b/base/java-tools/templates/pki_java_command_wrapper.in
+index 404bcf0..c82c18b 100644
+--- a/base/java-tools/templates/pki_java_command_wrapper.in
++++ b/base/java-tools/templates/pki_java_command_wrapper.in
+@@ -110,7 +110,7 @@ fi
+ ## order this command wrapper uses to find jar files. ##
+ ###############################################################################
+
+-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
++JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+ CP=${JNI_JAR_DIR}/jss4.jar
+ CP=/usr/share/java/commons-cli.jar:${CP}
+ CP=/usr/share/java/commons-codec.jar:${CP}
+diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+index 6c1abc7..6dc86de 100644
+--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
++++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+@@ -110,7 +110,7 @@ fi
+ ## order this command wrapper uses to find jar files. ##
+ ###############################################################################
+
+-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
++JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+ CP=${JNI_JAR_DIR}/jss4.jar
+ CP=/usr/share/java/commons-codec.jar:${CP}
+ CP=/usr/share/java/ldapjdk.jar:${CP}
+diff --git a/base/java-tools/templates/pretty_print_crl_command_wrapper.in b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+index 19f8bd8..2a74d4d 100644
+--- a/base/java-tools/templates/pretty_print_crl_command_wrapper.in
++++ b/base/java-tools/templates/pretty_print_crl_command_wrapper.in
+@@ -110,7 +110,7 @@ fi
+ ## order this command wrapper uses to find jar files. ##
+ ###############################################################################
+
+-JNI_JAR_DIR=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
++JNI_JAR_DIR=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+ CP=${JNI_JAR_DIR}/jss4.jar
+
+ CP=/usr/share/java/commons-codec.jar:${CP}
+diff --git a/base/server/scripts/operations b/base/server/scripts/operations
+index ede5f82..7c90227 100644
+--- a/base/server/scripts/operations
++++ b/base/server/scripts/operations
+@@ -1117,7 +1117,7 @@ verify_symlinks()
+ jni_jar_dir="/usr/share/java"
+ tomcat_dir="/usr/share/tomcat7"
+ else
+- jni_jar_dir=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR`
++ jni_jar_dir=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR`
+ tomcat_dir="/usr/share/tomcat"
+ fi
+
commit 070790e980b5e88400b336742eb3984ef4f54676
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Sep 23 02:18:06 2015 +0300
close bug 789138
diff --git a/debian/changelog b/debian/changelog
index b53a07e..b8fb295 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* pki-server.postinst, pki-base.post{inst,rm}: Add pki-upgrade/pki-
server-upgrade snippets.
* rules, patches: Explicitly build using tomcat7, and add a dummy
- method.
+ method. (Closes: #789138)
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
commit 757aa96ed94e09efd89c723c96f79bdc850a1843
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Wed Sep 23 01:38:56 2015 +0300
rules, patches: Explicitly build using tomcat7, and add a dummy method.
diff --git a/debian/changelog b/debian/changelog
index a65eab4..b53a07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* rules: Symlink jars under subsystem WEB-INF.
* pki-server.postinst, pki-base.post{inst,rm}: Add pki-upgrade/pki-
server-upgrade snippets.
+ * rules, patches: Explicitly build using tomcat7, and add a dummy
+ method.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/patches/series b/debian/patches/series
index 0031716..b340766 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-symkey-path.diff
fix-format-security-warnings.patch
fix-junit-jar.diff
dont-install-deleted-files.diff
+tomcat7-build-fix.diff
diff --git a/debian/patches/tomcat7-build-fix.diff b/debian/patches/tomcat7-build-fix.diff
new file mode 100644
index 0000000..18960e5
--- /dev/null
+++ b/debian/patches/tomcat7-build-fix.diff
@@ -0,0 +1,15 @@
+diff --git a/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java b/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
+index 094c056..a01bb7c 100644
+--- a/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
++++ b/base/server/tomcat7/src/com/netscape/cms/tomcat/ProxyRealm.java
+@@ -136,4 +136,10 @@ public class ProxyRealm implements Realm {
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ realm.removePropertyChangeListener(listener);
+ }
++
++ @Override
++ public Principal authenticate(String username) {
++ return realm.authenticate(username);
++ }
++
+ }
diff --git a/debian/rules b/debian/rules
index affae24..70102c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ confflags-core = \
-DSERVLET_JAR=/usr/share/java/servlet-api-3.0.jar \
-DXERCES_JAR=/usr/share/java/xercesImpl.jar \
-DXALAN_JAR=/usr/share/java/xalan2.jar \
+ -DWITH_TOMCAT8:BOOL=OFF \
$(confflags-common)
confflags-console = \
commit aeb504be133279e176dcb2f8aa7f34a3d49e6893
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Sep 18 15:37:14 2015 +0300
pki-server.postinst, pki-base.post{inst,rm}: Add pki-upgrade/pki- server-upgrade snippets.
diff --git a/debian/changelog b/debian/changelog
index a288af0..a65eab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* debian-support.diff: Fix nuxwdog paths.
* debian-support.diff: Don't try to manage rc3.d/* symlinks.
* rules: Symlink jars under subsystem WEB-INF.
+ * pki-server.postinst, pki-base.post{inst,rm}: Add pki-upgrade/pki-
+ server-upgrade snippets.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/pki-base.postinst b/debian/pki-base.postinst
new file mode 100644
index 0000000..8c77d57
--- /dev/null
+++ b/debian/pki-base.postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -e
+
+OLD_VERSION=`echo $2 | sed 's/-.*//'`
+VERSION=`dpkg-query -W pki-base | sed 's/.*\t//;s/-.*//'`
+
+if [ "$1" = configure ]; then
+ # we've forgot to create pki.version before, do it here
+ if dpkg --compare-versions "$2" lt "10.2.6"; then
+ echo "Configuration-Version: $OLD_VERSION" > /etc/pki/pki.version
+ fi
+
+ if [ ! -n "$2" ]; then
+ # On installation create system upgrade tracker
+ echo "Configuration-Version: $VERSION" > /etc/pki/pki.version
+ else
+ # On upgrade run system upgrade
+ echo "Upgrading system at `/bin/date`." >> /var/log/pki/pki-upgrade-$VERSION.log 2>&1
+ /usr/sbin/pki-upgrade --silent >> /var/log/pki/pki-upgrade-$VERSION.log 2>&1
+ echo >> /var/log/pki/pki-upgrade-$VERSION.log 2>&1
+ fi
+fi
+
+#DEBHELPER#
diff --git a/debian/pki-base.postrm b/debian/pki-base.postrm
new file mode 100644
index 0000000..53092ff
--- /dev/null
+++ b/debian/pki-base.postrm
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = purge ]; then
+ rm -f /etc/pki/pki.version
+ rmdir /etc/pki
+fi
+
+
+#DEBHELPER#
diff --git a/debian/pki-server.postinst b/debian/pki-server.postinst
index c156540..4785194 100644
--- a/debian/pki-server.postinst
+++ b/debian/pki-server.postinst
@@ -2,6 +2,7 @@
set -e
OUT=/dev/null
+VERSION=`dpkg-query -W pki-server | sed 's/.*\t//;s/-.*//'`
if [ "$1" = configure ]; then
# lets give them a user/group in all cases.
@@ -11,6 +12,12 @@ if [ "$1" = configure ]; then
--no-create-home --gecos "CA System User" \
pkiuser > $OUT
fi
+
+ if [ -n "$2" ]; then
+ echo "Upgrading server at `/bin/date`." >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
+ /usr/sbin/pki-server-upgrade --silent >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
+ echo >> /var/log/pki/pki-server-upgrade-$VERSION.log 2>&1
+ fi
fi
invoke_failure() {
@@ -23,4 +30,6 @@ invoke_failure() {
fi
}
+
+
#DEBHELPER#
commit 496079f529bbec5d5cf2871356af24254b2aef03
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Sat Sep 5 06:24:17 2015 +0300
rules: Symlink jars under subsystem WEB-INF.
diff --git a/debian/changelog b/debian/changelog
index c7dc949..a288af0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* install: Added new manpages, nuxwdog support, html docs to pki-base.
* debian-support.diff: Fix nuxwdog paths.
* debian-support.diff: Don't try to manage rc3.d/* symlinks.
+ * rules: Symlink jars under subsystem WEB-INF.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/rules b/debian/rules
index ead474a..affae24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,12 +96,24 @@ override_dh_auto_install:
find $(CURDIR)/debian/tmp/usr/share/pki -name '*.pl' -exec chmod 755 '{}' ';'
find $(CURDIR)/debian/tmp/lib/systemd -exec chmod 644 '{}' ';'
- # Create symlinks for TPS web application
- mkdir -p $(CURDIR)/debian/tmp/usr/share/pki/tps/webapps/tps/WEB-INF/lib
- for i in pki-nsutil.jar pki-cmsutil.jar pki-certsrv.jar pki-cms.jar pki-cmscore.jar \
- pki-cmsbundle.jar pki-tps.jar; do \
- ln -s /usr/share/pki/$$i $(CURDIR)/debian/tmp/usr/share/pki/tps/webapps/tps/WEB-INF/lib/$$i \
- ; done
+ # Create symlinks for subsystem libraries
+ for subsys in ca kra ocsp tks tps; do \
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-nsutil.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-cmsutil.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-certsrv.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-cms.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-cmscore.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-cmsbundle.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ ln -s /usr/share/java/pki/pki-$$subsys.jar \
+ $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+ done
override_dh_installinit:
dh_installinit -ppki-server --name=pki-tomcatd --error-handler=invoke_failure
commit 98bd1b8844341de169e60461b8182ae7b62fd537
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Sep 4 08:59:22 2015 +0300
debian-support.diff: Fix EnvironmentFile in systemd service.
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 08e49b8..7205216 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -124,9 +124,12 @@ Description: changes for Debian
--- a/base/server/share/lib/systemd/system/pki-tomcatd at .service
+++ b/base/server/share/lib/systemd/system/pki-tomcatd at .service
-@@ -6,7 +6,7 @@ PartOf=pki-tomcatd.target
+@@ -4,9 +4,9 @@ PartOf=pki-tomcatd.target
+
+ [Service]
Type=simple
- EnvironmentFile=/etc/tomcat/tomcat.conf
+-EnvironmentFile=/etc/tomcat/tomcat.conf
++EnvironmentFile=/etc/default/tomcat8
Environment="NAME=%i"
-EnvironmentFile=-/etc/sysconfig/%i
+EnvironmentFile=-/etc/default/%i
commit 66874dc147bbd3871e7e435220e7a5c5bec16fb9
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Sep 3 18:28:48 2015 +0300
debian-support.diff: Fix pki_registry_dir, broke when patch got refreshed.
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 86ee66b..08e49b8 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -96,7 +96,7 @@ Description: changes for Debian
java_dir="/usr/share/java"
pki_common_jar_dir="${PKI_INSTANCE_PATH}/common/lib"
- pki_registry_dir="/etc/sysconfig/pki/${PKI_WEB_SERVER_TYPE}/${PKI_INSTANCE_NAME}"
-+ pki_registry_dir="/etc/dogtag/pki/${PKI_WEB_SERVER_TYPE}/${PKI_INSTANCE_NAME}"
++ pki_registry_dir="/etc/dogtag/${PKI_WEB_SERVER_TYPE}/${PKI_INSTANCE_NAME}"
# Dogtag 10 Systemd variables
systemd_dir="/lib/systemd/system"
commit b6ad9132bf87901759b28dece8a6d57de0e6ee4a
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Sep 3 18:27:30 2015 +0300
debian-support.diff: Don't try to manage rc3.d/* symlinks.
diff --git a/debian/changelog b/debian/changelog
index a882664..c7dc949 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* control: Add libnuxwdog-java to build-depends, and pki-server depends.
* install: Added new manpages, nuxwdog support, html docs to pki-base.
* debian-support.diff: Fix nuxwdog paths.
+ * debian-support.diff: Don't try to manage rc3.d/* symlinks.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 86261ce..86ee66b 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -264,3 +264,25 @@ Description: changes for Debian
for line in fileinput.input(sysconfig_file, inplace=1):
match = re.search("^JAVA_OPTS=\"(.*)\"", line)
+--- a/base/server/python/pki/server/deployment/pkihelper.py
++++ b/base/server/python/pki/server/deployment/pkihelper.py
+@@ -3528,8 +3528,7 @@ class Systemd(object):
+ """
+ try:
+ if pki.system.SYSTEM_TYPE == "debian":
+- command = ["rm", "/etc/rc3.d/*" +
+- self.mdict['pki_instance_name']]
++ command = ["true"]
+ else:
+ command = ["systemctl", "disable", "pki-tomcatd.target"]
+
+@@ -3578,8 +3577,7 @@ class Systemd(object):
+ """
+ try:
+ if pki.system.SYSTEM_TYPE == "debian":
+- command = ["ln", "-s", "/etc/init.d/pki-tomcatd",
+- "/etc/rc3.d/S89" + self.mdict['pki_instance_name']]
++ command = ["true"]
+ else:
+ command = ["systemctl", "enable", "pki-tomcatd.target"]
+
commit 1a4b3978a553c2711445258cedb700cefbee5222
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Thu Sep 3 17:28:06 2015 +0300
debian-support.diff: Fix nuxwdog paths.
diff --git a/debian/changelog b/debian/changelog
index cb83f6c..a882664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
proxy which is gone.
* control: Add libnuxwdog-java to build-depends, and pki-server depends.
* install: Added new manpages, nuxwdog support, html docs to pki-base.
+ * debian-support.diff: Fix nuxwdog paths.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index cc8ad57..86261ce 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -16,6 +16,15 @@ Description: changes for Debian
pki_instance_path=%(pki_path)s/%(pki_instance_name)s
pki_instance_log_path=%(pki_log_path)s/%(pki_instance_name)s
pki_instance_configuration_path=%(pki_configuration_path)s/%(pki_instance_name)s
+@@ -330,7 +330,7 @@ pki_resteasy_jaxrs_jar=%(resteasy_lib)s/
+ pki_resteasy_jackson_provider_jar=%(resteasy_lib)s/resteasy-jackson-provider.jar
+
+ # nuxwdog
+-pki_nuxwdog_client_jar=/usr/lib/java/nuxwdog.jar
++pki_nuxwdog_client_jar=/usr/share/java/nuxwdog.jar
+
+
+ ###############################################################################
--- a/base/server/man/man8/pkispawn.8
+++ b/base/server/man/man8/pkispawn.8
@@ -103,7 +103,7 @@ the \-f option.
@@ -49,6 +58,19 @@ Description: changes for Debian
self.mdict['pki_instance_name']
self.mdict['pki_target_tomcat_conf'] = \
os.path.join(
+@@ -1044,10 +1044,10 @@ class PKIConfigParser:
+
+ if config.pki_architecture == 64:
+ self.mdict['NUXWDOG_JNI_PATH_SLOT'] = (
+- '/usr/lib64/nuxwdog-jni')
++ '/usr/lib/jni')
+ else:
+ self.mdict['NUXWDOG_JNI_PATH_SLOT'] = (
+- '/usr/lib/nuxwdog-jni')
++ '/usr/lib/jni')
+
+ # tps parameters
+ self.mdict['TOKENDB_HOST_SLOT'] = \
@@ -1313,7 +1313,7 @@ class PKIConfigParser:
instance_root = os.path.join('/var/lib/pki', instance_name)
if not os.path.exists(instance_root):
@@ -194,3 +216,51 @@ Description: changes for Debian
permission java.security.AllPermission;
};
+@@ -222,6 +222,6 @@ grant codeBase "file:${catalina.base}/we
+ permission java.security.AllPermission;
+ };
+
+-grant codeBase "file:/usr/lib/java/nuxwdog.jar" {
++grant codeBase "file:/usr/share/java/nuxwdog.jar" {
+ permission java.security.AllPermission;
+ };
+--- a/base/server/python/pki/server/cli/nuxwdog.py
++++ b/base/server/python/pki/server/cli/nuxwdog.py
+@@ -115,7 +115,7 @@ class NuxwdogEnableCLI(pki.cli.CLI):
+ self.modify_password_class_in_cs_cfg(instance)
+
+ def add_nuxwdog_link(self, instance):
+- nuxwdog_jar_path = '/usr/lib/java/nuxwdog.jar'
++ nuxwdog_jar_path = '/usr/share/java/nuxwdog.jar'
+ if not os.path.exists(nuxwdog_jar_path):
+ print (
+ "Error: nuxwdog jar file does not exist. "
+@@ -134,13 +134,13 @@ class NuxwdogEnableCLI(pki.cli.CLI):
+ os.symlink(nuxwdog_jar_path, instance_jar_path)
+
+ def enable_nuxwdog_sysconfig_file(self, instance):
+- sysconfig_file = os.path.join('/etc/sysconfig', instance.name)
++ sysconfig_file = os.path.join('/etc/default', instance.name)
+
+ arch = struct.calcsize("P") * 8
+ if arch == 64:
+- jni_str = "-Djava.library.path=/usr/lib64/nuxwdog-jni"
++ jni_str = "-Djava.library.path=/usr/lib/jni"
+ else:
+- jni_str = "-Djava.library.path=/usr/lib/nuxwdog-jni"
++ jni_str = "-Djava.library.path=/usr/lib/jni"
+
+ got_use_nuxwdog = False
+
+@@ -320,9 +320,9 @@ class NuxwdogDisableCLI(pki.cli.CLI):
+
+ arch = struct.calcsize("P") * 8
+ if arch == 64:
+- jni_str = "-Djava.library.path=/usr/lib64/nuxwdog-jni"
++ jni_str = "-Djava.library.path=/usr/lib/jni"
+ else:
+- jni_str = "-Djava.library.path=/usr/lib/nuxwdog-jni"
++ jni_str = "-Djava.library.path=/usr/lib/jni"
+
+ for line in fileinput.input(sysconfig_file, inplace=1):
+ match = re.search("^JAVA_OPTS=\"(.*)\"", line)
commit b17cb1a26778a67a9fa016cef8571dc547deb673
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Tue Jul 28 17:36:32 2015 +0300
install: Added new manpages, nuxwdog support, html docs to pki-base.
diff --git a/debian/changelog b/debian/changelog
index 27ec69a..cb83f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* control, pki-server.install: Clean up perl stuff, drop pki-setup-
proxy which is gone.
* control: Add libnuxwdog-java to build-depends, and pki-server depends.
+ * install: Added new manpages, nuxwdog support, html docs to pki-base.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/pki-base.install b/debian/pki-base.install
index e97b719..8541fd5 100644
--- a/debian/pki-base.install
+++ b/debian/pki-base.install
@@ -1,9 +1,11 @@
etc/pki/pki.conf
usr/lib/python*/dist-packages/pki/*.py
usr/sbin/pki-upgrade
+usr/share/doc/pki-base/html
usr/share/java/pki/pki-certsrv.jar
usr/share/java/pki/pki-cmsutil.jar
usr/share/java/pki/pki-nsutil.jar
+usr/share/man/man1/pki-python-client.1
usr/share/man/man8/pki-upgrade.8
usr/share/pki/VERSION
usr/share/pki/etc
diff --git a/debian/pki-server.install b/debian/pki-server.install
index 16e963c..524d758 100644
--- a/debian/pki-server.install
+++ b/debian/pki-server.install
@@ -1,9 +1,12 @@
etc/pki/default.cfg
lib/systemd/system/pki-tomcatd.target
lib/systemd/system/pki-tomcatd at .service
+lib/systemd/system/pki-tomcatd-nuxwdog.target
+lib/systemd/system/pki-tomcatd-nuxwdog at .service
usr/bin/pkidaemon
usr/lib/python*/dist-packages/pki/server
usr/sbin/pki-server
+usr/sbin/pki-server-nuxwdog
usr/sbin/pki-server-upgrade
usr/sbin/pkidestroy
usr/sbin/pkispawn
@@ -11,8 +14,14 @@ usr/share/java/pki/pki-cms.jar
usr/share/java/pki/pki-cmsbundle.jar
usr/share/java/pki/pki-cmscore.jar
usr/share/java/pki/pki-tomcat.jar
+usr/share/man/man1/pkidaemon.1
usr/share/man/man5/pki_default.cfg.5
+usr/share/man/man8/pki-server-instance.8
+usr/share/man/man8/pki-server-migrate.8
+usr/share/man/man8/pki-server-nuxwdog.8
+usr/share/man/man8/pki-server-subsystem.8
usr/share/man/man8/pki-server-upgrade.8
+usr/share/man/man8/pki-server.8
usr/share/man/man8/pkidestroy.8
usr/share/man/man8/pkispawn.8
usr/share/pki/deployment/config
diff --git a/debian/pki-tools.install b/debian/pki-tools.install
index 1a9a912..aa794eb 100644
--- a/debian/pki-tools.install
+++ b/debian/pki-tools.install
@@ -25,13 +25,17 @@ usr/bin/setpin
usr/bin/sslget
usr/bin/tkstool
usr/share/java/pki/pki-tools.jar
+usr/share/man/man1/pki-audit.1
usr/share/man/man1/pki-ca-profile.1
usr/share/man/man1/pki-cert.1
usr/share/man/man1/pki-client.1
usr/share/man/man1/pki-group.1
+usr/share/man/man1/pki-group-member.1
usr/share/man/man1/pki-key.1
usr/share/man/man1/pki-securitydomain.1
+usr/share/man/man1/pki-tps-profile.1
usr/share/man/man1/pki-user.1
+usr/share/man/man1/pki-user-cert.1
usr/share/man/man1/pki.1
usr/share/pki/java-tools/
usr/share/pki/native-tools/
diff --git a/debian/pki-tps-client.install b/debian/pki-tps-client.install
index 76b3c01..b7f5a12 100644
--- a/debian/pki-tps-client.install
+++ b/debian/pki-tps-client.install
@@ -1,3 +1,4 @@
usr/bin/tpsclient
usr/lib/tps/libtokendb.so
usr/lib/tps/libtps.so
+usr/share/man/man1/tpsclient.1*
commit 22f113530d463e8a96e720c76ddac833c86d7696
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Tue Jul 28 17:10:07 2015 +0300
control: Add libnuxwdog-java to build-depends, and pki-server depends.
diff --git a/debian/changelog b/debian/changelog
index 3f9e814..27ec69a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
* Update patches.
* control, pki-server.install: Clean up perl stuff, drop pki-setup-
proxy which is gone.
+ * control: Add libnuxwdog-java to build-depends, and pki-server depends.
-- Timo Aaltonen <tjaalton at debian.org> Thu, 02 Apr 2015 15:45:06 +0300
diff --git a/debian/control b/debian/control
index 59e3967..38a8f90 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends:
libldap2-dev,
libnspr4-dev,
libnss3-dev,
+ libnuxwdog-java,
libresteasy-java,
libservlet3.0-java,
libsvrcore-dev,
@@ -133,6 +134,7 @@ Depends:
libjs-jquery,
libjs-underscore,
libtomcatjss-java (>= 7.1.0),
+ libnuxwdog-java,
libxml-commons-external-java,
libxml-commons-resolver1.1-java,
pki-base (= ${binary:Version}),
More information about the Pkg-freeipa-devel
mailing list