[Fedora-directory-commits] mod_admserv aclocal.m4, 1.9, 1.10 Makefile.am, 1.13, 1.14 Makefile.in, 1.17, 1.18 configure.in, 1.15, 1.16
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6929
Modified Files:
aclocal.m4 Makefile.am Makefile.in configure.in
Log Message:
adding "@nspr_lib@ -lnspr4 -lplc4" to LIBS to build using components on /s/b/c.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am 26 Feb 2006 00:27:58 -0000 1.13
+++ Makefile.am 9 Mar 2006 17:28:05 -0000 1.14
@@ -8,7 +8,7 @@
## Set the includes and libraries needed
INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4
EXTRA_CPPFLAGS=@extra_cppflags@
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.in 26 Feb 2006 00:27:58 -0000 1.17
+++ Makefile.in 9 Mar 2006 17:28:05 -0000 1.18
@@ -117,7 +117,7 @@
#libmodadmserv_la_LDFLAGS = -module -avoid-version
INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4
EXTRA_CPPFLAGS = @extra_cppflags@
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/back-ldbm vlv.c, 1.6, 1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379
Modified Files:
vlv.c
Log Message:
[183222] Directory Server hangs when running VLV search and update operations simultaneously.
Demoted the write lock to the read lock in vlv_update_all_indexes
Index: vlv.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/back-ldbm/vlv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vlv.c 19 Apr 2005 22:07:38 -0000 1.6
+++ vlv.c 8 Mar 2006 01:31:12 -0000 1.7
@@ -72,6 +72,7 @@
backend *be = inst->inst_be;
vlvSearch_init(newVlvSearch, pb, entryBefore, inst);
+ /* vlvSearchList is modified; need Wlock */
PR_RWLock_Wlock(be->vlvSearchList_lock);
vlvSearch_addtolist(newVlvSearch, (struct vlvSearch **)&be->vlvSearchList);
PR_RWLock_Unlock(be->vlvSearchList_lock);
@@ -89,7 +90,8 @@
slapi_sdn_init(&parentdn);
slapi_sdn_get_parent(slapi_entry_get_sdn(entryBefore),&parentdn);
{
- PR_RWLock_Wlock(be->vlvSearchList_lock);
+ /* vlvIndex list is modified; need Wlock */
+ PR_RWLock_Wlock(be->vlvSearchList_lock);
parent= vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, &parentdn);
if(parent!=NULL)
{
@@ -109,10 +111,11 @@
int vlv_DeleteSearchEntry(Slapi_PBlock *pb, Slapi_Entry* entryBefore, Slapi_Entry* entryAfter, int *returncode, char *returntext, void *arg)
{
struct vlvSearch* p=NULL;
- backend *be= ((ldbm_instance*)arg)->inst_be;
+ backend *be= ((ldbm_instance*)arg)->inst_be;
- PR_RWLock_Wlock(be->vlvSearchList_lock);
- p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, slapi_entry_get_sdn(entryBefore));
+ /* vlvSearchList is modified; need Wlock */
+ PR_RWLock_Wlock(be->vlvSearchList_lock);
+ p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, slapi_entry_get_sdn(entryBefore));
if(p!=NULL)
{
LDAPDebug( LDAP_DEBUG_ANY, "Deleted Virtual List View Search (%s).\n", p->vlv_name, 0, 0);
@@ -269,7 +272,7 @@
int any_not_done = 0;
- PR_RWLock_Wlock(be->vlvSearchList_lock);
+ PR_RWLock_Wlock(be->vlvSearchList_lock);
if (seen_them_all) {
PR_RWLock_Unlock(be->vlvSearchList_lock);
return;
@@ -320,6 +323,7 @@
{
struct vlvSearch *t = NULL;
struct vlvSearch *nt = NULL;
+ /* vlvSearchList is modified; need Wlock */
PR_RWLock_Wlock(be->vlvSearchList_lock);
for (t = (struct vlvSearch *)be->vlvSearchList; NULL != t; )
{
@@ -762,8 +766,8 @@
*
* JCM: If only non-sorted attributes are changed, then the indexes don't need updating.
* JCM: Detecting this fact, given multi-valued atribibutes, might be tricky...
- * Added write lock
-*/
+ * Read lock (traverse vlvSearchList; no change on vlvSearchList/vlvIndex lists)
+ */
int
vlv_update_all_indexes(back_txn *txn, backend *be, Slapi_PBlock *pb, struct backentry* oldEntry, struct backentry* newEntry)
@@ -772,7 +776,7 @@
struct vlvSearch* ps=NULL;
struct ldbminfo *li = ((ldbm_instance *)be->be_instance_info)->inst_li;
- PR_RWLock_Wlock(be->vlvSearchList_lock);
+ PR_RWLock_Rlock(be->vlvSearchList_lock);
ps = (struct vlvSearch *)be->vlvSearchList;
for(;ps!=NULL;ps= ps->vlv_next)
{
@@ -1927,10 +1931,11 @@
tag1=create_vlv_search_tag(dn);
buf=slapi_ch_smprintf("%s%s%s%s%s","cn=MCC ",tag1,", cn=",inst->inst_name,LDBM_PLUGIN_ROOT);
newdn=slapi_sdn_new_dn_byval(buf);
+ /* vlvSearchList is modified; need Wlock */
PR_RWLock_Wlock(be->vlvSearchList_lock);
p = vlvSearch_finddn((struct vlvSearch *)be->vlvSearchList, newdn);
- if(p!=NULL)
- {
+ if(p!=NULL)
+ {
LDAPDebug( LDAP_DEBUG_ANY, "Deleted Virtual List View Search (%s).\n", p->vlv_name, 0, 0);
tag2=create_vlv_search_tag(dn);
buf2=slapi_ch_smprintf("%s%s,%s",TAG,tag2,buf);
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/cm Makefile, 1.30.2.17, 1.30.2.18 fedora-patch.inf, 1.1.2.10, 1.1.2.11 redhat-patch.inf, 1.1.2.10, 1.1.2.11
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19602
Modified Files:
Tag: Directory71RtmBranch
Makefile fedora-patch.inf redhat-patch.inf
Log Message:
[183717] Admin Server - wrong ELF class
Should have treated the 32-bit build and 64-bit in the different way:
32-bit -- copy from dist/<platform>/<component> (e.g., dist/SunOS5.9_OPT.OBJ/ldapsdk)
64-bit -- copy from dist/<platform>/shared32 (e.g., dist/SunOS5.9_64_OPT.OBJ/shared32)
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.30.2.17
retrieving revision 1.30.2.18
diff -u -r1.30.2.17 -r1.30.2.18
--- Makefile 3 Mar 2006 19:06:50 -0000 1.30.2.17
+++ Makefile 7 Mar 2006 00:52:08 -0000 1.30.2.18
@@ -233,6 +233,14 @@
ifdef BUILD_PATCH
PATCHINSTDIR = $(ABS_INSTDIR)-SP
SLAPDSP = slapd-71sp2
+PATCH_DISTDIR=$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)
+ifeq ($(USE_64), 1)
+ PATCH_DISTDIR32=$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32
+ PATCH_LDAPSDK=
+else
+ PATCH_DISTDIR32=$(PATCH_DISTDIR)
+ PATCH_LDAPSDK=ldapsdk
+endif
endif
INST_TARGET_RESKIT=$(INSTDIR)/reskit
@@ -714,16 +722,18 @@
ifdef BUILD_PATCH
# take care of files in components (e.g., a file in nsadmin.zip)
+ @echo compfile...
-@for pair in `grep "^compfile:" $(PATCHINF) | awk '{print $$3}'`; do \
- 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)/"` ; \
+ zipfile=`echo $$pair | awk -F: '{print $$1}' | sed -e "s/%DISTDIR32%/$(PATCH_DISTDIR32)/" | sed -e "s/%DISTDIR%/$(PATCH_DISTDIR)/"` ; \
afile=`echo $$pair | awk -F: '{print $$2}'` ; \
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); $(UNZIP) -o $$zipfile $$afile ; \
done
# copying files from the component area
+ @echo copyfile...
-@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/%DISTDIR32%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)\/shared32/" | sed -e "s/%DISTDIR%/$(ESCAPED_ABS_DISTDIR)\/$(NSOBJDIR_NAME)/"` ; \
+ sfile=`echo $$pair | awk -F: '{print $$2}' | sed -e "s/%DISTDIR32%/$(PATCH_DISTDIR32)/" | sed -e "s/%LDAPSDK%/$(PATCH_LDAPSDK)/" | sed -e "s/%DISTDIR%/$(PATCH_DISTDIR)/"` ; \
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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- fedora-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
+++ fedora-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
@@ -41,7 +41,10 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# 64bit:
# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
+# 32it:
+# %DISTDIR32% points <buildroot>/dist/<platform>
#
base: ...
@@ -76,11 +79,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/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.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/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.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- redhat-patch.inf 3 Mar 2006 19:06:50 -0000 1.1.2.10
+++ redhat-patch.inf 7 Mar 2006 00:52:08 -0000 1.1.2.11
@@ -41,7 +41,10 @@
# file: bug#: <patchfile>
# compfile: bug#: <patch_zipfile>:<patchfile>
# %DISTDIR% points <buildroot>/dist/<platform>
+# 64bit:
# %DISTDIR32% points <buildroot>/dist/<platform>/shared32
+# 32it:
+# %DISTDIR32% points <buildroot>/dist/<platform>
#
base: /share/builds/products/server/directry/7.1
@@ -76,11 +79,11 @@
file: M324525,M324529: clients/lib/libprldap50.*
file: M324525,M324529: clients/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.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/https/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/https/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/https/lib/libssldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libldap50.*:bin/admin/lib/libldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libprldap50.*:bin/admin/lib/libprldap50.*
+copyfile: M324525,M324529: admin/nsadmin.zip:%DISTDIR32%/%LDAPSDK%/lib/libssldap50.*:bin/admin/lib/libssldap50.*
compfile: 171306: %DISTDIR%/admserv/admin/nsadmin.zip:manual/help/help
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd passwd_extop.c, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313
Modified Files:
passwd_extop.c
Log Message:
Bug(s) fixed: 179723
Bug Description: crash after succesful pwdchange via ldappasswd
Reviewed by: Pete, Nathan (Thanks!)
Fix Description: The passwd_extop code does an internal operation to
change the password. Some of this code is only intended to be called
for external operations where you have a conn structure. The one place
in particular which caused this bug is in update_pw_info, where it is
only triggered if you must change the password or password expiration is
in effect. The fix is to just check to see if the pb_conn is not null.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
Index: passwd_extop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/passwd_extop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- passwd_extop.c 15 Feb 2006 21:22:46 -0000 1.7
+++ passwd_extop.c 6 Mar 2006 20:02:06 -0000 1.8
@@ -135,7 +135,6 @@
static int passwd_apply_mods(const char *dn, Slapi_Mods *mods)
{
Slapi_PBlock pb;
- Slapi_Operation *operation= NULL;
int ret=0;
LDAPDebug( LDAP_DEBUG_TRACE, "=> passwd_apply_mods\n", 0, 0, 0 );
@@ -150,9 +149,6 @@
pw_get_componentID(), /* PluginID */
0); /* Flags */
- /* Plugin operations are INTERNAL by default, bypass it to enforce ACL checks */
- slapi_pblock_get (&pb, SLAPI_OPERATION, &operation);
-
ret =slapi_modify_internal_pb (&pb);
slapi_pblock_get(&pb, SLAPI_PLUGIN_INTOP_RESULT, &ret);
18 years, 1 month
[Fedora-directory-commits] ldapserver/ldap/servers/slapd pw.c, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7325
Modified Files:
pw.c
Log Message:
Bug(s) fixed: 179723
Bug Description: crash after succesful pwdchange via ldappasswd
Reviewed by: Pete, Nathan (Thanks!)
Fix Description: The passwd_extop code does an internal operation to
change the password. Some of this code is only intended to be called
for external operations where you have a conn structure. The one place
in particular which caused this bug is in update_pw_info, where it is
only triggered if you must change the password or password expiration is
in effect. The fix is to just check to see if the pb_conn is not null.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
Index: pw.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/pw.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pw.c 25 Jan 2006 16:51:39 -0000 1.9
+++ pw.c 6 Mar 2006 20:00:47 -0000 1.10
@@ -647,8 +647,10 @@
pw_apply_mods(dn, &smods);
slapi_mods_done(&smods);
- /* reset c_needpw to 0 */
- pb->pb_conn->c_needpw = 0;
+ if (pb->pb_conn) { /* no conn for internal op */
+ /* reset c_needpw to 0 */
+ pb->pb_conn->c_needpw = 0;
+ }
return 0;
}
18 years, 1 month
[Fedora-directory-commits] mod_admserv mod_admserv.c,1.21,1.22
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26683
Modified Files:
mod_admserv.c
Log Message:
Bug(s) fixed: 183925
Bug Description: nsAdminAccessAddresses not working
Reviewed by: one line commit rule
Fix Description: The comparison was reversed so that if the match is successful the access is allowed.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_admserv.c 1 Mar 2006 18:43:51 -0000 1.21
+++ mod_admserv.c 3 Mar 2006 20:16:38 -0000 1.22
@@ -1913,7 +1913,7 @@
if (accessAddresses && *accessAddresses) {
int matchflags = APR_FNM_PERIOD;
apr_status_t rc = admserv_match_list(apr_pstrdup(r->pool, accessAddresses), clientIP, matchflags);
- if (rc == APR_SUCCESS) {
+ if (rc != APR_SUCCESS) {
} else {
return DECLINED;
}
18 years, 1 month
[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
by Doctor Conrad
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)
-@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
-@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
18 years, 1 month
[Fedora-directory-commits] ldapserver internal_comp_deps.mk, 1.24.2.1, 1.24.2.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24010
Modified Files:
Tag: Directory71RtmBranch
internal_comp_deps.mk
Log Message:
[183717] Admin Server - wrong ELF class
Package 32-bit LDAP C SDK libraries for the Admin Server.
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- internal_comp_deps.mk 15 Feb 2006 21:32:16 -0000 1.24.2.1
+++ internal_comp_deps.mk 3 Mar 2006 19:06:22 -0000 1.24.2.2
@@ -132,6 +132,12 @@
# do not need redundant copy of nssckbi
NSS32_NSPR32_SRC_LIBS = $(filter-out $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE),$(wildcard $(SHARED32_BUILD_DIR)/lib/*))
PACKAGE_SRC_DEST += $(addsuffix $(SPACE)shared32/lib,$(NSS32_NSPR32_SRC_LIBS))
+
+ifdef BUILD_PATCH
+# need 32-bit LDAP C SDK libs for SP2
+ LDAPSDK32_IMPORT = $(subst $(NS64TAG),,$(LDAP_RELEASE))
+ LDAPSDK32_PULLFILES = lib/$(LIB_PREFIX)$(subst $(SPACE),$(COMMA)lib/$(LIB_PREFIX),$(addsuffix .$(DLL_SUFFIX),$(LDAP_SOLIB_NAMES)))
+endif # BUILD_PATCH
endif # USE_64
ifdef VSFTPD_HACK
@@ -168,7 +174,12 @@
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(SHARED32_BUILD_DIR) -componentdir $(NSS32_IMPORT) \
-files $(subst $(SPACE),$(COMMA),$(NSS32_PULLFILES))
- mv $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
+ifdef BUILD_PATCH
+ $(FTP_PULL) -method $(LDAPSDK_PULL_METHOD) \
+ -objdir $(SHARED32_BUILD_DIR) -componentdir $(LDAPSDK32_IMPORT) \
+ -files $(subst $(SPACE),$(COMMA),$(LDAPSDK32_PULLFILES))
+endif
+ mv -f $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI_FILE) $(SHARED32_BUILD_DIR)/lib/$(NSSCKBI32_FILE)
endif # USE_64
endif # COMPONENT_DEPS
-@if [ ! -f $@ ] ; \
18 years, 1 month
[Fedora-directory-commits] mod_nss configure, 1.15, 1.16 configure.in, 1.11, 1.12 aclocal.m4, 1.9, 1.10 Makefile.in, 1.18, 1.19 Makefile.am, 1.11, 1.12
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13682
Modified Files:
configure configure.in aclocal.m4 Makefile.in Makefile.am
Log Message:
force checkin of autoconf files
18 years, 1 month
[Fedora-directory-commits] setuputil nsdefs.mk,1.6,1.7
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6220
Modified Files:
nsdefs.mk
Log Message:
replace nsperl with the system perl on non-Linux platforms
Index: nsdefs.mk
===================================================================
RCS file: /cvs/dirsec/setuputil/nsdefs.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nsdefs.mk 15 Feb 2006 22:51:00 -0000 1.6
+++ nsdefs.mk 2 Mar 2006 22:57:15 -0000 1.7
@@ -221,12 +221,7 @@
ZIP=$(ZIPDIR)/zip.exe
UNZIP = $(ZIPDIR)/unzip.exe -o
else
- ifeq ($(BUILD_ARCH), Linux)
- PERL=perl
- else
- NSPERL_RELDATE :=20020626
- PERL=/share/builds/sbstools/nsPerl/$(NSPERL_RELDATE)/$(NSOBJDIR_NAME_32)/nsperl
- endif
+ PERL=perl
ifeq ($(TMP_ARCH), SunOS)
NSOS_TEST1 := $(shell uname -m)
ifeq ($(NSOS_TEST1), i86pc)
18 years, 1 month