[Fedora-directory-commits] dsbuild/ds/ldapserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/ldapserver
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:29:06 -0000 1.2
@@ -1,7 +1,7 @@
include ../../objdirname.mk
GARNAME = fedora-ds
-GARVERSION = 1.0.1
+GARVERSION = 1.0.2
CATEGORIES = ds
# have the regular download rule download the patch rather than listing it in PATCHFILES
# this is so we can override the default patch rule
@@ -21,13 +21,13 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS = INSTDIR=$(PKGDIR) USE_PERL_FROM_PATH=1 BUILD_RPM=$(BUILD_RPM) \
MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
- ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \
- ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \
- SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \
+ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
+ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
+ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
SASL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/cyrus-sasl/work/cyrus-sasl-2.1.20 \
DB_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/db/work/db-4.2.52.NC \
NETSNMP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/net-snmp/work/net-snmp-5.2.1 \
- ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.1 \
+ ADMINSERVER_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminserver/work/fedora-adminserver-1.0.2 \
ONLINEHELP_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/dsonlinehelp/work/fedora-dsonlinehelp-1.0
ifndef NOJAVA
@@ -40,6 +40,9 @@
BUILD_ARGS += BUILD_JAVA_CODE=0 USE_DSMLGW= USE_CONSOLE= USE_JAVATOOLS=
endif # NOJAVA
+ifeq ($(DEBUG), optimize)
+BUILD_ARGS += BUILD_DEBUG=optimize
+endif
ifndef DEBUG
BUILD_ARGS += BUILD_DEBUG=optimize
endif
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/ldapserver/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:29:06 -0000 1.2
@@ -2,3 +2,4 @@
5c71c276c01daef37adf39a5337a6908 download/ldapserver-gcc4.patch
a3209ba62911a8ea55b7c7f9cef1d965 download/fedora-ds-1.0.tar.gz
4e29cb87a7907fc0d3646036c142774e download/fedora-ds-1.0.1.tar.gz
+d43cb74a6700d72fd8ee96062a35d1ce download/fedora-ds-1.0.2.tar.gz
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/icu Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/icu
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/icu
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/icu/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:51 -0000 1.2
@@ -1,5 +1,5 @@
GARNAME = icu
-GARVERSION = 2.4
+GARVERSION = 3.4
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tgz
PATCHFILES =
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/icu/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:51 -0000 1.2
@@ -1 +1,2 @@
77d56e4dca9ec0fd635151ce1dc72137 download/icu-2.4.tgz
+b19f3b9eec1c44fba86b07f287801084 download/icu-3.4.tgz
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/dsmlgwjars Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/dsmlgwjars
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/dsmlgwjars
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:45 -0000 1.2
@@ -4,7 +4,7 @@
# this is the subdir of the download dir where the jar files are kept - see ds.conf.mk
DSMLGWJAR_VERSION = 1.0
# this is the list of jar files
-MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar
+MYJARS = activation.jar axis.jar jaxrpc.jar saaj.jar xercesImpl.jar xml-apis.jar jakarta-commons-codec.jar
# these are the files to be downloaded
DISTFILES = $(MYJARS)
# do not extract the jar files, just download them
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/dsmlgwjars/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:45 -0000 1.2
@@ -4,3 +4,4 @@
bbc59424764db89879c7216bd4480ec0 download/saaj.jar
bc3a50120bbb72afe43a8d26d1633d0d download/xercesImpl.jar
2e7aed876c51af3ee6a23ed524180d37 download/xml-apis.jar
+191aab4f9fd7ef02f6e514c4fd9dbdbb download/jakarta-commons-codec.jar
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/directoryconsole Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/directoryconsole
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:38 -0000 1.2
@@ -1,7 +1,7 @@
include ../../objdirname.mk
GARNAME = fedora-directoryconsole
-GARVERSION = 1.0
+GARVERSION = 1.0.2
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
@@ -15,7 +15,7 @@
#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = custom
-IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/package
+IMPORTS=-Dconsole.location=$(ABS_GARDIR)/$(CATEGORIES)/console/work/built/release/package
configure-custom:
$(MAKECOOKIE)
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/directoryconsole/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:38 -0000 1.2
@@ -1 +1,2 @@
ea552fe1c83fb87b9ad652f0422a77fa download/fedora-directoryconsole-1.0.tar.gz
+7a057db966ee7bbe59a98a82d31bc087 download/fedora-directoryconsole-1.0.2.tar.gz
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/console Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/console
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/console/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:30 -0000 1.2
@@ -1,7 +1,7 @@
include ../../objdirname.mk
GARNAME = fedora-console
-GARVERSION = 1.0
+GARVERSION = 1.0.2
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
@@ -21,7 +21,7 @@
$(MAKECOOKIE)
build-custom:
- cd $(WORKSRC) && ant $(IMPORTS)
+ cd $(WORKSRC) && ant $(IMPORTS) package
$(MAKECOOKIE)
install-custom:
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/console/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:30 -0000 1.2
@@ -1 +1,2 @@
7514ba3946a23d638e7d0ab60f26255b download/fedora-console-1.0.tar.gz
+31b26c651997500690de9dd186bf1e30 download/fedora-console-1.0.2.tar.gz
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/adminutil Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminutil
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:25 -0000 1.2
@@ -1,5 +1,5 @@
GARNAME = fedora-adminutil
-GARVERSION = 1.0
+GARVERSION = 1.0.2
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
@@ -12,7 +12,7 @@
BUILD_SCRIPTS = $(WORKSRC)/Makefile
#INSTALL_SCRIPTS = $(WORKSRC)/Makefile
INSTALL_SCRIPTS = custom
-BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4
+BUILD_ARGS = BUILD_RPM= MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4
ifndef DEBUG
BUILD_ARGS += BUILD_DEBUG=optimize
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminutil/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:54 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:25 -0000 1.2
@@ -1 +1,2 @@
08c514a30604e192a22d7a035a9dfccc download/fedora-adminutil-1.0.tar.gz
+ff441f6af22846102592ad101929e02e download/fedora-adminutil-1.0.2.tar.gz
18 years, 2 months
[Fedora-directory-commits] dsbuild/ds/adminserver Makefile, 1.1.1.1, 1.2 checksums, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/dsbuild/ds/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137/dsbuild/ds/adminserver
Modified Files:
Makefile checksums
Log Message:
upgrade to 1.0.2
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ Makefile 14 Feb 2006 22:28:18 -0000 1.2
@@ -1,5 +1,5 @@
GARNAME = fedora-adminserver
-GARVERSION = 1.0.1
+GARVERSION = 1.0.2
CATEGORIES = ds
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
PATCHFILES =
@@ -14,14 +14,14 @@
INSTALL_SCRIPTS = custom
BUILD_ARGS = MOZILLA_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/mozilla/work/mozilla \
- ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-2.4 \
- ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0 \
- SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0 \
- ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0 \
- MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0/.libs \
- MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0/.libs \
- MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0/.libs \
- MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0
+ ICU_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/icu/work/icu-3.4 \
+ ADMINUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/adminutil/work/fedora-adminutil-1.0.2 \
+ SETUPUTIL_SOURCE_ROOT=$(ABS_GARDIR)/$(CATEGORIES)/setuputil/work/fedora-setuputil-1.0.2 \
+ ONLINEHELP_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/onlinehelp/work/fedora-onlinehelp-1.0.2 \
+ MOD_ADMSERV_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_admserv/work/mod_admserv-1.0.2/.libs \
+ MOD_RESTARTD_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_restartd/work/mod_restartd-1.0.2/.libs \
+ MOD_NSS_LIB_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2/.libs \
+ MOD_NSS_BIN_DIR=$(ABS_GARDIR)/$(CATEGORIES)/mod_nss/work/mod_nss-1.0.2
ifndef NOJAVA
BUILD_ARGS += CONSOLE_SOURCE_DIR=$(ABS_GARDIR)/$(CATEGORIES)/console/work
Index: checksums
===================================================================
RCS file: /cvs/dirsec/dsbuild/ds/adminserver/checksums,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- checksums 10 Feb 2006 15:28:53 -0000 1.1.1.1
+++ checksums 14 Feb 2006 22:28:18 -0000 1.2
@@ -1,2 +1,3 @@
b61ebbdff8d4a911ed54f94108476e37 download/fedora-adminserver-1.0.tar.gz
e2e2557b9548bb3d2f54803b5fcf9103 download/fedora-adminserver-1.0.1.tar.gz
+f3c89782dd1642bbc9939f07a3fd22d2 download/fedora-adminserver-1.0.2.tar.gz
18 years, 2 months
[Fedora-directory-commits] ldapserver components.mk,1.39,1.40
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15427
Modified Files:
components.mk
Log Message:
Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package.
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- components.mk 13 Feb 2006 22:25:27 -0000 1.39
+++ components.mk 14 Feb 2006 04:26:54 -0000 1.40
@@ -213,30 +213,30 @@
# as of NSS 3.11, no longer need to link with softokn3
SECURITY_LIBNAMES = ssl3 nss3
# these libs have a corresponding .chk file
-# freebl is new for NSS 3.11
-SECURITY_NEED_CHK = softokn3 freebl3
+SECURITY_NEED_CHK = softokn3
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3
+# these are the libs we need at runtime
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3
-ifneq ($(USE_64), 1)
+# freebl for all platforms is new for NSS 3.11
+# there are some platform specific versions as well
+FREEBL_LIBS = freebl3
+ifeq ($(USE_64), 1)
ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
+endif
+else # USE_64
+ifeq ($(ARCH), SOLARIS)
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
endif # SOLARIS
ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
endif # HPUX
-else # USE_64
-ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
-endif
endif # USE_64
+SECURITY_LIBNAMES.pkg += $(FREEBL_LIBS)
+SECURITY_NEED_CHK += $(FREEBL_LIBS)
+
SECURITY_TOOLS = $(addsuffix $(EXE_SUFFIX),$(SECURITY_BINNAMES))
SECURITY_TOOLS_FULLPATH = $(addprefix $(SECURITY_BINPATH)/, $(SECURITY_TOOLS))
18 years, 2 months
[Fedora-directory-commits] adminserver nsconfig.mk,1.22,1.23
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404
Modified Files:
nsconfig.mk
Log Message:
Wan-Teh pointed out that the platform specific freebl libs are needed _instead of_ libfreebl3, not _in addition to_. So, set the list of platform specific freebl libs and add them to the list of libs to package.
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nsconfig.mk 13 Feb 2006 22:09:55 -0000 1.22
+++ nsconfig.mk 14 Feb 2006 04:26:28 -0000 1.23
@@ -721,30 +721,27 @@
# where secmod.db file is, rather than in the LD_LIBRARY_PATH
SECURITY_SECMODDB_RUNTIME_LIBNAME = nssckbi
-# These files are only needed at runtime, not to link with
-SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 freebl3
-# these shared libs need the corresponding .chk files at runtime
-SECURITY_NEED_CHK = softokn3 freebl3
-
-ifneq ($(USE_64), 1)
+# freebl for all platforms is new for NSS 3.11
+# there are some platform specific versions as well
+FREEBL_LIBS = freebl3
+ifeq ($(USE_64), 1)
+ifeq ($(ARCH), SOLARIS)
+FREEBL_LIBS = freebl_64fpu_3 freebl_64int_3
+endif
+else # USE_64
ifeq ($(ARCH), SOLARIS)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
endif # SOLARIS
ifeq ($(ARCH), HPUX)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_32fpu_3 freebl_32int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+FREEBL_LIBS = freebl_32fpu_3 freebl_32int_3
endif # HPUX
-else # USE_64
-ifeq ($(ARCH), SOLARIS)
-SECURITY_EXTRA_RUNTIME_LIBNAMES += freebl_64fpu_3 freebl_64int_3
-# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
-endif
endif # USE_64
+# These files are only needed at runtime, not to link with
+SECURITY_EXTRA_RUNTIME_LIBNAMES = softokn3 $(FREEBL_LIBS)
+# these shared libs need the corresponding .chk files at runtime
+SECURITY_NEED_CHK = softokn3 $(FREEBL_LIBS)
+
ifeq ($(ARCH), WINNT)
SECURITYDLL_NAME = $(SECURITY_LIBNAMES)
SECURITYOBJNAME = $(addsuffix .lib, $(SECURITY_LIBNAMES))
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.47, 1.48 fixSetupInf.pl, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver/ldap/cm
Modified Files:
Makefile fixSetupInf.pl
Log Message:
Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime,
and more on Solaris and HP-UX.
Use setup.inf from admin server, and make sure the admin component is in there.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile 10 Feb 2006 23:22:00 -0000 1.47
+++ Makefile 13 Feb 2006 22:25:33 -0000 1.48
@@ -595,7 +595,6 @@
# this gets setup, setup.inf, silent.inf, the zip wrapper, and svrcore, among others
ifeq ($(USE_SETUPUTIL),1)
cp -R $(SETUPUTIL_BINPATH)/* $(INSTDIR)
- $(PERL) -w $(FIX_SETUP_INF) $(SETUPUTIL_BINPATH)/setup.inf $(INSTDIR)/setup.inf
endif
# copy in our product .inf files
@@ -691,6 +690,13 @@
done ; \
fi
+# make sure setup.inf has everything we need
+ifeq ($(USE_SETUPUTIL),1)
+ cp $(INSTDIR)/setup.inf $(INSTDIR)/setup.inf.tmp
+ $(PERL) -w $(FIX_SETUP_INF) $(INSTDIR)/setup.inf.tmp $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
+ rm -f $(INSTDIR)/setup.inf.tmp
+endif
+
# we must remove the nsbase.zip file - we package those files now
rm -f $(INSTDIR)/base/nsbase.zip
# we also need to remove the Archive directive from the [base] section of the
@@ -714,7 +720,7 @@
# build the combined packages tar file; use h flag to follow symlinks
ifdef BUILD_SHIP
ifndef BUILD_PATCH
- cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
+ cd $(INSTDIR); $(TAR) cvfh - setup slapd \
dsktune $(ADMIN_IMPORTS) | gzip -f > $(BUILD_SHIP)/$(FTPNAMEGZ)
endif
ifeq ($(DEBUG), optimize)
@@ -723,7 +729,7 @@
else
echo base/unzipped > $(TMPLIST)
echo admin/unzipped >> $(TMPLIST)
- cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd \
+ cd $(INSTDIR); $(TAR) cvfh - setup slapd \
dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
rm -f $(TMPLIST)
endif # BUILD_SHIP
@@ -913,7 +919,7 @@
# move the tarball back after the copy
mv $(ADMSERV_DIR)/../$(ADMIN_SERVER_TARGZ) $(ADMSERV_DIR)
# make sure our packages are in the setup.inf file
- $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf
+ $(PERL) -w $(FIX_SETUP_INF) $(ADMSERV_DIR)/setup.inf $(INSTDIR)/setup.inf $(USE_ADMINSERVER)
#---------------------------- slapd rules --------------------------------------------------
Index: fixSetupInf.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fixSetupInf.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fixSetupInf.pl 21 Oct 2005 19:21:12 -0000 1.7
+++ fixSetupInf.pl 13 Feb 2006 22:25:33 -0000 1.8
@@ -51,6 +51,8 @@
$input = shift;
$output = shift;
+$use_adminserver = shift;
+
die "cannot open input file $input" unless open( FILE, $input );
die "cannot open output file $output" unless open( OUT, ">$output" );
$inGeneralSection = 0;
@@ -65,6 +67,10 @@
$_ .= ", slapd";
$addedSlapd = 1;
}
+ if (! /admin/ && $use_adminserver) {
+ $_ .= ", admin";
+ $addedAdmin = 1;
+ }
if (! /perldap/) {
$_ .= ", perldap";
$addedPerLDAP = 1;
@@ -95,6 +101,11 @@
print OUT "ComponentInfoFile = slapd/slapd.inf\n";
}
+if ($addedAdmin) {
+ print OUT "\n[admin]\n";
+ print OUT "ComponentInfoFile = admin/admin.inf\n";
+}
+
if ($addedPerLDAP) {
print OUT "\n[perldap]\n";
print OUT "ComponentInfoFile = perldap/perldap.inf\n";
18 years, 2 months