[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.33, 1.34
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16542
Modified Files:
pkgadmin.mk
Log Message:
whoops - I left the - at the beginning of the mkdir command
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- pkgadmin.mk 7 Dec 2005 22:45:16 -0000 1.33
+++ pkgadmin.mk 8 Dec 2005 02:37:25 -0000 1.34
@@ -254,11 +254,11 @@
# Copy LIB ADMIN UTIL
cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
- -@if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \
- -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \
+ if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \
+ $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \
cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \
elif [ -d $(ADMINUTIL_LIBPATH)/adminutil-properties ] ; then \
- -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
+ $(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
fi
18 years, 4 months
[Fedora-directory-commits] ldapserver ldapserver.spec.tmpl, 1.19, 1.20
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400
Modified Files:
ldapserver.spec.tmpl
Log Message:
add the console-ld-libpath.patch for bug 174981
Index: ldapserver.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldapserver.spec.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ldapserver.spec.tmpl 7 Dec 2005 21:29:03 -0000 1.19
+++ ldapserver.spec.tmpl 8 Dec 2005 01:14:17 -0000 1.20
@@ -131,6 +131,10 @@
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
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
# fix up file permissions
testfile=$RPM_INSTALL_PREFIX/admin-serv/config/nss.conf
if [ ! -f $testfile ] ; then
18 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd dn.c, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12762
Modified Files:
dn.c
Log Message:
[175063] entry with escaped characters fails to import and index
It used to be taken to the "convert to quoted value" section even though the rdn did not have a quote.
Index: dn.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dn.c 19 Apr 2005 22:07:36 -0000 1.6
+++ dn.c 8 Dec 2005 00:59:14 -0000 1.7
@@ -188,8 +188,7 @@
case INVALUE:
if ( gotesc ) {
if ( SEPARATOR( *s ) ) {
- if ( value_separator ) value_separator = dn;
- else value_separator = d;
+ value_separator = d;
} else if ( ! NEEDSESCAPE( *s ) ) {
--d; /* eliminate the \ */
}
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff console-ld-libpath.patch, NONE, 1.1
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10890
Added Files:
console-ld-libpath.patch
Log Message:
make sure /opt/fedora-ds/shared/lib is used for shared libs used by the console
console-ld-libpath.patch:
--- NEW FILE console-ld-libpath.patch ---
--- 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
#
# Make sure java exists and is executable
#
-if [ ! -f java -a ! -x java ]
+if [ ! -f $JAVA_HOME/java -a ! -x $JAVA_HOME/java ]
then
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
#
# Launch the Console
#
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.32, 1.33
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7763/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
Change packaging so that either the old style adminutil properties or the
new style can be used.
Package the patch files in the setup directory.
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- pkgadmin.mk 23 Nov 2005 01:25:51 -0000 1.32
+++ pkgadmin.mk 7 Dec 2005 22:45:16 -0000 1.33
@@ -254,8 +254,13 @@
# Copy LIB ADMIN UTIL
cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
- -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties
- cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties
+ -@if [ -d $(ADMINUTIL_LIBPATH)/property ] ; then \
+ -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/property ; \
+ cp -p $(ADMINUTIL_LIBPATH)/property/* $(ADMIN_DIR)/bin/admin/lib/property ; \
+ elif [ -d $(ADMINUTIL_LIBPATH)/adminutil-properties ] ; then \
+ -$(MKDIR) $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
+ cp -p $(ADMINUTIL_LIBPATH)/adminutil-properties/* $(ADMIN_DIR)/bin/admin/lib/adminutil-properties ; \
+ fi
cd $(ADMSERV_OBJDIR)/cmdln; \
cp -p admconfig $(ADMIN_DIR)/bin/admin;
@@ -274,6 +279,13 @@
cp -p $(BUILD_ROOT)/admserv/cfgstuff/stop-admin $(ADMIN_DIR)/shared/config/template/stop-admin.tmpl
cp -p $(BUILD_ROOT)/admserv/cfgstuff/restart-admin $(ADMIN_DIR)/shared/config/template/restart-admin.tmpl
+# The patch file that upgrades 1.0 to 1.0.1
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver10to101.patch $(ADMIN_DIR)/setup
+# The patch file that fixes the start-admin ldap problem on Fedora Core 2
+ cp -p $(BUILD_ROOT)/admserv/cfgstuff/adminserver-start-admin.patch $(ADMIN_DIR)/setup
+# The patch file that fixes the console ld libpath problem
+ 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
cd $(ADMSERV_OBJDIR)/cgi ; \
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff start-admin, 1.4, 1.5
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7428/adminserver/admserv/cfgstuff
Modified Files:
start-admin
Log Message:
Bug(s) fixed: 175187
Bug Description: Apache linked with libldap.so not libldap-2.2.so on Fedora Core 2
Reviewed by: Nathan (Thanks!)
Fix Description: grep for "libldap" not "libldap-". On Fedora Core 2, Apache is linked with libldap.so, not the libldap-2.2.so as on later OS versions. So, just changing it to look for libldap on all platforms should work just fine. I've also changed the spec file to apply the patch when upgrading from fds10 to fds101.
Platforms tested: Fedora Core 4 (I don't have an FC 2 system to test this on, but the bug reported applied the same patch and it worked for him)
Flag Day: no
Doc impact: no
Index: start-admin
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start-admin 9 Sep 2005 19:12:03 -0000 1.4
+++ start-admin 7 Dec 2005 22:13:32 -0000 1.5
@@ -46,7 +46,7 @@
if [ $OS = "Linux" ]; then
hasol=0
- /usr/bin/ldd $HTTPD 2>&1 | grep libldap- > /dev/null 2>&1 && hasol=1
+ /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1
if [ $hasol -eq 1 ] ; then
LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap50.so"
18 years, 4 months
[Fedora-directory-commits] adminserver/admserv/newinst/src ux-update.cc, 1.16, 1.17
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7367/adminserver/admserv/newinst/src
Modified Files:
ux-update.cc
Log Message:
do not overwrite the dynamic console.conf file when upgrading
Index: ux-update.cc
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/ux-update.cc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ux-update.cc 18 Nov 2005 21:15:51 -0000 1.16
+++ ux-update.cc 7 Dec 2005 22:11:07 -0000 1.17
@@ -1208,11 +1208,16 @@
logUninstallInfo(sroot, "admin", "admin", tstr);
snprintf(tstr, sizeof(tstr), "%s/admin-serv/config/console.conf", sroot);
- snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot);
- replaceTokensInFile(src, tstr, consolearray);
- chmod(tstr, S_IRUSR | S_IWUSR);
- chown_file(SSuser, SSgroup, tstr);
- logUninstallInfo(sroot, "admin", "admin", tstr);
+ /*
+ all of the dynamic information goes into console.conf, so we should
+ not overwrite that information during an upgrade */
+ if (stat(tstr, &st)) {
+ snprintf(src, sizeof(tstr), "%s/shared/config/template/console.conf.tmpl", sroot);
+ replaceTokensInFile(src, tstr, consolearray);
+ chmod(tstr, S_IRUSR | S_IWUSR);
+ chown_file(SSuser, SSgroup, tstr);
+ logUninstallInfo(sroot, "admin", "admin", tstr);
+ }
snprintf(tstr, sizeof(tstr), "%s/start-admin", sroot);
snprintf(src, sizeof(tstr), "%s/shared/config/template/start-admin.tmpl", sroot);
18 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testbind.c, 1.6, 1.7 testdatainterop.c, 1.6, 1.7 testentry.c, 1.6, 1.7 testextendedop.c, 1.6, 1.7 testgetip.c, 1.6, 1.7 testpostop.c, 1.6, 1.7 testpreop.c, 1.7, 1.8 testsaslbind.c, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/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:
Bump version from 1.0 to 1.0.1
Index: testbind.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testbind.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testbind.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testbind.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -69,7 +69,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0",
+Slapi_PluginDesc bindpdesc = { "test-bind", "Fedora Project", "1.0.1",
"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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testdatainterop.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testdatainterop.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -113,7 +113,7 @@
/*
* Static variables.
*/
-static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0",
+static Slapi_PluginDesc plugindesc = { PLUGIN_NAME, "Fedora Project", "1.0.1",
"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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testentry.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testentry.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -90,7 +90,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0",
+Slapi_PluginDesc entrypdesc = { "test-entry", "Fedora Project", "1.0.1",
"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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testextendedop.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testextendedop.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -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",
+Slapi_PluginDesc expdesc = { "test-extendedop", "Fedora Project", "1.0.1",
"sample extended operation plugin" };
Index: testgetip.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testgetip.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testgetip.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testgetip.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -74,7 +74,7 @@
#include "slapi-plugin.h"
#include "nspr.h"
-Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0",
+Slapi_PluginDesc getippdesc = { "test-getip", "Fedora Project", "1.0.1",
"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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testpostop.c 29 Oct 2005 02:28:18 -0000 1.6
+++ testpostop.c 7 Dec 2005 21:50:09 -0000 1.7
@@ -93,7 +93,7 @@
static char *changelogfile = "/tmp/changelog";
#endif
-Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0",
+Slapi_PluginDesc postoppdesc = { "test-postop", "Fedora Project", "1.0.1",
"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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- testpreop.c 29 Oct 2005 02:28:18 -0000 1.7
+++ testpreop.c 7 Dec 2005 21:50:09 -0000 1.8
@@ -79,7 +79,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0",
+Slapi_PluginDesc preoppdesc = { "test-preop", "Fedora Project", "1.0.1",
"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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- testsaslbind.c 29 Oct 2005 02:28:18 -0000 1.8
+++ testsaslbind.c 7 Dec 2005 21:50:09 -0000 1.9
@@ -80,7 +80,7 @@
#include <string.h>
#include "slapi-plugin.h"
-Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0",
+Slapi_PluginDesc saslpdesc = { "test-saslbind", "Fedora Project", "1.0.1",
"sample SASL bind pre-operation plugin" };
18 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinstnt dsinst.rc, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinstnt
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/cm/newinstnt
Modified Files:
dsinst.rc
Log Message:
Bump version from 1.0 to 1.0.1
Index: dsinst.rc
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinstnt/dsinst.rc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsinst.rc 29 Oct 2005 02:26:22 -0000 1.8
+++ dsinst.rc 7 Dec 2005 21:50:03 -0000 1.9
@@ -89,7 +89,7 @@
VALUE "LegalCopyright", "Copyright 2001 Sun Microsystems, Inc. Portions copyright 1999, 2002 Netscape Communications Corporation. All rights reserved.\0"
VALUE "OriginalFilename", "\0"
VALUE "ProductName", "Fedora Server Products\0"
- VALUE "ProductVersion", "1, 0, 0, 0\0"
+ VALUE "ProductVersion", "1, 0, 1, 0\0"
END
END
BLOCK "VarFileInfo"
18 years, 4 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst slapd.inf, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5620/ldapserver/ldap/cm/newinst
Modified Files:
slapd.inf
Log Message:
Bump version from 1.0 to 1.0.1
Index: slapd.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/slapd.inf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- slapd.inf 21 Oct 2005 19:21:18 -0000 1.7
+++ slapd.inf 7 Dec 2005 21:49:58 -0000 1.8
@@ -46,13 +46,13 @@
InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
NickName= slapd
Version= %%%SERVER_VERSION%%%
-Compatible= 4.0
+Compatible= 1.0
BuildNumber= %%%SERVER_BUILD_NUM%%%
Expires= %%%PUMPKIN_HOUR%%%
Security= %%%SECURITY%%%
Vendor= Fedora Project
Description= %%%SERVER_NAME%%%
-Dependencies= base/4.5, svrcore/4.5
+Dependencies= base/1.0, svrcore/1.0
ProductName=Directory Server
IsDirLite=%%%IS_DIR_LITE%%%
SourcePath=slapd
@@ -70,7 +70,7 @@
Name= Fedora Directory Server Console
NickName= slapd-client
Version= %%%SERVER_VERSION%%%
-Compatible= 4.0
+Compatible= 1.0
Checked=True
Mandatory=False
IsLdap=False
18 years, 4 months