Author: qboosh Date: Fri Aug 12 17:16:56 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- changed ac patch to fix the real source of saslauthd breakage (underquoted
AC_CHECK_LIB calls in bsd_sockets.m4); reverted two-stage configure
---- Files affected:
packages/cyrus-sasl:
cyrus-sasl-ac.patch (1.1 -> 1.2) , cyrus-sasl.spec (1.205 -> 1.206)
---- Diffs:
================================================================
Index: packages/cyrus-sasl/cyrus-sasl-ac.patch
diff -u packages/cyrus-sasl/cyrus-sasl-ac.patch:1.1
packages/cyrus-sasl/cyrus-sasl-ac.patch:1.2
--- packages/cyrus-sasl/cyrus-sasl-ac.patch:1.1 Wed Aug 3 15:05:23 2011
+++ packages/cyrus-sasl/cyrus-sasl-ac.patch Fri Aug 12 19:16:51 2011
@@ -1,33 +1,29 @@
---- cyrus-sasl-2.1.23/saslauthd/configure.in~ 2011-08-03 14:54:14.954702810
+0200
-+++ cyrus-sasl-2.1.23/saslauthd/configure.in 2011-08-03 14:57:07.471702768
+0200
-@@ -3,6 +3,9 @@
-
- AC_CONFIG_AUX_DIR(config)
- AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET
-+AM_INIT_AUTOMAKE(saslauthd,2.1.23)
-+CMU_INIT_AUTOMAKE
-
- dnl Should we enable SASLAUTHd at all?
- AC_ARG_WITH(saslauthd, [ --with-saslauthd=DIR enable use of the saslauth
daemon using state dir DIR ],
-@@ -15,9 +18,6 @@
- AC_DEFINE_UNQUOTED(PATH_SASLAUTHD_RUNDIR, "$with_saslauthd",[Location of
saslauthd socket])
- AM_CONDITIONAL(SASLAUTHD, test "$with_saslauthd" != no)
-
--AM_INIT_AUTOMAKE(saslauthd,2.1.23)
--CMU_INIT_AUTOMAKE
--
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
---- cyrus-sasl-2.1.23/configure.in~ 2011-08-03 14:57:55.858702760 +0200
-+++ cyrus-sasl-2.1.23/configure.in 2011-08-03 14:58:57.027702746 +0200
-@@ -1076,8 +1076,6 @@
-
- AC_SUBST(DIRS)
-
--AC_CONFIG_SUBDIRS(saslauthd)
--
- AH_TOP([
- /* acconfig.h - autoheader configuration input */
- /*
+--- cyrus-sasl-2.1.23/cmulocal/bsd_sockets.m4.orig 2011-08-06
20:20:49.396403059 +0200
++++ cyrus-sasl-2.1.23/cmulocal/bsd_sockets.m4 2011-08-12 19:07:57.869787230
+0200
+@@ -9,14 +9,14 @@
+ AC_DEFUN([CMU_SOCKETS], [
+ save_LIBS="$LIBS"
+ LIB_SOCKET=""
+- AC_CHECK_FUNC(connect, :,
++ AC_CHECK_FUNC(connect, :,[
+ 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, :,
++ AC_CHECK_FUNC(res_search, :,[
+ LIBS="-lresolv $LIB_SOCKET $save_LIBS"
+ AC_TRY_LINK([[
+ #include <sys/types.h>
+@@ -31,7 +31,7 @@
+ res_search( host, C_IN, T_MX, (u_char *)&ans, sizeof(ans));
+ return 0;
+ ]], LIB_SOCKET="$LIB_SOCKET") dnl res_* funcs aren't used anyway
+- )
++ ])
+ LIBS="$LIB_SOCKET $save_LIBS"
+ AC_CHECK_FUNCS(dn_expand dns_lookup)
+ LIBS="$save_LIBS"
================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.205
packages/cyrus-sasl/cyrus-sasl.spec:1.206
--- packages/cyrus-sasl/cyrus-sasl.spec:1.205 Wed Aug 3 15:06:46 2011
+++ packages/cyrus-sasl/cyrus-sasl.spec Fri Aug 12 19:16:51 2011
@@ -507,7 +507,12 @@
%{__autoheader}
%{__autoconf}
%{__automake}
-
+cd saslauthd
+%{__aclocal} -I ../cmulocal -I ../config
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+cd ..
%configure \
%{?with_cryptedpw: LDFLAGS=-lcrypt} \
--disable-krb4 \
@@ -533,29 +538,6 @@
%{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
--with-saslauthd=/var/lib/sasl2
-cd saslauthd
-%{__aclocal} -I ../cmulocal -I ../config
-%{__autoheader}
-%{__autoconf}
-%{__automake}
-
-%configure \
- %{?with_cryptedpw: LDFLAGS=-lcrypt} \
- --disable-krb4 \
- %{!?with_gssapi: --disable-gssapi} \
- %{?with_gssapi: --enable-gssapi --with-gss_impl=heimdal} \
- --enable-httpform \
- %{?with_srp: --enable-srp} \
- --with-dblib=berkeley \
- --with-dbpath=/var/lib/sasl2/sasl.db \
- %{?with_authlib:--with-authdaemond=/var/spool/authdaemon/socket} \
- %{?with_ldap: --with-ldap=%{_prefix}} \
- %{?with_opie: --with-opie=%{_prefix}} \
- --with-pam \
- %{?with_pwcheck: --with-pwcheck=/var/lib/sasl2} \
- --with-saslauthd=/var/lib/sasl2
-cd ..
-
%{__make}
%{__make} -C saslauthd testsaslauthd
@@ -578,8 +560,7 @@
sasldir=%{_libdir}/sasl2 \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
-rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
cp -a utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
cp -a saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
@@ -768,6 +749,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.206 2011/08/12 17:16:51 qboosh
+- changed ac patch to fix the real source of saslauthd breakage (underquoted
AC_CHECK_LIB calls in bsd_sockets.m4); reverted two-stage configure
+
Revision 1.205 2011/08/03 13:06:46 baggins
- rel 15
- fix pam detection and other fuckups caused by latest autocrap,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl-ac.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.205&r2=1.206&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
