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

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Fri Mar 7 15:35:08 CET 2014


Revision: 23152
          http://sourceforge.net/p/gar/code/23152
Author:   cgrzemba
Date:     2014-03-07 14:35:06 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
389-ds-base/branches/vers1.3.2: use gcc and make some fixes

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/0010-no-Crun-Cstd-lib-config.ac.patch
    csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0015-use-PL_strcasestr-acllas.c.patch

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-07 14:26:26 UTC (rev 23151)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/Makefile	2014-03-07 14:35:06 UTC (rev 23152)
@@ -23,7 +23,7 @@
 
 LICENSE = LICENSE
 
-GARCOMPILER = SOS12U3
+GARCOMPILER = GCC4
 
 PATCHFILES += 0005-add-standard-path.patch
 PATCHFILES += 0006-replace-SV-sh-with-Posix-sh.patch
@@ -43,6 +43,9 @@
 # PATCHFILES += 0012-fix-for-47327.patch
 PATCHFILES += 0013-use-posix-threads-configure.ac.patch
 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
 
 
 BUILD_DEP_PKGS += CSWautoconf
@@ -51,7 +54,7 @@
 BUILD_DEP_PKGS += CSWnspr-dev
 BUILD_DEP_PKGS += CSWlibnss-dev
 BUILD_DEP_PKGS += CSWnetsnmp-dev
-BUILD_DEP_PKGS += CSWmozldap-tools
+BUILD_DEP_PKGS += CSWopenldap-dev
 BUILD_DEP_PKGS += CSWsasl-dev
 BUILD_DEP_PKGS += CSWlibicu-dev
 BUILD_DEP_PKGS += CSWlibsvrcore0-dev
@@ -103,8 +106,11 @@
 
 EXTRA_LIB = /opt/csw/bdb48/lib
 # remove -I/opt/csw/include
-CPPFLAGS = 
-EXTRA_LINKER_FLAGS = -xnorunpath -norunpath
+# CPPFLAGS = 
+# EXTRA_CFLAGS = -xnorunpath
+# EXTRA_CXXFLAGS = -norunpath
+EXTRA_CPPFLAGS = -DSOLARIS_GCC
+STRIP_LIBTOOL = 1
 
 GARFLAVOR = DBG
 

Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0010-no-Crun-Cstd-lib-config.ac.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0010-no-Crun-Cstd-lib-config.ac.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0010-no-Crun-Cstd-lib-config.ac.patch	2014-03-07 14:35:06 UTC (rev 23152)
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -570,9 +570,9 @@ dnl socket nsl and dl are required to link several programs and libdb
+     LIBDL=-ldl
+     AC_SUBST([LIBDL], [$LIBDL])
+ dnl Cstd and Crun are required to link any C++ related code
+-    LIBCSTD=-lCstd
++    LIBCSTD=
+     AC_SUBST([LIBCSTD], [$LIBCSTD])
+-    LIBCRUN=-lCrun
++    LIBCRUN=
+     AC_SUBST([LIBCRUN], [$LIBCRUN])
+     platform="solaris"
+     initdir='$(sysconfdir)/init.d'

