[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.12, 1.30.2.13 fedora-patch.inf, 1.1.2.6, 1.1.2.7 genRpmPatch.pl, 1.1.2.3, 1.1.2.4 redhat-patch.inf, 1.1.2.6, 1.1.2.7
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Wed Feb 15 21:32:34 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24857/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf genRpmPatch.pl redhat-patch.inf
Log Message:
[181582] Directory Server 7.1 SP2 packaging
Changes:
1) SP1 -> SP2
2) LDAPCSDK v5.16 -> v5.17
3) redhat-ds-7.1SP1-3.RHEL4.i386.opt.rpm ->
redhat-ds-7.1SP2-4.RHEL4.i386.opt.rpm
4) modified makefile/script to support copying a component file
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.12
retrieving revision 1.30.2.13
diff -u -r1.30.2.12 -r1.30.2.13
--- Makefile 22 Oct 2005 07:00:03 -0000 1.30.2.12
+++ Makefile 15 Feb 2006 21:32:27 -0000 1.30.2.13
@@ -106,9 +106,9 @@
endif
ifdef USE_64
-VERSION=-ver 7.1SP1-64bit
+VERSION=-ver 7.1SP2-64bit
else
-VERSION=-ver 7.1SP1
+VERSION=-ver 7.1SP2
endif
ifeq ($(ARCH), HPUX)
@@ -191,9 +191,6 @@
SHARETOP = $(COMPONENTS_DIR)/ldapsdk
BUILD_DATE = $(shell date +%Y%m%d)
SHAREDIR = $(SHARETOP)/$(BUILD_DATE)/$(NC_BUILD_FLAVOR)
-#ADM_VERSDIR = admserv40
-#ADM_RELDATE = untested/19980119
-#IMPORTADMINSRV = $(IMPORTADMINSRV_BASE)/$(NSOBJDIR_NAME_32)
IMPORTADMINSRVNOTAR = $(COMPONENTS_DIR)/$(ADM_VERSDIR)/$(ADM_VERSION)/untar/$(NSOBJDIR_NAME)
# these are files and directories in the import adminsrv directory which we don't
# make a local copy of, we just import directly into the tar file or create a
@@ -235,7 +232,7 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
-SLAPDSP = slapd-71sp1
+SLAPDSP = slapd-71sp2
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -271,7 +268,7 @@
ifdef BUILD_RPM
# name and version of RPM - must correspond to the spec file - these get branded
RPM_BASE_NAME=fedora
- RPM_VERSION=7.1SP1
+ RPM_VERSION=7.1SP2
RPM_FILE_BASE=$(RPM_BASE_NAME)-ds-$(RPM_VERSION)
RPM_ARCH = $(shell uname -i)
# root dir for RPM built and temp files
@@ -655,21 +652,6 @@
endif
endif
-ifdef BUILD_PATCH
-# take care of files in components (e.g., a file in nsadmin.zip)
- - at for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
- 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
@@ -730,6 +712,26 @@
$(PERL) -w $(FIX_SETUP_INF) $(IMPORTADMINSRVNOTAR)/setup.inf setup.inf ; \
fi
+ifdef BUILD_PATCH
+# copying a file from the component area
+ - at for pair in `grep "^copyfile:" $(PATCHINF) | awk '{print $$3}'`; do \
+ zipfile=`echo $$pair | awk -F: '{print $$1}'` ; \
+ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ dfile=`echo $$pair | awk -F: '{print $$3}'` ; \
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); \
+ mkdir -p `dirname $$dfile`; cp $$sfile $$dfile ; \
+ echo $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
+ $(ZIP) $(ABS_INSTDIR)/$$zipfile $$dfile ; \
+ 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 #BUILD_RPM
+endif #BUILD_PATCH
+
# 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
@@ -831,6 +833,7 @@
# 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}'`
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip -u `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'`
# 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) ; \
@@ -842,6 +845,7 @@
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
+ cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `grep "^copyfile:" $(PATCHINF) | awk -F: '{print $$5}'` >> $(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.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- fedora-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
+++ fedora-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
@@ -36,17 +36,17 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-# Info file to generate DS7.1 SP1 patch
+# Info file to generate DS7.1 SP2 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
+base: ...
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
@@ -60,5 +60,26 @@
file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+file: M324525,M324529: shared/lib/libldap50.so
+file: M324525,M324529: shared/lib/libprldap50.so
+file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: bin/slapd/lib/libldap50.so
+file: M324525,M324529: bin/slapd/lib/libprldap50.so
+file: M324525,M324529: bin/slapd/lib/libssldap50.so
+file: M324525,M324529: clients/lib/libldap50.so
+file: M324525,M324529: clients/lib/libprldap50.so
+file: M324525,M324529: clients/lib/libssldap50.so
+file: M324525,M324529: shared/bin/ldapcmp
+file: M324525,M324529: shared/bin/ldapcompare
+file: M324525,M324529: shared/bin/ldapdelete
+file: M324525,M324529: shared/bin/ldapmodify
+file: M324525,M324529: shared/bin/ldapsearch
+
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
+copyfile: M324525,M324529: %DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: genRpmPatch.pl
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/genRpmPatch.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- genRpmPatch.pl 22 Oct 2005 00:07:42 -0000 1.1.2.3
+++ genRpmPatch.pl 15 Feb 2006 21:32:27 -0000 1.1.2.4
@@ -129,16 +129,11 @@
$pos = rindex($l, ":", $pos);
$pos++;
$file = substr($l, $pos);
- $file =~ s/[ ]//g;
- push(@newfiles, ($file));
- } elsif ($l =~ /^compfile: /) {
- $pos = rindex($l, ":", $pos);
- $pos++;
- $file = substr($l, $pos);
- $file =~ s/[ ]//g;
+ $file =~ s/[ ]//g;
push(@newfiles, ($file));
}
}
+close(INFFILE);
if (1 == $verbose) {
print "Base: $basedir\n";
print "New Files:\n";
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- redhat-patch.inf 22 Oct 2005 00:07:42 -0000 1.1.2.6
+++ redhat-patch.inf 15 Feb 2006 21:32:27 -0000 1.1.2.7
@@ -36,17 +36,17 @@
# All rights reserved.
# END COPYRIGHT BLOCK
#
-# Info file to generate DS7.1 SP1 patch
+# Info file to generate DS7.1 SP2 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
+base: /share/builds/products/server/directry/7.1
file: 147585: plugins/slapd/slapi/examples/testpreop.c
-file: 164834,165641,166229: bin/slapd/server/ns-slapd
-file: 155276,164834,164843,165641,166229: bin/slapd/server/libslapd.*
+file: 164834,165641,166229,173687: bin/slapd/server/ns-slapd
+file: 155276,164834,164843,165641,166229,173687: bin/slapd/server/libslapd.*
file: 151678: bin/slapd/admin/bin/ds_newinst
file: 151678: bin/slapd/admin/bin/ds_create
file: 155276,164843,165641,165827,165862,166012: lib/libback-ldbm.*
@@ -60,5 +60,26 @@
file: 169388,169954,170071,170350: lib/replication-plugin.*
file: xxxxxx: bin/slapd/README.txt
file: xxxxxx: README.txt
+file: M324525,M324529: shared/lib/libldap50.so
+file: M324525,M324529: shared/lib/libprldap50.so
+file: M324525,M324529: shared/lib/libssldap50.so
+file: M324525,M324529: shared/bin/ldapcmp
+file: M324525,M324529: shared/bin/ldapcompare
+file: M324525,M324529: shared/bin/ldapdelete
+file: M324525,M324529: shared/bin/ldapmodify
+file: M324525,M324529: shared/bin/ldapsearch
+file: M324525,M324529: bin/slapd/lib/libldap50.so
+file: M324525,M324529: bin/slapd/lib/libprldap50.so
+file: M324525,M324529: bin/slapd/lib/libssldap50.so
+file: M324525,M324529: clients/lib/libldap50.so
+file: M324525,M324529: clients/lib/libprldap50.so
+file: M324525,M324529: clients/lib/libssldap50.so
+
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/https/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/https/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/https/lib/libssldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.so:bin/admin/lib/libldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.so:bin/admin/lib/libprldap50.so
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.so:bin/admin/lib/libssldap50.so
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
More information about the Fedora-directory-commits
mailing list