[Fedora-directory-commits] dsbuild/ds/adminutil checksums,1.6,1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/dsbuild/ds/adminutil
Modified Files:
checksums
Log Message:
pushed new fds103 candidate tarballs for the sasl build issue; do not need sasl source on rhel3, only snmp source
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- checksums 13 Oct 2006 18:44:02 -0000 1.6
+++ checksums 13 Oct 2006 23:31:28 -0000 1.7
@@ -1 +1 @@
-0a3b9dc8cabe9be9d325affd09ea67f0 download/fedora-adminutil-1.0.3.tar.gz
+d63fbb0fb6b14e7cd961b4b4274ded51 download/fedora-adminutil-1.0.3.tar.gz
17 years, 7 months
[Fedora-directory-commits] dsbuild/ds/adminserver checksums, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5797/dsbuild/ds/adminserver
Modified Files:
checksums
Log Message:
pushed new fds103 candidate tarballs for the sasl build issue; do not need sasl source on rhel3, only snmp source
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- checksums 13 Oct 2006 15:28:56 -0000 1.9
+++ checksums 13 Oct 2006 23:31:27 -0000 1.10
@@ -1 +1 @@
-8f203a6ca482ffe31e2517e5c04b5b89 download/fedora-adminserver-1.0.3.tar.gz
+99b7db5ff281c45624d7ee1378fb43f2 download/fedora-adminserver-1.0.3.tar.gz
17 years, 7 months
[Fedora-directory-commits] ldapserver components.mk,1.55,1.56
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575
Modified Files:
components.mk
Log Message:
Change the way ldapserver links with SASL. Rather than specifying a hard coded link path
of /usr/lib, which will not work on 64 bit systems, just don't specify a -L option for
SASL if we want the linker to just use the default path. The linker will find the system
SASL in /usr/lib or /usr/lib64 or wherever it is.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- components.mk 10 Oct 2006 20:37:05 -0000 1.55
+++ components.mk 13 Oct 2006 23:03:27 -0000 1.56
@@ -365,8 +365,11 @@
ifeq ($(ARCH), Linux)
ifeq ($(BUILD_ARCH), RHEL3)
SASL_LIBPATH = /usr/kerberos/lib
+ SASL_LINK = -L$(SASL_LIBPATH)
else
- SASL_LIBPATH = /usr/lib
+# just use default linker path
+ SASL_LIBPATH =
+ SASL_LINK =
endif
SASL_INCDIR = /usr/include/sasl
else
@@ -377,6 +380,7 @@
SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
endif
+ SASL_LINK = -L$(SASL_LIBPATH)
endif
SASL_INCLUDE = $(SASL_INCDIR)
@@ -403,7 +407,7 @@
endif
endif
- SASL_LINK = -L$(SASL_LIBPATH) -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
+ SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
endif
###########################################################
17 years, 7 months
[Fedora-directory-commits] adminserver/admserv/newinst/src Makefile, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/adminserver/admserv/newinst/src
Modified Files:
Makefile
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL. The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 12 May 2006 18:29:13 -0000 1.11
+++ Makefile 13 Oct 2006 22:59:05 -0000 1.12
@@ -143,18 +143,18 @@
$(BINDEST)/ns-config: $(OBJDEST)/ux-config.o $(OBJS1) $(DEPLIBS) $(LIBINST)
$(CXX) $(MODULE_CFLAGS) -o $(BINDEST)/ns-config $(OBJDEST)/ux-config.o \
- $(OBJS1) $(LIBINST) $(LIBLDAP) \
- $(DEPLIBS) $(EXTRA_LIBS) $(CURSES)
+ $(OBJS1) $(LIBINST) $(LIBLDAP) $(SASL_LINK) \
+ $(DEPLIBS) $(EXTRA_LIBS) $(CURSES)
$(BINDEST)/ns-update: $(OBJDEST)/ux-update.o $(OBJS2) $(DEPLIBS) $(LIBINST)
$(CXX) $(MODULE_CFLAGS) $(RPATHFLAG_PREFIX)$(RPATHFLAG) \
-o $(BINDEST)/ns-update $(OBJDEST)/ux-update.o \
- $(OBJS2) $(LIBINST) $(LIBLDAP) \
+ $(OBJS2) $(LIBINST) $(LIBLDAP) $(SASL_LINK) \
$(DEPLIBS2) $(EXTRA_LIBS) $(CURSES)
$(BINDEST)/ns-remove: $(OBJDEST)/ux-remove.o $(DEPLIBS) $(LIBINST)
$(CXX) $(MODULE_CFLAGS) -o $(BINDEST)/ns-remove $(OBJDEST)/ux-remove.o \
- $(OBJS2) $(LIBINST) $(LIBLDAP) \
+ $(OBJS2) $(LIBINST) $(LIBLDAP) $(SASL_LINK) \
$(DEPLIBS) $(EXTRA_LIBS) $(CURSES)
$(OBJDEST)/%.o: %.c
17 years, 7 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 Makefile, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/adminserver/admserv/cgi-src40
Modified Files:
Makefile
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL. The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile 10 Oct 2006 19:56:29 -0000 1.11
+++ Makefile 13 Oct 2006 22:59:04 -0000 1.12
@@ -381,8 +381,8 @@
$*.c /link /INCREMENTAL:no /SUBSYSTEM:console
else
-ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
-SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
+ADMINSERVERLINKS = $(ADMINUTILLINK) $(LDAPLINK) $(SASL_LINK) $(SECURITYLINK) $(LIBDBM) $(ICULINK) $(NSPRLINK) $(GLUEOBJS) $(EXTRA_LIBS)
+SETUPADMINSERVERLINKS = $(ADMINUTILLINK) $(SETUPUTIL) $(LDAPLINK) $(SASL_LINK) $(SECURITYLINK) $(LIBDBM) $(SETUPUTIL_EXTRALIBS) $(ICULINK) $(NSPRLINK) $(EXTRA_LIBS)
$(BINDIR)/security: security.c
cd $(BINDIR); \
17 years, 7 months
[Fedora-directory-commits] adminserver buildpaths.mk, 1.10, 1.11 components.mk, 1.54, 1.55 internal_buildpaths.mk, 1.5, 1.6 nsconfig.mk, 1.32, 1.33
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/adminserver
Modified Files:
buildpaths.mk components.mk internal_buildpaths.mk nsconfig.mk
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL. The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildpaths.mk 23 May 2006 22:13:36 -0000 1.10
+++ buildpaths.mk 13 Oct 2006 22:59:03 -0000 1.11
@@ -98,3 +98,6 @@
JSS_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/jss
ONLINEHELP_SOURCE_DIR = $(BUILD_ROOT)/../onlinehelp
+
+SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
+#SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- components.mk 9 Oct 2006 15:21:09 -0000 1.54
+++ components.mk 13 Oct 2006 22:59:03 -0000 1.55
@@ -331,6 +331,33 @@
@if [ ! -f $@ ]; then echo $@ does not exist - please build or download it ; exit 1 ; fi
endif
+ifndef SASL_SOURCE_ROOT
+ifndef SASL_VERSDIR
+ SASL_VERSDIR=cyrus
+endif
+ifndef SASL_RELDATE
+ SASL_RELDATE=v2.1.20.2
+endif
+
+ifneq ($(ARCH), Linux)
+SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_DEP = $(SASL_INCLUDE)/sasl.h
+ifndef SASL_PULL_METHOD
+SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+endif
+
+$(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL)
+ifdef COMPONENT_DEPS
+ $(FTP_PULL) -method $(SASL_PULL_METHOD) \
+ -objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
+ -files include,lib
+endif
+ -@if [ ! -f $@ ] ; \
+ then echo "Error: could not get component SASL file $@" ; \
+ fi
+endif # not Linux
+endif # SASL_SOURCE_ROOT
+
###############################################################
# LDAP java classes
##############################################################
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/internal_buildpaths.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- internal_buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.5
+++ internal_buildpaths.mk 13 Oct 2006 22:59:03 -0000 1.6
@@ -101,6 +101,11 @@
SETUPUTIL_BUILD_DIR = $(NSCP_COMPDIR)/setuputil/$(NSOBJDIR_NAME)
endif # SETUPUTIL_SOURCE_ROOT
+#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
+ifndef SASL_SOURCE_ROOT
+SASL_BUILD_DIR = $(NSCP_COMPDIR)/sasl
+endif # SASL_SOURCE_ROOT
+
ifndef JSS_SOURCE_DIR
JSS_BUILD_DIR = $(NSCP_COMPDIR)/jss/$(NSOBJDIR_NAME)
endif
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- nsconfig.mk 9 Oct 2006 15:21:09 -0000 1.32
+++ nsconfig.mk 13 Oct 2006 22:59:03 -0000 1.33
@@ -894,6 +894,57 @@
MOD_RESTARTD = $(addprefix $(MOD_RESTARTD_LIBPATH)/, $(MOD_REATARTD_LIBNAME))
MOD_NSS = $(addprefix $(MOD_NSS_LIBPATH)/, $(MOD_NSS_LIBNAME))
+### The LDAP C SDK is now compiled with SASL support - this means
+### that we will get undefined symbols when we link against the
+### static LDAP libraries - we have to link with SASL to
+### resolve those symbols
+ifeq ($(ARCH), Linux)
+ ifeq ($(BUILD_ARCH), RHEL3)
+ SASL_LIBPATH = /usr/kerberos/lib
+ SASL_LINK = -L$(SASL_LIBPATH)
+ else
+# use default linker path
+ SASL_LINK =
+ endif
+ SASL_INCDIR = /usr/include/sasl
+else
+ ifdef SASL_SOURCE_ROOT
+ SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
+ SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
+ else
+ SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
+ SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
+ endif
+ SASL_LINK = -L$(SASL_LIBPATH)
+endif
+SASL_INCLUDE = $(SASL_INCDIR)
+
+ifeq ($(ARCH), WINNT)
+ SASL_LIB_ROOT_NAME = sasl
+ SASL_LINK = /LIBPATH:$(SASL_LIBPATH) lib$(SASL_LIB_ROOT_NAME).lib
+ SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).lib,lib$(SASL_LIB_ROOT_NAME).dll,saslDIGESTMD5.dll
+else
+ # for cyrus it's sasl2
+ SASL_LIB_ROOT_NAME = sasl2
+ SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
+ ifeq ($(ARCH), Linux)
+# I don't think we need this anymore
+ GSSAPI_LIBS=
+# GSSAPI_LIBS=-lgssapi_krb5
+ endif
+ ifeq ($(ARCH), SOLARIS)
+ GSSAPI_LIBS=-lgss
+ endif
+ ifeq ($(ARCH), HPUX)
+ GSSAPI_LIBS=-lgss
+ ifeq ($(USE_64),1)
+ GSSAPI_LIBS=-lgss
+ endif
+ endif
+
+ SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
+endif
+
#########################################
# NMCSDK
#########################################
17 years, 7 months
[Fedora-directory-commits] setuputil buildpaths.mk, 1.3, 1.4 component_versions.mk, 1.5, 1.6 components.mk, 1.4, 1.5 internal_buildpaths.mk, 1.1.1.1, 1.2 internal_comp_deps.mk, 1.2, 1.3
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/setuputil
Modified Files:
buildpaths.mk component_versions.mk components.mk
internal_buildpaths.mk internal_comp_deps.mk
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL. The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/buildpaths.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildpaths.mk 17 Feb 2006 15:03:36 -0000 1.3
+++ buildpaths.mk 13 Oct 2006 22:59:02 -0000 1.4
@@ -90,6 +90,8 @@
LDAPSDK_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
#LDAP_ROOT = $(BUILD_ROOT)/../ldapsdk-5.15
+SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20/built
+#SASL_BUILD_DIR = $(BUILD_ROOT)/../sasl
ifeq ($(ARCH), WINNT)
MSVCRT_ROOT = $(ABS_ROOT_PARENT)/dll-files
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/component_versions.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- component_versions.mk 9 Oct 2006 15:06:17 -0000 1.5
+++ component_versions.mk 13 Oct 2006 22:59:02 -0000 1.6
@@ -67,3 +67,11 @@
ifndef SVRCORE_RELDATE
SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
endif
+
+ifndef SASL_VERSDIR
+ SASL_VERSDIR=cyrus
+endif
+ifndef SASL_RELDATE
+ SASL_RELDATE=v2.1.20.2
+endif
+
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/components.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- components.mk 21 Jun 2006 18:44:26 -0000 1.4
+++ components.mk 13 Oct 2006 22:59:02 -0000 1.5
@@ -280,6 +280,58 @@
endif
endif
+### SASL package ##########################################
+### The LDAP C SDK is now compiled with SASL support - this means
+### that we will get undefined symbols when we link against the
+### static LDAP libraries - we have to link with SASL to
+### resolve those symbols
+ifeq ($(ARCH), Linux)
+ ifeq ($(BUILD_ARCH), RHEL3)
+ SASL_LIBPATH = /usr/kerberos/lib
+ SASL_LINK = -L$(SASL_LIBPATH)
+ else
+# use default linker path
+ SASL_LINK =
+ endif
+ SASL_INCDIR = /usr/include/sasl
+else
+ ifdef SASL_SOURCE_ROOT
+ SASL_LIBPATH = $(SASL_SOURCE_ROOT)/lib
+ SASL_INCDIR = $(SASL_SOURCE_ROOT)/include/sasl
+ else
+ SASL_LIBPATH = $(SASL_BUILD_DIR)/lib
+ SASL_INCDIR = $(SASL_BUILD_DIR)/include/sasl
+ endif
+ SASL_LINK = -L$(SASL_LIBPATH)
+endif
+SASL_INCLUDE = $(SASL_INCDIR)
+
+ifeq ($(ARCH), WINNT)
+ SASL_LIB_ROOT_NAME = sasl
+ SASL_LINK = /LIBPATH:$(SASL_LIBPATH) lib$(SASL_LIB_ROOT_NAME).lib
+ SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).lib,lib$(SASL_LIB_ROOT_NAME).dll,saslDIGESTMD5.dll
+else
+ # for cyrus it's sasl2
+ SASL_LIB_ROOT_NAME = sasl2
+ SASL_LIBS = lib$(SASL_LIB_ROOT_NAME).a
+ ifeq ($(ARCH), Linux)
+# I don't think we need this anymore
+ GSSAPI_LIBS=
+# GSSAPI_LIBS=-lgssapi_krb5
+ endif
+ ifeq ($(ARCH), SOLARIS)
+ GSSAPI_LIBS=-lgss
+ endif
+ ifeq ($(ARCH), HPUX)
+ GSSAPI_LIBS=-lgss
+ ifeq ($(USE_64),1)
+ GSSAPI_LIBS=-lgss
+ endif
+ endif
+
+ SASL_LINK += -l$(SASL_LIB_ROOT_NAME) $(GSSAPI_LIBS)
+endif
+
#################################################################
# Infozip (for Windows Packaging)
#################################################################
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/internal_buildpaths.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- internal_buildpaths.mk 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ internal_buildpaths.mk 13 Oct 2006 22:59:02 -0000 1.2
@@ -78,5 +78,10 @@
LDAP_ROOT = $(NSCP_DISTDIR_FULL_RTL)/ldapsdk
endif # LDAPSDK_SOURCE_ROOT
+#SASL_SOURCE_ROOT = $(BUILD_ROOT)/../cyrus-sasl-2.1.20
+ifndef SASL_SOURCE_ROOT
+SASL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/sasl
+endif # SASL_SOURCE_ROOT
+
# Infozip (for Windows Packaging)
BASE_INFOZIP = $(COMPONENTS_DIR)/infozip/i386
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/internal_comp_deps.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- internal_comp_deps.mk 23 Feb 2006 22:50:21 -0000 1.2
+++ internal_comp_deps.mk 13 Oct 2006 22:59:02 -0000 1.3
@@ -64,6 +64,26 @@
fi
endif # LDAPSDK_SOURCE_ROOT
+ifndef SASL_SOURCE_ROOT
+ifneq ($(ARCH), Linux)
+SASL_RELEASE = $(COMPONENTS_DIR)/sasl/$(SASL_VERSDIR)/$(SASL_RELDATE)/$(NSOBJDIR_NAME)
+SASL_DEP = $(SASL_INCLUDE)/sasl.h
+ifndef SASL_PULL_METHOD
+SASL_PULL_METHOD = $(COMPONENT_PULL_METHOD)
+endif
+
+$(SASL_DEP): $(NSCP_DISTDIR_FULL_RTL)
+ifdef COMPONENT_DEPS
+ $(FTP_PULL) -method $(SASL_PULL_METHOD) \
+ -objdir $(SASL_BUILD_DIR) -componentdir $(SASL_RELEASE) \
+ -files include,lib
+endif
+ -@if [ ! -f $@ ] ; \
+ then echo "Error: could not get component SASL file $@" ; \
+ fi
+endif # not Linux
+endif # SASL_SOURCE_ROOT
+
#################################################################
# Infozip (for Windows Packaging)
#################################################################
17 years, 7 months
[Fedora-directory-commits] setuputil/installer/unix Makefile, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/setuputil/installer/unix
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2544/setuputil/installer/unix
Modified Files:
Makefile
Log Message:
Now that the LDAP C SDK is linked with SASL by default, other executables
that link with the LDAP C SDK also require linking with SASL. The ones
in the directory server were already done, but we were missing the
setuputil executables setup and uninstall, and the setup and CGI executables
in the adminserver.
These changes add SASL_LINK to the link line for those executables.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/installer/unix/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 21 Jun 2006 18:44:27 -0000 1.3
+++ Makefile 13 Oct 2006 22:59:03 -0000 1.4
@@ -157,13 +157,13 @@
$(CXX) $(NONSHARED) $(MODULE_CFLAGS) \
-o $(BINDEST)/setup \
$(INSTOBJS) $(OBJS) $(LIBINSTALL) $(EXTRA_LIBS) $(CURSES) \
- $(LDAPLINK) $(SECURITYLINK) $(NSPRLINK)
+ $(LDAPLINK) $(SASL_LINK) $(SECURITYLINK) $(NSPRLINK)
$(BINDEST)/uninstall: $(OBJS) $(UNINSTOBJS) $(LIBINSTALL)
@echo
$(CXX) $(NONSHARED) $(MODULE_CFLAGS) \
-o $(BINDEST)/uninstall \
- $(UNINSTOBJS) $(OBJS) $(LIBINSTALL) $(LDAPLINK) $(EXTRA_LIBS) \
+ $(UNINSTOBJS) $(OBJS) $(LIBINSTALL) $(LDAPLINK) $(SASL_LINK) $(EXTRA_LIBS) \
$(CURSES) $(SECURITYLINK) $(NSPRLINK)
#$(BINDEST)/download.bin: $(OBJS) $(DNLDOBJS) $(LIBINSTALL) $(LIBNET)
17 years, 7 months
[Fedora-directory-commits] dsbuild/ds/mozilla Makefile,1.5,1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/mozilla
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27495
Modified Files:
Makefile
Log Message:
mozldap now finds the correct sasl when using --with-sasl; add --with-rpath
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/mozilla/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 11 Oct 2006 14:36:25 -0000 1.5
+++ Makefile 13 Oct 2006 20:16:28 -0000 1.6
@@ -27,18 +27,6 @@
ifeq ($(USE_64), 1)
CONFIGURE_OPTS += --enable-64bit
endif
-# use /usr/include/sasl on RHEL3 and RHEL4
-ifneq (,$(findstring RHEL3,$(OBJDIR_NAME)))
-CONFIGURE_OPTS += --with-sasl-inc=/usr/include/sasl --with-sasl-lib=/usr/lib
-endif
-ifneq (,$(findstring RHEL4,$(OBJDIR_NAME)))
-CONFIGURE_OPTS += --with-sasl-inc=/usr/include/sasl
-ifeq ($(USE_64), 1)
-CONFIGURE_OPTS += --with-sasl-lib=/usr/lib64
-else
-CONFIGURE_OPTS += --with-sasl-lib=/usr/lib
-endif
-endif
NSPR_PREFIX=$(ABS_GARDIR)/$(CATEGORIES)/$(GARNAME)/work/mozilla/dist/$(OBJDIR)
@@ -79,7 +67,7 @@
cd work/mozilla/security/svrcore && $(MAKE) $(OPTFLAG) OBJDIR_NAME=$(OBJDIR)
# next, configure and make the ldap c sdk
- cd work/mozilla/directory/c-sdk && ./configure --enable-clu --with-svrcore $(CONFIGURE_OPTS)
+ cd work/mozilla/directory/c-sdk && ./configure --enable-clu --with-svrcore --with-sasl --with-rpath $(CONFIGURE_OPTS)
cd work/mozilla/directory/c-sdk && $(MAKE) $(OPTFLAG)
# perldap uses MakeMaker, so lots of env. vars.
17 years, 7 months
[Fedora-directory-commits] dsbuild/ds/setuputil checksums,1.6,1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19756/setuputil
Modified Files:
checksums
Log Message:
fds103 release candidate
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/setuputil/checksums,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- checksums 12 Oct 2006 20:08:14 -0000 1.6
+++ checksums 13 Oct 2006 18:44:17 -0000 1.7
@@ -1 +1 @@
-18631cc3d51ae9df54461a0a9f6b8ff4 download/fedora-setuputil-1.0.3.tar.gz
+4802b9c7cf40a6ffe3cfec1b95617ac2 download/fedora-setuputil-1.0.3.tar.gz
17 years, 7 months