[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Fri Dec 22 12:33:21 UTC 2017
debian/changelog | 12 ++++++
debian/control | 3 +
debian/patches/fix-jar-search.diff | 35 ++++++++++++------
debian/patches/rename-logging-config.diff | 57 ++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 1
6 files changed, 98 insertions(+), 11 deletions(-)
New commits:
commit 78dd185beb39450d3b681583a29e255583436436
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 14:32:40 2017 +0200
releasing package dogtag-pki version 10.5.3-3
diff --git a/debian/changelog b/debian/changelog
index a4d15a0..df10e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
+dogtag-pki (10.5.3-3) unstable; urgency=medium
* control: Add libhttpclient-java, libhttpcore-java, libjaxrs-api-java to
pki-base-java Depends.
@@ -8,7 +8,7 @@ dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
symkey.jar.
* rules: Link jboss-logging.jar under server/common/lib too.
- -- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 13:56:30 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 14:32:32 +0200
dogtag-pki (10.5.3-2) unstable; urgency=medium
commit 52f0fddbbabe9921d1daefd4bd3e06033114d3b9
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 14:32:15 2017 +0200
rules: Link jboss-logging.jar under server/common/lib too.
diff --git a/debian/changelog b/debian/changelog
index f7460f0..a4d15a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
PKI_LOGGING_CONFIG, otherwise catalina startup would fail.
* fix-jar-search.diff: Fix search for commons-collections3.jar and
symkey.jar.
+ * rules: Link jboss-logging.jar under server/common/lib too.
-- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 13:56:30 +0200
diff --git a/debian/rules b/debian/rules
index db4d067..e32ec04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -118,6 +118,7 @@ override_dh_install:
rm -rf $(CURDIR)/debian/tmp/usr/share/pki/tps/applets
ln -sf /usr/share/java/jboss-logging.jar $(CURDIR)/debian/tmp/usr/share/pki/lib/jboss-logging.jar
+ ln -sf /usr/share/java/jboss-logging.jar $(CURDIR)/debian/tmp/usr/share/pki/server/common/lib/jboss-logging.jar
dh_install
commit cd2d5f0fecc1b85aee8a84f2bf99aab9632e18f9
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 14:17:06 2017 +0200
fix-jar-search.diff: Fix search for commons-collections3.jar and symkey.jar.
diff --git a/debian/changelog b/debian/changelog
index 01677ba..f7460f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
pki-base-java Depends.
* rename-logging-config.diff: Rename LOGGING_CONFIG to
PKI_LOGGING_CONFIG, otherwise catalina startup would fail.
+ * fix-jar-search.diff: Fix search for commons-collections3.jar and
+ symkey.jar.
-- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 13:56:30 +0200
diff --git a/debian/patches/fix-jar-search.diff b/debian/patches/fix-jar-search.diff
index 94f26a7..57e9841 100644
--- a/debian/patches/fix-jar-search.diff
+++ b/debian/patches/fix-jar-search.diff
@@ -129,13 +129,14 @@
)
find_file(COMMONS_CODEC_JAR
-@@ -37,6 +48,13 @@ find_file(COMMONS_CODEC_JAR
+@@ -37,6 +48,14 @@ find_file(COMMONS_CODEC_JAR
/usr/share/java
)
+find_file(COMMONS_COLLECTIONS_JAR
+ NAMES
+ commons-collections.jar
++ commons-collections3.jar
+ PATHS
+ /usr/share/java
+)
@@ -143,7 +144,7 @@
find_file(COMMONS_HTTPCLIENT_JAR
NAMES
commons-httpclient.jar
-@@ -58,6 +76,13 @@ find_file(COMMONS_LANG_JAR
+@@ -58,6 +77,13 @@ find_file(COMMONS_LANG_JAR
/usr/share/java
)
@@ -157,7 +158,7 @@
find_file(HAMCREST_JAR
NAMES
core.jar
-@@ -70,6 +95,7 @@ find_file(HTTPCLIENT_JAR
+@@ -70,6 +96,7 @@ find_file(HTTPCLIENT_JAR
httpclient.jar
PATHS
/usr/share/java/httpcomponents
@@ -165,7 +166,7 @@
)
find_file(HTTPCORE_JAR
-@@ -77,6 +103,7 @@ find_file(HTTPCORE_JAR
+@@ -77,6 +104,7 @@ find_file(HTTPCORE_JAR
httpcore.jar
PATHS
/usr/share/java/httpcomponents
@@ -173,7 +174,7 @@
)
find_file(JACKSON_CORE_JAR
-@@ -84,6 +111,15 @@ find_file(JACKSON_CORE_JAR
+@@ -84,6 +112,15 @@ find_file(JACKSON_CORE_JAR
jackson-core-asl.jar
PATHS
/usr/share/java/jackson
@@ -189,7 +190,7 @@
)
find_file(JACKSON_MAPPER_JAR
-@@ -91,6 +127,31 @@ find_file(JACKSON_MAPPER_JAR
+@@ -91,6 +128,31 @@ find_file(JACKSON_MAPPER_JAR
jackson-mapper-asl.jar
PATHS
/usr/share/java/jackson
@@ -221,7 +222,7 @@
)
find_file(JSS_JAR
-@@ -104,6 +165,7 @@ find_file(JSS_JAR
+@@ -104,6 +166,7 @@ find_file(JSS_JAR
find_file(JUNIT_JAR
NAMES
junit.jar
@@ -229,7 +230,18 @@
PATHS
/usr/share/java
)
-@@ -141,36 +203,46 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
+@@ -138,39 +201,57 @@ find_file(RESTEASY_ATOM_PROVIDER_JAR
+ ${RESTEASY_LIB}
+ )
+
++find_file(SYMKEY_JAR
++ NAMES
++ symkey.jar
++ PATHS
++ /usr/lib/java
++ /usr/share/java
++)
++
find_file(TOMCAT_API_JAR
NAMES
tomcat-api.jar
@@ -276,7 +288,7 @@
)
find_file(TOMCATJSS_JAR
-@@ -191,6 +263,7 @@ find_file(VELOCITY_JAR
+@@ -191,6 +272,7 @@ find_file(VELOCITY_JAR
find_file(XALAN_JAR
NAMES
xalan-j2.jar
@@ -284,7 +296,7 @@
PATHS
${JAVA_LIB_INSTALL_DIR}
/usr/share/java
-@@ -199,11 +272,28 @@ find_file(XALAN_JAR
+@@ -199,11 +281,28 @@ find_file(XALAN_JAR
find_file(XERCES_JAR
NAMES
xerces-j2.jar
@@ -468,12 +480,13 @@
COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/scannotation.jar common/lib/scannotation.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLF4J_API_JAR} common/lib/slf4j-api.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLF4J_JDK14_JAR} common/lib/slf4j-jdk14.jar
- COMMAND /bin/ln -sf /usr/lib/java/symkey.jar ${CMAKE_CURRENT_BINARY_DIR}/common/lib/symkey.jar
+- COMMAND /bin/ln -sf /usr/lib/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
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xml-commons-apis.jar common/lib/xml-commons-apis.jar
- COMMAND ${CMAKE_COMMAND} -E create_symlink /usr/share/java/xml-commons-resolver.jar common/lib/xml-commons-resolver.jar
++ COMMAND /bin/ln -sf ${SYMKEY_JAR} ${CMAKE_CURRENT_BINARY_DIR}/common/lib/symkey.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${TOMCATJSS_JAR} common/lib/tomcatjss.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${VELOCITY_JAR} common/lib/velocity.jar
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${XERCES_JAR} common/lib/xerces-j2.jar
commit fc8debc10d15b80608e558559dea572c0e9703af
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 14:15:17 2017 +0200
add libjaxrs-api-java to pki-base-java Depends
diff --git a/debian/changelog b/debian/changelog
index baf8eae..01677ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
- * control: Add libhttpclient-java, libhttpcore-java to pki-base-java
- Depends.
+ * control: Add libhttpclient-java, libhttpcore-java, libjaxrs-api-java to
+ pki-base-java Depends.
* rename-logging-config.diff: Rename LOGGING_CONFIG to
PKI_LOGGING_CONFIG, otherwise catalina startup would fail.
diff --git a/debian/control b/debian/control
index 9b18084..411c777 100644
--- a/debian/control
+++ b/debian/control
@@ -110,7 +110,8 @@ Depends:
libcommons-lang-java,
libcommons-logging-java,
libhttpclient-java,
- libhttpcore-java
+ libhttpcore-java,
+ libjaxrs-api-java,
libjavassist-java,
libjettison-java,
libjss-java (>= 4.4.2-2),
commit 7cef9612198d3ca05246bb9fa78a66cac425dfce
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 13:58:24 2017 +0200
rename-logging-config.diff: Rename LOGGING_CONFIG to PKI_LOGGING_CONFIG, otherwise catalina startup would fail.
diff --git a/debian/changelog b/debian/changelog
index 34ae8de..baf8eae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
* control: Add libhttpclient-java, libhttpcore-java to pki-base-java
Depends.
+ * rename-logging-config.diff: Rename LOGGING_CONFIG to
+ PKI_LOGGING_CONFIG, otherwise catalina startup would fail.
-- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 13:56:30 +0200
diff --git a/debian/patches/rename-logging-config.diff b/debian/patches/rename-logging-config.diff
new file mode 100644
index 0000000..1b96d76
--- /dev/null
+++ b/debian/patches/rename-logging-config.diff
@@ -0,0 +1,57 @@
+--- a/base/common/man/man5/pki-logging.5
++++ b/base/common/man/man5/pki-logging.5
+@@ -78,7 +78,7 @@ Then specify the location of the custom
+
+ .IP
+ .nf
+-LOGGING_CONFIG=/etc/pki/logging.properties
++PKI_LOGGING_CONFIG=/etc/pki/logging.properties
+ .fi
+ .PP
+
+--- a/base/common/python/pki/cli/main.py
++++ b/base/common/python/pki/cli/main.py
+@@ -108,7 +108,7 @@ class PKICLI(pki.cli.CLI):
+
+ java_home = os.getenv('JAVA_HOME')
+ pki_lib = os.getenv('PKI_LIB')
+- logging_config = os.getenv('LOGGING_CONFIG')
++ logging_config = os.getenv('PKI_LOGGING_CONFIG')
+
+ cmd = [
+ java_home + '/bin/java',
+--- a/base/common/share/etc/pki.conf
++++ b/base/common/share/etc/pki.conf
+@@ -11,8 +11,8 @@ PKI_LIB=/usr/share/pki/lib
+ export PKI_LIB
+
+ # logging configuration location
+-LOGGING_CONFIG=/usr/share/pki/etc/logging.properties
+-export LOGGING_CONFIG
++PKI_LOGGING_CONFIG=/usr/share/pki/etc/logging.properties
++export PKI_LOGGING_CONFIG
+
+ # PKI CLI options
+ PKI_CLI_OPTIONS=
+--- a/base/console/templates/pki_console_wrapper
++++ b/base/console/templates/pki_console_wrapper
+@@ -174,7 +174,7 @@ ${JAVA} ${JAVA_OPTIONS} \
+ -cp ${CP} \
+ -Djava.util.prefs.systemRoot=/tmp/.java \
+ -Djava.util.prefs.userRoot=/tmp/java \
+- -Djava.util.logging.config.file=${LOGGING_CONFIG} \
++ -Djava.util.logging.config.file=${PKI_LOGGING_CONFIG} \
+ com.netscape.admin.certsrv.Console \
+ "$@"
+
+--- a/base/java-tools/templates/pki_java_command_wrapper.in
++++ b/base/java-tools/templates/pki_java_command_wrapper.in
+@@ -152,7 +152,7 @@ set_nss_default_db_type
+
+ ${JAVA} ${JAVA_OPTIONS} \
+ -Djava.ext.dirs=${PKI_LIB} \
+- -Djava.util.logging.config.file=${LOGGING_CONFIG} \
++ -Djava.util.logging.config.file=${PKI_LOGGING_CONFIG} \
+ com.netscape.cmstools.${COMMAND} "$@"
+
+ exit $?
diff --git a/debian/patches/series b/debian/patches/series
index a475de2..0c8f99a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix-cve-2016-1240.diff
create-target-wants.diff
#use-resteasy-legacy.diff
use-bindsto.diff
+rename-logging-config.diff
commit f3060cbb15ea68fedf4dcaf0090fe891a776d0af
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Dec 22 13:56:47 2017 +0200
control: Add libhttpclient-java, libhttpcore-java to pki-base-java Depends.
diff --git a/debian/changelog b/debian/changelog
index 152bd51..34ae8de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dogtag-pki (10.5.3-3) UNRELEASED; urgency=medium
+
+ * control: Add libhttpclient-java, libhttpcore-java to pki-base-java
+ Depends.
+
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 22 Dec 2017 13:56:30 +0200
+
dogtag-pki (10.5.3-2) unstable; urgency=medium
* control: Add python{,3}-cryptography to pki-base, pki-server and
diff --git a/debian/control b/debian/control
index 8fe151b..9b18084 100644
--- a/debian/control
+++ b/debian/control
@@ -109,6 +109,8 @@ Depends:
libcommons-io-java,
libcommons-lang-java,
libcommons-logging-java,
+ libhttpclient-java,
+ libhttpcore-java
libjavassist-java,
libjettison-java,
libjss-java (>= 4.4.2-2),
More information about the Pkg-freeipa-devel
mailing list