From 44ed8bab7f2de4b295a88230a35f66af72a12d18 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 7 Feb 2007 23:57:40 +0000 Subject: esolves: bug 227618 Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir Reviewed by: many people (Thanks!) Fix Description: In order to be more FHS compliant, we need to make the following changes: 1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc. 2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin) And, to be more packaging friendly, the additional changes: 3) move libback-ldbm to the plugins dir - it is a plugin 4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins I had to add support for sbindir and SBINDIR to create_instance and ds_newinst. We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself. These are now in 3 different places. The biggest change was to the scripts. I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff. I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew). I've tested instance creation with these diffs - everything seems to work fine. 5) reorder files in alphabetical order - suggested by nkinder 6) add $LDFLAGS to test in db.m4 7) touch all template/wrapper .in files to make them newer than their corresponding files Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes. --- wrappers/dbscan.in | 2 +- wrappers/ds_newinst.in | 4 ++-- wrappers/dsktune.in | 2 +- wrappers/ldap-agent.in | 2 +- wrappers/ldif.in | 2 +- wrappers/migratecred.in | 4 ++-- wrappers/mmldif.in | 4 ++-- wrappers/pwdhash.in | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'wrappers') diff --git a/wrappers/dbscan.in b/wrappers/dbscan.in index 511ca693..115a126d 100755 --- a/wrappers/dbscan.in +++ b/wrappers/dbscan.in @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nspr_libdir@:@db_libdir@ -BIN_DIR=@serverdir@ +BIN_DIR=@bindir@ COMMAND=dbscan-bin diff --git a/wrappers/ds_newinst.in b/wrappers/ds_newinst.in index 1af13ff3..12e2839b 100755 --- a/wrappers/ds_newinst.in +++ b/wrappers/ds_newinst.in @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@serverdir@:@libdir@ -BIN_DIR=@serverdir@:@bindir@:/usr/bin:/bin +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@:@libdir@ +BIN_DIR=@bindir@:/usr/bin:/bin COMMAND=ds_newinst-bin diff --git a/wrappers/dsktune.in b/wrappers/dsktune.in index f04fbd58..7c4777c5 100755 --- a/wrappers/dsktune.in +++ b/wrappers/dsktune.in @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR= -BIN_DIR=@serverdir@ +BIN_DIR=@bindir@ COMMAND=dsktune-bin diff --git a/wrappers/ldap-agent.in b/wrappers/ldap-agent.in index c3f8c5ff..f2fa57b7 100755 --- a/wrappers/ldap-agent.in +++ b/wrappers/ldap-agent.in @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@netsnmp_libdir@ -BIN_DIR=@serverdir@ +BIN_DIR=@bindir@ COMMAND=ldap-agent-bin diff --git a/wrappers/ldif.in b/wrappers/ldif.in index d04227f5..8fcaf171 100755 --- a/wrappers/ldif.in +++ b/wrappers/ldif.in @@ -5,7 +5,7 @@ ############################################################################### LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@serverdir@ +BIN_DIR=@bindir@ COMMAND=ldif-bin diff --git a/wrappers/migratecred.in b/wrappers/migratecred.in index f7487c69..c1aeabf2 100755 --- a/wrappers/migratecred.in +++ b/wrappers/migratecred.in @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@serverdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +BIN_DIR=@bindir@ COMMAND=migratecred-bin diff --git a/wrappers/mmldif.in b/wrappers/mmldif.in index 35b995d3..3a89ce4c 100755 --- a/wrappers/mmldif.in +++ b/wrappers/mmldif.in @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@serverdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +BIN_DIR=@bindir@ COMMAND=mmldif-bin diff --git a/wrappers/pwdhash.in b/wrappers/pwdhash.in index 94e6bc87..ab84914b 100755 --- a/wrappers/pwdhash.in +++ b/wrappers/pwdhash.in @@ -4,8 +4,8 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ -BIN_DIR=@serverdir@ +LIB_DIR=@serverdir@:@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@ +BIN_DIR=@bindir@ COMMAND=pwdhash-bin -- cgit