OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Nov-2005 10:05:33
Branch: HEAD Handle: 2005112709053200
Modified files:
openpkg-src/sasl sasl.spec
Log:
add optional GSS/Kerberos and OTP/OPIE support
Summary:
Revision Changes Path
1.134 +36 -5 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.133 -r1.134 sasl.spec
--- openpkg-src/sasl/sasl.spec 23 Sep 2005 12:41:40 -0000 1.133
+++ openpkg-src/sasl/sasl.spec 27 Nov 2005 09:05:32 -0000 1.134
@@ -33,7 +33,7 @@
Group: Cryptography
License: BSD
Version: 2.1.21
-Release: 20050923
+Release: 20051127
# package options
%option with_fsl yes
@@ -44,6 +44,8 @@
%option with_pgsql no
%option with_sqlite no
%option with_ntlm no
+%option with_otp no
+%option with_gss no
%option with_sasldb no
# list of sources
@@ -84,6 +86,14 @@
BuildPreReq: sqlite
PreReq: sqlite
%endif
+%if "%{with_otp}" == "yes"
+BuildPreReq: opie
+PreReq: opie
+%endif
+%if "%{with_gss}" == "yes"
+BuildPreReq: kerberos
+PreReq: kerberos
+%endif
AutoReq: no
AutoReqProv: no
@@ -124,6 +134,13 @@
saslauthd/configure
%endif
+ # fix GSS/Kerberos support
+%if "%{with_gss}" == "yes"
+ %{l_shtool} subst \
+ -e 's;\(-lk5crypto\);\1 -lkrb5support;' \
+ configure
+%endif
+
# enforce disabled Kerberos 5 support in saslauthd
echo 'ac_cv_header_krb5_h=no' >config.cache
@@ -142,6 +159,9 @@
%if "%{with_mysql}" == "yes"
libs="$libs -lz -lm"
%endif
+%if "%{with_gss}" == "yes"
+ ldflags="$ldflags %{l_ldflags kerberos}"
+%endif
case "%{l_platform -t}" in
*-sunos* ) libs="$libs -lrt" ;;
esac
@@ -178,6 +198,20 @@
%else
--without-ldap \
%endif
+%if "%{with_otp}" == "yes"
+ --enable-otp \
+ --with-opie=%{l_prefix} \
+%else
+ --disable-otp \
+ --without-opie \
+%endif
+%if "%{with_gss}" == "yes"
+ --enable-gssapi \
+ --with-gss_impl=mit \
+%else
+ --disable-gssapi \
+ --without-gss_impl \
+%endif
%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_pgsql}"
== "yes"
--enable-sql \
%if "%{with_mysql}" == "yes"
@@ -210,10 +244,7 @@
--disable-java \
--disable-sample \
--disable-krb4 \
- --disable-gssapi \
- --disable-otp \
- --without-des \
- --without-opie
+ --without-des
# post adjustment: trust me, libtool, I know what I am doing
%{l_shtool} subst \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
