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: 26-May-2005 21:06:56
Branch: HEAD Handle: 2005052620065600
Modified files:
openpkg-src/sasl sasl.patch sasl.spec
Log:
upgrading package: sasl 2.1.20 -> 2.1.21
Summary:
Revision Changes Path
1.15 +50 -50 openpkg-src/sasl/sasl.patch
1.129 +2 -2 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 sasl.patch
--- openpkg-src/sasl/sasl.patch 21 Mar 2005 16:10:33 -0000 1.14
+++ openpkg-src/sasl/sasl.patch 26 May 2005 19:06:56 -0000 1.15
@@ -1,58 +1,16 @@
-Index: lib/server.c
---- lib/server.c.orig 2004-07-06 15:42:23 +0200
-+++ lib/server.c 2004-07-14 19:38:16 +0200
-@@ -470,16 +470,8 @@
- return SASL_CONTINUE;
- }
-
-- /* get the path to the plugins; for now the config file will reside there
*/
-- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
-- if (getpath_cb==NULL) return SASL_BADPARAM;
--
-- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
-- system */
-- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
-- &path_to_config);
-- if (result!=SASL_OK) goto done;
-- if (path_to_config == NULL) path_to_config = "";
-+ result = SASL_OK;
-+ path_to_config = "@l_sysconfdir@";
-
- c = strchr(path_to_config, PATHS_DELIMITER);
-
-Index: saslauthd/lak.c
---- saslauthd/lak.c.orig 2003-10-30 18:21:47.000000000 +0100
-+++ saslauthd/lak.c 2004-02-08 11:56:59.000000000 +0100
-@@ -47,6 +47,7 @@
- #include <crypt.h>
- #endif
-
-+#include "saslauthd.h" /* get strlcpy macro for non-BSD; get HAVE_OPENSSL
from config.h */
- #ifdef HAVE_OPENSSL
- #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
- #define OPENSSL_DISABLE_OLD_DES_SUPPORT
-@@ -57,7 +58,7 @@
-
- #include <ldap.h>
- #include <lber.h>
--#include <sasl.h>
-+#include "sasl.h"
- #include "lak.h"
-
- typedef struct lak_auth_method {
Index: configure
---- configure.orig 2005-03-21 15:33:01 +0100
-+++ configure 2005-03-21 15:36:05 +0100
-@@ -5129,7 +5129,7 @@
+--- configure.orig 2005-05-15 07:58:28 +0200
++++ configure 2005-05-26 20:55:23 +0200
+@@ -5124,7 +5124,7 @@
fi
saved_LIBS=$LIBS
-- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ for dbname in db
do
LIBS="$saved_LIBS -l$dbname"
cat >conftest.$ac_ext <<_ACEOF
-@@ -5208,6 +5208,54 @@
+@@ -5204,6 +5204,54 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
@@ -107,16 +65,16 @@
LIBS=$saved_LIBS
LDFLAGS=$BDB_SAVE_LDFLAGS
-@@ -5885,7 +5933,7 @@
+@@ -5881,7 +5929,7 @@
fi
saved_LIBS=$LIBS
-- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4
db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42
db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2
db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+ for dbname in db
do
LIBS="$saved_LIBS -l$dbname"
cat >conftest.$ac_ext <<_ACEOF
-@@ -5964,6 +6012,54 @@
+@@ -5961,6 +6009,54 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
@@ -171,3 +129,45 @@
LIBS=$saved_LIBS
LDFLAGS=$BDB_SAVE_LDFLAGS
+Index: lib/server.c
+--- lib/server.c.orig 2004-11-17 15:19:30 +0100
++++ lib/server.c 2005-05-26 20:54:36 +0200
+@@ -473,16 +473,8 @@
+ return SASL_CONTINUE;
+ }
+
+- /* get the path to the plugins; for now the config file will reside there
*/
+- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks );
+- if (getpath_cb==NULL) return SASL_BADPARAM;
+-
+- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type
+- system */
+- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context,
+- &path_to_config);
+- if (result!=SASL_OK) goto done;
+- if (path_to_config == NULL) path_to_config = "";
++ result = SASL_OK;
++ path_to_config = "@l_sysconfdir@";
+
+ c = strchr(path_to_config, PATHS_DELIMITER);
+
+Index: saslauthd/lak.c
+--- saslauthd/lak.c.orig 2005-05-15 07:55:22 +0200
++++ saslauthd/lak.c 2005-05-26 20:54:36 +0200
+@@ -47,6 +47,7 @@
+ #include <crypt.h>
+ #endif
+
++#include "saslauthd.h" /* get strlcpy macro for non-BSD; get HAVE_OPENSSL
from config.h */
+ #ifdef HAVE_OPENSSL
+ #ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
+ #define OPENSSL_DISABLE_OLD_DES_SUPPORT
+@@ -57,7 +58,7 @@
+
+ #include <ldap.h>
+ #include <lber.h>
+-#include <sasl.h>
++#include "sasl.h"
+ #include "lak.h"
+
+ typedef struct lak_auth_method {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.128 -r1.129 sasl.spec
--- openpkg-src/sasl/sasl.spec 24 Mar 2005 11:20:14 -0000 1.128
+++ openpkg-src/sasl/sasl.spec 26 May 2005 19:06:56 -0000 1.129
@@ -32,8 +32,8 @@
Class: BASE
Group: Cryptography
License: BSD
-Version: 2.1.20
-Release: 20050321
+Version: 2.1.21
+Release: 20050526
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
