[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master-next] refresh rest of the patches
Timo Aaltonen
gitlab at salsa.debian.org
Sun Nov 1 16:54:57 GMT 2020
Timo Aaltonen pushed to branch master-next at FreeIPA packaging / dogtag-pki
Commits:
8fdbdced by Timo Aaltonen at 2020-11-01T18:54:44+02:00
refresh rest of the patches
- - - - -
5 changed files:
- debian/patches/create-target-wants.diff
- debian/patches/debian-support.diff
- debian/patches/fix-symkey-path.diff
- debian/patches/fix-tomcat-jars.diff
- debian/patches/fix-tomcat-paths.diff
Changes:
=====================================
debian/patches/create-target-wants.diff
=====================================
@@ -1,6 +1,6 @@
--- a/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
+++ b/base/server/python/pki/server/deployment/scriptlets/instance_layout.py
-@@ -257,6 +257,11 @@ class PkiScriptlet(pkiscriptlet.Abstract
+@@ -249,6 +249,11 @@ class PkiScriptlet(pkiscriptlet.Abstract
deployer.mdict['pki_instance_log_path'],
deployer.mdict['pki_instance_logs_link'])
=====================================
debian/patches/debian-support.diff
=====================================
@@ -41,7 +41,7 @@ Description: changes for Debian
ETC_SYSTEMD_DIR = '/etc/systemd'
LIB_SYSTEMD_DIR = '/lib/systemd'
-@@ -105,7 +105,7 @@ class PKIServer(object):
+@@ -104,7 +104,7 @@ class PKIServer(object):
CONFIG_DIR = '/etc/pki'
LOG_DIR = '/var/log/pki'
SHARE_DIR = '/usr/share/pki'
@@ -52,7 +52,7 @@ Description: changes for Debian
def __init__(self,
--- a/base/server/python/pki/server/deployment/pkiparser.py
+++ b/base/server/python/pki/server/deployment/pkiparser.py
-@@ -625,7 +625,7 @@ class PKIConfigParser:
+@@ -624,7 +624,7 @@ class PKIConfigParser:
self.mdict['pki_instance_configuration_path'],
"context.xml")
self.mdict['pki_target_tomcat_conf_instance_id'] = \
@@ -61,7 +61,7 @@ Description: changes for Debian
self.mdict['pki_instance_name']
self.mdict['pki_target_tomcat_conf'] = \
os.path.join(
-@@ -1171,7 +1171,7 @@ class PKIConfigParser:
+@@ -1087,7 +1087,7 @@ class PKIConfigParser:
instance_root = os.path.join('/var/lib/pki', instance_name)
if not os.path.exists(instance_root):
return data
@@ -103,7 +103,7 @@ Description: changes for Debian
--- a/base/common/share/etc/pki.conf
+++ b/base/common/share/etc/pki.conf
-@@ -15,7 +15,7 @@ PKI_JAVA_PATH=${Java_JAVA_EXECUTABLE}
+@@ -15,7 +15,7 @@ PKI_JAVA_PATH=${PKI_JAVA_PATH}
export PKI_JAVA_PATH
# JNI jar file location
=====================================
debian/patches/fix-symkey-path.diff
=====================================
@@ -31,7 +31,7 @@ Description: fix the libsymkey.so JNI install path
} else {
--- a/base/server/CMakeLists.txt
+++ b/base/server/CMakeLists.txt
-@@ -107,7 +107,7 @@ add_custom_command(
+@@ -112,7 +112,7 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_LIB}/resteasy-jaxb-provider.jar common/lib/resteasy-jaxb-provider.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${JAXRS_API_JAR} common/lib/jaxrs-api.jar
COMMAND ${CMAKE_COMMAND} -E create_symlink ${RESTEASY_JAXRS_JAR} common/lib/resteasy-jaxrs.jar
=====================================
debian/patches/fix-tomcat-jars.diff
=====================================
@@ -1,6 +1,6 @@
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
-@@ -229,7 +229,7 @@ find_file(SYMKEY_JAR
+@@ -251,7 +251,7 @@ find_file(SYMKEY_JAR
find_file(JASPIC_API_JAR
NAMES
jaspic-api.jar
@@ -9,7 +9,7 @@
PATHS
/usr/share/java/tomcat
/usr/share/java
-@@ -238,7 +238,7 @@ find_file(JASPIC_API_JAR
+@@ -260,7 +260,7 @@ find_file(JASPIC_API_JAR
find_file(TOMCAT_API_JAR
NAMES
tomcat-api.jar
@@ -18,7 +18,7 @@
PATHS
/usr/share/java/tomcat
/usr/share/java
-@@ -247,7 +247,7 @@ find_file(TOMCAT_API_JAR
+@@ -269,7 +269,7 @@ find_file(TOMCAT_API_JAR
find_file(TOMCAT_CATALINA_JAR
NAMES
catalina.jar
@@ -27,7 +27,7 @@
PATHS
/usr/share/java/tomcat
/usr/share/java
-@@ -256,7 +256,7 @@ find_file(TOMCAT_CATALINA_JAR
+@@ -278,7 +278,7 @@ find_file(TOMCAT_CATALINA_JAR
find_file(TOMCAT_COYOTE_JAR
NAMES
tomcat-coyote.jar
@@ -36,7 +36,7 @@
PATHS
/usr/share/java/tomcat
/usr/share/java
-@@ -265,7 +265,7 @@ find_file(TOMCAT_COYOTE_JAR
+@@ -287,7 +287,7 @@ find_file(TOMCAT_COYOTE_JAR
find_file(TOMCAT_UTIL_JAR
NAMES
tomcat-util.jar
@@ -45,7 +45,7 @@
PATHS
/usr/share/java/tomcat
/usr/share/java
-@@ -274,7 +274,7 @@ find_file(TOMCAT_UTIL_JAR
+@@ -296,7 +296,7 @@ find_file(TOMCAT_UTIL_JAR
find_file(TOMCAT_UTIL_SCAN_JAR
NAMES
tomcat-util-scan.jar
=====================================
debian/patches/fix-tomcat-paths.diff
=====================================
@@ -1,6 +1,6 @@
--- a/base/server/python/pki/server/__init__.py
+++ b/base/server/python/pki/server/__init__.py
-@@ -72,11 +72,11 @@ class Tomcat(object):
+@@ -71,11 +71,11 @@ class Tomcat(object):
BASE_DIR = '/var/lib/tomcats'
CONF_DIR = '/etc/tomcat'
@@ -18,7 +18,7 @@
def get_version(cls):
--- a/base/server/upgrade/10.6.0/02-FixServerConfiguration.py
+++ b/base/server/upgrade/10.6.0/02-FixServerConfiguration.py
-@@ -43,12 +43,12 @@ class FixServerConfiguration(pki.server.
+@@ -44,12 +44,12 @@ class FixServerConfiguration(pki.server.
self.replace_with_link(
instance,
'context.xml',
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/8fdbdced6b34a362b6e8133d0334ce3f33965dd1
--
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/8fdbdced6b34a362b6e8133d0334ce3f33965dd1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20201101/a00d8949/attachment-0001.html>
More information about the Pkg-freeipa-devel
mailing list