diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | include/version.h | 4 | ||||
-rw-r--r-- | ldap/cm/Makefile | 6 | ||||
-rw-r--r-- | ldap/docs/README.txt | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testbind.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testdatainterop.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testentry.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testextendedop.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testgetip.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testpostop.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testpreop.c | 2 | ||||
-rw-r--r-- | ldap/servers/slapd/test-plugins/testsaslbind.c | 2 | ||||
-rw-r--r-- | ldapserver.spec.tmpl | 26 | ||||
-rw-r--r-- | nsdefs.mk | 4 |
14 files changed, 33 insertions, 27 deletions
@@ -353,7 +353,7 @@ fedora-ds.spec: ldapserver.spec.tmpl -e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \ -e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \ -e 's/@GEN-VERSION@/1.0/g' \ - -e 's/@NOSP-VERSION@/1.0.1/g' \ + -e 's/@NOSP-VERSION@/1.0.2/g' \ -e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \ ldapserver.spec.tmpl > $@ mv $@ $(OBJDIR) diff --git a/include/version.h b/include/version.h index dc0a25e1..abb98671 100644 --- a/include/version.h +++ b/include/version.h @@ -44,9 +44,9 @@ exist, the PRODUCT_VERSION define has _DEF appended. */ -#define DIRECTORY_VERSION_DEF "1.0.1" +#define DIRECTORY_VERSION_DEF "1.0.2" #define DIRECTORY_COMPATIBLE "3.0" -#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.1" +#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0.2" #define DS_VERSION_DEF DIRECTORY_VERSION_DEF #define DS_VERSION_STRING DIRECTORY_VERSION_STRING diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile index c849561b..ea495c15 100644 --- a/ldap/cm/Makefile +++ b/ldap/cm/Makefile @@ -108,9 +108,9 @@ endif endif ifdef USE_64 -VERSION=-ver 1.0.1-64bit +VERSION=-ver 1.0.2-64bit else -VERSION=-ver 1.0.1 +VERSION=-ver 1.0.2 endif ifeq ($(ARCH), HPUX) @@ -270,7 +270,7 @@ PACKAGE_SETUP_LIBS_32=$(subst $(NS64TAG),,$(PACKAGE_SETUP_LIBS)) ifdef BUILD_RPM # name and version of RPM - must correspond to the spec file - these get branded RPM_BASE_NAME=fedora - RPM_VERSION=1.0.1 + RPM_VERSION=1.0.2 RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION) RPM_ARCH = $(shell uname -i) # root dir for RPM built and temp files diff --git a/ldap/docs/README.txt b/ldap/docs/README.txt index bfe665e5..2eef34ff 100644 --- a/ldap/docs/README.txt +++ b/ldap/docs/README.txt @@ -1,5 +1,5 @@ ======================================================================= - Fedora Directory Server 1.0 + Fedora Directory Server 1.0.2 ======================================================================= The Fedora Directory Server is subject to the terms detailed in the diff --git a/ldap/servers/slapd/test-plugins/testbind.c b/ldap/servers/slapd/test-plugins/testbind.c index 6121c6d4..f27ae48a 100644 --- a/ldap/servers/slapd/test-plugins/testbind.c +++ b/ldap/servers/slapd/test-plugins/testbind.c @@ -69,7 +69,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.1", +Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.2", "sample bind pre-operation plugin" }; static Slapi_ComponentId *plugin_id = NULL; diff --git a/ldap/servers/slapd/test-plugins/testdatainterop.c b/ldap/servers/slapd/test-plugins/testdatainterop.c index 79647ea7..b04b908d 100644 --- a/ldap/servers/slapd/test-plugins/testdatainterop.c +++ b/ldap/servers/slapd/test-plugins/testdatainterop.c @@ -113,7 +113,7 @@ /* * Static variables. */ -static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.1", +static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.2", "sample pre-operation null suffix plugin" }; static Slapi_ComponentId *plugin_id = NULL; diff --git a/ldap/servers/slapd/test-plugins/testentry.c b/ldap/servers/slapd/test-plugins/testentry.c index 8fa2ca6c..a15edb49 100644 --- a/ldap/servers/slapd/test-plugins/testentry.c +++ b/ldap/servers/slapd/test-plugins/testentry.c @@ -90,7 +90,7 @@ nsslapd-pluginId: test-entry #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.1", +Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.2", "sample entry modification plugin" }; /* Entry store plug-in function */ diff --git a/ldap/servers/slapd/test-plugins/testextendedop.c b/ldap/servers/slapd/test-plugins/testextendedop.c index 7654fa90..9e5c7c77 100644 --- a/ldap/servers/slapd/test-plugins/testextendedop.c +++ b/ldap/servers/slapd/test-plugins/testextendedop.c @@ -83,7 +83,7 @@ /* OID of the extended operation handled by this plug-in */ #define MY_OID "1.2.3.4" -Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.1", +Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.2", "sample extended operation plugin" }; diff --git a/ldap/servers/slapd/test-plugins/testgetip.c b/ldap/servers/slapd/test-plugins/testgetip.c index e0d980fc..6b8651d3 100644 --- a/ldap/servers/slapd/test-plugins/testgetip.c +++ b/ldap/servers/slapd/test-plugins/testgetip.c @@ -74,7 +74,7 @@ #include "slapi-plugin.h" #include "nspr.h" -Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.1", +Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.2", "sample pre-operation plugin" }; static char *netaddr2str( PRNetAddr *addrp, char *buf, size_t buflen ); diff --git a/ldap/servers/slapd/test-plugins/testpostop.c b/ldap/servers/slapd/test-plugins/testpostop.c index 5c6b14b8..55d998a0 100644 --- a/ldap/servers/slapd/test-plugins/testpostop.c +++ b/ldap/servers/slapd/test-plugins/testpostop.c @@ -93,7 +93,7 @@ static char changelogfile[MAX_PATH+1]; static char *changelogfile = "/tmp/changelog"; #endif -Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.1", +Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.2", "sample post-operation plugin" }; static void write_changelog( int optype, char *dn, void *change, int flag ); diff --git a/ldap/servers/slapd/test-plugins/testpreop.c b/ldap/servers/slapd/test-plugins/testpreop.c index cb48709f..8309186a 100644 --- a/ldap/servers/slapd/test-plugins/testpreop.c +++ b/ldap/servers/slapd/test-plugins/testpreop.c @@ -79,7 +79,7 @@ #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.1", +Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.2", "sample pre-operation plugin" }; /* Pre-operation plug-in function */ diff --git a/ldap/servers/slapd/test-plugins/testsaslbind.c b/ldap/servers/slapd/test-plugins/testsaslbind.c index 9ee1f1b7..1a6e2cc5 100644 --- a/ldap/servers/slapd/test-plugins/testsaslbind.c +++ b/ldap/servers/slapd/test-plugins/testsaslbind.c @@ -80,7 +80,7 @@ nsslapd-plugindescription: sample SASL bind pre-operation plugin #include <string.h> #include "slapi-plugin.h" -Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.1", +Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.2", "sample SASL bind pre-operation plugin" }; diff --git a/ldapserver.spec.tmpl b/ldapserver.spec.tmpl index d64c825b..e48cec8b 100644 --- a/ldapserver.spec.tmpl +++ b/ldapserver.spec.tmpl @@ -122,18 +122,18 @@ echo "" if [ -z "$RPM_INSTALL_PREFIX" ]; then RPM_INSTALL_PREFIX=%{prefix} fi -# patch file to fix startconsole ld libpath -if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch -fi if [ "$1" -gt 1 ] ; then # patch file to upgrade admin server from 1.0 to 1.0.1 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver10to101.patch fi # patch file to fix start-admin on Fedora Core 2 if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then - patch -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch + fi +# patch file to fix module load order + if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch ] ; then + patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch fi # fix up file permissions testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf @@ -152,11 +152,12 @@ if [ "$1" -gt 1 ] ; then chown $usergroup $RPM_INSTALL_PREFIX/alias fi fi - echo "Install finished. Please restart your directory servers first," - echo "then the admin server. Do not run setup." -else - echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." + for instance in `ls -d $RPM_INSTALL_PREFIX/slapd-*` + do + cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif $instance/config/schema + done fi +echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers." %preun # only run uninstall if this is the last version of the package @@ -169,6 +170,11 @@ if [ "$1" = 0 ] ; then fi %changelog +* Wed Feb 22 2006 Rich Megginson <rmeggins@redhat.com> - 1.0.2-1 +- Remove startconsole patch; add patch to fix admin server httpd +- module load order; you must now run setup after an upgrade; copy +- in the new 00core.ldif schema file to the server instances + * Tue Dec 6 2005 Rich Megginson <rmeggins@redhat.com> - 1.0.1-1 - Use nosp version instead of gen version to get patch version numbers - Patch the admin server in the post install section @@ -227,8 +227,8 @@ COMMON_OBJDIR_32= $(subst $(NS64TAG),,$(COMMON_OBJDIR)) OBJDIR=$(COMMON_OBJDIR) OBJDIR_32=$(COMMON_OBJDIR_32) DO_SEARCH=no -DIR_VERSION:=1.0.1 -NOSP_DIR_VERSION:=1.0.1 +DIR_VERSION:=1.0.2 +NOSP_DIR_VERSION:=1.0.2 DIR_NORM_VERSION:=1.0 PRODUCT_NAME="$(PRODUCTCORE) $(DIR_VERSION)" # When you change DIRSDK_VERSION or DIRSDK_VERSION_DLL_SUFFIX, you must |