[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'ubuntu'

Timo Aaltonen tjaalton-guest at alioth.debian.org
Thu Oct 10 22:07:01 UTC 2013


 debian/changelog                          |   16 ++
 debian/control                            |    1 
 debian/patches/admin_scripts.diff         |  201 ++++++++++++++++++++++++++++++
 debian/patches/fix-sasl-path.diff         |    8 -
 debian/patches/rename-online-scripts.diff |   61 +++++++++
 debian/patches/series                     |    2 
 debian/rules                              |   35 ++---
 7 files changed, 304 insertions(+), 20 deletions(-)

New commits:
commit a79bcf63fa7c57777268a6098b247ebf25c87a8e
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Oct 10 10:09:46 2013 +0300

    release to saucy

diff --git a/debian/changelog b/debian/changelog
index b6e5ab0..6be8f1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+389-ds-base (1.3.1.9-0ubuntu2) saucy; urgency=low
+
+  * Merge from debian git
+    - admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
+    - control: Add ldap-utils to -base depends.
+    - rules, rename-online-scripts.diff: Some scripts with .pl suffix are
+      meant for an online server, so instead of overwriting the offline
+      scripts use -online suffix.
+
+ -- Timo Aaltonen <tjaalton at ubuntu.com>  Thu, 10 Oct 2013 09:49:15 +0300
+
 389-ds-base (1.3.1.9-0ubuntu1) saucy; urgency=low
 
   * Sync from unreleased debian git.

commit 71a8a53b6e6ee83913f838b12ff751cc20f97a47
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Oct 9 01:41:34 2013 +0300

    rules: Some scripts with .pl suffix are meant for an online server, so instead of overwriting the offline scripts use -online suffix.

diff --git a/debian/changelog b/debian/changelog
index f253743..6d97e67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@
     #1088822)
   * admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
   * control: Add ldap-utils to -base depends.
+  * rules, rename-online-scripts.diff: Some scripts with .pl suffix are
+    meant for an online server, so instead of overwriting the offline
+    scripts use -online suffix.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Mon, 05 Aug 2013 10:54:03 +0300
 
diff --git a/debian/patches/rename-online-scripts.diff b/debian/patches/rename-online-scripts.diff
new file mode 100644
index 0000000..355fe54
--- /dev/null
+++ b/debian/patches/rename-online-scripts.diff
@@ -0,0 +1,61 @@
+diff --git a/ldap/admin/src/scripts/template-bak2db.pl.in b/ldap/admin/src/scripts/template-bak2db.pl.in
+index 4c7bab8..a972878 100644
+--- a/ldap/admin/src/scripts/template-bak2db.pl.in
++++ b/ldap/admin/src/scripts/template-bak2db.pl.in
+@@ -49,6 +49,6 @@ while ($i <= $#ARGV) {
+         $i++;
+ }
+ 
+-exec "{{SERVERBIN-DIR}}/bak2db.pl @wrapperArgs -Z {{SERV-ID}}";
++exec "{{SERVERBIN-DIR}}/bak2db-online @wrapperArgs -Z {{SERV-ID}}";
+ 
+ exit ($?);
+diff --git a/ldap/admin/src/scripts/template-db2bak.pl.in b/ldap/admin/src/scripts/template-db2bak.pl.in
+index 712f387..e5f44eb 100644
+--- a/ldap/admin/src/scripts/template-db2bak.pl.in
++++ b/ldap/admin/src/scripts/template-db2bak.pl.in
+@@ -49,7 +49,7 @@ while ($i <= $#ARGV) {
+         $i++;
+ }
+ 
+-exec "{{SERVERBIN-DIR}}/db2bak.pl @wrapperArgs -Z {{SERV-ID}}";
++exec "{{SERVERBIN-DIR}}/db2bak-online @wrapperArgs -Z {{SERV-ID}}";
+ 
+ exit ($?);
+ 
+diff --git a/ldap/admin/src/scripts/template-db2index.pl.in b/ldap/admin/src/scripts/template-db2index.pl.in
+index d2d6d87..7edb3c2 100644
+--- a/ldap/admin/src/scripts/template-db2index.pl.in
++++ b/ldap/admin/src/scripts/template-db2index.pl.in
+@@ -49,6 +49,6 @@ while ($i <= $#ARGV) {
+         $i++;
+ }
+ 
+-exec "{{SERVERBIN-DIR}}/db2index.pl @wrapperArgs -Z {{SERV-ID}}";
++exec "{{SERVERBIN-DIR}}/db2index-online @wrapperArgs -Z {{SERV-ID}}";
+ 
+ exit ($?);
+diff --git a/ldap/admin/src/scripts/template-db2ldif.pl.in b/ldap/admin/src/scripts/template-db2ldif.pl.in
+index feb8af9..10db293 100644
+--- a/ldap/admin/src/scripts/template-db2ldif.pl.in
++++ b/ldap/admin/src/scripts/template-db2ldif.pl.in
+@@ -53,6 +53,6 @@ while ($i <= $#ARGV) {
+ 
+ $cwd = cwd();
+ 
+-exec "{{SERVERBIN-DIR}}/db2ldif.pl -c $cwd @wrapperArgs -Z {{SERV-ID}}";
++exec "{{SERVERBIN-DIR}}/db2ldif-online -c $cwd @wrapperArgs -Z {{SERV-ID}}";
+ 
+ exit ($?);
+diff --git a/ldap/admin/src/scripts/template-ldif2db.pl.in b/ldap/admin/src/scripts/template-ldif2db.pl.in
+index 5211fd5..0bae57d 100644
+--- a/ldap/admin/src/scripts/template-ldif2db.pl.in
++++ b/ldap/admin/src/scripts/template-ldif2db.pl.in
+@@ -49,6 +49,6 @@ while ($i <= $#ARGV) {
+         $i++;
+ }
+ 
+-exec "{{SERVERBIN-DIR}}/ldif2db.pl @wrapperArgs -Z {{SERV-ID}}";
++exec "{{SERVERBIN-DIR}}/ldif2db-online @wrapperArgs -Z {{SERV-ID}}";
+ 
+ exit ($?);
diff --git a/debian/patches/series b/debian/patches/series
index ea8086c..0d14cd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 default_user
 fix-sasl-path.diff
 admin_scripts.diff
+rename-online-scripts.diff
diff --git a/debian/rules b/debian/rules
index 3692f92..c960bb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,27 +15,12 @@ REALFILE = \
 	bin/ds-logpipe.py \
 	bin/logconv.pl \
 	bin/repl-monitor.pl \
-	bin/dbscan-bin \
-	bin/dsktune-bin \
-	bin/infadd-bin \
-	bin/ldclt-bin \
-	bin/ldif-bin \
-	bin/migratecred-bin \
-	bin/mmldif-bin \
-	bin/pwdhash-bin \
-	bin/rsearch-bin	\
-	sbin/ldap-agent-bin \
 	sbin/migrate-ds.pl \
 	sbin/remove-ds.pl \
 	sbin/setup-ds.pl \
-	sbin/bak2db.pl \
 	sbin/cleanallruv.pl \
-	sbin/db2bak.pl \
-	sbin/db2index.pl \
-	sbin/db2ldif.pl \
 	sbin/fixup-linkedattrs.pl \
 	sbin/fixup-memberof.pl \
-	sbin/ldif2db.pl \
 	sbin/ns-accountstatus.pl \
 	sbin/ns-activate.pl \
 	sbin/ns-inactivate.pl \
@@ -51,6 +36,19 @@ REALFILE = \
 	share/man/man8/setup-ds.pl.8 \
 	share/man/man8/remove-ds.pl.8
 
+# scripts for handling online servers
+REALFILE_ONLINE = \
+	sbin/bak2db.pl \
+	sbin/db2bak.pl \
+	sbin/db2index.pl \
+	sbin/db2ldif.pl \
+	sbin/ldif2db.pl \
+	share/man/man8/bak2db.pl.8 \
+	share/man/man8/db2bak.pl.8 \
+	share/man/man8/db2index.pl.8 \
+	share/man/man8/db2ldif.pl.8 \
+	share/man/man8/ldif2db.pl.8
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--with-openldap \
@@ -60,7 +58,12 @@ override_dh_install:
 	# lets do the renaming here afterall, instead of in 389-ds-base.install
 	for file in $(REALFILE); do mv -f $(CURDIR)/debian/tmp/usr/$$file \
 		$(CURDIR)/debian/tmp/usr/`echo $$file | \
-		sed -s 's/\-bin//;s/\.pl//;s/\.py//'`; \
+		sed -s 's/\.pl//;s/\.py//'`; \
+		done
+	# use -online suffix so that they won't overwrite the offline scripts
+	for file in $(REALFILE_ONLINE); do mv -f $(CURDIR)/debian/tmp/usr/$$file \
+		$(CURDIR)/debian/tmp/usr/`echo $$file | \
+		sed -s 's/\.pl/-online/'`; \
 		done
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;

commit 56fe9267bb2a532f4f46397fb66bbf8623b1373d
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Oct 8 20:40:15 2013 +0300

    control: Add ldap-utils to -base depends.

diff --git a/debian/changelog b/debian/changelog
index 9ec5bcf..f253743 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@
   * fix-sasl-path.diff: Use a triplet path to find libsasl2. (LP:
     #1088822)
   * admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
+  * control: Add ldap-utils to -base depends.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Mon, 05 Aug 2013 10:54:03 +0300
 
diff --git a/debian/control b/debian/control
index 9170590..5d370ce 100644
--- a/debian/control
+++ b/debian/control
@@ -100,6 +100,7 @@ Pre-Depends: debconf (>= 0.5) | debconf-2.0
 Depends: ${misc:Depends}, ${shlibs:Depends},
  389-ds-base-libs (= ${binary:Version}),
  adduser,
+ ldap-utils,
  libmozilla-ldap-perl,
  libnetaddr-ip-perl,
  libsasl2-modules-gssapi-mit,

commit 36b1b17843793bb228bd368d6ed62bba0f2745f8
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Oct 8 15:20:15 2013 +0300

    admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.

diff --git a/debian/changelog b/debian/changelog
index 5275cfa..9ec5bcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@
   * rules: Add new scripts to rename.
   * fix-sasl-path.diff: Use a triplet path to find libsasl2. (LP:
     #1088822)
+  * admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Mon, 05 Aug 2013 10:54:03 +0300
 
diff --git a/debian/patches/admin_scripts.diff b/debian/patches/admin_scripts.diff
new file mode 100644
index 0000000..ae88641
--- /dev/null
+++ b/debian/patches/admin_scripts.diff
@@ -0,0 +1,201 @@
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/bak2db.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/bak2db.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/bak2db.in	2013-09-16 12:54:44.439015292 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/bak2db.in	2013-09-16 12:58:25.527019898 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2bak.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2bak.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2bak.in	2013-09-16 12:54:44.447015221 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2bak.in	2013-09-16 12:58:25.535020258 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2index.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2index.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2index.in	2013-09-16 12:54:44.451015196 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2index.in	2013-09-16 12:58:25.539020279 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2ldif.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2ldif.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/db2ldif.in	2013-09-16 12:54:44.455015196 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/db2ldif.in	2013-09-16 12:58:25.543020275 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/dbverify.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/dbverify.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/dbverify.in	2013-09-16 12:54:44.459015215 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/dbverify.in	2013-09-16 12:58:25.551020235 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/dn2rdn.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/dn2rdn.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/dn2rdn.in	2013-09-16 12:54:44.463015220 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/dn2rdn.in	2013-09-16 12:58:25.555020215 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/ldif2db.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/ldif2db.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/ldif2db.in	2013-09-16 12:54:44.471015223 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/ldif2db.in	2013-09-16 12:58:25.559020205 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/ldif2ldap.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/ldif2ldap.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/ldif2ldap.in	2013-09-16 12:54:44.475015221 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/ldif2ldap.in	2013-09-16 12:58:25.567020214 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@ldapsdk_libdir@"
+ libpath_add "@libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/monitor.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/monitor.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/monitor.in	2013-09-16 12:54:44.479015218 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/monitor.in	2013-09-16 12:58:25.571020216 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@ldapsdk_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/restart-dirsrv.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/restart-dirsrv.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/restart-dirsrv.in	2013-09-16 12:54:44.487015217 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/restart-dirsrv.in	2013-09-16 12:58:25.579020217 +0200
+@@ -7,7 +7,7 @@
+ #       2: Server started successfully (was not running)
+ #       3: Server could not be stopped
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ restart_instance() {
+     SERV_ID=$1
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/restoreconfig.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/restoreconfig.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/restoreconfig.in	2013-09-16 12:54:44.491015218 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/restoreconfig.in	2013-09-16 12:58:25.583020216 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@nss_libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/saveconfig.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/saveconfig.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/saveconfig.in	2013-09-16 12:54:44.495015219 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/saveconfig.in	2013-09-16 12:58:25.587020214 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/start-dirsrv.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/start-dirsrv.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/start-dirsrv.in	2013-09-16 12:54:44.499015219 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/start-dirsrv.in	2013-09-16 12:58:25.591020213 +0200
+@@ -6,7 +6,7 @@
+ #       1: Server could not be started
+ #       2: Server already running
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ # Starts a single instance
+ start_instance() {
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/stop-dirsrv.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/stop-dirsrv.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/stop-dirsrv.in	2013-09-16 12:54:44.503015218 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/stop-dirsrv.in	2013-09-16 12:58:25.595020213 +0200
+@@ -6,7 +6,7 @@
+ #       1: Server could not be stopped
+ #       2: Server was not running
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ stop_instance() {
+     SERV_ID=$1
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/suffix2instance.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/suffix2instance.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/suffix2instance.in	2013-09-16 12:54:44.507015218 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/suffix2instance.in	2013-09-16 12:58:25.599020214 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/upgradedb.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/upgradedb.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/upgradedb.in	2013-09-16 12:54:44.535015219 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/upgradedb.in	2013-09-16 12:58:25.627020215 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@libdir@"
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/upgradednformat.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/upgradednformat.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/upgradednformat.in	2013-09-16 12:54:44.539015219 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/upgradednformat.in	2013-09-16 12:58:25.631020216 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ # upgradednformat -- upgrade DN format to the new style (RFC 4514)
+ # Usgae: upgradednformat [-N] -n backend_instance -a db_instance_directory
+diff -u 389-ds-base-1.3.1.8/ldap/admin/src/scripts/vlvindex.in 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/vlvindex.in
+--- 389-ds-base-1.3.1.8/ldap/admin/src/scripts/vlvindex.in	2013-09-16 12:54:44.543015220 +0200
++++ 389-ds-base-1.3.1.8-local/ldap/admin/src/scripts/vlvindex.in	2013-09-16 12:58:25.639020215 +0200
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ 
+-source @datadir@/@package_name@/data/DSSharedLib
++. @datadir@/@package_name@/data/DSSharedLib
+ 
+ libpath_add "@libdir@/@package_name@/"
+ libpath_add "@libdir@"
diff --git a/debian/patches/series b/debian/patches/series
index e9111e8..ea8086c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 default_user
 fix-sasl-path.diff
+admin_scripts.diff

commit 984827993460b85951b63aa7f9fd3afde6d937b9
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Oct 4 19:05:23 2013 +0300

    fix sasl paths

diff --git a/debian/patches/fix-sasl-path.diff b/debian/patches/fix-sasl-path.diff
index 73a085c..0cbf73c 100644
--- a/debian/patches/fix-sasl-path.diff
+++ b/debian/patches/fix-sasl-path.diff
@@ -6,13 +6,13 @@
              pluginpath = "/usr/lib64/sasl2";
 +            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
 +                /* Since the path does not exist, try gnu triplet. */
-+                pluginpath = "/usr/lib/x86_64-linux-gnu";
++                pluginpath = "/usr/lib/x86_64-linux-gnu/sasl2";
 +            }
  #else
              pluginpath = "/usr/lib/sasl2";
 +            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
 +                /* Since the path does not exist, try gnu triplet. */
-+                pluginpath = "/usr/lib/i386-linux-gnu";
++                pluginpath = "/usr/lib/i386-linux-gnu/sasl2";
 +            }
  #endif
          }
@@ -25,13 +25,13 @@
              pluginpath = "/usr/lib64/sasl2";
 +            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
 +                /* Since the path does not exist, try gnu triplet. */
-+                pluginpath = "/usr/lib/x86_64-linux-gnu";
++                pluginpath = "/usr/lib/x86_64-linux-gnu/sasl2";
 +            }
  #else
              pluginpath = "/usr/lib/sasl2";
 +            if (PR_SUCCESS != PR_Access(pluginpath, PR_ACCESS_EXISTS)) {
 +                /* Since the path does not exist, try gnu triplet. */
-+                pluginpath = "/usr/lib/i386-linux-gnu";
++                pluginpath = "/usr/lib/i386-linux-gnu/sasl2";
 +            }
  #endif
          }



More information about the Pkg-fedora-ds-maintainers mailing list