Author: baggins Date: Wed Aug 3 13:06:52 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 15 - fix pam detection and other fuckups caused by latest autocrap, that produced unusable saslauthd (no pam, no ldap)
---- Files affected: packages/cyrus-sasl: cyrus-sasl.spec (1.204 -> 1.205) ---- Diffs: ================================================================ Index: packages/cyrus-sasl/cyrus-sasl.spec diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.204 packages/cyrus-sasl/cyrus-sasl.spec:1.205 --- packages/cyrus-sasl/cyrus-sasl.spec:1.204 Wed Aug 3 11:44:31 2011 +++ packages/cyrus-sasl/cyrus-sasl.spec Wed Aug 3 15:06:46 2011 @@ -26,7 +26,7 @@ Summary(uk.UTF-8): Бібліотека Cyrus SASL Name: cyrus-sasl Version: 2.1.23 -Release: 14 +Release: 15 License: distributable Group: Libraries Source0: ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{version}.tar.gz @@ -53,6 +53,8 @@ Patch14: %{name}-gssapi-detect.patch Patch15: %{name}-saslauthd-httpform-urlescape.patch Patch16: %{name}-ac-libs.patch +Patch17: %{name}-pam.patch +Patch18: %{name}-ac.patch URL: http://asg.web.cmu.edu/sasl/ BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.7 @@ -478,6 +480,8 @@ %patch14 -p1 %patch15 -p0 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 cd doc echo "cyrus-sasl complies with the following RFCs:" > rfc-compliance @@ -501,19 +505,10 @@ %{__libtoolize} %{__aclocal} -I cmulocal -I config %{__autoheader} -%{__automake} %{__autoconf} - -cd saslauthd -%{__libtoolize} -%{__aclocal} -I ../cmulocal -I ../config -I config -%{__autoheader} %{__automake} -%{__autoconf} -cd .. %configure \ - --with-lib-subdir=%{_lib} \ %{?with_cryptedpw: LDFLAGS=-lcrypt} \ --disable-krb4 \ %{!?with_gssapi: --disable-gssapi} \ @@ -538,6 +533,29 @@ %{?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 @@ -750,6 +768,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.205 2011/08/03 13:06:46 baggins +- rel 15 +- fix pam detection and other fuckups caused by latest autocrap, + that produced unusable saslauthd (no pam, no ldap) + Revision 1.204 2011/08/03 09:44:31 baggins - rel 14 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.204&r2=1.205&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
