From 496c14401c4432ed7e6579f42d55b0fd838778ac Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Aug 13 2007 15:35:36 +0000 Subject: Resolves: bug 251549 Bug Description: Change filesystem path naming from "fedora-ds" to "dirsrv" Reviewed by: nkinder (Thanks!) Fix Description: Mostly just changing the package name in configure.ac, and making sure we consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@ for adminserver). Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: Oh yes. QA impact: Any existing tests that depend on /path/brand-ds will need to change to use dirsrv. It is highly encouraged to use a macro or variable for the package name in any scripts to minimize the impact of future package name changes. --- diff --git a/configure b/configure index ae9ba25..53a2a60 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0a4. +# Generated by GNU Autoconf 2.59 for dirsrv 1.1.0b1. # # Report bugs to . # @@ -421,10 +421,10 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME='fedora-ds' -PACKAGE_TARNAME='fedora-ds' -PACKAGE_VERSION='1.1.0a4' -PACKAGE_STRING='fedora-ds 1.1.0a4' +PACKAGE_NAME='dirsrv' +PACKAGE_TARNAME='dirsrv' +PACKAGE_VERSION='1.1.0b1' +PACKAGE_STRING='dirsrv 1.1.0b1' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/' # Factoring default headers for most tests. @@ -954,7 +954,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fedora-ds 1.1.0a4 to adapt to many kinds of systems. +\`configure' configures dirsrv 1.1.0b1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1020,7 +1020,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fedora-ds 1.1.0a4:";; + short | recursive ) echo "Configuration of dirsrv 1.1.0b1:";; esac cat <<\_ACEOF @@ -1201,7 +1201,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -fedora-ds configure 1.1.0a4 +dirsrv configure 1.1.0b1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1215,7 +1215,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fedora-ds $as_me 1.1.0a4, which was +It was created by dirsrv $as_me 1.1.0b1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1860,8 +1860,8 @@ fi # Define the identity of the package. - PACKAGE='fedora-ds' - VERSION='1.1.0a4' + PACKAGE='dirsrv' + VERSION='1.1.0b1' cat >>confdefs.h <<_ACEOF @@ -25696,7 +25696,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by fedora-ds $as_me 1.1.0a4, which was +This file was extended by dirsrv $as_me 1.1.0b1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25759,7 +25759,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -fedora-ds config.status 1.1.0a4 +dirsrv config.status 1.1.0b1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 07db323..2bd249b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) # This version is the version returned by ns-slapd -v -AC_INIT([fedora-ds], [1.1.0a4], [http://bugzilla.redhat.com/]) +AC_INIT([dirsrv], [1.1.0b1], [http://bugzilla.redhat.com/]) # AC_CONFIG_HEADER must be called right after AC_INIT. AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) diff --git a/ldap/servers/slapd/test-plugins/README b/ldap/servers/slapd/test-plugins/README index dd89034..8edf5e6 100644 --- a/ldap/servers/slapd/test-plugins/README +++ b/ldap/servers/slapd/test-plugins/README @@ -188,7 +188,7 @@ When started, the server loads plug-ins. 1. Stop the server. Console: Select the server; Object > Stop Server - Command Line: cd [prefix]/usr/lib/-ds/slapd-[serverID] ; ./stop-slapd + Command Line: cd [prefix]/usr/lib//slapd-[serverID] ; ./stop-slapd 2. Add the entry for the server plug-in to [prefix]/var/lib/slapd-[serverID]/dse.ldif. For example: @@ -198,7 +198,7 @@ When started, the server loads plug-ins. objectClass: nsSlapdPlugin objectClass: extensibleObject cn: [My Server Plugin] - nsslapd-pluginPath: [[prefix]/usr/lib/-ds/plugins/myveryown-plugin.so] + nsslapd-pluginPath: [[prefix]/usr/lib//plugins/myveryown-plugin.so] nsslapd-pluginInitfunc: [my_plugin_init] nsslapd-pluginType: [myPluginType] nsslapd-pluginEnabled: on @@ -217,4 +217,4 @@ When started, the server loads plug-ins. 3. Restart the server. Console: Object > Start Server - Command Line: cd [prefix]/usr/lib/-ds/slapd-[serverID] ; ./restart-slapd + Command Line: cd [prefix]/usr/lib//slapd-[serverID] ; ./restart-slapd diff --git a/ldap/servers/slapd/test-plugins/sampletask.c b/ldap/servers/slapd/test-plugins/sampletask.c index 88fe6f3..94f1ade 100644 --- a/ldap/servers/slapd/test-plugins/sampletask.c +++ b/ldap/servers/slapd/test-plugins/sampletask.c @@ -39,7 +39,7 @@ * * [How to set up the plugin for testing] * 1. compile and package with the other plugins - * 2. put the plugin libsampletask-plugin.so at /usr/lib/-ds/plugins + * 2. put the plugin libsampletask-plugin.so at /usr/lib//plugins * 3. register it as a plugin in dse.ldif * Plugin entry: * dn: cn=sampletask,cn=plugins,cn=config @@ -47,7 +47,7 @@ * objectClass: nsSlapdPlugin * objectClass: extensibleObject * cn: sampletask - * nsslapd-pluginPath: /usr/lib/-ds/plugins/libsampletask-plugin.so + * nsslapd-pluginPath: /usr/lib//plugins/libsampletask-plugin.so * nsslapd-pluginInitfunc: sampletask_init * nsslapd-pluginType: object * nsslapd-pluginEnabled: on diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c index 7f9433c..d5d605e 100644 --- a/ldap/servers/slapd/tools/dbscan.c +++ b/ldap/servers/slapd/tools/dbscan.c @@ -750,7 +750,7 @@ static void usage(char *argv0) printf(" -r display the conents of idl\n"); printf(" -s Summary of index counts\n"); printf(" sample usages:\n"); - printf(" # set /usr/lib/:/usr/lib:/usr/lib in the library path\n"); + printf(" # set /usr/lib/:/usr/lib:/usr/lib in the library path\n"); printf(" # dump the entry file\n"); printf(" %s -f id2entry.db\n", argv0); printf(" # display index keys in cn.db4\n"); diff --git a/wrappers/initscript.in b/wrappers/initscript.in index f8bef0d..28a5d37 100644 --- a/wrappers/initscript.in +++ b/wrappers/initscript.in @@ -3,7 +3,7 @@ # @package_name@ This starts and stops @package_name@ # # chkconfig: - 21 79 -# description: @package_name@ Directory Server +# description: @capbrand@ Directory Server # processname: @sbindir@/ns-slapd # configdir: @sysconfdir@/@package_name@/ # piddir: @localstatedir@/run/@package_name@