[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.23, 1.24
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32291
Modified Files:
ldapserver.spec.tmpl
Log Message:
Still need the console ld libpath patch for startconsole
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ldapserver.spec.tmpl 23 Feb 2006 01:19:55 -0000 1.23
+++ ldapserver.spec.tmpl 23 Feb 2006 04:06:17 -0000 1.24
@@ -122,18 +122,22 @@
if [ -z "$RPM_INSTALL_PREFIX" ]; then
RPM_INSTALL_PREFIX=%{prefix}
fi
+# patch file to fix console ld libpath
+if [ -f $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch ] ; then
+ patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/console-ld-libpath.patch > /dev/null 2>&1
+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 -s -f -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 > /dev/null 2>&1
fi
# patch file to fix start-admin on Fedora Core 2
if [ -f $RPM_INSTALL_PREFIX/setup/adminserver-start-admin.patch ] ; then
- patch -s -f -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 > /dev/null 2>&1
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
+ patch -s -f -d $RPM_INSTALL_PREFIX -p0 < $RPM_INSTALL_PREFIX/setup/adminserver-httpd-moduleorder.patch > /dev/null 2>&1
fi
# fix up file permissions
testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
@@ -156,6 +160,7 @@
do
cp $RPM_INSTALL_PREFIX/bin/slapd/install/schema/00core.ldif $instance/config/schema
done
+ echo "Upgrade complete. Please restart slapd then admin."
fi
echo "Install finished. Please run $RPM_INSTALL_PREFIX/setup/setup to set up the servers."
@@ -171,9 +176,9 @@
%changelog
* Wed Feb 22 2006 Rich Megginson <rmeggins(a)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
+- 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(a)redhat.com> - 1.0.1-1
- Use nosp version instead of gen version to get patch version numbers
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.39, 1.40
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32259
Modified Files:
pkgadmin.mk
Log Message:
still need the console ld libpath patch for startconsole
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- pkgadmin.mk 23 Feb 2006 01:12:03 -0000 1.39
+++ pkgadmin.mk 23 Feb 2006 04:05:13 -0000 1.40
@@ -294,6 +294,8 @@
cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup
# The patch file that fixes module load order
cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-httpd-moduleorder.patch $(ADMIN_DIR)/setup
+# The patch file that fixes console ld libpath
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/console-ld-libpath.patch $(ADMIN_DIR)/setup
cp -p $(BUILD_ROOT)/admserv/newinst/common/config/not_installed.html $(ADMIN_DIR)/clients
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32216
Modified Files:
console-ld-libpath.patch
Log Message:
Still need the console ld lib path patch for startconsole
console-ld-libpath.patch:
Index: console-ld-libpath.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/console-ld-libpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- console-ld-libpath.patch 8 Dec 2005 02:37:52 -0000 1.2
+++ console-ld-libpath.patch 23 Feb 2006 04:04:14 -0000 1.3
@@ -1,41 +1,22 @@
---- startconsole 26 Oct 2005 23:16:14 -0000 1.4
-+++ startconsole 7 Dec 2005 23:50:54 -0000
-@@ -26,17 +26,17 @@
- then
- echo "$0: Your JAVA_HOME environment variable is not set. Please set it appropriately."
- exit 1
- fi
+--- startconsole.orig 2006-02-22 20:45:12.000000000 -0700
++++ startconsole 2006-02-22 20:46:03.000000000 -0700
+@@ -21,12 +21,19 @@
- #
- # Make sure java exists and is executable
- #
--if [ ! -f java -a ! -x java ]
-+if [ ! -f $JAVA_HOME/bin/java -a ! -x $JAVA_HOME/bin/java ]
+ JAVA=`which java`
+ if [ -z "$JAVA" -o ! -x "$JAVA" ]
then
- echo "$0: The java program is not in your path, or is not executable."
+ echo "$0: The java program is not in your path, or is not executable.";
exit 1
fi
- #
- # See if libjava and libjvm exist, and set the lib path. These are linked to by JSS.
- #
-@@ -53,16 +53,19 @@
- LD_LIBRARY_PATH="$LIBJAVA_DIR"
- SHLIB_PATH="$LIBJAVA_DIR"
- DYLD_PATH="$LIBJAVA_DIR"
- else
- LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
- fi
-+ LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
-+ SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
-+ DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
- export LD_LIBRARY_PATH
- export SHLIB_PATH
- export DYLD_PATH
- fi
-
++LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
++SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
++DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
++export LD_LIBRARY_PATH
++export SHLIB_PATH
++export DYLD_PATH
++
#
# Launch the Console
#
+ java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-httpd-moduleorder.patch, 1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25486
Modified Files:
adminserver-httpd-moduleorder.patch
Log Message:
replace %%% tokens with the real default paths, otherwise patch won't work
adminserver-httpd-moduleorder.patch:
Index: adminserver-httpd-moduleorder.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-httpd-moduleorder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminserver-httpd-moduleorder.patch 23 Feb 2006 01:12:11 -0000 1.1
+++ adminserver-httpd-moduleorder.patch 23 Feb 2006 01:50:30 -0000 1.2
@@ -1,17 +1,17 @@
--- admin-serv/config/httpd.conf 7 Dec 2005 20:46:06 -0000 1.7
+++ admin-serv/config/httpd.conf 18 Jan 2006 16:58:37 -0000 1.8
@@ -143,18 +143,18 @@
- LoadModule alias_module %%%module_dir%%%/modules/mod_alias.so
- LoadModule rewrite_module %%%module_dir%%%/modules/mod_rewrite.so
- LoadModule cache_module %%%module_dir%%%/modules/mod_cache.so
- LoadModule disk_cache_module %%%module_dir%%%/modules/mod_disk_cache.so
- LoadModule file_cache_module %%%module_dir%%%/modules/mod_file_cache.so
- LoadModule mem_cache_module %%%module_dir%%%/modules/mod_mem_cache.so
- LoadModule cgi_module %%%module_dir%%%/modules/mod_cgi.so
- LoadModule restartd_module %%%sroot%%%/bin/admin/lib/libmodrestartd.so
--LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so
- LoadModule nss_module %%%sroot%%%/bin/admin/lib/libmodnss.so
-+LoadModule admserv_module %%%sroot%%%/bin/admin/lib/libmodadmserv.so
+ LoadModule alias_module /etc/httpd/modules/mod_alias.so
+ LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so
+ LoadModule cache_module /etc/httpd/modules/mod_cache.so
+ LoadModule disk_cache_module /etc/httpd/modules/mod_disk_cache.so
+ LoadModule file_cache_module /etc/httpd/modules/mod_file_cache.so
+ LoadModule mem_cache_module /etc/httpd/modules/mod_mem_cache.so
+ LoadModule cgi_module /etc/httpd/modules/mod_cgi.so
+ LoadModule restartd_module /opt/fedora-ds/bin/admin/lib/libmodrestartd.so
+-LoadModule admserv_module /opt/fedora-ds/bin/admin/lib/libmodadmserv.so
+ LoadModule nss_module /opt/fedora-ds/bin/admin/lib/libmodnss.so
++LoadModule admserv_module /opt/fedora-ds/bin/admin/lib/libmodadmserv.so
### Section 2: 'Main' server configuration
#
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.7, 1.8 testdatainterop.c, 1.7, 1.8 testentry.c, 1.7, 1.8 testextendedop.c, 1.7, 1.8 testgetip.c, 1.7, 1.8 testpostop.c, 1.7, 1.8 testpreop.c, 1.8, 1.9 testsaslbind.c, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/servers/slapd/test-plugins
Modified Files:
testbind.c testdatainterop.c testentry.c testextendedop.c
testgetip.c testpostop.c testpreop.c testsaslbind.c
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.
Index: testbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testbind.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testbind.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -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;
Index: testdatainterop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdatainterop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testdatainterop.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testdatainterop.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -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;
Index: testentry.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testentry.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testentry.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testentry.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -90,7 +90,7 @@
#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 */
Index: testextendedop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testextendedop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testextendedop.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testextendedop.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -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" };
Index: testgetip.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testgetip.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testgetip.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -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 );
Index: testpostop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpostop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testpostop.c 7 Dec 2005 21:50:09 -0000 1.7
+++ testpostop.c 23 Feb 2006 01:20:17 -0000 1.8
@@ -93,7 +93,7 @@
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 );
Index: testpreop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testpreop.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testpreop.c 7 Dec 2005 21:50:09 -0000 1.8
+++ testpreop.c 23 Feb 2006 01:20:17 -0000 1.9
@@ -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 */
Index: testsaslbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testsaslbind.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- testsaslbind.c 7 Dec 2005 21:50:09 -0000 1.9
+++ testsaslbind.c 23 Feb 2006 01:20:17 -0000 1.10
@@ -80,7 +80,7 @@
#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" };
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/docs README.txt,1.3,1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/docs
Modified Files:
README.txt
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.
Index: README.txt
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/docs/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.txt 29 Oct 2005 02:26:29 -0000 1.3
+++ README.txt 23 Feb 2006 01:20:12 -0000 1.4
@@ -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
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.50,1.51
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Makefile 17 Feb 2006 16:57:19 -0000 1.50
+++ Makefile 23 Feb 2006 01:20:06 -0000 1.51
@@ -108,9 +108,9 @@
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 @@
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
18 years, 2 months
[Fedora-directory-commits] ldapserver/include version.h,1.8,1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver/include
Modified Files:
version.h
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.
Index: version.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/include/version.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- version.h 7 Dec 2005 21:49:47 -0000 1.8
+++ version.h 23 Feb 2006 01:20:01 -0000 1.9
@@ -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
18 years, 2 months
[Fedora-directory-commits] ldapserver Makefile, 1.29, 1.30 ldapserver.spec.tmpl, 1.22, 1.23 nsdefs.mk, 1.16, 1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25254/ldapserver
Modified Files:
Makefile ldapserver.spec.tmpl nsdefs.mk
Log Message:
Change version to 1.0.2
RPM post install adds a new patch to fix the httpd module load order, removes
the console patch
Tell the user to run setup/setup after upgrade installation.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile 7 Dec 2005 21:25:50 -0000 1.29
+++ Makefile 23 Feb 2006 01:19:55 -0000 1.30
@@ -353,7 +353,7 @@
-e 's/@COMPANY-PRODUCT-NAME@/Fedora Directory Server/g' \
-e 's/@LCASE-COMPANY-NAME-NOSP@/fedora/g' \
-e 's/@GEN-VERSION(a)/1.0/g' \
- -e 's/@NOSP-VERSION(a)/1.0.1/g' \
+ -e 's/@NOSP-VERSION(a)/1.0.2/g' \
-e 's+@COMPANY-URL@+http://directory.fedora.redhat.com/+g' \
ldapserver.spec.tmpl > $@
mv $@ $(OBJDIR)
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ldapserver.spec.tmpl 8 Dec 2005 04:14:27 -0000 1.22
+++ ldapserver.spec.tmpl 23 Feb 2006 01:19:55 -0000 1.23
@@ -122,18 +122,18 @@
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 @@
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 @@
fi
%changelog
+* Wed Feb 22 2006 Rich Megginson <rmeggins(a)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(a)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
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/nsdefs.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsdefs.mk 7 Dec 2005 21:25:50 -0000 1.16
+++ nsdefs.mk 23 Feb 2006 01:19:55 -0000 1.17
@@ -227,8 +227,8 @@
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
18 years, 2 months
[Fedora-directory-commits] adminserver/include/nt regparms.h, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/include/nt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25111/adminserver/include/nt
Modified Files:
regparms.h
Log Message:
Change admin server version to 1.0.2
Added adminserver-httpd-moduleorder.patch for use when upgrading to make sure
mod_admserv is loaded after mod_nss
Index: regparms.h
===================================================================
RCS file: /cvs/dirsec/adminserver/include/nt/regparms.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- regparms.h 7 Dec 2005 21:42:40 -0000 1.8
+++ regparms.h 23 Feb 2006 01:12:51 -0000 1.9
@@ -46,19 +46,19 @@
/* Admin IDs */
#define ADM_ID_PRODUCT "admin"
#define ADM_NAME_SHORT "Administration"
-#define ADM_VERSION "1.0.1"
-#define ADM_NAME_VERSION "Administration 1.0.1"
+#define ADM_VERSION "1.0.2"
+#define ADM_NAME_VERSION "Administration 1.0.2"
#define ADM_NAME_SERVER "Administration Server"
#define ADM_NAME_FULL "Fedora Administration Server"
-#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0.1"
-#define ADM_NAME_SERVICE "Fedora Administration 1.0.1"
+#define ADM_NAME_FULL_VERSION "Fedora Administration Server 1.0.2"
+#define ADM_NAME_SERVICE "Fedora Administration 1.0.2"
#define ADM_EXE "ns-admin.exe"
#define ADM_EXE_START "admin.exe"
#define ADM_ID_SERVICE "admin10"
-#define ADM_KEY_ROOT "Administration\\1.0.1"
+#define ADM_KEY_ROOT "Administration\\1.0.2"
#define ADM_SERVER_LST_NAME "adm:Netscape Enterprise Server"
#define ADM_DIR_ROOT "admin"
-#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0.1"
+#define ADM_NAME_UNINSTALL "Uninstall Administration Server 1.0.2"
/* original definitions */
// Upper-level registry parameters
18 years, 2 months