[Pkg-fedora-ds-maintainers] 389-admin: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                          |    7 +++++++
 debian/patches/add-softokn-ldlibpath.diff |   12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit e696dcc64ee2d9cac4777f3092994822d5f59428
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Mar 31 00:04:45 2015 +0300

    releasing package 389-admin version 1.1.35-4

diff --git a/debian/changelog b/debian/changelog
index edf0f39..c200913 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-389-admin (1.1.35-4) UNRELEASED; urgency=medium
+389-admin (1.1.35-4) unstable; urgency=medium
 
   * add-softokn-ldlibpath.diff: The libpath needs to be fixed in AdminServer.pm
     too. (Closes: #737214)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Tue, 31 Mar 2015 00:02:56 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 31 Mar 2015 00:04:24 +0300
 
 389-admin (1.1.35-3) unstable; urgency=medium
 

commit b72fd9954172f5f175bfc28ffcec4dee6361bce5
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Tue Mar 31 00:04:18 2015 +0300

    add-softokn-ldlibpath.diff: The libpath needs to be fixed in AdminServer.pm too. (Closes: #737214)

diff --git a/debian/changelog b/debian/changelog
index 3dc750e..edf0f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+389-admin (1.1.35-4) UNRELEASED; urgency=medium
+
+  * add-softokn-ldlibpath.diff: The libpath needs to be fixed in AdminServer.pm
+    too. (Closes: #737214)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 31 Mar 2015 00:02:56 +0300
+
 389-admin (1.1.35-3) unstable; urgency=medium
 
   * fix-group-name.patch: Add the patch to series too.
diff --git a/debian/patches/add-softokn-ldlibpath.diff b/debian/patches/add-softokn-ldlibpath.diff
index 7a765f0..74bf87c 100644
--- a/debian/patches/add-softokn-ldlibpath.diff
+++ b/debian/patches/add-softokn-ldlibpath.diff
@@ -1,5 +1,3 @@
-diff --git a/admserv/cfgstuff/start-ds-admin.in b/admserv/cfgstuff/start-ds-admin.in
-index 2d0e4bf..4fb3b2a 100644
 --- a/admserv/cfgstuff/start-ds-admin.in
 +++ b/admserv/cfgstuff/start-ds-admin.in
 @@ -50,6 +50,7 @@ SHLIB_PATH=
@@ -10,3 +8,13 @@ index 2d0e4bf..4fb3b2a 100644
  ldlibpath_add "${OLD_LD_LIBRARY_PATH}"
  export LD_LIBRARY_PATH
  
+--- a/admserv/newinst/src/AdminServer.pm.in
++++ b/admserv/newinst/src/AdminServer.pm.in
+@@ -371,6 +371,7 @@ sub updateHttpConfFiles {
+     my $savepath = $ENV{SHLIB_PATH} || $ENV{LD_LIBRARY_PATH};
+     $ENV{LD_LIBRARY_PATH} = "";
+     libpath_add("@LIBPATH@");
++    libpath_add("@LIBPATH@/nss");
+     libpath_add("$savepath");
+     $ENV{SHLIB_PATH} = $ENV{LD_LIBRARY_PATH};
+     my $cmd = "@cgibindir@/config op=set configuration.nsSuiteSpotUser=\"$user\"";