[csw-devel] SF.net SVN: gar:[17727] csw/mgar/pkg/sasl/trunk

[dmichelsen at users.sourceforge.net]

Revision: 17727
          http://gar.svn.sourceforge.net/gar/?rev=17727&view=rev
Author:   dmichelsen
Date:     2012-04-17 18:40:51 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
sasl/trunk: Add patch to avoid coredump on kerberos binds and rework dependencies

Modified Paths:
--------------
    csw/mgar/pkg/sasl/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/sasl/trunk/files/check-realloc.patch

Modified: csw/mgar/pkg/sasl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sasl/trunk/Makefile	2012-04-17 16:44:36 UTC (rev 17726)
+++ csw/mgar/pkg/sasl/trunk/Makefile	2012-04-17 18:40:51 UTC (rev 17727)
@@ -37,19 +37,24 @@
 # patch libtool discards -R options passed with LDFLAGS
 PATCHFILES += ltmain.diff
 
+# Use patch until it is fixed upstream:
+#   http://www.spinics.net/lists/cyrus-sasl/msg02004.html
+PATCHFILES += check-realloc.patch
+
 VENDOR_URL = http://asg.web.cmu.edu/sasl/
 
 PACKAGES += CSWsasl
 SPKG_DESC_CSWsasl = Cyrus Simple Authentication and Security Layer
-RUNTIME_DEP_PKGS_CSWsasl = CSWosslrt
+RUNTIME_DEP_PKGS_CSWsasl += CSWlibssl0-9-8
 RUNTIME_DEP_PKGS_CSWsasl += CSWbdb48
 RUNTIME_DEP_PKGS_CSWsasl += CSWlibsasl2-2
 
 PACKAGES += CSWsaslauthd
 SPKG_DESC_CSWsaslauthd = Cyrus Simple Authentication and Security Layer Authentication Daemon
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWsasl
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWosslrt
-RUNTIME_DEP_PKGS_CSWsaslauthd += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibcom-err3
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibkrb5-3
 RUNTIME_DEP_PKGS_CSWsaslauthd += CSWlibk5crypto3

Added: csw/mgar/pkg/sasl/trunk/files/check-realloc.patch
===================================================================
--- csw/mgar/pkg/sasl/trunk/files/check-realloc.patch	                        (rev 0)
+++ csw/mgar/pkg/sasl/trunk/files/check-realloc.patch	2012-04-17 18:40:51 UTC (rev 17727)
@@ -0,0 +1,21 @@
+--- cyrus-sasl-2.1.25-orig/plugins/gssapi.c	2011-10-07 03:11:43.000000000 +0000
++++ cyrus-sasl-2.1.25/plugins/gssapi.c	2011-10-07 03:12:12.000000000 +0000
+@@ -370,7 +370,7 @@ sasl_gss_encode(void *context, const str
+     }
+     
+     if (output_token->value && output) {
+-	unsigned char * p = (unsigned char *) text->encode_buf;
++	unsigned char * p;
+ 	
+ 	ret = _plug_buf_alloc(text->utils,
+ 			      &(text->encode_buf),
+@@ -383,6 +383,8 @@ sasl_gss_encode(void *context, const str
+ 	    GSS_UNLOCK_MUTEX(text->utils);
+ 	    return ret;
+ 	}
++
++	p = (unsigned char *) text->encode_buf;
+ 	
+ 	p[0] = (output_token->length>>24) & 0xFF;
+ 	p[1] = (output_token->length>>16) & 0xFF;
+

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