[Pkg-freeipa-devel] [Git][freeipa-team/dogtag-pki][master-next] patches: Refreshed.

[Timo Aaltonen]

Timo Aaltonen pushed to branch master-next at FreeIPA packaging / dogtag-pki


Commits:
98bb5b17 by Timo Aaltonen at 2020-08-13T13:53:19+03:00
patches: Refreshed.

- - - - -


3 changed files:

- debian/changelog
- debian/patches/debian-support.diff
- debian/patches/fix-tomcat-paths.diff


Changes:

=====================================
debian/changelog
=====================================
@@ -5,6 +5,7 @@ dogtag-pki (10.9.1-1) UNRELEASED; urgency=medium
   * server.install: Updated.
   * fix-upgrade-script.diff: Fix hardcoding /etc/sysconfig on an upgrade
     script.
+  * patches: Refreshed.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Wed, 01 Jul 2020 07:06:06 +0300
 


=====================================
debian/patches/debian-support.diff
=====================================
@@ -7,7 +7,7 @@ Description: changes for Debian
 
 --- a/base/server/etc/default.cfg
 +++ b/base/server/etc/default.cfg
-@@ -212,7 +212,7 @@ pki_source_subsystem_path=/usr/share/pki
+@@ -218,7 +218,7 @@ pki_source_subsystem_path=/usr/share/pki
  pki_path=/var/lib/pki
  pki_log_path=/var/log/pki
  pki_configuration_path=/etc/pki
@@ -16,7 +16,7 @@ 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
-@@ -290,11 +290,11 @@ pki_cgroup_systemd_service=%(pki_cgroup_
+@@ -296,11 +296,11 @@ pki_cgroup_systemd_service=%(pki_cgroup_
  pki_cgroup_cpu_systemd_service_path=/sys/fs/cgroup/cpu\,cpuacct/system/%(pki_systemd_service)s
  pki_cgroup_cpu_systemd_service=%(pki_cgroup_cpu_systemd_service_path)s/%(pki_systemd_service)s
  
@@ -32,7 +32,7 @@ Description: changes for Debian
  pki_source_tomcat_conf=%(pki_source_server_path)s/tomcat.conf
 --- a/base/server/python/pki/server/__init__.py
 +++ b/base/server/python/pki/server/__init__.py
-@@ -47,7 +47,7 @@ import pki.util
+@@ -48,7 +48,7 @@ import pki.util
  from pki.keyring import Keyring
  import pki.server.subsystem
  
@@ -41,7 +41,7 @@ Description: changes for Debian
  ETC_SYSTEMD_DIR = '/etc/systemd'
  LIB_SYSTEMD_DIR = '/lib/systemd'
  
-@@ -103,7 +103,7 @@ class PKIServer(object):
+@@ -105,7 +105,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
-@@ -621,7 +621,7 @@ class PKIConfigParser:
+@@ -625,7 +625,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(
-@@ -1167,7 +1167,7 @@ class PKIConfigParser:
+@@ -1171,7 +1171,7 @@ class PKIConfigParser:
          instance_root = os.path.join('/var/lib/pki', instance_name)
          if not os.path.exists(instance_root):
              return data
@@ -94,8 +94,8 @@ Description: changes for Debian
  
 --- a/base/common/share/etc/pki.conf
 +++ b/base/common/share/etc/pki.conf
-@@ -11,7 +11,7 @@ JAVA_HOME=${JAVA_HOME}
- export JAVA_HOME
+@@ -15,7 +15,7 @@ PKI_JAVA_PATH=${Java_JAVA_EXECUTABLE}
+ export PKI_JAVA_PATH
  
  # JNI jar file location
 -JNI_JAR_DIR=/usr/lib/java


=====================================
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
-@@ -70,11 +70,11 @@ class Tomcat(object):
+@@ -72,11 +72,11 @@ class Tomcat(object):
  
      BASE_DIR = '/var/lib/tomcats'
      CONF_DIR = '/etc/tomcat'



View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/98bb5b17936b3e5b678c0a85ee88d8586480be09

-- 
View it on GitLab: https://salsa.debian.org/freeipa-team/dogtag-pki/-/commit/98bb5b17936b3e5b678c0a85ee88d8586480be09
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/20200813/5fa3c623/attachment-0001.html>