Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21179
Added Files:
cyrus-sasl2.info cyrus-sasl2.patch
Log Message:
Moved to stable. Fixes bad packging.
--- NEW FILE: cyrus-sasl2.patch ---
diff -ru cyrus-sasl-2.1.21.orig/lib/client.c cyrus-sasl-2.1.21/lib/client.c
--- cyrus-sasl-2.1.21.orig/lib/client.c 2004-11-17 09:19:30.000000000 -0500
+++ cyrus-sasl-2.1.21/lib/client.c 2005-06-26 16:08:52.000000000 -0400
@@ -1,7 +1,7 @@
/* SASL client API implementation
* Rob Siemborski
* Tim Martin
- * $Id: client.c,v 1.64 2004/11/02 11:32:17 mel Exp $
+ * $Id: client.c,v 1.65 2005/05/18 21:06:50 shadow Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -60,9 +60,7 @@
#include "saslint.h"
static cmech_list_t *cmechlist; /* global var which holds the list */
-
-static sasl_global_callbacks_t global_callbacks;
-
+sasl_global_callbacks_t global_callbacks_client;
static int _sasl_client_active = 0;
static int init_mechlist()
@@ -70,7 +68,7 @@
cmechlist->mutex = sasl_MUTEX_ALLOC();
if(!cmechlist->mutex) return SASL_FAIL;
- cmechlist->utils=_sasl_alloc_utils(NULL, &global_callbacks);
+ cmechlist->utils=_sasl_alloc_utils(NULL, &global_callbacks_client);
if (cmechlist->utils==NULL)
return SASL_NOMEM;
@@ -211,8 +209,8 @@
return SASL_OK;
}
- global_callbacks.callbacks = callbacks;
- global_callbacks.appname = NULL;
+ global_callbacks_client.callbacks = callbacks;
+ global_callbacks_client.appname = NULL;
cmechlist=sasl_ALLOC(sizeof(cmech_list_t));
if (cmechlist==NULL) return SASL_NOMEM;
@@ -229,7 +227,7 @@
sasl_client_add_plugin("EXTERNAL", &external_client_plug_init);
- ret = _sasl_common_init(&global_callbacks);
+ ret = _sasl_common_init(&global_callbacks_client);
if (ret == SASL_OK)
ret = _sasl_load_plugins(ep_list,
@@ -333,10 +331,10 @@
result = _sasl_conn_init(*pconn, service, flags, SASL_CONN_CLIENT,
&client_idle, serverFQDN,
iplocalport, ipremoteport,
- prompt_supp, &global_callbacks);
+ prompt_supp, &global_callbacks_client);
if (result != SASL_OK) RETURN(*pconn, result);
- utils=_sasl_alloc_utils(*pconn, &global_callbacks);
+ utils=_sasl_alloc_utils(*pconn, &global_callbacks_client);
if (utils==NULL)
MEMERROR(*pconn);
diff -ru cyrus-sasl-2.1.21.orig/saslauthd/configure
cyrus-sasl-2.1.21/saslauthd/configure
--- cyrus-sasl-2.1.21.orig/saslauthd/configure 2005-05-15 01:59:04.000000000
-0400
+++ cyrus-sasl-2.1.21/saslauthd/configure 2005-06-26 16:10:28.000000000
-0400
@@ -9380,8 +9380,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
@@ -9389,8 +9389,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. */
@@ -9399,7 +9399,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
@@ -9425,8 +9425,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. */
@@ -9434,7 +9434,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
@@ -9467,10 +9467,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
## ------------------------------------ ##
@@ -9481,12 +9481,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
## ------------------------------------ ##
@@ -9497,8 +9497,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
--- NEW FILE: cyrus-sasl2.info ---
Package: cyrus-sasl2
Version: 2.1.21
Revision: 4
Maintainer: Daniel Johnson <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
BuildDepends: system-openssl-dev, db43-ssl | db43
Source: mirror:custom:cyrus-sasl-%v.tar.gz
CustomMirror: <<
Primary: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
Secondary: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/
<<
Source-MD5: dde02db234dea892bee298390890502e
Patch: %n.patch
NoSetLDFLAGS: True
SetLibs: -L%p/lib
ConfigureParams: --libexecdir=%p/lib --mandir=%p/share/man
--infodir=%p/share/info --with-plugindir=%p/lib/sasl2
--with-dbpath=%p/etc/sasldb2 --disable-static --with-saslauthd=%p/var/saslauthd
--with-bdb-incdir=%p/include/db4 --enable-login --enable-ntlm
--disable-dependency-tracking --with-dblib=berkeley --disable-macos-framework
--with-openssl=%p/lib/system-openssl
SetCPPFLAGS: -I%p/lib/system-openssl/include
InstallScript: <<
mkdir -p %i/share/man/man8
mkdir -p %i/var/saslauthd
make install DESTDIR=%d
cd utils; cp sasldblistusers2.8 saslpasswd2.8 %i/share/man/man8
<<
DocFiles: AUTHORS COPYING NEWS README ChangeLog doc/TODO doc/*.html doc/*.txt
SplitOff: <<
Package: %N-shlibs
Depends: db43-ssl-shlibs | db43-shlibs
Conflicts: %N-dev (<= 2.1.21-3)
Replaces: %N-dev (<= 2.1.21-3)
Files: lib/*.*.dylib lib/sasl2/*.*.so lib/sasl2/*.la
Shlibs: %p/lib/libsasl2.2.dylib 3.0.0 %n (>= 2.1.13-12)
DocFiles: COPYING README
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
Conflicts: %N (<= 2.1.10-2)
Replaces: %N (<= 2.1.10-2)
Files: include/sasl lib/*.dylib lib/*.la lib/sasl2/*.so
BuildDependsOnly: True
DocFiles: COPYING README
<<
SplitOff3: <<
Package: %N-doc
Conflicts: cyrus-sasl (<= 1.5.27-15), cyrus-sasl-doc
Replaces: cyrus-sasl (<= 1.5.27-15), cyrus-sasl-doc
Files: share/man
DocFiles: COPYING README
<<
Description: Cyrus Simple Auth. 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.
<<
DescPort: <<
Patch to stop the creation and installing of a framework and look for PAM
headers in /usr/include/pam instead of /usr/include/security. KERBEROS IV
support has been disabled for Darwin by the upstream developers.
<<
DescPackaging: <<
Moved the manual pages to there own splitoff so cyrus-sasl and cyrus-sasl2
can co-exist happliy.
Now uses system's OpenSSL (via system-openssl-dev) and removed from crypto
tree. Yay!
Previous versions maintained by Matt Stephenson <[EMAIL PROTECTED]>
Borrowed a patch from redhat to build on new gcc.
<<
License: OSI-Approved
Homepage: http://asg.web.cmu.edu/sasl
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
