Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24407
Modified Files:
cyrus-sasl2.info cyrus-sasl2.patch
Log Message:
Apple changed the pam header files from pam/* to security/* in 10.6, so we have
to make sure we find the right ones regardless of OS version. Also switch to
db48.
Index: cyrus-sasl2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/cyrus-sasl2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cyrus-sasl2.patch 7 Jun 2009 13:27:59 -0000 1.3
+++ cyrus-sasl2.patch 24 Nov 2009 15:38:12 -0000 1.4
@@ -126,105 +126,6 @@
#define PWBUFSZ 256 /***SWB***/
/* MODULE: auth_shadow */
-diff -ru cyrus-sasl-2.1.23.orig/saslauthd/configure
cyrus-sasl-2.1.23/saslauthd/configure
---- cyrus-sasl-2.1.23.orig/saslauthd/configure 2009-05-07 10:25:24.000000000
-0400
-+++ cyrus-sasl-2.1.23/saslauthd/configure 2009-06-07 09:15:34.000000000
-0400
-@@ -9538,8 +9538,8 @@
- if test $ac_cv_lib_pam_pam_start = yes; then
-
- if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
--echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
-+echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
- if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
-@@ -9547,8 +9547,8 @@
- echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
--echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking pam/pam_appl.h usability" >&5
-+echo $ECHO_N "checking pam/pam_appl.h usability... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -9557,7 +9557,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--#include <security/pam_appl.h>
-+#include <pam/pam_appl.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -9583,8 +9583,8 @@
- echo "${ECHO_T}$ac_header_compiler" >&6
-
- # Is the header present?
--echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
--echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking pam/pam_appl.h presence" >&5
-+echo $ECHO_N "checking pam/pam_appl.h presence... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -9592,7 +9592,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--#include <security/pam_appl.h>
-+#include <pam/pam_appl.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -9625,10 +9625,10 @@
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc in
- yes:no )
-- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the
compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler,
rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the
preprocessor's result" >&5
--echo "$as_me: WARNING: security/pam_appl.h: proceeding with the
preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: accepted by the
compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: accepted by the compiler, rejected by
the preprocessor!" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the
preprocessor's result" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's
result" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9639,12 +9639,12 @@
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- no:yes )
-- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot
be compiled" >&5
--echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled"
>&2;}
-- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing
prerequisite headers?" >&5
--echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite
headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the
preprocessor's result" >&5
--echo "$as_me: WARNING: security/pam_appl.h: proceeding with the
preprocessor's result" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: present but cannot be
compiled" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: present but cannot be compiled" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: check for missing
prerequisite headers?" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: check for missing prerequisite
headers?" >&2;}
-+ { echo "$as_me:$LINENO: WARNING: pam/pam_appl.h: proceeding with the
preprocessor's result" >&5
-+echo "$as_me: WARNING: pam/pam_appl.h: proceeding with the preprocessor's
result" >&2;}
- (
- cat <<\_ASBOX
- ## ------------------------------------ ##
-@@ -9655,8 +9655,8 @@
- sed "s/^/$as_me: WARNING: /" >&2
- ;;
- esac
--echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
--echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for pam/pam_appl.h" >&5
-+echo $ECHO_N "checking for pam/pam_appl.h... $ECHO_C" >&6
- if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
diff -ru cyrus-sasl-2.1.23.orig/saslauthd/lak.c
cyrus-sasl-2.1.23/saslauthd/lak.c
--- cyrus-sasl-2.1.23.orig/saslauthd/lak.c 2009-04-28 11:09:18.000000000
-0400
+++ cyrus-sasl-2.1.23/saslauthd/lak.c 2009-06-07 09:16:45.000000000 -0400
Index: cyrus-sasl2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/cyrus-sasl2.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cyrus-sasl2.info 7 Jun 2009 13:27:59 -0000 1.14
+++ cyrus-sasl2.info 24 Nov 2009 15:38:12 -0000 1.15
@@ -1,13 +1,13 @@
Info4: <<
Package: cyrus-sasl2%type_pkg[-64bit]
Version: 2.1.23
-Revision: 1
+Revision: 2
Type: -64bit (boolean)
Architecture: ( %type_raw[-64bit] = -64bit ) powerpc, ( %type_raw[-64bit] =
-64bit ) i386
Distribution: ( %type_raw[-64bit] = -64bit ) 10.5, ( %type_raw[-64bit] =
-64bit ) 10.6
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
-BuildDepends: system-openssl-dev, db47-aes%type_pkg[-64bit] |
db47%type_pkg[-64bit] , fink (>= 0.26.2), libtool2
+BuildDepends: system-openssl-dev, db48-aes%type_pkg[-64bit] |
db48%type_pkg[-64bit] , fink (>= 0.26.2), libtool2
Conflicts: cyrus-sasl2, cyrus-sasl2-64bit
Replaces: cyrus-sasl2, cyrus-sasl2-64bit
Source: mirror:custom:cyrus-sasl-%v.tar.gz
@@ -17,11 +17,21 @@
<<
Source-MD5: 2eb0e48106f0e9cd8001e654f267ecbc
PatchFile: %{ni}.patch
-PatchFile-MD5: cf069b77875a248ce779b90e07388980
+PatchFile-MD5: 7655be102c4b1a8659775761d118d892
PatchScript: <<
+ #!/bin/bash -ev
%{default_script}
- perl -pi -e 's/db-4.4/db-4.7/g' configure
+ #Use db48
+ perl -pi -e 's/db-4.4/db-4.8/g' configure
+ #This is only needed for the -64bit variant
perl -pi -e 's,lib/sasl2,%lib/sasl2,g' Makefile.in plugins/Makefile.in
+ #Fix bug in configure on 10.6
+ perl -pi -e 's,HAVE_SECURITY_PAM_H,HAVE_SECURITY_PAM_APPL_H,' configure
+ #Make sure saslauthd can find pam on < 10.6
+ let version=`uname -r | cut -f 1 -d .`
+ if [ $version -lt 10 ]; then
+ perl -pi -e 's,security/pam_appl.h,pam/pam_appl.h,g' saslauthd/configure
+ fi
<<
NoSetLDFLAGS: True
SetLibs: -L%p/%lib
@@ -41,6 +51,7 @@
--with-dblib=berkeley \
--with-dbpath=%p/etc/sasldb2 \
--with-openssl=%p/lib/system-openssl \
+ --with-pam \
--with-plugindir=%p/%lib/sasl2 \
--with-saslauthd=%p/var/saslauthd
<<
@@ -52,7 +63,7 @@
export CC="gcc -m64"
fi
./configure %c --host=`uname -p`-apple-darwin`uname -r`
- make SASL_DB_LIB="-L%p/%lib -ldb-4.7" LIBTOOL=glibtool
+ make SASL_DB_LIB="-L%p/%lib -ldb-4.8" LIBTOOL=glibtool
<<
InstallScript: <<
mkdir -p %i/share/man/man8
@@ -65,7 +76,7 @@
DocFiles: AUTHORS COPYING NEWS README ChangeLog doc/TODO doc/*.html doc/*.txt
SplitOff: <<
Package: %N-shlibs
- Depends: db47-aes%type_pkg[-64bit]-shlibs | db47%type_pkg[-64bit]-shlibs, (
%type_raw[-64bit] = -64bit ) 64bit-cpu
+ Depends: db48-aes%type_pkg[-64bit]-shlibs | db48%type_pkg[-64bit]-shlibs, (
%type_raw[-64bit] = -64bit ) 64bit-cpu
Replaces: %N-dev (<< 2.1.21-14)
Files: %lib/*.*.dylib %lib/sasl2/*.*.so %lib/sasl2/*.la
Shlibs: %p/%lib/libsasl2.2.dylib 3.0.0 %n (>= 2.1.13-12) %type_num[-64bit]
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
