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: 20-Sep-2006 21:22:41
Branch: OPENPKG_2_STABLE Handle: 2006092020224100
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/sasl sasl.patch sasl.spec
Log:
MFC: Solaris 10 fixes
Summary:
Revision Changes Path
1.17.2.1 +64 -10 openpkg-src/sasl/sasl.patch
1.136.2.2 +3 -2 openpkg-src/sasl/sasl.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.patch
============================================================================
$ cvs diff -u -r1.17 -r1.17.2.1 sasl.patch
--- openpkg-src/sasl/sasl.patch 22 May 2006 09:29:41 -0000 1.17
+++ openpkg-src/sasl/sasl.patch 20 Sep 2006 19:22:41 -0000 1.17.2.1
@@ -1,6 +1,6 @@
Index: configure
---- configure.orig 2006-05-18 21:30:13 +0200
-+++ configure 2006-05-22 11:23:18 +0200
+--- configure.orig 2006-05-18 21:30:13.000000000 +0200
++++ configure 2006-09-20 07:42:24.019489745 +0200
@@ -5125,7 +5125,7 @@
fi
@@ -130,8 +130,8 @@
LDFLAGS=$BDB_SAVE_LDFLAGS
Index: lib/saslint.h
---- lib/saslint.h.orig 2006-04-18 22:25:45 +0200
-+++ lib/saslint.h 2006-05-22 11:23:19 +0200
+--- lib/saslint.h.orig 2006-04-18 22:25:45.000000000 +0200
++++ lib/saslint.h 2006-09-20 07:42:24.019997273 +0200
@@ -109,8 +109,6 @@
const char *appname;
} sasl_global_callbacks_t;
@@ -142,8 +142,8 @@
{
sasl_ssf_t ssf;
Index: lib/server.c
---- lib/server.c.orig 2006-05-22 11:23:18 +0200
-+++ lib/server.c 2006-05-22 11:25:01 +0200
+--- lib/server.c.orig 2006-05-17 18:46:13.000000000 +0200
++++ lib/server.c 2006-09-20 07:42:24.020844262 +0200
@@ -95,7 +95,7 @@
static mech_list_t *mechlist = NULL; /* global var which holds the list */
@@ -172,9 +172,63 @@
next = path_to_config;
+Index: sample/client.c
+--- sample/client.c.orig 2004-03-09 18:35:32.000000000 +0100
++++ sample/client.c 2006-09-20 07:42:24.022328546 +0200
+@@ -133,13 +133,11 @@
+ return SASL_OK;
+ }
+
+-#ifndef HAVE_GETPASSPHRASE
+ static char *
+-getpassphrase(const char *prompt)
++my_getpassphrase(const char *prompt)
+ {
+ return getpass(prompt);
+ }
+-#endif /* ! HAVE_GETPASSPHRASE */
+
+ static int
+ getsecret(sasl_conn_t *conn,
+@@ -155,7 +153,7 @@
+ if (! conn || ! psecret || id != SASL_CB_PASS)
+ return SASL_BADPARAM;
+
+- password = getpassphrase("Password: ");
++ password = my_getpassphrase("Password: ");
+ if (! password)
+ return SASL_FAIL;
+
+Index: sample/sample-client.c
+--- sample/sample-client.c.orig 2004-10-26 13:14:33.000000000 +0200
++++ sample/sample-client.c 2006-09-20 07:42:24.022722474 +0200
+@@ -244,13 +244,11 @@
+ return SASL_OK;
+ }
+
+-#ifndef HAVE_GETPASSPHRASE
+ static char *
+-getpassphrase(const char *prompt)
++my_getpassphrase(const char *prompt)
+ {
+ return getpass(prompt);
+ }
+-#endif /* ! HAVE_GETPASSPHRASE */
+
+ static int
+ getsecret(sasl_conn_t *conn,
+@@ -264,7 +262,7 @@
+ if (! conn || ! psecret || id != SASL_CB_PASS)
+ return SASL_BADPARAM;
+
+- password = getpassphrase("Password: ");
++ password = my_getpassphrase("Password: ");
+ if (! password)
+ return SASL_FAIL;
+
Index: saslauthd/Makefile.in
---- saslauthd/Makefile.in.orig 2006-05-18 21:30:21 +0200
-+++ saslauthd/Makefile.in 2006-05-22 11:23:19 +0200
+--- saslauthd/Makefile.in.orig 2006-05-18 21:30:21.000000000 +0200
++++ saslauthd/Makefile.in 2006-09-20 07:42:24.021263412 +0200
@@ -150,11 +150,11 @@
saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
saslauthd_LDADD = @SASL_KRB_LIB@ \
@@ -190,8 +244,8 @@
saslcache_SOURCES = saslcache.c
Index: saslauthd/lak.c
---- saslauthd/lak.c.orig 2005-05-15 07:49:51 +0200
-+++ saslauthd/lak.c 2006-05-22 11:23:19 +0200
+--- saslauthd/lak.c.orig 2005-05-15 07:49:51.000000000 +0200
++++ saslauthd/lak.c 2006-09-20 07:42:24.022012854 +0200
@@ -47,6 +47,7 @@
#include <crypt.h>
#endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sasl/sasl.spec
============================================================================
$ cvs diff -u -r1.136.2.1 -r1.136.2.2 sasl.spec
--- openpkg-src/sasl/sasl.spec 20 Jun 2006 15:24:31 -0000
1.136.2.1
+++ openpkg-src/sasl/sasl.spec 20 Sep 2006 19:22:41 -0000
1.136.2.2
@@ -33,7 +33,7 @@
Group: Cryptography
License: BSD
Version: 2.1.22
-Release: 2.20060622
+Release: 2.20060920
# package options
%option with_fsl yes
@@ -263,7 +263,8 @@
%{l_shtool} subst \
-e 's;\(\$(CCLD)\);\1 -static;' \
-e 's;\(noinst.*=\) *dbconverter.*;\1;' \
- utils/Makefile
+ utils/Makefile \
+ sample/Makefile
# post adjustment: fix OpenLDAP support
%if "%{with_ldap}" == "yes"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
