packages: cyrus-sasl/cyrus-sasl.spec, cyrus-sasl/cyrus-sasl-ac-libs.patch (...

[baggins]

Author: baggins                      Date: Wed Aug  3 08:39:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reverted last change
- fixed configure picking -L/usr/lib on x8664

---- Files affected:
packages/cyrus-sasl:
   cyrus-sasl.spec (1.201 -> 1.202) , cyrus-sasl-ac-libs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.201 packages/cyrus-sasl/cyrus-sasl.spec:1.202
--- packages/cyrus-sasl/cyrus-sasl.spec:1.201	Wed Aug  3 08:32:05 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec	Wed Aug  3 10:39:41 2011
@@ -51,7 +51,8 @@
 Patch12:	%{name}-nagios-plugin.patch
 Patch13:	%{name}-parallel-make.patch
 Patch14:	%{name}-gssapi-detect.patch
-Patch15:		%{name}-saslauthd-httpform-urlescape.patch
+Patch15:	%{name}-saslauthd-httpform-urlescape.patch
+Patch16:	%{name}-ac-libs.patch
 URL:		http://asg.web.cmu.edu/sasl/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
@@ -476,6 +477,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p0
+%patch16 -p1
 
 cd doc
 echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance
@@ -526,14 +528,15 @@
 	--with-dblib=berkeley \
 	--with-dbpath=/var/lib/sasl2/sasl.db \
 	%{?with_authlib:--with-authdaemond=/var/spool/authdaemon/socket} \
-	%{?with_ldap: --with-ldap} \
-	%{?with_mysql: --with-mysql} \
-	%{?with_pgsql: --with-pgsql} \
-	%{?with_sqlite: --with-sqlite} \
-	%{?with_opie: --with-opie} \
+	%{?with_ldap: --with-ldap=%{_prefix}} \
+	%{?with_mysql: --with-mysql=%{_prefix}} \
+	%{?with_pgsql: --with-pgsql=%{_prefix}} \
+	%{?with_sqlite: --with-sqlite=%{_prefix}} \
+	%{?with_opie: --with-opie=%{_prefix}} \
 	--with-pam \
 	%{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
 	--with-saslauthd=/var/lib/sasl2
+
 %{__make}
 
 %{__make} -C saslauthd testsaslauthd
@@ -746,6 +749,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.202  2011/08/03 08:39:41  baggins
+- reverted last change
+- fixed configure picking -L/usr/lib on x8664
+
 Revision 1.201  2011/08/03 06:32:05  baggins
 - drop _prefix fro configure options
 

================================================================
Index: packages/cyrus-sasl/cyrus-sasl-ac-libs.patch
diff -u /dev/null packages/cyrus-sasl/cyrus-sasl-ac-libs.patch:1.1
--- /dev/null	Wed Aug  3 10:39:46 2011
+++ packages/cyrus-sasl/cyrus-sasl-ac-libs.patch	Wed Aug  3 10:39:41 2011
@@ -0,0 +1,71 @@
+--- cyrus-sasl-2.1.23/configure.in.orig	2011-08-03 10:26:16.234418985 +0200
++++ cyrus-sasl-2.1.23/configure.in	2011-08-03 10:37:21.689418838 +0200
+@@ -461,8 +461,7 @@
+ 		;;
+ 	*)
+ 		if test -d $with_opie; then
+-		  CPPFLAGS="${CPPFLAGS} -I${with_opie}/include -I${with_opie}/include/security"
+-		  LDFLAGS="${LDFLAGS} -L${with_opie}/lib"
++		  CPPFLAGS="${CPPFLAGS} rI${with_opie}/include/security"
+ 		else
+ 		  with_opie="no"
+ 		fi
+@@ -692,16 +691,6 @@
+     no) true;;
+     notfound) AC_WARN([MySQL Library not found]); true;;
+     *)
+-     if test -d ${with_mysql}/lib/mysql; then
+-	CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
+-     elif test -d ${with_mysql}/mysql/lib; then
+-	CMU_ADD_LIBPATH_TO(${with_mysql}/mysql/lib, LIB_MYSQL)
+-     elif test -d ${with_mysql}/lib; then
+-	CMU_ADD_LIBPATH_TO(${with_mysql}/lib, LIB_MYSQL)
+-     else
+-	CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
+-     fi
+-
+      SASL_MECHS="$SASL_MECHS libmysql.la"
+      SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
+      LIB_MYSQL_DIR=$LIB_MYSQL
+@@ -758,16 +747,6 @@
+     no) true;;
+     notfound) AC_WARN([PostgreSQL Library not found]); true;;
+     *)
+-     if test -d ${with_pgsql}/lib/pgsql; then
+-	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
+-     elif test -d ${with_pgsql}/pgsql/lib; then
+-	CMU_ADD_LIBPATH_TO(${with_pgsql}/pgsql/lib, LIB_PGSQL)
+-     elif test -d ${with_pgsql}/lib; then
+-	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib, LIB_PGSQL)
+-     else
+-	CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
+-     fi
+-
+      SASL_MECHS="$SASL_MECHS libpgsql.la"
+      SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
+      LIB_PGSQL_DIR=$LIB_PGSQL
+@@ -825,12 +804,6 @@
+     no) true;;
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+-     if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
+-     else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
+-     fi
+-
+      SASL_MECHS="$SASL_MECHS libsqlite.la"
+      SASL_STATIC_OBJS="$SASL_STATIC_OBJS"
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -872,11 +845,6 @@
+     save_CPPFLAGS=$CPPFLAGS
+     save_LDFLAGS=$LDFLAGS
+ 
+-    if test -d $with_ldap; then
+-        CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
+-        CMU_ADD_LIBPATH(${with_ldap}/lib)
+-    fi
+-
+     AC_CHECK_HEADERS(ldap.h lber.h)
+ 
+     if test $ac_cv_header_ldap_h = yes -a $ac_cv_header_lber_h = yes; then
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.201&r2=1.202&f=u