fix cyrus-sasl 2.1.19 build

3 files changed, 148 insertions, 0 deletions

diff --git a/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/cyrus-sasl-2.1.23-db5-fix.patch b/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/cyrus-sasl-2.1.23-db5-fix.patch
new file mode 100644
index 0000000..fa25896
--- /dev/null
+++ b/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/cyrus-sasl-2.1.23-db5-fix.patch
@@ -0,0 +1,23 @@
+--- a/sasldb/db_berkeley.c.orig	2010-10-04 21:11:15.044010468 -0400
++++ a/sasldb/db_berkeley.c	2010-10-04 21:12:18.921998718 -0400
+@@ -100,7 +100,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 4
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+
+--- a/utils/dbconverter-2.c.orig	2010-10-04 21:23:39.778000256 -0400
++++ a/utils/dbconverter-2.c	2010-10-04 21:24:50.384999893 -0400
+@@ -214,7 +214,7 @@
+     ret = db_create(mbdb, NULL, 0);
+     if (ret == 0 && *mbdb != NULL)
+     {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR > 4
+ 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/plugin.patch b/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/plugin.patch
new file mode 100644
index 0000000..c9fa4d5
--- /dev/null
+++ b/multitech/recipes/cyrus-sasl/cyrus-sasl-2.1.19/plugin.patch
@@ -0,0 +1,117 @@
+diff -uprN cyrus-sasl-2.1.19.org/plugins/Makefile.am cyrus-sasl-2.1.19/plugins/Makefile.am
+--- cyrus-sasl-2.1.19.org/plugins/Makefile.am	2004-07-02 14:39:39.000000000 -0500
++++ cyrus-sasl-2.1.19/plugins/Makefile.am	2010-12-06 13:05:58.000000000 -0600
+@@ -46,21 +46,23 @@
+ 
+ # Library version info - here at the top, for sanity
+ # CURRENT:REVISION:AGE
+-anonymous_version = 2:19:0
+-digestmd5_version = 2:19:0
+-kerberos4_version = 2:19:0
+-gssapiv2_version = 2:19:0
+-crammd5_version = 2:19:0
+-sasldb_version = 2:19:0
+-login_version = 2:19:0
+-plain_version = 2:19:0
+-ntlm_version = 2:19:0
+-otp_version = 2:19:0
+-sql_version = 2:19:0
+-srp_version = 2:19:0
++#anonymous_version = 2:19:0
++#digestmd5_version = 2:19:0
++#kerberos4_version = 2:19:0
++#gssapiv2_version = 2:19:0
++#crammd5_version = 2:19:0
++#sasldb_version = 2:19:0
++#login_version = 2:19:0
++#plain_version = 2:19:0
++#ntlm_version = 2:19:0
++#otp_version = 2:19:0
++#sql_version = 2:19:0
++#srp_version = 2:19:0
++plugin_version = 2:19:0
+ 
+ INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
+-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
++#AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
++AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
+ 
+ COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
+ 
+@@ -80,63 +82,64 @@ EXTRA_LTLIBRARIES = libplain.la libanony
+ 	libntlm.la libsasldb.la libsql.la
+ 
+ libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
+-libplain_la_LDFLAGS = -version-info $(plain_version)
++#libplain_la_LDFLAGS = -version-info $(plain_version)
+ libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
+-libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
++#libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
+ libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libanonymous_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
+-libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
++#libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
+ libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
+-libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
++#libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
+ libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
+-libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
++#libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
+ libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libcrammd5_la_LIBADD = $(COMPAT_OBJS)
+ 
+ libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
+-libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
++#libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
+ libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
+ 
+ liblogin_la_SOURCES = login.c login_init.c $(common_sources)
+-liblogin_la_LDFLAGS = -version-info $(login_version)
++#liblogin_la_LDFLAGS = -version-info $(login_version)
+ liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
+ liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
+ 
+ libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
+-libsrp_la_LDFLAGS = -version-info $(srp_version)
++#libsrp_la_LDFLAGS = -version-info $(srp_version)
+ libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
+ 
+ libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
+-libotp_la_LDFLAGS = -version-info $(otp_version)
++#libotp_la_LDFLAGS = -version-info $(otp_version)
+ libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
+ 
+ libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
+-libntlm_la_LDFLAGS = -version-info $(ntlm_version)
++#libntlm_la_LDFLAGS = -version-info $(ntlm_version)
+ libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
+ 
+ # Auxprop Plugins
+ libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
+-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
++#libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
+ libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
+ 
+ libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
+-libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++#libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
++libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(AM_LDFLAGS)
+ libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
+ libsql_la_LIBADD = $(COMPAT_OBJS)
+ 
diff --git a/multitech/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bbappend b/multitech/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bbappend
new file mode 100644
index 0000000..8b4ad6d
--- /dev/null
+++ b/multitech/recipes/cyrus-sasl/cyrus-sasl_2.1.19.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRA := "${THISDIR}"
+FILESPATHBASE =. "${FILESEXTRA}:"
+
+PR .= ".corecdp1"
+
+# add plugin patch and db5 fix
+SRC_URI_append = " file://plugin.patch \
+				  file://cyrus-sasl-2.1.23-db5-fix.patch"