[171306] Cleanup of admin server code

(component_versions.mk ldap/cm/Makefile ldap/cm/fedora-patch.inf ldap/cm/redhat-patch.inf ldap/cm/genRpmPatch.pl)
[171349] JRE,JSS files in DS 7.1 SP1 package appear changed due to stripping
(ldap/cm/Makefile)

5 files changed, 40 insertions, 16 deletions

diff --git a/component_versions.mk b/component_versions.mk
index 17fe8ca1..f307615e 100644
--- a/component_versions.mk
+++ b/component_versions.mk
@@ -122,7 +122,7 @@ endif
 # admin server
 
 ifndef ADM_RELDATE
-  ADM_RELDATE = 20050512
+  ADM_RELDATE = 20051017
 endif
 ifndef ADM_VERSDIR
   ADM_VERSDIR = adminserver/70$(BUILD_MODE)
@@ -250,7 +250,7 @@ ifndef MAVEN_VERSION
 endif
 
 ifndef ADSYNC_VERSION
-	ADSYNC_VERSION=20050912
+	ADSYNC_VERSION=20051017
 endif
 
 ifndef NT4SYNC_VERSION
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index d5c52843..4bcaffe6 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -230,6 +230,8 @@ INSTDIR = $(BUILD_DRIVE)$(BUILD_ROOT)/../$(MMDD)/$(NS_BUILD_FLAVOR)
 endif
 endif
 ABS_INSTDIR = $(shell cd $(INSTDIR); pwd)
+ABS_DISTDIR = $(ABSBUILD_ROOT)/../dist
+ESCAPED_ABS_DISTDIR = $(shell echo $(ABS_DISTDIR) | sed -e 's/\//\\\//g')
 
 ifdef BUILD_PATCH
 PATCHINSTDIR = $(ABS_INSTDIR)-SP
@@ -628,15 +630,6 @@ packageDirectory: $(INSTDIR)/slapd \
 	$(INSTDIR)/tools/infozip.zip \
 	$(ADMSERV_DEP)
 
-ifdef BUILD_PATCH
-ifdef BUILD_RPM
-# create a patch
-	$(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
-	mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
-	ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
-endif
-endif
-
 # copy over the setup sdk stuff
 # hack - remove once admin server bundles setupsdk 6.02
 #	cp -R $(SETUP_SDK_BUILD_DIR)/bin/* $(INSTDIR)
@@ -661,6 +654,22 @@ endif
 endif
 endif
 endif
+
+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)\/$(NC_BUILD_FLAVOR)/"` ; \
+	  afile=`echo $$pair | awk -F: '{print $$2}'` ; \
+	  cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
+	done
+ifdef BUILD_RPM
+# create a patch
+	$(GENRPMPATCH) -i $(RPM_BASE_NAME) -o $(NS_BUILD_FLAVOR) -r $(ABSRELDIR) -e $(SPEXT) -f $(PATCHINF) -v
+	mv $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR) $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR).original
+	ln -s $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)$(SPEXT)/opt/$(RPM_BASE_NAME)-ds $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR)
+endif
+endif
+
 # create the slapd-client.zip file, which only has the ds jar file for the console and
 # the ldap client utility programs
 	rm -f $(INSTDIR)/slapd/slapd-client.zip
@@ -821,6 +830,7 @@ ifdef BUILD_PATCH
 	echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
 # create a zip file based upon the $(PATCHINF) file
 	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `grep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
+	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'`
 # put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
 	$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
 	-@for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -831,6 +841,7 @@ ifdef BUILD_PATCH
 # create patch inf file: $(SLAPD).inf
 	cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
 	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^compfile:" $(PATCHINF) | awk -F: '{print $$4}'` >> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
 	echo `cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp` | sed -e "s/ /,/g" > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
 	echo "BackupFiles="`cat $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2`>> $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
 	rm -f $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp2
diff --git a/ldap/cm/fedora-patch.inf b/ldap/cm/fedora-patch.inf
index 6cb5d48b..f14a3d67 100644
--- a/ldap/cm/fedora-patch.inf
+++ b/ldap/cm/fedora-patch.inf
@@ -39,6 +39,8 @@
 # Info file to generate DS7.1 SP1 patch
 # base: <builddir> containing the base package -- DS7.1
 # file: bug#: <patchfile>
+# compfile: bug#: <patch_zipfile>:<patchfile> 
+#                 %DISTDIR% points <buildroot>/dist/<platform>
 #
 base: /share/dev4/fedora-ds/fds71/ships/20050526.1
 
@@ -53,9 +55,10 @@ file: 160003: bin/slapd/admin/bin/upgradeServer
 file: 164836,165600: lib/attr-unique-plugin.*
 file: 165640: lib/views-plugin.*
 file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
 file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
 file: xxxxxx: bin/slapd/README.txt
 file: xxxxxx: README.txt
 
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
diff --git a/ldap/cm/genRpmPatch.pl b/ldap/cm/genRpmPatch.pl
index d8750a96..0450c9b0 100755
--- a/ldap/cm/genRpmPatch.pl
+++ b/ldap/cm/genRpmPatch.pl
@@ -129,7 +129,13 @@ while ($l = <INFFILE>) {
         $pos = rindex($l, ":", $pos);
         $pos++;
         $file = substr($l, $pos);
-        $file =~ s/[     ]//g;
+        $file =~ s/[ 	]//g;
+        push(@newfiles, ($file));
+    } elsif ($l =~ /^compfile: /) {
+        $pos = rindex($l, ":", $pos);
+        $pos++;
+        $file = substr($l, $pos);
+        $file =~ s/[ 	]//g;
         push(@newfiles, ($file));
     }
 }
diff --git a/ldap/cm/redhat-patch.inf b/ldap/cm/redhat-patch.inf
index 91334564..9bca2872 100644
--- a/ldap/cm/redhat-patch.inf
+++ b/ldap/cm/redhat-patch.inf
@@ -39,6 +39,8 @@
 # Info file to generate DS7.1 SP1 patch
 # base: <builddir> containing the base package -- DS7.1
 # file: bug#: <patchfile>
+# compfile: bug#: <patch_zipfile>:<patchfile> 
+#                 %DISTDIR% points <buildroot>/dist/<platform>
 #
 base: /share/dev4/ds/ds71/ships/20050524.1
 
@@ -53,8 +55,10 @@ file: 160003: bin/slapd/admin/bin/upgradeServer
 file: 164836,165600: lib/attr-unique-plugin.*
 file: 165640: lib/views-plugin.*
 file: 167478,160589: setup/setup
-file: 156120,159037: winsync/PassSync.msi
+file: 156120,159037,170321,170328,170556,170558,170816: winsync/PassSync.msi
 file: 167761: java/jars/ds71.jar
-file: 169388: lib/replication-plugin.*
+file: 169388,169954,170071,170350: lib/replication-plugin.*
 file: xxxxxx: bin/slapd/README.txt
 file: xxxxxx: README.txt
+
+compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help