96fcb7ad46
Copy from home:coolo:branches:openSUSE:Factory/cyrus-sasl via accept of submit request 41203 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/41203 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=13
164 lines
6.2 KiB
Plaintext
164 lines
6.2 KiB
Plaintext
Index: cmulocal/cyrus.m4
|
|
===================================================================
|
|
--- cmulocal/cyrus.m4.orig 2010-06-07 08:12:01.970338718 +0200
|
|
+++ cmulocal/cyrus.m4 2010-06-07 08:12:05.411368488 +0200
|
|
@@ -37,7 +37,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
|
|
SAVE_LDFLAGS="${LDFLAGS}"
|
|
LDFLAGS="-R /usr/lib"
|
|
AC_TRY_LINK([],[],[andrew_runpath_switch="-R"], [
|
|
- LDFLAGS="-Wl,-rpath,/usr/lib"
|
|
+# LDFLAGS="-Wl,-rpath,/usr/lib"
|
|
AC_TRY_LINK([],[],[andrew_runpath_switch="-Wl,-rpath,"],
|
|
[andrew_runpath_switch="none"])
|
|
])
|
|
Index: Makefile.am
|
|
===================================================================
|
|
--- Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
|
|
+++ Makefile.am 2010-06-07 08:12:05.412348032 +0200
|
|
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
|
|
#
|
|
################################################################
|
|
|
|
+ACLOCAL_AMFLAGS="-I config"
|
|
if SASLAUTHD
|
|
SAD = saslauthd
|
|
else
|
|
Index: configure.in
|
|
===================================================================
|
|
--- configure.in.orig 2010-06-07 08:12:01.970338718 +0200
|
|
+++ configure.in 2010-06-07 08:12:05.412348032 +0200
|
|
@@ -52,6 +52,7 @@ AC_CACHE_LOAD
|
|
fi
|
|
|
|
AC_CONFIG_AUX_DIR(config)
|
|
+AC_CONFIG_MACRO_DIR([config])
|
|
AC_CANONICAL_HOST
|
|
AC_CANONICAL_TARGET
|
|
|
|
Index: plugins/Makefile.am
|
|
===================================================================
|
|
--- plugins/Makefile.am.orig 2010-06-07 08:12:01.970338718 +0200
|
|
+++ plugins/Makefile.am 2010-06-07 08:12:05.413338170 +0200
|
|
@@ -46,23 +46,10 @@
|
|
|
|
# Library version info - here at the top, for sanity
|
|
# CURRENT:REVISION:AGE
|
|
-anonymous_version = 2:23:0
|
|
-digestmd5_version = 2:23:0
|
|
-kerberos4_version = 2:23:0
|
|
-gssapiv2_version = 2:23:0
|
|
-crammd5_version = 2:23:0
|
|
-passdss_version = 2:23:0
|
|
-sasldb_version = 2:23:0
|
|
-login_version = 2:23:0
|
|
-plain_version = 2:23:0
|
|
-ntlm_version = 2:23:0
|
|
-otp_version = 2:23:0
|
|
-sql_version = 2:23:0
|
|
-ldapdb_version = 2:23:0
|
|
-srp_version = 2:23:0
|
|
+plugin_version = 2:23: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) -version-info $(plugin_version)
|
|
|
|
COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
|
|
|
|
@@ -82,73 +69,61 @@ EXTRA_LTLIBRARIES = libplain.la libanony
|
|
libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
|
|
|
|
libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
|
|
-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_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_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_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_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_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_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_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_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_DEPENDENCIES = $(COMPAT_OBJS)
|
|
libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
|
|
|
|
libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
|
|
-libpassdss_la_LDFLAGS = -version-info $(passdss_version)
|
|
libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
|
|
libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
|
|
|
|
# Auxprop Plugins
|
|
libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
|
|
-libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
|
|
libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
|
|
libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
|
|
|
|
libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
|
|
-libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
|
|
+libldapdb_la_LDFLAGS = $(LIB_LDAP) $(AM_LDFLAGS)
|
|
libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
|
|
libldapdb_la_LIBADD = $(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) $(AM_LDFLAGS)
|
|
libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
|
|
libsql_la_LIBADD = $(COMPAT_OBJS)
|
|
|
|
Index: sasldb/Makefile.am
|
|
===================================================================
|
|
--- sasldb/Makefile.am.orig 2010-06-07 08:12:02.020337539 +0200
|
|
+++ sasldb/Makefile.am 2010-06-07 08:12:47.433338361 +0200
|
|
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
|
|
|
|
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
|
|
|
|
+AM_CFLAGS = "-fPIC"
|
|
EXTRA_DIST = NTMakefile
|
|
|
|
noinst_LTLIBRARIES = libsasldb.la
|
|
@@ -66,3 +67,7 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
|
|
$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
|
|
|
|
|
|
+# avoid these two files created at the same time, they use both the same
|
|
+# dep file
|
|
+db_berkeley.lo: db_berkeley.o
|
|
+
|