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";
Show replies by date