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: 09-Oct-2007 21:51:24
Branch: HEAD Handle: 2007100920512300
Modified files:
openpkg-src/sasl sasl.spec
Log:
allow SASL to be build against both MIT and Heimdal Kerberos and use
with_kerberos similar to the other packages
Summary:
Revision Changes Path
1.156 +21 -20 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.155 -r1.156 sasl.spec
--- openpkg-src/sasl/sasl.spec 4 Aug 2007 20:22:54 -0000 1.155
+++ openpkg-src/sasl/sasl.spec 9 Oct 2007 19:51:23 -0000 1.156
@@ -33,20 +33,20 @@
Group: Cryptography
License: BSD
Version: 2.1.22
-Release: 20070804
+Release: 20071009
# package options
-%option with_fsl yes
-%option with_sasldb yes
-%option with_pam no
-%option with_login no
-%option with_ldap no
-%option with_mysql no
-%option with_pgsql no
-%option with_sqlite no
-%option with_ntlm no
-%option with_otp no
-%option with_gss no
+%option with_fsl yes
+%option with_sasldb yes
+%option with_pam no
+%option with_login no
+%option with_ldap no
+%option with_mysql no
+%option with_pgsql no
+%option with_sqlite no
+%option with_ntlm no
+%option with_otp no
+%option with_kerberos no
# list of sources
Source0:
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
@@ -90,9 +90,9 @@
BuildPreReq: opie
PreReq: opie
%endif
-%if "%{with_gss}" == "yes"
-BuildPreReq: kerberos
-PreReq: kerberos
+%if "%{with_kerberos}" == "yes"
+BuildPreReq: KERBEROS
+PreReq: KERBEROS
%endif
AutoReq: no
AutoReqProv: no
@@ -135,7 +135,7 @@
%endif
# fix GSS/Kerberos support
-%if "%{with_gss}" == "yes"
+%if "%{with_kerberos}" == "yes"
%{l_shtool} subst \
-e 's;\(-lk5crypto\);\1 -lkrb5support;' \
configure
@@ -163,8 +163,9 @@
cflags="$cflags -I%{l_cppflags postgresql}"
libs="$libs -lssl -lcrypto -lcrypt"
%endif
-%if "%{with_gss}" == "yes"
- ldflags="$ldflags %{l_ldflags kerberos}"
+%if "%{with_kerberos}" == "yes"
+ cflags="$cflags `krb5-config --cflags gssapi`"
+ libs="$libs `krb5-config --libs gssapi`"
%endif
case "%{l_platform -t}" in
*-sunos* ) libs="$libs -lrt" ;;
@@ -218,9 +219,9 @@
--disable-otp \
--without-opie \
%endif
-%if "%{with_gss}" == "yes"
+%if "%{with_kerberos}" == "yes"
--enable-gssapi \
- --with-gss_impl=mit \
+ --with-gss_impl=`if [ -d %{l_prefix}/include/heimdal ]; then echo
"heimdal"; else echo "mit"; fi` \
%else
--disable-gssapi \
--without-gss_impl \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
