[Pkg-fedora-ds-maintainers] [389-admin] 02/02: add-softokn-ldlibpath.diff: Fix loading softokn3. (Closes: #737214)

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository 389-admin.

commit 075add00e3c6e7403142296969e2f0ce35b168f4
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Nov 7 01:06:35 2014 +0200

    add-softokn-ldlibpath.diff: Fix loading softokn3. (Closes: #737214)
---
 debian/changelog                          |  1 +
 debian/patches/add-softokn-ldlibpath.diff | 12 ++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8704a92..159f6fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 389-admin (1.1.35-3) UNRELEASED; urgency=medium
 
   * fix-group-name.patch: Add the patch to series too.
+  * add-softokn-ldlibpath.diff: Fix loading softokn3. (Closes: #737214)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Fri, 07 Nov 2014 00:38:48 +0200
 
diff --git a/debian/patches/add-softokn-ldlibpath.diff b/debian/patches/add-softokn-ldlibpath.diff
new file mode 100644
index 0000000..7a765f0
--- /dev/null
+++ b/debian/patches/add-softokn-ldlibpath.diff
@@ -0,0 +1,12 @@
+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=
+ LIBPATH=
+ 
+ ldlibpath_add "@LIBPATH@"
++ldlibpath_add "@LIBPATH@/nss"
+ ldlibpath_add "${OLD_LD_LIBRARY_PATH}"
+ export LD_LIBRARY_PATH
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8350ded..94a7418 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ support-kfreebsd.patch
 fix-typos.patch
 fix-hyphen-used-as-minus-sign.patch
 fix-group-name.patch
+add-softokn-ldlibpath.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/389-admin.git