rpms/cyrus-sasl/F-13 cyrus-sasl-2.1.23-ac-quote.patch, NONE, 1.1 cyrus-sasl.spec, 1.87, 1.88

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/cyrus-sasl/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8161

Modified Files:
	cyrus-sasl.spec 
Added Files:
	cyrus-sasl-2.1.23-ac-quote.patch 
Log Message:
improve m4 quoting to fix saslauthd/configure

cyrus-sasl-2.1.23-ac-quote.patch:
 bsd_sockets.m4 |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE cyrus-sasl-2.1.23-ac-quote.patch ---
2010-02-17  Stepan Kasal  <skasal at redhat.com>

	* cmulocal/bsd_sockets.m4: better quoting of macro params

--- cyrus-sasl-2.1.23/cmulocal/bsd_sockets.m4	2005-04-26 21:14:07.000000000 +0200
+++ cyrus-sasl-2.1.23/cmulocal/bsd_sockets.m4	2010-02-17 15:03:34.000000000 +0100
@@ -10,14 +10,14 @@
 	save_LIBS="$LIBS"
 	LIB_SOCKET=""
 	AC_CHECK_FUNC(connect, :,
-		AC_CHECK_LIB(nsl, gethostbyname,
+		[AC_CHECK_LIB(nsl, gethostbyname,
 			     LIB_SOCKET="-lnsl $LIB_SOCKET")
 		AC_CHECK_LIB(socket, connect,
-			     LIB_SOCKET="-lsocket $LIB_SOCKET")
+			     LIB_SOCKET="-lsocket $LIB_SOCKET")]
 	)
 	LIBS="$LIB_SOCKET $save_LIBS"
 	AC_CHECK_FUNC(res_search, :,
-		LIBS="-lresolv $LIB_SOCKET $save_LIBS"
+		[LIBS="-lresolv $LIB_SOCKET $save_LIBS"
 		AC_TRY_LINK([[
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -31,7 +31,7 @@
 res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
 return 0;
 ]], LIB_SOCKET="-lresolv $LIB_SOCKET")
-        )
+        ])
 	LIBS="$LIB_SOCKET $save_LIBS"
 	AC_CHECK_FUNCS(dn_expand dns_lookup)
 	LIBS="$save_LIBS"


Index: cyrus-sasl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-sasl/F-13/cyrus-sasl.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- cyrus-sasl.spec	5 Feb 2010 10:09:52 -0000	1.87
+++ cyrus-sasl.spec	17 Feb 2010 15:55:30 -0000	1.88
@@ -9,7 +9,7 @@
 Summary: The Cyrus SASL library
 Name: cyrus-sasl
 Version: 2.1.23
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: BSD
 Group: System Environment/Libraries
 # Source0 originally comes from ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/;
@@ -37,6 +37,7 @@ Patch32: cyrus-sasl-2.1.22-warnings.patc
 Patch33: cyrus-sasl-2.1.22-current-db.patch
 Patch34: cyrus-sasl-2.1.22-ldap-timeout.patch
 Patch35: cyrus-sasl-2.1.22-bad-elif.patch
+Patch36: cyrus-sasl-2.1.23-ac-quote.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -155,7 +156,9 @@ chmod -x include/*.h
 %patch33 -p1 -b .current-db
 %patch34 -p1 -b .ldap-timeout
 %patch35 -p1 -b .elif
+%patch36 -p1 -b .ac-quote
 
+%build
 # FIXME - we remove these files directly so that we can avoid using the -f
 # flag, which has a nasty habit of overwriting files like COPYING.
 rm -f config/config.guess config/config.sub 
@@ -178,7 +181,6 @@ autoheader
 autoconf
 popd
 
-%build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
 
 # Find Kerberos.
@@ -391,6 +393,10 @@ fi
 %{_sbindir}/sasl2-shared-mechlist
 
 %changelog
+* Wed Feb 17 2010 Stepan Kasal <skasal at redhat.com> - 2.1.23-8
+- improve m4 quoting to fix saslauthd/configure (#566088)
+- call autotools in build, not in prep
+
 * Fri Feb  5 2010 Jan F. Chadima <jchadima at redhat.com> - 2.1.23-7
 - Add man page to testtcpauthd (#526189)