[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm import-threads.c, 1.8, 1.8.2.1 import.c, 1.5, 1.5.2.1 import.h, 1.4, 1.4.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23432/back-ldbm
Modified Files:
Tag: Directory71RtmBranch
import-threads.c import.c import.h
Log Message:
[175063] entry with escaped characters fails to import and index
Index: import-threads.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import-threads.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- import-threads.c 28 Apr 2005 17:31:54 -0000 1.8
+++ import-threads.c 20 Feb 2006 18:14:50 -0000 1.8.2.1
@@ -986,6 +986,7 @@
int ret = 0;
struct attrinfo *parentid_ai;
Slapi_PBlock *pb = slapi_pblock_new();
+ int shift = 0;
PR_ASSERT(info != NULL);
PR_ASSERT(inst != NULL);
@@ -1027,10 +1028,11 @@
info->state = RUNNING;
/* Read that entry from the cache */
- fi = import_fifo_fetch(job, id, 0);
+ fi = import_fifo_fetch(job, id, 0, shift);
if (! fi) {
- import_log_notice(job, "ERROR: foreman fifo error");
- goto error;
+ import_log_notice(job, "WARNING: entry id %d is missing");
+ shift++;
+ continue;
}
/* first, fill in any operational attributes */
@@ -1268,7 +1270,7 @@
info->state = RUNNING;
/* Read that entry from the cache */
- fi = import_fifo_fetch(job, id, 1);
+ fi = import_fifo_fetch(job, id, 1, 0);
ep = fi ? fi->entry : NULL;
if (!ep) {
/* skipping an entry that turned out to be bad */
Index: import.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.c,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- import.c 19 Apr 2005 22:07:38 -0000 1.5
+++ import.c 20 Feb 2006 18:14:50 -0000 1.5.2.1
@@ -91,7 +91,7 @@
return 0;
}
-FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker)
+FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift)
{
int idx = id % job->fifo.size;
FifoItem *fi;
@@ -102,7 +102,7 @@
return NULL;
}
if (fi->entry) {
- if (id != fi->entry->ep_id)
+ if (id != fi->entry->ep_id - shift)
fi = NULL;
else if (worker) {
if (fi->bad) return NULL;
Index: import.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/import.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- import.h 19 Apr 2005 22:07:38 -0000 1.4
+++ import.h 20 Feb 2006 18:14:50 -0000 1.4.2.1
@@ -201,7 +201,7 @@
/* import.c */
-FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker);
+FifoItem *import_fifo_fetch(ImportJob *job, ID id, int worker, int shift);
void import_free_job(ImportJob *job);
void import_log_notice(ImportJob *job, char *format, ...);
void import_abort_all(ImportJob *job, int wait_for_them);
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/servers/slapd dn.c, 1.6, 1.6.2.1
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23432
Modified Files:
Tag: Directory71RtmBranch
dn.c
Log Message:
[175063] entry with escaped characters fails to import and index
Index: dn.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/dn.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- dn.c 19 Apr 2005 22:07:36 -0000 1.6
+++ dn.c 20 Feb 2006 18:14:43 -0000 1.6.2.1
@@ -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, 3 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.14, 1.30.2.15
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8175
Modified Files:
Tag: Directory71RtmBranch
Makefile
Log Message:
The first character should have been tab for the command line. (fix for the previous fix)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.14
retrieving revision 1.30.2.15
diff -u -r1.30.2.14 -r1.30.2.15
--- Makefile 17 Feb 2006 01:16:22 -0000 1.30.2.14
+++ Makefile 17 Feb 2006 17:26:01 -0000 1.30.2.15
@@ -714,11 +714,11 @@
ifdef BUILD_PATCH
# take care of files in components (e.g., a file in nsadmin.zip)
- -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
- afile=`echo $$pair | awk -F: '{print $$2}'` ; \
- cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
- done
+ -@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+ done
# copying files from the component area
-@for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/admin/src Makefile, 1.14, 1.15
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/admin/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7860
Modified Files:
Makefile
Log Message:
Don't attempt to package 32 bit NSS apps/libs with the 64 bit package on rhel/linux - assume everything is native 64 bit.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 21 Oct 2005 19:21:10 -0000 1.14
+++ Makefile 17 Feb 2006 17:02:05 -0000 1.15
@@ -235,8 +235,20 @@
TEMPLATE_SCRIPTS_SRC = $(wildcard scripts/template-*)
TEMPLATE_SCRIPTS_DEST = $(subst scripts/,$(SCRIPTSDIR)/,$(TEMPLATE_SCRIPTS_SRC))
+# We only need to do this if we have to ship 32 bit binaries in our 64 bit packages
+# Right now, on rhel/linux, we ship all native 64 bit apps so we don't have to do
+# this. We still may need to do this on solaris/hpux, but hopefully not for very
+# much longer
ifeq ($(USE_64), 1)
- FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64
+ ifeq ($(ARCH), RHEL)
+ FIX_SECMOD_DEP =
+ else
+ ifeq ($(ARCH), Linux)
+ FIX_SECMOD_DEP =
+ else
+ FIX_SECMOD_DEP = $(BINDIR)/fix_secmod_db_64
+ endif
+ endif
endif
# gmake 3.74 will remove "intermediate" files if generated via a pattern match rule
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.49,1.50
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6012
Modified Files:
Makefile
Log Message:
Reviewed by Nathan (Thanks!)
NSS 3.11 introduces a new library (libfreebl3.so) that is loaded as part of NSS initialization. With Fedora DS 1.0, we moved NSS initialization to occur after the setuid from root to the runtime uid so that the files created during NSS init would have the correct ownership. However, the bin/slapd/server directory is set to 0700 meaning no execute permission for the runtime uid. The OS requires this directory to be 711 to allow the slapd process to load in the shared libraries needed by NSS. We use 711 to disallow reading in this directory because if slapd crashes shortly after startup, a core file may go in this directory which may contain secret information.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Makefile 15 Feb 2006 22:53:56 -0000 1.49
+++ Makefile 17 Feb 2006 16:57:19 -0000 1.50
@@ -581,9 +581,12 @@
endif # BUILD_RPM
find $(RELDIR) -exec chmod go-w {} \;
-# $(RELDIR)/bin/slapd/server may host a core file.
-# For security reason, it's readable only by the owner
- chmod 700 $(RELDIR)/bin/slapd/server
+# $(RELDIR)/bin/slapd/server may host a core file if the server crashes
+# shortly after startup (otherwise, cores go in slapd-instance/logs)
+# For security reasons, it's readable only by the owner
+# but it needs to be executable (11) so that it can
+# load in shared libs from slapd/lib after the setuid
+ chmod 711 $(RELDIR)/bin/slapd/server
$(INSTDIR)/slapd:
$(MKDIR) -p $@
18 years, 3 months
[Fedora-directory-commits] ldapserver buildpaths.mk,1.11,1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2521
Modified Files:
buildpaths.mk
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buildpaths.mk 15 Feb 2006 22:53:45 -0000 1.11
+++ buildpaths.mk 17 Feb 2006 15:05:32 -0000 1.12
@@ -67,17 +67,23 @@
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
ifdef MOZILLA_SOURCE_ROOT
- # some of the mozilla components are put in a platform/buildtype specific
- # subdir of mozilla/dist, and their naming convention is different than
- # ours - we need to map ours to theirs
- ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
- else
- ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
- else
- MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
- endif
+ ifndef MOZ_OBJDIR_NAME
+ # some of the mozilla components are put in a platform/buildtype specific
+ # subdir of mozilla/dist, and their naming convention is different than
+ # ours - we need to map ours to theirs
+ ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+ endif
+ endif
+ endif
endif
endif
18 years, 3 months
[Fedora-directory-commits] adminserver buildpaths.mk,1.6,1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2493
Modified Files:
buildpaths.mk
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildpaths.mk 15 Feb 2006 22:53:03 -0000 1.6
+++ buildpaths.mk 17 Feb 2006 15:04:54 -0000 1.7
@@ -49,17 +49,23 @@
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
ifdef MOZILLA_SOURCE_ROOT
- # some of the mozilla components are put in a platform/buildtype specific
- # subdir of mozilla/dist, and their naming convention is different than
- # ours - we need to map ours to theirs
- ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
- else
- ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
- else
- MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
- endif
+ ifndef MOZ_OBJDIR_NAME
+ # some of the mozilla components are put in a platform/buildtype specific
+ # subdir of mozilla/dist, and their naming convention is different than
+ # ours - we need to map ours to theirs
+ ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(64BIT_TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+ endif
+ endif
+ endif
endif
endif
18 years, 3 months
[Fedora-directory-commits] setuputil buildpaths.mk,1.2,1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2461
Modified Files:
buildpaths.mk
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk 15 Feb 2006 22:51:00 -0000 1.2
+++ buildpaths.mk 17 Feb 2006 15:03:36 -0000 1.3
@@ -54,17 +54,23 @@
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
endif
ifdef MOZILLA_SOURCE_ROOT
- # some of the mozilla components are put in a platform/buildtype specific
- # subdir of mozilla/dist, and their naming convention is different than
- # ours - we need to map ours to theirs
- ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
- else
- ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
- else
- MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
- endif
+ ifndef MOZ_OBJDIR_NAME
+ # some of the mozilla components are put in a platform/buildtype specific
+ # subdir of mozilla/dist, and their naming convention is different than
+ # ours - we need to map ours to theirs
+ ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+ endif
+ endif
+ endif
endif
endif
18 years, 3 months
[Fedora-directory-commits] adminutil buildpaths.mk, 1.2, 1.3 nsconfig.mk, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv629
Modified Files:
buildpaths.mk nsconfig.mk
Log Message:
1) Fix moz objdir name for generic linux x86_64
2) Allow moz objdir name to be passed in
3) append _64 tag to objdir name directly rather than via +=
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/buildpaths.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildpaths.mk 15 Feb 2006 22:50:15 -0000 1.2
+++ buildpaths.mk 17 Feb 2006 14:59:52 -0000 1.3
@@ -52,18 +52,25 @@
else
MOZILLA_SOURCE_ROOT = $(BUILD_ROOT)/../mozilla
endif
+
ifdef MOZILLA_SOURCE_ROOT
- # some of the mozilla components are put in a platform/buildtype specific
- # subdir of mozilla/dist, and their naming convention is different than
- # ours - we need to map ours to theirs
- ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
- else
- ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
- MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
- else
- MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
- endif
+ ifndef MOZ_OBJDIR_NAME
+ # some of the mozilla components are put in a platform/buildtype specific
+ # subdir of mozilla/dist, and their naming convention is different than
+ # ours - we need to map ours to theirs
+ ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+ else
+ ifneq (,$(findstring Linux,$(NSOBJDIR_NAME)))
+ MOZ_OBJDIR_NAME = $(subst _glibc_PTH_,_glibc_PTH$(NS64TAG)_,$(NSOBJDIR_NAME))
+ else
+ MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
+ endif
+ endif
+ endif
endif
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/nsconfig.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nsconfig.mk 15 Feb 2006 22:50:15 -0000 1.8
+++ nsconfig.mk 17 Feb 2006 14:59:52 -0000 1.9
@@ -69,27 +69,25 @@
NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
NSCONFIG_NOTAG = $(NSCONFIG)
else
+# add _64 tag on all platforms except linux/rhel
ifeq ($(NSOS_ARCH),HP-UX)
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_TEST1), ia64)
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
else
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
endif
else
ifeq ($(NSOS_TEST1),i86pc)
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)_$(NSOS_TEST1)$(NS64TAG)
else
- NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)
- NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
+ NSCONFIG = $(NSOS_ARCH)$(NSOS_RELEASE)$(NS64TAG)
+ NSCONFIG_NOTAG = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)$(NS64TAG)
endif
endif
-# add _64 tag on all platforms except linux/rhel
- NSCONFIG += $(NS64TAG)
- NSCONFIG_NOTAG += $(NS64TAG)
endif
endif
18 years, 3 months
[Fedora-directory-commits] ldapserver/ldap/admin/lib Makefile, 1.8, 1.9
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/admin/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387
Modified Files:
Makefile
Log Message:
Fix build-time issue of lib_dsadmin.so for x86_64 support
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/lib/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 3 Oct 2005 19:53:47 -0000 1.8
+++ Makefile 17 Feb 2006 03:36:08 -0000 1.9
@@ -98,13 +98,6 @@
EXTRA_LIBS += -lc
endif
-ifneq ($(BUILD_DEBUG), optimize)
-ifeq ($(ARCH), Linux)
-LINK_DLL += -Wl,--no-allow-shlib-undefined
-EXTRA_LIBS += -lc -lpthread -ldl /lib/ld-linux.so.2
-endif
-endif
-
all: $(LIBS) $(LDAP_ADMDLL_RELDLLS)
$(LIBS): $(OBJDEST) $(LDAP_ADMDLLDIR) $(LDAP_ADMLIBDIR) $(OBJS) $(EXTRA_LIBS_DEP)
18 years, 3 months