Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22004/net
Modified Files:
cyrus-sasl2.info cyrus-sasl2.patch
Log Message:
Move to stable.
Index: cyrus-sasl2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/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 24 Nov 2009 17:03:26 -0000 1.3
+++ cyrus-sasl2.patch 10 Jan 2011 22:49:00 -0000 1.4
@@ -1,6 +1,6 @@
diff -ru cyrus-sasl-2.1.23.orig/lib/client.c cyrus-sasl-2.1.23/lib/client.c
--- cyrus-sasl-2.1.23.orig/lib/client.c 2009-04-28 11:09:15.000000000
-0400
-+++ cyrus-sasl-2.1.23/lib/client.c 2009-06-07 09:15:56.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/client.c 2010-10-15 18:57:53.000000000 -0400
@@ -202,6 +202,9 @@
{ NULL, NULL }
};
@@ -13,7 +13,7 @@
/* xxx do something with the callback structure? */
diff -ru cyrus-sasl-2.1.23.orig/lib/common.c cyrus-sasl-2.1.23/lib/common.c
--- cyrus-sasl-2.1.23.orig/lib/common.c 2009-04-28 11:09:15.000000000
-0400
-+++ cyrus-sasl-2.1.23/lib/common.c 2009-06-07 09:16:54.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/common.c 2010-10-15 18:57:53.000000000 -0400
@@ -107,6 +107,7 @@
(sasl_realloc_t *) &realloc,
(sasl_free_t *) &free
@@ -46,7 +46,7 @@
_sasl_allocation_utils.realloc=r;
diff -ru cyrus-sasl-2.1.23.orig/lib/saslint.h cyrus-sasl-2.1.23/lib/saslint.h
--- cyrus-sasl-2.1.23.orig/lib/saslint.h 2009-04-28 11:09:15.000000000
-0400
-+++ cyrus-sasl-2.1.23/lib/saslint.h 2009-06-07 09:15:56.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/saslint.h 2010-10-15 18:57:53.000000000 -0400
@@ -300,6 +300,7 @@
extern sasl_allocation_utils_t _sasl_allocation_utils;
@@ -57,7 +57,7 @@
* checkpw.c
diff -ru cyrus-sasl-2.1.23.orig/lib/server.c cyrus-sasl-2.1.23/lib/server.c
--- cyrus-sasl-2.1.23.orig/lib/server.c 2009-04-28 11:09:15.000000000
-0400
-+++ cyrus-sasl-2.1.23/lib/server.c 2009-06-07 09:15:56.000000000 -0400
++++ cyrus-sasl-2.1.23/lib/server.c 2010-10-15 18:57:53.000000000 -0400
@@ -698,6 +698,9 @@
{ NULL, NULL }
};
@@ -70,7 +70,7 @@
return SASL_BADPARAM;
diff -ru cyrus-sasl-2.1.23.orig/plugins/digestmd5.c
cyrus-sasl-2.1.23/plugins/digestmd5.c
--- cyrus-sasl-2.1.23.orig/plugins/digestmd5.c 2009-04-28 11:09:17.000000000
-0400
-+++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2009-06-07 09:17:07.000000000
-0400
++++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2010-10-15 18:57:53.000000000
-0400
@@ -2715,7 +2715,7 @@
"DIGEST-MD5", /* mech_name */
#ifdef WITH_RC4
@@ -91,7 +91,7 @@
1,
diff -ru cyrus-sasl-2.1.23.orig/saslauthd/auth_rimap.c
cyrus-sasl-2.1.23/saslauthd/auth_rimap.c
--- cyrus-sasl-2.1.23.orig/saslauthd/auth_rimap.c 2009-04-28
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/auth_rimap.c 2009-06-07 09:16:33.000000000
-0400
++++ cyrus-sasl-2.1.23/saslauthd/auth_rimap.c 2010-10-15 18:57:53.000000000
-0400
@@ -162,6 +162,7 @@
num_quotes = 0;
p1 = s;
@@ -120,7 +120,7 @@
/* read and parse the LOGIN response */
diff -ru cyrus-sasl-2.1.23.orig/saslauthd/auth_shadow.c
cyrus-sasl-2.1.23/saslauthd/auth_shadow.c
--- cyrus-sasl-2.1.23.orig/saslauthd/auth_shadow.c 2009-04-28
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/auth_shadow.c 2009-06-07 09:16:08.000000000
-0400
++++ cyrus-sasl-2.1.23/saslauthd/auth_shadow.c 2010-10-15 18:57:53.000000000
-0400
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE
#define PWBUFSZ 256 /***SWB***/
@@ -128,7 +128,7 @@
/* MODULE: auth_shadow */
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
++++ cyrus-sasl-2.1.23/saslauthd/lak.c 2010-10-15 18:57:53.000000000 -0400
@@ -55,6 +55,7 @@
#include <openssl/des.h>
#endif
@@ -139,7 +139,7 @@
#include <sasl.h>
diff -ru cyrus-sasl-2.1.23.orig/saslauthd/saslauthd-main.c
cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c
--- cyrus-sasl-2.1.23.orig/saslauthd/saslauthd-main.c 2009-04-28
11:09:18.000000000 -0400
-+++ cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c 2009-06-07
09:16:18.000000000 -0400
++++ cyrus-sasl-2.1.23/saslauthd/saslauthd-main.c 2010-10-15
18:57:53.000000000 -0400
@@ -276,7 +276,7 @@
exit(1);
}
@@ -158,3 +158,27 @@
rc = errno;
logger(L_ERR, L_FUNC, "could not open pid lock file: %s",
pid_file_lock);
logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
+diff -ru cyrus-sasl-2.1.23.orig/sasldb/db_berkeley.c
cyrus-sasl-2.1.23/sasldb/db_berkeley.c
+--- cyrus-sasl-2.1.23.orig/sasldb/db_berkeley.c 2009-04-28
11:09:18.000000000 -0400
++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2010-10-15 18:58:37.000000000
-0400
+@@ -100,7 +100,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
+diff -ru cyrus-sasl-2.1.23.orig/utils/dbconverter-2.c
cyrus-sasl-2.1.23/utils/dbconverter-2.c
+--- cyrus-sasl-2.1.23.orig/utils/dbconverter-2.c 2003-02-13
14:56:17.000000000 -0500
++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2010-10-15 19:02:18.000000000
-0400
+@@ -214,7 +214,7 @@
+ ret = db_create(mbdb, NULL, 0);
+ if (ret == 0 && *mbdb != NULL)
+ {
+-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
++#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
+ #else
+ ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
Index: cyrus-sasl2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/net/cyrus-sasl2.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cyrus-sasl2.info 24 Nov 2009 17:03:26 -0000 1.7
+++ cyrus-sasl2.info 10 Jan 2011 22:49:00 -0000 1.8
@@ -1,13 +1,13 @@
Info4: <<
Package: cyrus-sasl2%type_pkg[-64bit]
Version: 2.1.23
-Revision: 2
+Revision: 3
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 <[email protected]>
Depends: %N-shlibs (= %v-%r), ( %type_raw[-64bit] = -64bit ) 64bit-cpu
-BuildDepends: system-openssl-dev, db48-aes%type_pkg[-64bit] |
db48%type_pkg[-64bit] , fink (>= 0.26.2), libtool2
+BuildDepends: system-openssl-dev, db51-aes%type_pkg[-64bit] |
db51%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,12 +17,12 @@
<<
Source-MD5: 2eb0e48106f0e9cd8001e654f267ecbc
PatchFile: %{ni}.patch
-PatchFile-MD5: 7655be102c4b1a8659775761d118d892
+PatchFile-MD5: f8628add63a620ef6271551fc1c3551c
PatchScript: <<
#!/bin/bash -ev
%{default_script}
- #Use db48
- perl -pi -e 's/db-4.4/db-4.8/g' configure
+ #Use db51
+ perl -pi -e 's/db-4.4/db-5.1/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
@@ -46,7 +46,7 @@
--libexecdir=%p/%lib \
--mandir=%p/share/man \
--with-authdaemond \
- --with-bdb-incdir=%p/include/db4 \
+ --with-bdb-incdir=%p/include/db5 \
--with-bdb-libdir=%p/%lib \
--with-dblib=berkeley \
--with-dbpath=%p/etc/sasldb2 \
@@ -63,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.8" LIBTOOL=glibtool
+ make SASL_DB_LIB="-L%p/%lib -ldb-5.1" LIBTOOL=glibtool
<<
InstallScript: <<
mkdir -p %i/share/man/man8
@@ -76,7 +76,7 @@
DocFiles: AUTHORS COPYING NEWS README ChangeLog doc/TODO doc/*.html doc/*.txt
SplitOff: <<
Package: %N-shlibs
- Depends: db48-aes%type_pkg[-64bit]-shlibs | db48%type_pkg[-64bit]-shlibs, (
%type_raw[-64bit] = -64bit ) 64bit-cpu
+ Depends: db51-aes%type_pkg[-64bit]-shlibs | db51%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]
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs