[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'master'
Timo Aaltonen
tjaalton at moszumanska.debian.org
Fri Jan 16 13:48:13 UTC 2015
debian/changelog | 8
debian/patches/admin_scripts.diff | 333 -----------------------------
debian/patches/fix-saslpath.diff | 35 +++
debian/patches/series | 2
debian/patches/use-bash-instead-of-sh.diff | 144 ++++++++++++
5 files changed, 188 insertions(+), 334 deletions(-)
New commits:
commit 8698c136c2e452a0a91a1a62eaddb6925bc10284
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Jan 16 15:47:55 2015 +0200
releasing package 389-ds-base version 1.3.3.5-3
diff --git a/debian/changelog b/debian/changelog
index dbffaf1..f5cdef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-389-ds-base (1.3.3.5-3) UNRELEASED; urgency=medium
+389-ds-base (1.3.3.5-3) unstable; urgency=medium
* use-bash-instead-of-sh.diff: Drop admin_scripts.diff and patch the
scripts to use bash instead of trying to fix bashisms. (Closes:
#772195)
- -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Jan 2015 15:14:48 +0200
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Jan 2015 15:40:23 +0200
389-ds-base (1.3.3.5-2) unstable; urgency=medium
commit 783f0055fee7d2311324a8f11a42e859fee92c1a
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Jan 16 15:16:00 2015 +0200
add fix-saslpath.diff to git
diff --git a/debian/patches/fix-saslpath.diff b/debian/patches/fix-saslpath.diff
new file mode 100644
index 0000000..3e85bea
--- /dev/null
+++ b/debian/patches/fix-saslpath.diff
@@ -0,0 +1,35 @@
+diff --git a/ldap/servers/slapd/ldaputil.c b/ldap/servers/slapd/ldaputil.c
+index 7daaaf3..2885bb6 100644
+--- a/ldap/servers/slapd/ldaputil.c
++++ b/ldap/servers/slapd/ldaputil.c
+@@ -971,10 +971,10 @@ ldaputil_get_saslpath()
+ if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {
+ #ifdef CPU_arm
+ /* the 64-bit ARMv8 architecture. */
+- saslpath = "/usr/lib/aarch64-linux-gnu";
++ saslpath = "/usr/lib/aarch64-linux-gnu/sasl2";
+ #else
+ /* Try x86_64 gnu triplet */
+- saslpath = "/usr/lib/x86_64-linux-gnu";
++ saslpath = "/usr/lib/x86_64-linux-gnu/sasl2";
+ #endif
+ }
+ #else
+@@ -982,14 +982,14 @@ ldaputil_get_saslpath()
+ if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {
+ #ifdef CPU_arm
+ /* the latest 32 bit ARM architecture using the hard-float version of EABI. */
+- saslpath = "/usr/lib/arm-linux-gnueabihf";
++ saslpath = "/usr/lib/arm-linux-gnueabihf/sasl2";
+ if (PR_SUCCESS != PR_Access(saslpath, PR_ACCESS_EXISTS)) {
+ /* the 32 bit ARM architecture of EABI. */
+- saslpath = "/usr/lib/arm-linux-gnueabi";
++ saslpath = "/usr/lib/arm-linux-gnueabi/sasl2";
+ }
+ #else
+ /* Try i386 gnu triplet */
+- saslpath = "/usr/lib/i386-linux-gnu";
++ saslpath = "/usr/lib/i386-linux-gnu/sasl2";
+ #endif
+ }
+ #endif
commit 6b0f0d4be865b9376b9f09f9e7e8f70a6669f230
Author: Timo Aaltonen <tjaalton at debian.org>
Date: Fri Jan 16 15:15:43 2015 +0200
use-bash-instead-of-sh.diff: Drop admin_scripts.diff and patch the scripts to use bash instead of trying to fix bashisms. (Closes: #772195)
diff --git a/debian/changelog b/debian/changelog
index ba50050..dbffaf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+389-ds-base (1.3.3.5-3) UNRELEASED; urgency=medium
+
+ * use-bash-instead-of-sh.diff: Drop admin_scripts.diff and patch the
+ scripts to use bash instead of trying to fix bashisms. (Closes:
+ #772195)
+
+ -- Timo Aaltonen <tjaalton at debian.org> Fri, 16 Jan 2015 15:14:48 +0200
+
389-ds-base (1.3.3.5-2) unstable; urgency=medium
* fix-saslpath.diff: Fix SASL library path.
diff --git a/debian/patches/admin_scripts.diff b/debian/patches/admin_scripts.diff
deleted file mode 100644
index 403c26c..0000000
--- a/debian/patches/admin_scripts.diff
+++ /dev/null
@@ -1,333 +0,0 @@
---- a/ldap/admin/src/scripts/bak2db.in
-+++ b/ldap/admin/src/scripts/bak2db.in
-@@ -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@"
-@@ -26,15 +26,18 @@ if [ $# -lt 1 ] || [ $# -gt 7 ]
- then
- usage
- exit 1
--elif [[ $1 == -* ]]
--then
-- usage
-- exit 1
--else
-- archivedir=$1
-- shift
- fi
--
-+case $1 in
-+ -*)
-+ usage
-+ exit 1
-+ ;;
-+ *)
-+ archivedir=$1
-+ shift
-+ ;;
-+esac
-+
- while getopts "hn:Z:qd:vi:a:SD:" flag
- do
- case $flag in
---- a/ldap/admin/src/scripts/db2bak.in
-+++ b/ldap/admin/src/scripts/db2bak.in
-@@ -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@"
-@@ -21,20 +21,21 @@ usage()
- echo " -h - Display usage"
- }
-
--if [ $# -gt 4 ]
-+if [ $# -lt 1 ] || [ $# -gt 4 ]
- then
- usage
- exit 1
- fi
--
--if [ "$#" -gt 0 ]
--then
-- if [[ $1 != -* ]]
-- then
-+case $1 in
-+ -*)
-+ usage
-+ exit 1
-+ ;;
-+ *)
- bak_dir=$1
- shift
-- fi
--fi
-+ ;;
-+esac
-
- while getopts "hqd:Z:vi:a:SD" flag
- do
---- a/ldap/admin/src/scripts/db2index.in
-+++ b/ldap/admin/src/scripts/db2index.in
-@@ -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@"
---- a/ldap/admin/src/scripts/db2ldif.in
-+++ b/ldap/admin/src/scripts/db2ldif.in
-@@ -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@"
---- a/ldap/admin/src/scripts/dbverify.in
-+++ b/ldap/admin/src/scripts/dbverify.in
-@@ -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@"
---- a/ldap/admin/src/scripts/dn2rdn.in
-+++ b/ldap/admin/src/scripts/dn2rdn.in
-@@ -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@"
---- a/ldap/admin/src/scripts/ldif2db.in
-+++ b/ldap/admin/src/scripts/ldif2db.in
-@@ -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@"
---- a/ldap/admin/src/scripts/ldif2ldap.in
-+++ b/ldap/admin/src/scripts/ldif2ldap.in
-@@ -1,6 +1,6 @@
- #!/bin/sh
-
--source @datadir@/@package_name@/data/DSSharedLib
-+. @datadir@/@package_name@/data/DSSharedLib
-
- libpath_add "@ldapsdk_libdir@"
- libpath_add "@libdir@"
---- a/ldap/admin/src/scripts/monitor.in
-+++ b/ldap/admin/src/scripts/monitor.in
-@@ -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@"
---- a/ldap/admin/src/scripts/restart-dirsrv.in
-+++ b/ldap/admin/src/scripts/restart-dirsrv.in
-@@ -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
---- a/ldap/admin/src/scripts/restoreconfig.in
-+++ b/ldap/admin/src/scripts/restoreconfig.in
-@@ -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@"
---- a/ldap/admin/src/scripts/saveconfig.in
-+++ b/ldap/admin/src/scripts/saveconfig.in
-@@ -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@"
---- a/ldap/admin/src/scripts/start-dirsrv.in
-+++ b/ldap/admin/src/scripts/start-dirsrv.in
-@@ -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() {
---- a/ldap/admin/src/scripts/stop-dirsrv.in
-+++ b/ldap/admin/src/scripts/stop-dirsrv.in
-@@ -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
---- a/ldap/admin/src/scripts/suffix2instance.in
-+++ b/ldap/admin/src/scripts/suffix2instance.in
-@@ -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@"
---- a/ldap/admin/src/scripts/upgradedb.in
-+++ b/ldap/admin/src/scripts/upgradedb.in
-@@ -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@"
---- a/ldap/admin/src/scripts/upgradednformat.in
-+++ b/ldap/admin/src/scripts/upgradednformat.in
-@@ -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
---- a/ldap/admin/src/scripts/vlvindex.in
-+++ b/ldap/admin/src/scripts/vlvindex.in
-@@ -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@"
---- a/ldap/admin/src/scripts/DSSharedLib.in
-+++ b/ldap/admin/src/scripts/DSSharedLib.in
-@@ -135,48 +135,44 @@ process_dse ()
- configdir=$1
- pid=$2
- file="$configdir/dse.ldif"
-- shopt -s nocasematch
-- OLD_IFC=$IFC
-+ OLD_IFS=$IFS
- IFS=""
- while read -r LINE
- do
-- if [[ $LINE != \ * ]] && [ "$output" != "" ]
-- then
-- echo "$output" >> /tmp/DSSharedLib.$pid
-- output=""
-- fi
-- if [ "$output" != "" ] && [[ $LINE == \ * ]]
-- then
-- # continuation line, strip the space and append it
-- LINE=`echo "$LINE" | sed -e 's/^ //'`
-- output=$output$LINE
-- elif [[ $LINE == nsslapd-port* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-localhost* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-securePort* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-security* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-ldapilisten* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-ldapifilepath* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-rootdn* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-ldapiautobind* ]]
-- then
-- output=$LINE;
-- elif [[ $LINE == nsslapd-certdir* ]]
-- then
-- output=$LINE;
-+ case $LINE in
-+ ' '*)
-+ ;;
-+ *)
-+ if [ "$output" != "" ]
-+ then
-+ echo "$output" >> /tmp/DSSharedLib.$pid
-+ output=""
-+ fi
-+ ;;
-+ esac
-+ if [ "$output" != "" ]
-+ then
-+ case $LINE in
-+ ' '*)
-+ # continuation line, strip the space and append it
-+ LINE=`echo "$LINE" | sed -e 's/^ //'`
-+ output=$output$LINE
-+ ;;
-+ esac
-+ else
-+ case $LINE in
-+ nsslapd-certdir*|\
-+ nsslapd-ldapiautobind*|\
-+ nsslapd-ldapilisten*|\
-+ nsslapd-ldapifilepath*|\
-+ nsslapd-localhost*|\
-+ nsslapd-port*|\
-+ nsslapd-rootdn*|\
-+ nsslapd-securePort*|\
-+ nsslapd-security*)
-+ output=$LINE
-+ ;;
-+ esac
- fi
-
- done < $file
-@@ -224,4 +220,4 @@ check_protocol ()
- fi
-
- echo "$protocol"
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index cd316be..1e33765 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
default_user
-admin_scripts.diff
+use-bash-instead-of-sh.diff
rename-online-scripts.diff
ftbs_lsoftotkn3.diff
fix-bsd.patch
diff --git a/debian/patches/use-bash-instead-of-sh.diff b/debian/patches/use-bash-instead-of-sh.diff
new file mode 100644
index 0000000..225fdbf
--- /dev/null
+++ b/debian/patches/use-bash-instead-of-sh.diff
@@ -0,0 +1,144 @@
+--- a/ldap/admin/src/scripts/bak2db.in
++++ b/ldap/admin/src/scripts/bak2db.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/db2bak.in
++++ b/ldap/admin/src/scripts/db2bak.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/db2index.in
++++ b/ldap/admin/src/scripts/db2index.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/db2ldif.in
++++ b/ldap/admin/src/scripts/db2ldif.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/dbverify.in
++++ b/ldap/admin/src/scripts/dbverify.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/dn2rdn.in
++++ b/ldap/admin/src/scripts/dn2rdn.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/ldif2db.in
++++ b/ldap/admin/src/scripts/ldif2db.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/ldif2ldap.in
++++ b/ldap/admin/src/scripts/ldif2ldap.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/monitor.in
++++ b/ldap/admin/src/scripts/monitor.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/restart-dirsrv.in
++++ b/ldap/admin/src/scripts/restart-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # Script that restarts the ns-slapd server.
+ # Exit status can be:
+--- a/ldap/admin/src/scripts/restoreconfig.in
++++ b/ldap/admin/src/scripts/restoreconfig.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/saveconfig.in
++++ b/ldap/admin/src/scripts/saveconfig.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/start-dirsrv.in
++++ b/ldap/admin/src/scripts/start-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # Script that starts the ns-slapd server.
+ # Exit status can be:
+--- a/ldap/admin/src/scripts/stop-dirsrv.in
++++ b/ldap/admin/src/scripts/stop-dirsrv.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # Script that stops the ns-slapd server.
+ # Exit status can be:
+--- a/ldap/admin/src/scripts/suffix2instance.in
++++ b/ldap/admin/src/scripts/suffix2instance.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/upgradedb.in
++++ b/ldap/admin/src/scripts/upgradedb.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/upgradednformat.in
++++ b/ldap/admin/src/scripts/upgradednformat.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
+--- a/ldap/admin/src/scripts/vlvindex.in
++++ b/ldap/admin/src/scripts/vlvindex.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ source @datadir@/@package_name@/data/DSSharedLib
+
More information about the Pkg-fedora-ds-maintainers
mailing list