rpms/cyrus-sasl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- improve m4 quoting to fix saslauthd/configure

Browse Source 
- call autotools in build, not in prep
This commit is contained in:
Štěpán Kasal 2010-02-17 14:41:35 +00:00
parent 48b481cae8
commit a6feee0f50
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cyrus-sasl-ac-quote.patch Normal file
View File

@ -0,0 +1,33 @@
2010-02-17 Stepan Kasal <skasal@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"

10
cyrus-sasl.spec
View File

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