Bug(s) fixed: 172056

Bug Description: Fix internal component versions and formats for initial
FDS 1.0 build
Reviewed by: Noriko (Thanks!)
Fix Description: Some of the naming conventions needed to change e.g.
/s/b/c/ldapconsole10ext became /fedora/components/directoryconsole/1.0.
Made the ds onlinehelp docs available to build externally.  Perldap has
no zip file anymore, just the dirs we copy over.  Adminserver includes
the unzipped directories - we need to fix that eventually, but in the
meantime, I made tar skip those unzipped directories.  I also merged
Noriko's fix for the assecure.txt problem in setup into Fedora DS.  Noriko also pointed out an unused Makefile variable.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no

2 files changed, 48 insertions, 31 deletions

diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index dbff5fff..3f3f26f5 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -70,6 +70,8 @@ endif
 
 MMDD = $(shell date +%m.%d)
 
+TMPLIST := $(shell echo /tmp/build.$$$$)
+
 # we don't want to build with warnings-as-errors for the cm/ stuff, because
 # it's crappy C++ code which is LITTERED with warnings, most of which we
 # can't fix because it comes from files in dist/, etc.
@@ -483,16 +485,24 @@ endif
 # docs
 	-$(RM) -r $(RELDIR)/manual/en/slapd
 	-$(MKDIR) $(RELDIR)/manual/en/slapd
-	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
+# copy over the manual files built in our build tree
+	if [ -d "$(OBJDIR)/manual/slapd" ] ; then \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/manual/en/slapd/help ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/pixel.gif $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/topicindex.htm $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/tokens.map $(RELDIR)/manual/en/slapd/ ; \
+    fi
+# copy the manual files from the zip files or checked out directory
+	if [ "$(DSDOC_DIR)" -a -d "$(DSDOC_DIR)" ] ; then \
 	  cd $(RELDIR)/manual/en/slapd; \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
-	  $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      if [ -f $(DSDOC_DIR)/$(DSDOC_COPYRIGHT) ] ; then \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_COPYRIGHT); \
+	    $(UNZIP) $(DSDOC_DIR)/$(DSDOC_CLIENTS); \
+      else \
+        cp -r $(DSDOC_DIR) . ; \
+      fi ; \
 	fi
 
 ifdef USE_PURIFY
@@ -651,7 +661,6 @@ endif
 		for file in $(ADMINSERVER_SUBCOMPS) ; \
 			do rm -rf $(INSTDIR)/$$file ; \
 			cp -r $(ADMSERV_DIR)/$$file $(INSTDIR)/$$file ; \
-			rm -rf $(INSTDIR)/$$file/unzipped ; \
 		done ; \
 	fi
 
@@ -685,8 +694,11 @@ ifeq ($(DEBUG), optimize)
 #	$(REMSH) "/u/svbld/bin/preRtm $(BUILD_SHIP) $(FTPNAMEGZ) svbld"
 endif
 else
+	echo base/unzipped > $(TMPLIST)
+	echo admin/unzipped >> $(TMPLIST)
 	cd $(INSTDIR); $(TAR) cvfh - setup.inf setup slapd  \
-	dsktune $(ADMIN_IMPORTS) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	dsktune $(ADMIN_IMPORTS) -X $(TMPLIST) | gzip -f > ../all$(NS_BUILD_FLAVOR).tar.gz
+	rm -f $(TMPLIST)
 endif # BUILD_SHIP
 #cp $(INSTDIR).tar.gz  $(BUILD_SHIP)
 #cp $(INSTDIR)/all$(NS_BUILD_FLAVOR).tar.gz  $(BUILD_SHIP)
diff --git a/ldap/cm/newinst/setup b/ldap/cm/newinst/setup
index c3a13ad5..bea81614 100755
--- a/ldap/cm/newinst/setup
+++ b/ldap/cm/newinst/setup
@@ -312,38 +312,43 @@ adminXmlSSLOn() {
 }
 
 SSLOn() {
-	for dir in `cat dssecure.txt` ; do
-		if [ -f $dir/config/dse.ldif ]; then
-			security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
-			$dir/stop-slapd
-			cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
-			mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
-			echo "$dir/config/dse.ldif: SSL on ..."
-			echo "Restarting Directory Server: $dir/start-slapd"
-			$dir/start-slapd
-		fi
-	done
+	if [ -f dssecure.txt ]; then
+		for dir in `cat dssecure.txt` ; do
+			if [ -f $dir/config/dse.ldif ]; then
+				security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+				$dir/stop-slapd
+				cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+				mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+				echo "$dir/config/dse.ldif: SSL on ..."
+				echo "Restarting Directory Server: $dir/start-slapd"
+				$dir/start-slapd
+			fi
+		done
+		rm -f dssecure.txt > /dev/null 2>&1
+	fi
 
 	if [ $isadminsslon -ne 0 ]; then
 		$sroot/stop-admin
 	fi
-	for confline in `cat assecure.txt` ; do
-		conffile=`echo $confline | awk -F= '{print $1}'`
-		confparam=`echo $confline | awk -F= '{print $2}'`
-		echo $conffile | grep "\.xml$" > /dev/null 2>&1
-		rval=$?
-		if [ $rval -eq 0 ]; then
-			adminXmlSSLOn $conffile $confparam
-		else
-			adminSSLOn $conffile $confparam
-		fi
-	done
+	if [ -f assecure.txt ]; then
+		for confline in `cat assecure.txt` ; do
+			conffile=`echo $confline | awk -F= '{print $1}'`
+			confparam=`echo $confline | awk -F= '{print $2}'`
+			echo $conffile | grep "\.xml$" > /dev/null 2>&1
+			rval=$?
+			if [ $rval -eq 0 ]; then
+				adminXmlSSLOn $conffile $confparam
+			else
+				adminSSLOn $conffile $confparam
+			fi
+		done
+		rm -f assecure.txt > /dev/null 2>&1
+	fi
 	if [ $isadminsslon -ne 0 ]; then
 		echo "Restarting Administration Server: $sroot/start-admin"
 		$sroot/start-admin
 	fi
 
-	rm -f dssecure.txt assecure.txt > /dev/null 2>&1
 }
 
 # check whether it is an in-place installation
@@ -362,7 +367,7 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		suitespotgroup=`ls -l $sroot/$dsinst/config/dse.ldif | awk '{print $4}'`
 		admindomain=`echo $ldaphost | awk -F. '{print $5 ? $2 "." $3 "." $4 "." $5: $4 ? $2 "." $3 "." $4 : $3 ? $2 "." $3 : $2 ? $2 : ""}'`
 		if [ "$admindomain" = "" ]; then
-    		admindomain=`domainname`
+			admindomain=`domainname`
 		fi
 
 		echo "In order to reconfigure your installation, the Configuration Directory"
@@ -376,8 +381,8 @@ if [ -f $sroot/admin-serv/config/adm.conf ]; then
 		echo "administrator ID: $siepid"
 		siepasswd=""
 		while [ "$siepasswd" = "" ]; do
-    		printf "Password: "
-    		read siepasswd
+			printf "Password: "
+			read siepasswd
 		done
 
 		inffile=$sroot/setup/myinstall.inf