[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.16, 1.30.2.17 fedora-patch.inf, 1.1.2.9, 1.1.2.10 redhat-patch.inf, 1.1.2.9, 1.1.2.10
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Fri Mar 3 19:07:00 UTC 2006
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24010/ldap/cm
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[183717] Admin Server - wrong ELF class
Package 32-bit LDAP C SDK libraries for the Admin Server.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.16
retrieving revision 1.30.2.17
diff -u -r1.30.2.16 -r1.30.2.17
--- Makefile 22 Feb 2006 03:08:49 -0000 1.30.2.16
+++ Makefile 3 Mar 2006 19:06:50 -0000 1.30.2.17
@@ -715,7 +715,7 @@
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)/"` ; \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR32%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32/" | 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
@@ -723,7 +723,7 @@
# copying files 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)/"` ; \
+ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR32%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32/" | 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 `dirname $$dfile` ; \
Index: fedora-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/fedora-patch.inf,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- fedora-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9
+++ fedora-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
@@ -41,6 +41,7 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
#
base: ...
@@ -75,11 +76,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
Index: redhat-patch.inf
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/redhat-patch.inf,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- redhat-patch.inf 21 Feb 2006 21:38:05 -0000 1.1.2.9
+++ redhat-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
@@ -41,6 +41,7 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
#
base: /share/builds/products/server/directry/7.1
@@ -75,11 +76,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/https/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/https/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/https/lib/libssldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libldap50.*:bin/admin/lib/libldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libprldap50.*:bin/admin/lib/libprldap50.*
-copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR%/ldapsdk/lib/libssldap50.*:bin/admin/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
More information about the Fedora-directory-commits
mailing list