Added: csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0015-use-PL_strcasestr-acllas.c.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0015-use-PL_strcasestr-acllas.c.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/branches/vers1.3.2/files/0015-use-PL_strcasestr-acllas.c.patch	2014-03-07 14:35:06 UTC (rev 23152)
@@ -0,0 +1,138 @@
+--- a/ldap/servers/plugins/acl/acllas.c
++++ b/ldap/servers/plugins/acl/acllas.c
+@@ -584,9 +584,9 @@ DS_LASUserDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator,
+ 		} else {
+ 			/* URL format */
+ 			
+-			if ((strcasestr (user, ACL_RULE_MACRO_DN_KEY) != NULL) ||
+-				(strcasestr (user, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
+-				(strcasestr (user, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
++			if ((PL_strcasestr (user, ACL_RULE_MACRO_DN_KEY) != NULL) ||
++				(PL_strcasestr (user, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
++				(PL_strcasestr (user, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
+ 				
+ 				matched = aclutil_evaluate_macro( s_user, &lasinfo,
+ 													ACL_EVAL_USER);
+@@ -856,9 +856,9 @@ DS_LASGroupDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator,
+ 					"Group not evaluated(%s)\n", groupName);
+ 			break;
+ 		} else {			
+-			if ((strcasestr (groupName, ACL_RULE_MACRO_DN_KEY) != NULL) ||
+-				(strcasestr (groupName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
+-				(strcasestr (groupName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
++			if ((PL_strcasestr (groupName, ACL_RULE_MACRO_DN_KEY) != NULL) ||
++				(PL_strcasestr (groupName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
++				(PL_strcasestr (groupName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
+ 				matched = aclutil_evaluate_macro( groupName, &lasinfo,
+ 													ACL_EVAL_GROUP);
+ 				slapi_log_error ( SLAPI_LOG_ACL, plugin_name,
+@@ -1075,9 +1075,9 @@ DS_LASRoleDnEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator,
+ 		} else {
+ 
+ 			/* Take care of param strings */
+-			if ((strcasestr (role, ACL_RULE_MACRO_DN_KEY) != NULL) ||
+-				(strcasestr (role, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
+-				(strcasestr (role, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
++			if ((PL_strcasestr (role, ACL_RULE_MACRO_DN_KEY) != NULL) ||
++				(PL_strcasestr (role, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
++				(PL_strcasestr (role, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
+ 				
+ 				matched = aclutil_evaluate_macro( role, &lasinfo,
+ 													ACL_EVAL_ROLE);
+@@ -2630,9 +2630,9 @@ DS_LASGroupDnAttrEval(NSErr_t *errp, char *attr_name, CmpOp_t comparator,
+ 
+ 		/* In this case "grppupdnattr="ldap:///base??attr" */
+ 
+-		if ((strcasestr (attrName, ACL_RULE_MACRO_DN_KEY) != NULL) ||
+-			(strcasestr (attrName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
+-			(strcasestr (attrName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
++		if ((PL_strcasestr (attrName, ACL_RULE_MACRO_DN_KEY) != NULL) ||
++			(PL_strcasestr (attrName, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) ||
++			(PL_strcasestr (attrName, ACL_RULE_MACRO_ATTR_KEY) != NULL)) {			
+ 				
+ 				matched = aclutil_evaluate_macro( attrName, &lasinfo,
+ 													ACL_EVAL_GROUPDNATTR);
+@@ -4203,12 +4203,12 @@ acllas_replace_dn_macro( char *rule, char *matched_val, lasInfo *lasinfo) {
+ 	int has_macro_levels = 0;
+ 	
+ 	/* Determine what the rule's got once */
+-	if ( strcasestr(rule, ACL_RULE_MACRO_DN_KEY) != NULL) {
++	if ( PL_strcasestr(rule, ACL_RULE_MACRO_DN_KEY) != NULL) {
+ 		/* ($dn) exists */
+ 		has_macro_dn = 1;
+ 	}
+ 
+-	if ( strcasestr(rule, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) {
++	if ( PL_strcasestr(rule, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL) {
+ 		/* [$dn] exists */
+ 		has_macro_levels = 1;
+ 	}
+@@ -4312,7 +4312,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo)
+ 	int l;
+ 	Slapi_Attr *attr = NULL;
+ 	
+-	str = strcasestr(rule, ACL_RULE_MACRO_ATTR_KEY);
++	str = PL_strcasestr(rule, ACL_RULE_MACRO_ATTR_KEY);
+ 	if ( str == NULL ) {
+ 
+ 		charray_add(&a, slapi_ch_strdup(rule));
+@@ -4321,7 +4321,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo)
+ 	} else {
+ 	
+ 		working_rule = slapi_ch_strdup(rule);
+-		str = strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY);
++		str = PL_strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY);
+ 		charray_add(&working_list, working_rule );
+ 		
+ 		while( str != NULL) {
+@@ -4419,7 +4419,7 @@ acllas_replace_attr_macro( char *rule, lasInfo *lasinfo)
+ 			slapi_ch_free_string(&macro_str);
+ 			slapi_ch_free_string(&macro_attr_name);
+ 			
+-			str = strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY);
++			str = PL_strcasestr(working_rule, ACL_RULE_MACRO_ATTR_KEY);
+ 		
+         }/* while */
+ 		
+--- a/ldap/servers/plugins/acl/aclparse.c
++++ b/ldap/servers/plugins/acl/aclparse.c
+@@ -315,8 +315,8 @@ __aclp__parse_aci(char *str, aci_t  *aci_item, char **errbuf)
+ 			 * have a target and it must have a macro.
+ 			*/
+ 		
+-			if ((strcasestr(str, ACL_RULE_MACRO_DN_KEY) != NULL) ||
+-			    (strcasestr(str, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL)) {
++			if ((PL_strcasestr(str, ACL_RULE_MACRO_DN_KEY) != NULL) ||
++			    (PL_strcasestr(str, ACL_RULE_MACRO_DN_LEVELS_KEY) != NULL)) {
+ 			
+ 				/* Must have a targetmacro */
+ 				if ( !(aci_item->aci_type & ACI_TARGET_MACRO_DN)) {
+--- a/ldap/servers/plugins/acl/aclutil.c
++++ b/ldap/servers/plugins/acl/aclutil.c
+@@ -1247,7 +1247,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) {
+ 		char *working_s, *suffix, *prefix, *patched;
+ 		int replace_with_len, substr_len, prefix_len, suffix_len;
+ 
+-		if (strcasestr(s, substr) == NULL) {
++		if (PL_strcasestr(s, substr) == NULL) {
+ 			return(slapi_ch_strdup(s));
+ 		} else {
+ 
+@@ -1257,7 +1257,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) {
+ 		
+ 			working_s = slapi_ch_strdup(s);	
+ 			prefix = working_s;
+-			str = strcasestr(prefix, substr);
++			str = PL_strcasestr(prefix, substr);
+ 			
+ 			while (str != NULL) {
+ 				
+@@ -1284,7 +1284,7 @@ acl_replace_str(char * s, char *substr, char* replace_with_str) {
+ 
+ 				working_s = patched;
+ 				prefix = working_s;
+-				str = strcasestr(prefix, substr);		
++				str = PL_strcasestr(prefix, substr);		
+ 				
+ 			}
+ 

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



More information about the devel mailing list