[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.7, 1.30.2.8 fedora-patch.inf, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.3, 1.1.2.4

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/ldap/cm

Modified Files:
      Tag: Directory71RtmBranch
	Makefile fedora-patch.inf redhat-patch.inf 
Log Message:
[167982] Service Pack framework
To make patch installation easier and less confusing, 1) adding a setup wrapper
(ldap/cm/newinst/setup.patch) for Solaris and HP as well as 2) adding some code
to RPM setup script (ldap/cm/newinst/setup) for RHELs, which checks the
existing server config files and retrieves the values needed for the upgrade.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.7
retrieving revision 1.30.2.8
diff -u -r1.30.2.7 -r1.30.2.8
--- Makefile	16 Sep 2005 20:01:17 -0000	1.30.2.7
+++ Makefile	28 Sep 2005 22:47:13 -0000	1.30.2.8
@@ -813,13 +813,14 @@
 	cp $(INSTDIR)/dssetup $(PATCHINSTDIR)
 	cp $(INSTDIR)/LICENSE.txt $(PATCHINSTDIR)
 	cp $(INSTDIR)/README.txt $(PATCHINSTDIR)
+	cp $(BUILD_ROOT)/ldap/cm/newinst/setup.patch $(PATCHINSTDIR)/setup
 # prepare the main inf file: setup.inf pointing inf file $(SLAPDS)/$(SLAPD).inf
 	sed -e "s/Components.*=/Components = $(SLAPDSP)/" $(INSTDIR)/setup.inf > $(PATCHINSTDIR)/setup.inf
 	echo "" >> $(PATCHINSTDIR)/setup.inf
 	echo "[$(SLAPDSP)]" >> $(PATCHINSTDIR)/setup.inf
 	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 `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
+	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep "^file:" $(PATCHINF) | awk -F: '{print $$3}'`
 # put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
 	$(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
 	- at for file in $(PACKAGE_SETUP_LIBS_32) ; \
@@ -829,7 +830,7 @@
 	done
 # create patch inf file: $(SLAPD).inf
 	cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
-	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
+	cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep "^file:" $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(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


Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- fedora-patch.inf	12 Sep 2005 20:05:15 -0000	1.1.2.3
+++ fedora-patch.inf	28 Sep 2005 22:47:13 -0000	1.1.2.4
@@ -38,7 +38,7 @@
 #
 # Info file to generate DS7.1 SP1 patch
 # base: <builddir> containing the base package -- DS7.1
-# file: <patchfile>
+# file: bug#: <patchfile>
 #
 base: /share/dev4/fedora-ds/fds71/ships/20050526.1
 
@@ -56,6 +56,7 @@
 file: 156120,159037: winsync/PassSync.msi
 file: 156120,159037: winsync/ntds.msi
 file: 167761: java/jars/ds71.jar
+file: 169388: lib/replication-plugin.*
 file: xxxxxx: bin/slapd/README.txt
 file: xxxxxx: README.txt
 


Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- redhat-patch.inf	12 Sep 2005 20:05:15 -0000	1.1.2.3
+++ redhat-patch.inf	28 Sep 2005 22:47:13 -0000	1.1.2.4
@@ -38,7 +38,7 @@
 #
 # Info file to generate DS7.1 SP1 patch
 # base: <builddir> containing the base package -- DS7.1
-# file: <patchfile>
+# file: bug#: <patchfile>
 #
 base: /share/dev4/ds/ds71/ships/20050524.1
 
@@ -56,5 +56,6 @@
 file: 156120,159037: winsync/PassSync.msi
 file: 156120,159037: winsync/ntds.msi
 file: 167761: java/jars/ds71.jar
+file: 169388: lib/replication-plugin.*
 file: xxxxxx: bin/slapd/README.txt
 file: xxxxxx: README.txt