SF.net SVN: gar:[23211] csw/mgar/pkg/389-ds-base/branches/vers1.3.2

[cgrzemba at users.sourceforge.net]

Revision: 23211
          http://sourceforge.net/p/gar/code/23211
Author:   cgrzemba
Date:     2014-03-14 09:52:23 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
389-ds-base/branches/vers1.3.2: fix big endian problem, debbugging still enabled

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0017-disable-asm-for-Sparc.patch
    csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0018-correct-64bit-ptr-bind.c

Modified: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile	2014-03-14 01:58:02 UTC (rev 23210)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile	2014-03-14 09:52:23 UTC (rev 23211)
@@ -24,7 +24,8 @@
 
 LICENSE = LICENSE
 
-GARCOMPILER = GCC4
+GARCOMPILER = SOS12U3
+# GARCOMPILER = GCC4
 
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
@@ -46,8 +47,12 @@
 PATCHFILES += 0014-ldap-include-Makefile.am.patch
 # needed at least on GCC4
 PATCHFILES += 0015-use-PL_strcasestr-acllas.c.patch
-PATCHFILES += 0010-no-Crun-Cstd-lib-config.ac.patch
+PATCHFILES_GCC4 += 0010-no-Crun-Cstd-lib-config.ac.patch
 PATCHFILES += 0016-fix-bigendian-utf8compare.c
+PATCHFILES += 0017-disable-asm-for-Sparc.patch
+# probably only with openLDAP 
+PATCHFILES += 0018-correct-64bit-ptr-bind.c
+PATCHFILES += $(PATCHFILES_$(GARCOMPILER))
 
 
 BUILD_DEP_PKGS += CSWautoconf
@@ -107,11 +112,14 @@
 
 
 EXTRA_LIB = /opt/csw/bdb48/lib
-# remove -I/opt/csw/include
+# if use MozillaLDAP remove -I/opt/csw/include because there are OpenLDAP header
 # CPPFLAGS = 
-# EXTRA_CFLAGS = -xnorunpath
-# EXTRA_CXXFLAGS = -norunpath
-EXTRA_CPPFLAGS = -DSOLARIS_GCC
+EXTRA_CFLAGS_SOS12U3 = -xnorunpath
+EXTRA_CXXFLAGS_SOS12U3 = -norunpath
+EXTRA_CPPFLAGS_GCC4 = -DSOLARIS_GCC
+EXTRA_CPPFLAGS += $(EXTRA_CPPFLAGS_$(GARCOMPILER))
+EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS_$(GARCOMPILER))
+EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCOMPILER))
 STRIP_LIBTOOL = 1
 
 GARFLAVOR = DBG

Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0017-disable-asm-for-Sparc.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0017-disable-asm-for-Sparc.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0017-disable-asm-for-Sparc.patch	2014-03-14 09:52:23 UTC (rev 23211)
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -583,7 +583,6 @@ dnl I dont know why i386 need this explicit
+         ;;
+       sparc-*-solaris*)
+ dnl includes some assembler stuff in counter.o
+-        AC_DEFINE([ATOMIC_64BIT_OPERATIONS], [1], [enabling atomic counter])
+         AC_DEFINE([CPU_sparc], [], [cpu type sparc])
+         TARGET='SPARC'
+         ;;

Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0018-correct-64bit-ptr-bind.c
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0018-correct-64bit-ptr-bind.c	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0018-correct-64bit-ptr-bind.c	2014-03-14 09:52:23 UTC (rev 23211)
@@ -0,0 +1,30 @@
+--- a/ldap/servers/slapd/bind.c
++++ b/ldap/servers/slapd/bind.c
+@@ -119,7 +119,8 @@ do_bind( Slapi_PBlock *pb )
+ {
+     BerElement	*ber = pb->pb_op->o_ber;
+     int		err, isroot;
+-    ber_tag_t 	method = LBER_DEFAULT;
++    ber_tag_t 	ber_method = LBER_DEFAULT;
++    int 	method = 0;
+     ber_int_t	version = -1;
+     int		auth_response_requested = 0;
+     int		pw_response_requested = 0;
+@@ -162,7 +163,7 @@ do_bind( Slapi_PBlock *pb )
+      *	}
+      */
+ 
+-    ber_rc = ber_scanf( ber, "{iat", &version, &rawdn, &method );
++    ber_rc = ber_scanf( ber, "{iat", &version, &rawdn, &ber_method );
+     if ( ber_rc == LBER_ERROR ) {
+         LDAPDebug( LDAP_DEBUG_ANY,
+                    "ber_scanf failed (op=Bind; params=Version,DN,Method)\n",
+@@ -173,6 +174,8 @@ do_bind( Slapi_PBlock *pb )
+         slapi_ch_free_string(&rawdn);
+         return;
+     }
++    /* (int) = (long) */
++    method = (int)(ber_method & 0xffff);
+     /* Check if we should be performing strict validation. */
+     if (rawdn && config_get_dn_validate_strict()) { 
+         /* check that the dn is formatted correctly */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.