[Fedora-directory-commits] ldapserver/wrappers dbscan.in, 1.2, 1.3 ds_newinst.in, 1.3, 1.4 dsktune.in, 1.2, 1.3 ldap-agent.in, 1.2, 1.3 ldif.in, 1.2, 1.3 migratecred.in, 1.2, 1.3 mmldif.in, 1.2, 1.3 pwdhash.in, 1.2, 1.3

Wed Feb 7 23:57:47 UTC 2007

Author: rmeggins

Update of /cvs/dirsec/ldapserver/wrappers
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15984/ldapserver/wrappers

Modified Files:
	dbscan.in ds_newinst.in dsktune.in ldap-agent.in ldif.in 
	migratecred.in mmldif.in pwdhash.in 
Log Message:
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. 



Index: dbscan.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/dbscan.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- dbscan.in	2 Nov 2006 03:11:40 -0000	1.2
+++ dbscan.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nspr_libdir@:@db_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=dbscan-bin
 
 


Index: ds_newinst.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ds_newinst.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ds_newinst.in	29 Jan 2007 18:48:11 -0000	1.3
+++ ds_newinst.in	7 Feb 2007 23:57:40 -0000	1.4
@@ -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
 
 


Index: dsktune.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/dsktune.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dsktune.in	2 Nov 2006 03:11:40 -0000	1.2
+++ dsktune.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=dsktune-bin
 
 


Index: ldap-agent.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ldap-agent.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldap-agent.in	2 Nov 2006 03:11:40 -0000	1.2
+++ ldap-agent.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@netsnmp_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=ldap-agent-bin
 
 


Index: ldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/ldif.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ldif.in	2 Nov 2006 03:11:40 -0000	1.2
+++ ldif.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -5,7 +5,7 @@
 ###############################################################################
 
 LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@sasl_libdir@
-BIN_DIR=@serverdir@
+BIN_DIR=@bindir@
 COMMAND=ldif-bin
 
 


Index: migratecred.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/migratecred.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- migratecred.in	2 Nov 2006 03:11:40 -0000	1.2
+++ migratecred.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -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
 
 


Index: mmldif.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/mmldif.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mmldif.in	2 Nov 2006 03:11:40 -0000	1.2
+++ mmldif.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -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
 
 


Index: pwdhash.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/wrappers/pwdhash.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwdhash.in	2 Nov 2006 03:11:40 -0000	1.2
+++ pwdhash.in	7 Feb 2007 23:57:40 -0000	1.3
@@ -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
 
 


