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

[Timo Aaltonen]

 debian/changelog                |    6 ++-
 debian/patches/series           |    1 
 debian/patches/use-usr-bin.diff |   71 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)

New commits:
commit eaf41223bb787fb5177a58da8c2f8ba6135b24cd
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 02:27:57 2016 +0200

    releasing package dogtag-pki version 10.2.6-3

diff --git a/debian/changelog b/debian/changelog
index 78f8f6c..6ca2b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-dogtag-pki (10.2.6-3) UNRELEASED; urgency=medium
+dogtag-pki (10.2.6-3) unstable; urgency=medium
 
   * pki-base.postrm: Remove upgrade logs on purge. (Closes: #801139)
   * use-usr-bin.diff: Fix paths to binaries to use /usr/bin instead of
     /bin.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Tue, 06 Oct 2015 22:29:04 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 08 Jan 2016 02:18:17 +0200
 
 dogtag-pki (10.2.6-2) unstable; urgency=medium
 

commit 555f4796a1bce07c0d6917ee79a33686824035b1
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Jan 8 01:24:42 2016 +0200

    use-usr-bin.diff: Fix paths to binaries to use /usr/bin instead of /bin.

diff --git a/debian/changelog b/debian/changelog
index d7abf9f..78f8f6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dogtag-pki (10.2.6-3) UNRELEASED; urgency=medium
 
   * pki-base.postrm: Remove upgrade logs on purge. (Closes: #801139)
+  * use-usr-bin.diff: Fix paths to binaries to use /usr/bin instead of
+    /bin.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Tue, 06 Oct 2015 22:29:04 +0300
 
diff --git a/debian/patches/series b/debian/patches/series
index 9dc5406..9a08a21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix-junit-jar.diff
 dont-install-deleted-files.diff
 tomcat7-build-fix.diff
 use-dot-instead-of-source.diff
+use-usr-bin.diff
diff --git a/debian/patches/use-usr-bin.diff b/debian/patches/use-usr-bin.diff
new file mode 100644
index 0000000..fc670eb
--- /dev/null
+++ b/debian/patches/use-usr-bin.diff
@@ -0,0 +1,71 @@
+--- a/base/java-tools/src/com/netscape/cmstools/cli/HelpCLI.java
++++ b/base/java-tools/src/com/netscape/cmstools/cli/HelpCLI.java
+@@ -77,7 +77,7 @@ public class HelpCLI extends CLI {
+         while (true) {
+             // display man page for the command
+             ProcessBuilder pb = new ProcessBuilder(
+-                    "/bin/man",
++                    "/usr/bin/man",
+                     manPage);
+ 
+             pb.inheritIO();
+--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java
++++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java
+@@ -282,7 +282,7 @@ public class ClientCertImportCLI extends
+         }
+ 
+         String[] command = {
+-                "/bin/certutil", "-A",
++                "/usr/bin/certutil", "-A",
+                 "-d", dbPath,
+                 "-i", certPath,
+                 "-n", nickname,
+@@ -304,7 +304,7 @@ public class ClientCertImportCLI extends
+             String pkcs12PasswordPath) throws Exception {
+ 
+         String[] command = {
+-                "/bin/pk12util",
++                "/usr/bin/pk12util",
+                 "-d", dbPath,
+                 "-K", dbPassword,
+                 "-i", pkcs12Path,
+--- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertShowCLI.java
++++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertShowCLI.java
+@@ -202,7 +202,7 @@ public class ClientCertShowCLI extends C
+             String nickname) throws Exception {
+ 
+         String[] command = {
+-                "/bin/pk12util",
++                "/usr/bin/pk12util",
+                 "-d", dbPath,
+                 "-K", dbPassword,
+                 "-o", pkcs12Path,
+@@ -224,7 +224,7 @@ public class ClientCertShowCLI extends C
+             String clientCertPath) throws Exception {
+ 
+         String[] command = {
+-                "/bin/openssl",
++                "/usr/bin/openssl",
+                 "pkcs12",
+                 "-clcerts", // client certificate only
+                 "-nodes",   // no encryption
+--- a/base/server/python/pki/server/deployment/pkihelper.py
++++ b/base/server/python/pki/server/deployment/pkihelper.py
+@@ -3043,7 +3043,7 @@ class KRAConnector:
+     def execute_using_pki(
+             self, caport, cahost, subsystemnick,
+             token_pwd, krahost, kraport, critical_failure=False):
+-        command = ["/bin/pki",
++        command = ["/usr/bin/pki",
+                    "-p", str(caport),
+                    "-h", cahost,
+                    "-n", subsystemnick,
+@@ -3193,7 +3193,7 @@ class TPSConnector:
+     def execute_using_pki(
+             self, tkshost, tksport, subsystemnick,
+             token_pwd, tpshost, tpsport, critical_failure=False):
+-        command = ["/bin/pki",
++        command = ["/usr/bin/pki",
+                    "-p", str(tksport),
+                    "-h", tkshost,
+                    "-n", subsystemnick,