Update of /cvsroot/fink/experimental/crypto/rangerrick
In directory usw-pr-cvs1:/tmp/cvs-serv13789
Modified Files:
openldap-ssl-2.1.3-1.info openldap-ssl-2.1.3-1.patch
Added Files:
cyrus-sasl-1.5.27-4.info cyrus-sasl-1.5.27-4.patch
Removed Files:
cyrus-sasl-1.5.27-3.info cyrus-sasl-1.5.27-3.patch
Log Message:
whoo! db3/db4 was the issue
It now builds properly on 10.1 and jag, and slapd works
--- NEW FILE: cyrus-sasl-1.5.27-4.info ---
Package: cyrus-sasl
Version: 1.5.27
Revision: 4
Description: Cyrus Simple Authentication and Security Layer Library.
DescDetail: <<
SASL is the Simple Authentication and Security Layer, a method for adding
authentication support to connection-based protocols. To use SASL, a protocol
includes a command for identifying and authenticating a user to a server and
for optionally negotiating protection of subsequent protocol interactions. If
its use is negotiated, a security layer is inserted between the protocol and
the connection.
<<
License: OSI-Approved
Homepage: http://asg.web.cmu.edu/sasl
Maintainer: Michael McKibben <[EMAIL PROTECTED]>
Depends: db4-shlibs, openssl-shlibs
Recommends: openssl
BuildDepends: openssl-dev, db4
Provides: sasl
Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/%n-%v.tar.gz
UpdateConfigGuessInDirs: config
ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man --infodir=%p/share/info
--with-plugindir=%p/lib/sasl --with-dbpath=%p/etc/sasldb
SetCFLAGS: -I%p/include/db4
SetCPPFLAGS: -no-cpp-precomp
Patch: %f.patch
InstallScript: <<
make install DESTDIR=%d
<<
DocFiles: AUTHORS COPYING NEWS README TODO ChangeLog doc/*.html doc/*.txt
--- NEW FILE: cyrus-sasl-1.5.27-4.patch ---
diff -uNbr cyrus-sasl-1.5.27/config/ltconfig cyrus-sasl-1.5.27-new/config/ltconfig
--- cyrus-sasl-1.5.27/config/ltconfig Thu Dec 30 13:16:25 1999
+++ cyrus-sasl-1.5.27-new/config/ltconfig Fri Aug 9 18:02:48 2002
@@ -169,8 +169,8 @@
# Constants:
PROGRAM=ltconfig
PACKAGE=libtool
-VERSION=1.3.4
-TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
+VERSION=1.3.5
+TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
rm="rm -f"
@@ -678,6 +678,11 @@
cygwin* | mingw* | os2*)
# We can build DLLs from non-PIC.
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ pic_flag='-fno-common'
+ ;;
amigaos*)
# FIXME: we need at least 68020 code to build shared libraries, but
# adding the `-m68020' flag to GCC prevents building anything better,
@@ -773,8 +778,8 @@
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $pic_flag -DPIC"
- echo "$progname:776: checking if $compiler PIC flag $pic_flag works" >&5
- if { (eval echo $progname:777: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>conftest.err; } && test -s conftest.$objext; then
+ echo "$progname:781: checking if $compiler PIC flag $pic_flag works" >&5
+ if { (eval echo $progname:782: \"$ac_compile\") 1>&5; (eval $ac_compile)
+2>conftest.err; } && test -s conftest.$objext; then
# Append any warnings to the config.log.
cat conftest.err 1>&5
@@ -826,8 +831,8 @@
chmod -w .
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.o"
-echo "$progname:829: checking if $compiler supports -c -o file.o" >&5
-if { (eval echo $progname:830: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>out/conftest.err; } && test -s out/conftest2.o; then
+echo "$progname:834: checking if $compiler supports -c -o file.o" >&5
+if { (eval echo $progname:835: \"$ac_compile\") 1>&5; (eval $ac_compile)
+2>out/conftest.err; } && test -s out/conftest2.o; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -859,8 +864,8 @@
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -c -o conftest.lo"
- echo "$progname:862: checking if $compiler supports -c -o file.lo" >&5
-if { (eval echo $progname:863: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>conftest.err; } && test -s conftest.lo; then
+ echo "$progname:867: checking if $compiler supports -c -o file.lo" >&5
+if { (eval echo $progname:868: \"$ac_compile\") 1>&5; (eval $ac_compile)
+2>conftest.err; } && test -s conftest.lo; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -911,8 +916,8 @@
echo "int some_variable = 0;" > conftest.c
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
- echo "$progname:914: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- if { (eval echo $progname:915: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>conftest.err; } && test -s conftest.o; then
+ echo "$progname:919: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ if { (eval echo $progname:920: \"$ac_compile\") 1>&5; (eval $ac_compile)
+2>conftest.err; } && test -s conftest.o; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -955,8 +960,8 @@
echo 'main(){return(0);}' > conftest.c
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $link_static_flag"
-echo "$progname:958: checking if $compiler static flag $link_static_flag works" >&5
-if { (eval echo $progname:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s
conftest; then
+echo "$progname:963: checking if $compiler static flag $link_static_flag works" >&5
+if { (eval echo $progname:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s
+conftest; then
echo "$ac_t$link_static_flag" 1>&6
else
echo "$ac_t"none 1>&6
@@ -988,7 +993,7 @@
if test "$with_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
- echo "$progname:991: checking for ld used by GCC" >&5
+ echo "$progname:996: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1012,10 +1017,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld... $ac_c" 1>&6
- echo "$progname:1015: checking for GNU ld" >&5
+ echo "$progname:1020: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
- echo "$progname:1018: checking for non-GNU ld" >&5
+ echo "$progname:1023: checking for non-GNU ld" >&5
fi
if test -z "$LD"; then
@@ -1164,15 +1169,21 @@
# Extract the symbol export list from an `--export-all' def file,
# then regenerate the def file from the symbol export list, so that
# the compiled dll only exports the symbol export list.
+ # Be careful not to strip the DATA tag left by newer dlltools.
export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c
starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 >
$objdir/$soname-ltdll.c~
test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
$DLLTOOL --export-all --exclude-symbols
DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def
$objdir/$soname-def $objdir/$soname-ltdll.$objext $libobjs $convenience~
- sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def >
$export_symbols'
+ sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def
+> $export_symbols'
+ # If DATA tags from a recent dlltool are present, honour them!
archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
_lt_hint=1;
- for symbol in `cat $export_symbols`; do
- echo " \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
+ cat $export_symbols | while read symbol; do
+ set dummy \$symbol;
+ case \$# in
+ 2) echo " \$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
+ *) echo " \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
+ esac;
_lt_hint=`expr 1 + \$_lt_hint`;
done~
test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here
\*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 >
$objdir/$soname-ltdll.c~
@@ -1361,6 +1372,23 @@
hardcode_shlibpath_var=no
;;
+ darwin* | rhapsody*)
+ case "$host_os" in
+ rhapsody* | darwin1.[012])
+ allow_undefined_flag='-undefined suppress'
+ ;;
+ *) # Darwin 1.3 on
+ allow_undefined_flag='-flat_namespace -undefined suppress'
+ ;;
+ esac
+ archive_cmds='$nonopt -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs
+$linkopts -install_name $rpath/$soname $verstring'
+ # We need to add '_' to the symbols in $export_symbols first
+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ whole_archive_flag_spec='-all_load $convenience'
+ ;;
+
hpux9* | hpux10* | hpux11*)
case "$host_os" in
hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o
$objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv
$objdir/$soname $lib' ;;
@@ -1466,7 +1494,13 @@
;;
sysv4)
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
+ else
archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+ fi
runpath_var='LD_RUN_PATH'
hardcode_shlibpath_var=no
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
@@ -1632,11 +1666,11 @@
main(){nm_test_var='a';nm_test_func();return(0);}
EOF
- echo "$progname:1635: checking if global_symbol_pipe works" >&5
- if { (eval echo $progname:1636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }
&& test -s conftest.$objext; then
+ echo "$progname:1669: checking if global_symbol_pipe works" >&5
+ if { (eval echo $progname:1670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }
+&& test -s conftest.$objext; then
# Now try to grab the symbols.
nlist=conftest.nm
- if { echo "$progname:1639: eval \"$NM conftest.$objext | $global_symbol_pipe >
$nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } &&
test -s "$nlist"; then
+ if { echo "$progname:1673: eval \"$NM conftest.$objext | $global_symbol_pipe >
+$nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } &&
+test -s "$nlist"; then
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
@@ -1688,7 +1722,7 @@
save_CFLAGS="$CFLAGS"
LIBS="conftstm.$objext"
CFLAGS="$CFLAGS$no_builtin_flag"
- if { (eval echo $progname:1691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest; then
+ if { (eval echo $progname:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+&& test -s conftest; then
pipe_works=yes
else
echo "$progname: failed program was:" >&5
@@ -1897,6 +1931,27 @@
esac
;;
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+ file_magic_cmd='/usr/bin/file -L'
+ case "$host_os" in
+ rhapsody* | darwin1.[012])
+ file_magic_test_file='/System/Library/Frameworks/System.framework/System'
+ ;;
+ *) # Darwin 1.3 on
+ file_magic_test_file='/usr/lib/libSystem.dylib'
+ ;;
+ esac
+ library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo
+so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so ||
+echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+ soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo
+dylib)'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ ;;
+
gnu*)
version_type=linux
need_lib_prefix=no
@@ -1919,6 +1974,14 @@
soname_spec='${libname}${release}.sl$major'
# HP-UX runs *really* slowly unless shared libraries are mode 555.
postinstall_cmds='chmod 555 $lib'
+ case "$host_os" in
+ hpux10.20*)
+ # TODO: Does this work for hpux-11 too?
+ deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared
+library'
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
;;
irix5* | irix6*)
@@ -1966,9 +2029,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic
lib )'
- file_magic_cmd=/usr/bin/file
- file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+ deplibs_check_method=pass_all
if test -f /lib/ld.so.1; then
dynamic_linker='GNU ld.so'
@@ -2069,6 +2130,10 @@
soname_spec='${libname}${release}.so$major'
shlibpath_var=LD_LIBRARY_PATH
case "$host_vendor" in
+ sequent)
+ file_magic_cmd='/bin/file'
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared
+object|dynamic lib )'
+ ;;
ncr)
deplibs_check_method='pass_all'
;;
@@ -2209,7 +2274,7 @@
if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
lt_cv_dlopen=no lt_cv_dlopen_libs=
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "$progname:2212: checking for dlopen in -ldl" >&5
+echo "$progname:2277: checking for dlopen in -ldl" >&5
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2217,7 +2282,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2220 "ltconfig"
+#line 2285 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -2230,7 +2295,7 @@
dlopen()
; return 0; }
EOF
-if { (eval echo $progname:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo $progname:2298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2249,12 +2314,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
-echo "$progname:2252: checking for dlopen" >&5
+echo "$progname:2317: checking for dlopen" >&5
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2257 "ltconfig"
+#line 2322 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
#include <assert.h>
@@ -2279,7 +2344,7 @@
; return 0; }
EOF
-if { (eval echo $progname:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo $progname:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dlopen=yes"
else
@@ -2296,7 +2361,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "$progname:2299: checking for dld_link in -ldld" >&5
+echo "$progname:2364: checking for dld_link in -ldld" >&5
ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2304,7 +2369,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2307 "ltconfig"
+#line 2372 "ltconfig"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
@@ -2317,7 +2382,7 @@
dld_link()
; return 0; }
EOF
-if { (eval echo $progname:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo $progname:2385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2336,12 +2401,12 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load""... $ac_c" 1>&6
-echo "$progname:2339: checking for shl_load" >&5
+echo "$progname:2404: checking for shl_load" >&5
if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2344 "ltconfig"
+#line 2409 "ltconfig"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load(); below. */
#include <assert.h>
@@ -2366,7 +2431,7 @@
; return 0; }
EOF
-if { (eval echo $progname:2369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo $progname:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shl_load=yes"
else
@@ -2384,7 +2449,7 @@
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "$progname:2387: checking for shl_load in -ldld" >&5
+echo "$progname:2452: checking for shl_load in -ldld" >&5
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2392,7 +2457,7 @@
ac_save_LIBS="$LIBS"
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2395 "ltconfig"
+#line 2460 "ltconfig"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2406,7 +2471,7 @@
shl_load()
; return 0; }
EOF
-if { (eval echo $progname:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest${ac_exeext}; then
+if { (eval echo $progname:2474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2449,17 +2514,17 @@
for ac_hdr in dlfcn.h; do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "$progname:2452: checking for $ac_hdr" >&5
+echo "$progname:2517: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2457 "ltconfig"
+#line 2522 "ltconfig"
#include <$ac_hdr>
int fnord = 0;
EOF
ac_try="$ac_compile >/dev/null 2>conftest.out"
-{ (eval echo $progname:2462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo $progname:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2487,7 +2552,7 @@
LIBS="$lt_cv_dlopen_libs $LIBS"
echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
-echo "$progname:2490: checking whether a program can dlopen itself" >&5
+echo "$progname:2555: checking whether a program can dlopen itself" >&5
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2495,7 +2560,7 @@
lt_cv_dlopen_self=cross
else
cat > conftest.c <<EOF
-#line 2498 "ltconfig"
+#line 2563 "ltconfig"
#if HAVE_DLFCN_H
#include <dlfcn.h>
@@ -2541,7 +2606,7 @@
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
EOF
-if { (eval echo $progname:2544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self=yes
else
@@ -2560,7 +2625,7 @@
if test "$lt_cv_dlopen_self" = yes; then
LDFLAGS="$LDFLAGS $link_static_flag"
echo $ac_n "checking whether a statically linked program can dlopen itself""...
$ac_c" 1>&6
-echo "$progname:2563: checking whether a statically linked program can dlopen itself"
>&5
+echo "$progname:2628: checking whether a statically linked program can dlopen itself"
+>&5
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2568,7 +2633,7 @@
lt_cv_dlopen_self_static=cross
else
cat > conftest.c <<EOF
-#line 2571 "ltconfig"
+#line 2636 "ltconfig"
#if HAVE_DLFCN_H
#include <dlfcn.h>
@@ -2614,7 +2679,7 @@
if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); }
EOF
-if { (eval echo $progname:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
-s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo $progname:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test
+-s conftest && (./conftest; exit) 2>/dev/null
then
lt_cv_dlopen_self_static=yes
else
diff -uNbr cyrus-sasl-1.5.27/config/ltmain.sh cyrus-sasl-1.5.27-new/config/ltmain.sh
--- cyrus-sasl-1.5.27/config/ltmain.sh Thu Dec 30 13:16:25 1999
+++ cyrus-sasl-1.5.27-new/config/ltmain.sh Fri Aug 9 18:02:48 2002
@@ -54,8 +54,8 @@
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.3.4
-TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
+VERSION=1.3.5
+TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
default_mode=
help="Try \`$progname --help' for more information."
@@ -1079,6 +1079,11 @@
# These systems don't actually have c library (as such)
continue
;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+ deplibs="$deplibs -framework System"
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -1086,6 +1091,11 @@
# These systems don't actually have math library (as such)
continue
;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody math library is in the System framework
+ deplibs="$deplibs -framework System"
+ continue
+ ;;
esac
fi
deplibs="$deplibs $arg"
@@ -1753,6 +1763,16 @@
versuffix="-$major-$age-$revision"
;;
+ darwin)
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+ verstring="-compatibility_version $minor_current -current_version
+$minor_current.$revision"
+ ;;
+
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
echo "Fatal configuration error. See the $PACKAGE docs for more
information." 1>&2
@@ -1763,7 +1783,16 @@
# Clear the version info if we defaulted, and they specified a release.
if test -z "$vinfo" && test -n "$release"; then
major=
+ case "$version_type" in
+ darwin)
+ # we can't check for "0.0" in archive_cmds due to quoting
+ # problems, so we reset it completely
+ verstring=""
+ ;;
+ *)
verstring="0.0"
+ ;;
+ esac
if test "$need_version" = no; then
versuffix=
else
@@ -1795,6 +1824,10 @@
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+ deplibs="$deplibs -framework System"
+ ;;
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -2927,13 +2960,21 @@
# Run the actual program with our arguments.
"
case $host in
- *-*-cygwin* | *-*-mingw | *-*-os2*)
# win32 systems need to use the prog path for dll
# lookup to work
+ *-*-cygwin*)
+ $echo >> $output "\
+ exec \$progdir/\$program \${1+\"\$@\"}
+"
+ ;;
+
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
$echo >> $output "\
exec \$progdir\\\\\$program \${1+\"\$@\"}
"
;;
+
*)
$echo >> $output "\
# Export the path to the program.
diff -uNbr cyrus-sasl-1.5.27/configure cyrus-sasl-1.5.27-new/configure
--- cyrus-sasl-1.5.27/configure Fri Mar 23 20:48:12 2001
+++ cyrus-sasl-1.5.27-new/configure Fri Aug 9 18:04:24 2002
@@ -2144,14 +2144,14 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for db_create in -ldb-3""... $ac_c" 1>&6
-echo "configure:2149: checking for db_create in -ldb-3" >&5
-ac_lib_var=`echo db-3'_'db_create | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for db_create in -ldb-4""... $ac_c" 1>&6
+echo "configure:2149: checking for db_create in -ldb-4" >&5
+ac_lib_var=`echo db-4'_'db_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ldb-3 $LIBS"
+LIBS="-ldb-4 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2157 "configure"
#include "confdefs.h"
@@ -2179,7 +2179,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- SASL_DB_LIB="-ldb-3";
+ SASL_DB_LIB="-ldb-4";
dblib="berkeley"
else
echo "$ac_t""no" 1>&6
@@ -2502,14 +2502,14 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- echo $ac_n "checking for db_create in -ldb-3""... $ac_c" 1>&6
-echo "configure:2507: checking for db_create in -ldb-3" >&5
-ac_lib_var=`echo db-3'_'db_create | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for db_create in -ldb-4""... $ac_c" 1>&6
+echo "configure:2507: checking for db_create in -ldb-4" >&5
+ac_lib_var=`echo db-4'_'db_create | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ldb-3 $LIBS"
+LIBS="-ldb-4 $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2515 "configure"
#include "confdefs.h"
@@ -2537,7 +2537,7 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- SASL_DB_LIB="-ldb-3";
+ SASL_DB_LIB="-ldb-4";
dblib="berkeley"
else
echo "$ac_t""no" 1>&6
@@ -3571,7 +3571,13 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ldes $LIBS"
+ if test -f /usr/lib/libdes524.dylib; then
+ LIBS="-ldes524 $LIBS"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ LIBS="-ldes425 $LIBS"
+ fi
+ fi
cat > conftest.$ac_ext <<EOF
#line 3577 "configure"
#include "confdefs.h"
@@ -3599,7 +3605,13 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LIB_DES="-ldes";
+ if test -f /usr/lib/libdes524.dylib; then
+ LIB_DES="-ldes524"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ LIB_DES="-ldes425"
+ fi
+ fi
with_des=yes
else
echo "$ac_t""no" 1>&6
@@ -3741,7 +3753,13 @@
#define WITH_DES 1
EOF
- LIB_DES="-ldes"
+ if test -f /usr/lib/libdes524.dylib; then
+ LIB_DES="-ldes524"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ LIB_DES="-ldes425"
+ fi
+ fi
fi
@@ -3886,7 +3904,13 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lkrb -ldes $LIBS"
+ if test -f /usr/lib/libdes524.dylib; then
+ LIBS="-lkrb -ldes524 $LIBS"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ LIBS="-lkrb -ldes425 $LIBS"
+ fi
+ fi
cat > conftest.$ac_ext <<EOF
#line 3892 "configure"
#include "confdefs.h"
@@ -3924,7 +3948,13 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lkrb -ldes -lcom_err $LIBS"
+ if test -f /usr/lib/libdes524.dylib; then
+ LIBS="-lkrb -ldes524 -lcom_err $LIBS"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ LIBS="-lkrb -ldes425 -lcom_err $LIBS"
+ fi
+ fi
cat > conftest.$ac_ext <<EOF
#line 3930 "configure"
#include "confdefs.h"
@@ -3980,7 +4010,13 @@
#define HAVE_KRB 1
EOF
- SASL_KRB_LIB="-lkrb -ldes $COM_ERR"
+ if test -f /usr/lib/libdes524.dylib; then
+ SASL_KRB_LIB="-lkrb -ldes524 $COM_ERR"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ SASL_KRB_LIB="-lkrb -ldes425 $COM_ERR"
+ fi
+ fi
else
echo "$ac_t""disabled" 1>&6
@@ -4222,7 +4258,14 @@
if test "$gss_impl" = mit; then
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
elif test "$gss_impl" = "heimdal"; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi -lkrb5 -ldes -lasn1 -lroken
${LIB_CRYPT} -lcom_err"
+ if test -f /usr/lib/libdes524.dylib; then
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi -lkrb5 -ldes524 -lasn1 -lroken
+${LIB_CRYPT} -lcom_err"
+ else
+ if test -f /usr/lib/libdes425.dylib; then
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS/lib -lgssapi -lkrb5 -ldes425 -lasn1 -lroken
+${LIB_CRYPT} -lcom_err"
+ fi
+ fi
+
else
gssapi="no"
echo "configure: warning: Disabling GSSAPI" 1>&2
diff -uNbr cyrus-sasl-1.5.27/lib/dlopen.c cyrus-sasl-1.5.27-new/lib/dlopen.c
--- cyrus-sasl-1.5.27/lib/dlopen.c Sun Aug 13 21:44:02 2000
+++ cyrus-sasl-1.5.27-new/lib/dlopen.c Fri Aug 9 18:02:48 2002
@@ -158,7 +158,7 @@
int flag;
void *library;
void *entry_point;
-#if __OpenBSD__
+#if __OpenBSD__ || __APPLE__
char adj_entryname[1024];
#else
#define adj_entryname entryname
@@ -179,7 +179,7 @@
return SASL_FAIL;
}
-#if __OpenBSD__
+#if __OpenBSD__ || __APPLE__
snprintf(adj_entryname, sizeof adj_entryname, "_%s", entryname);
#endif
diff -uNbr cyrus-sasl-1.5.27/lib/saslutil.c cyrus-sasl-1.5.27-new/lib/saslutil.c
--- cyrus-sasl-1.5.27/lib/saslutil.c Thu Dec 21 01:03:43 2000
+++ cyrus-sasl-1.5.27-new/lib/saslutil.c Fri Aug 9 18:02:48 2002
@@ -349,6 +349,10 @@
if (len > 6) len = 6;
for (lup = 0; lup < len; lup += 2)
rpool->pool[lup] = (seed[lup] << 8) + seed[lup + 1];
+
+#ifdef __APPLE__
+ srandom((unsigned)(*rpool->pool));
+#endif /* __APPLE__ */
}
static void randinit(sasl_rand_t *rpool)
@@ -370,13 +374,16 @@
/* init if necessary */
randinit(rpool);
-#ifdef WIN32
+#ifdef __APPLE__
+ for (lup=0;lup<len; ++lup)
+ buf[lup] = (char) (random() >> 8);
+#elif WIN32
for (lup=0;lup<len;lup++)
buf[lup] = (char) (rand() >> 8);
#else /* WIN32 */
for (lup=0; lup<len; lup++)
buf[lup] = (char) (jrand48(rpool->pool) >> 8);
-#endif /* WIN32 */
+#endif /* __APPLE__ */
}
/* this function is just a bad idea all around, since we're not trying to
diff -uNbr cyrus-sasl-1.5.27/plugins/Makefile.in
cyrus-sasl-1.5.27-new/plugins/Makefile.in
--- cyrus-sasl-1.5.27/plugins/Makefile.in Fri Mar 23 20:48:13 2001
+++ cyrus-sasl-1.5.27-new/plugins/Makefile.in Fri Aug 9 18:02:48 2002
@@ -160,7 +160,7 @@
INCLUDES = -I$(top_srcdir)/include
-LDFLAGS = @LDFLAGS@ -export-dynamic -rpath $(plugindir)
+LDFLAGS = @LDFLAGS@ -export-dynamic -module -rpath $(plugindir)
plugindir = @plugindir@
Index: openldap-ssl-2.1.3-1.info
===================================================================
RCS file: /cvsroot/fink/experimental/crypto/rangerrick/openldap-ssl-2.1.3-1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openldap-ssl-2.1.3-1.info 9 Aug 2002 19:31:59 -0000 1.4
+++ openldap-ssl-2.1.3-1.info 9 Aug 2002 22:50:36 -0000 1.5
@@ -3,16 +3,16 @@
Revision: 1
Source: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%v.tgz
Patch: %f.patch
-Depends: readline, openssl, sasl, %N-shlibs (= %v-%r), libtool14-shlibs
-BuildDepends: openssl-dev, libtool14
+Depends: readline, openssl, cyrus-sasl (>= 1.5.27-4), %N-shlibs (= %v-%r),
+libtool14-shlibs, daemonic, db4-shlibs
+BuildDepends: openssl-dev, cyrus-sasl (>= 1.5.27-4), libtool14, db4
Provides: openldap
Conflicts: openldap
Replaces: openldap
-SetCFLAGS: -I%b/include -I%p/include -fno-common
-SetCPPFLAGS: -no-cpp-precomp
+SetCFLAGS: -fno-common
+SetCPPFLAGS: -I%b/include -I%p/include -I%p/include/db4 -no-cpp-precomp
SetLDFLAGS: -L%b/libraries/libavl -L%b/libraries/liblber -L%b/libraries/libldap
-L%b/libraries/libldap_r -L%b/libraries/libldbm -L%b/libraries/libldif
-L%b/libraries/liblunicode -L%b/libraries/liblutil -L%b/libraries/librewrite -L%i/lib
-L%p/lib
UpdateConfigGuessInDirs: build
-ConfigureParams: --prefix=%p --libexecdir=%p/sbin --mandir=%p/share/man
--infodir=%p/share/info/%n --enable-modules --with-pic --includedir=%p/include
--disable-bdb --enable-crypt --enable-kpasswd --enable-spasswd --enable-rewrite
--enable-dnssrv --enable-ldap --with-ldap-module=dynamic --enable-ldbm
--with-ldbm-module=dynamic --enable-meta --with-meta-module=dynamic --enable-monitor
--with-monitor-module=dynamic --enable-null --with-null-module=dynamic --enable-perl
--with-perl-module=dynamic --enable-shell --with-shell-module=dynamic --enable-slurpd
+ConfigureParams: --prefix=%p --libexecdir=%p/sbin --mandir=%p/share/man
+--infodir=%p/share/info/%n --enable-modules --with-pic --includedir=%p/include
+--enable-bdb --enable-crypt --enable-kpasswd --enable-spasswd --enable-rewrite
+--enable-dnssrv --enable-ldap --with-ldap-module=static --enable-ldbm
+--with-ldbm-module=static --enable-meta --with-meta-module=static --enable-monitor
+--with-monitor-module=static --enable-null --with-null-module=static --enable-perl
+--with-perl-module=static --enable-shell --with-shell-module=static --enable-slurpd
+--enable-ssl
CompileScript: <<
(unset DYLD_LIBRARY_PATH; ./configure %c)
(unset DYLD_LIBRARY_PATH; make)
@@ -34,6 +34,28 @@
%p/etc/openldap/schema/nis.schema
%p/etc/openldap/schema/openldap.schema
%p/etc/openldap/slapd.conf
+<<
+DaemonicFile: <<
+<service>
+<description>OpenLDAP Server</description>
+<message>OpenLDAP Server</message>
+
+<daemon name="openldap-ssl">
+<executable checkexit="true">%p/sbin/slapd</executable>
+<configfile>%p/etc/openldap/ldap.conf</configfile>
+</daemon>
+
+</service>
+<<
+PostInstScript: <<
+# update daemonic init script if necessary
+daemonic install %N
+<<
+PreRmScript: <<
+# clean up
+if [ $1 != "upgrade" ]; then
+ daemonic remove %N
+fi
<<
SplitOff: <<
Package: %N-shlibs
Index: openldap-ssl-2.1.3-1.patch
===================================================================
RCS file: /cvsroot/fink/experimental/crypto/rangerrick/openldap-ssl-2.1.3-1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openldap-ssl-2.1.3-1.patch 9 Aug 2002 14:55:01 -0000 1.2
+++ openldap-ssl-2.1.3-1.patch 9 Aug 2002 22:50:36 -0000 1.3
@@ -1,6 +1,6 @@
diff -uNbr openldap-2.1.3/build/ltmain.sh openldap-2.1.3-new/build/ltmain.sh
--- openldap-2.1.3/build/ltmain.sh Mon Feb 11 00:45:59 2002
-+++ openldap-2.1.3-new/build/ltmain.sh Thu Aug 8 23:53:05 2002
++++ openldap-2.1.3-new/build/ltmain.sh Fri Aug 9 15:43:59 2002
@@ -1744,7 +1744,7 @@
if test "$installed" = no; then
@@ -10,9 +10,25 @@
fi
if test -n "$old_archive_from_expsyms_cmds"; then
[...1314 lines suppressed...]
+ if test -d $$i -a -f $$i/Makefile ; then \
+ echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \
+diff -uNbr openldap-2.1.3/servers/slurpd/Makefile.in
+openldap-2.1.3-new/servers/slurpd/Makefile.in
+--- openldap-2.1.3/servers/slurpd/Makefile.in Wed May 22 10:25:58 2002
++++ openldap-2.1.3-new/servers/slurpd/Makefile.in Fri Aug 9 15:45:15 2002
+@@ -42,12 +42,12 @@
+ $(MKVERSION) slurpd > $@
+
+ install-local-srv: FORCE
+- -$(MKDIR) $(DESTDIR)$(libexecdir)
++ -$(MKDIR) $(DESTDIR)$(sbindir)
+ @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-slurp
+ @( \
+ for prg in $(PROGRAMS); do \
+ $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT) \
+- $(DESTDIR)$(libexecdir); \
++ $(DESTDIR)$(sbindir); \
+ done \
+ )
+
--- cyrus-sasl-1.5.27-3.info DELETED ---
--- cyrus-sasl-1.5.27-3.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
