[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'

Timo Aaltonen tjaalton at moszumanska.debian.org
Wed Jan 18 02:23:17 UTC 2017 

 debian/changelog                        |   12 ++++++++++++
 debian/patches/create-target-wants.diff |   13 +++++++++++++
 debian/patches/debian-support.diff      |   18 +++++++++++++++++-
 debian/patches/series                   |    1 +
 debian/pki-server.dirs                  |    2 --
 5 files changed, 43 insertions(+), 3 deletions(-)

New commits:
commit bbd2ffc73676c26e49eb3b9fe42fad43853a1ae5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Jan 18 04:22:53 2017 +0200

    releasing package dogtag-pki version 10.3.5-7

diff --git a/debian/changelog b/debian/changelog
index d280c79..8e8f7ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
+dogtag-pki (10.3.5-7) unstable; urgency=medium
 
   * debian-support: Fix an upgrade script to use /etc/default instead of
     /etc/sysconfig.
@@ -8,7 +8,7 @@ dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
   * pki-server.dirs: Drop target.wants-directories, they'd just get
     deleted by systemd helpers and are now created on demand anyway.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Fri, 02 Dec 2016 11:09:12 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 18 Jan 2017 04:20:42 +0200
 
 dogtag-pki (10.3.5-6) unstable; urgency=medium
 

commit e8bc730c66db857178f0e136f652c6ce20101e1c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Jan 18 04:22:45 2017 +0200

    use mkdir -p

diff --git a/debian/patches/create-target-wants.diff b/debian/patches/create-target-wants.diff
index 0a11e24..4a2a95d 100644
--- a/debian/patches/create-target-wants.diff
+++ b/debian/patches/create-target-wants.diff
@@ -5,7 +5,7 @@
      fi
  
 +    if [ ! -d ${pki_systemd_dir} ]; then
-+        mkdir ${pki_systemd_dir}
++        mkdir -p ${pki_systemd_dir}
 +    fi
 +
      # '${PKI_INSTANCE_PATH}' symlinks

commit ed393d478abc0bce4430d596bc41ba6a5bcf8dbb
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Jan 18 04:20:29 2017 +0200

    pki-server.dirs: Drop target.wants-directories, they'd just get deleted by systemd helpers and are now created on demand anyway.

diff --git a/debian/changelog b/debian/changelog
index 62710dc..d280c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
   * debian-support: Fix nuxwdog to use /etc/default in each case.
   * create-target-wants.diff: Create the systemd target.wants
     directories on demand.
+  * pki-server.dirs: Drop target.wants-directories, they'd just get
+    deleted by systemd helpers and are now created on demand anyway.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 02 Dec 2016 11:09:12 +0200
 
diff --git a/debian/pki-server.dirs b/debian/pki-server.dirs
index 18ee6ae..77f65d1 100644
--- a/debian/pki-server.dirs
+++ b/debian/pki-server.dirs
@@ -1,4 +1,2 @@
 etc/dogtag
-etc/systemd/system/pki-tomcatd.target.wants
-etc/systemd/system/pki-tomcatd-nuxwdog.target.wants
 var/lib/pki

commit b415766c9602ac412f143a56d27192e122c0f4aa
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Jan 18 04:19:05 2017 +0200

    create-target-wants.diff: Create the systemd target.wants directories on demand.

diff --git a/debian/changelog b/debian/changelog
index 8483caf..62710dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
   * debian-support: Fix an upgrade script to use /etc/default instead of
     /etc/sysconfig.
   * debian-support: Fix nuxwdog to use /etc/default in each case.
+  * create-target-wants.diff: Create the systemd target.wants
+    directories on demand.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 02 Dec 2016 11:09:12 +0200
 
diff --git a/debian/patches/create-target-wants.diff b/debian/patches/create-target-wants.diff
new file mode 100644
index 0000000..0a11e24
--- /dev/null
+++ b/debian/patches/create-target-wants.diff
@@ -0,0 +1,13 @@
+--- a/base/server/scripts/operations
++++ b/base/server/scripts/operations
+@@ -947,6 +947,10 @@ verify_symlinks()
+         pki_systemd_link="pki-${PKI_WEB_SERVER_TYPE}d@${PKI_INSTANCE_NAME}.service"
+     fi
+ 
++    if [ ! -d ${pki_systemd_dir} ]; then
++        mkdir ${pki_systemd_dir}
++    fi
++
+     # '${PKI_INSTANCE_PATH}' symlinks
+     base_symlinks=(
+         [alias]=/etc/pki/${PKI_INSTANCE_NAME}/alias
diff --git a/debian/patches/series b/debian/patches/series
index ef6ee99..6016342 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ fix-cli-migrate.diff
 use-bash.diff
 fix-cve-2016-1240.diff
 sync-rpm-10.3.5-7.diff
+create-target-wants.diff

commit e2be8c6367378859aba1c2ba77ca356059c27c2f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Jan 18 04:13:07 2017 +0200

    debian-support: Fix nuxwdog to use /etc/default in each case.

diff --git a/debian/changelog b/debian/changelog
index 37cb48e..8483caf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
 
   * debian-support: Fix an upgrade script to use /etc/default instead of
     /etc/sysconfig.
+  * debian-support: Fix nuxwdog to use /etc/default in each case.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 02 Dec 2016 11:09:12 +0200
 
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 0062052..bcef9bb 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -315,7 +315,12 @@ Description: changes for Debian
  
          got_use_nuxwdog = False
  
-@@ -321,9 +321,9 @@ class NuxwdogDisableCLI(pki.cli.CLI):
+@@ -317,13 +317,13 @@ class NuxwdogDisableCLI(pki.cli.CLI):
+         self.modify_password_class_in_cs_cfg(instance)
+ 
+     def disable_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:

commit 8e31c41b30882454e49ddaeeffa218f945c204a1
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Dec 2 11:09:31 2016 +0200

    debian-support: Fix an upgrade script to use /etc/default instead of /etc/sysconfig.

diff --git a/debian/changelog b/debian/changelog
index 885dd58..37cb48e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dogtag-pki (10.3.5-7) UNRELEASED; urgency=medium
+
+  * debian-support: Fix an upgrade script to use /etc/default instead of
+    /etc/sysconfig.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 02 Dec 2016 11:09:12 +0200
+
 dogtag-pki (10.3.5-6) unstable; urgency=medium
 
   * sync-rpm-10.3.5-7.diff: Pull changes from upstream branch needed by
diff --git a/debian/patches/debian-support.diff b/debian/patches/debian-support.diff
index 44b9476..0062052 100644
--- a/debian/patches/debian-support.diff
+++ b/debian/patches/debian-support.diff
@@ -464,3 +464,14 @@ Description: changes for Debian
  )
  
  install(
+--- a/base/server/upgrade/10.3.3/01-FixJavaHome
++++ b/base/server/upgrade/10.3.3/01-FixJavaHome
+@@ -39,7 +39,7 @@ class FixJavaHome(pki.server.upgrade.PKI
+ 
+     def upgrade_instance(self, instance):
+ 
+-        systemd_conf = os.path.join('/etc/sysconfig', instance.name)
++        systemd_conf = os.path.join('/etc/default', instance.name)
+         self.fix_tomcat_conf(systemd_conf)
+ 
+         tomcat_conf = os.path.join(instance.conf_dir, 'tomcat.conf')

More information about the Pkg-freeipa-devel mailing list