Stefan Fiedler
20 years ago
6 changed files with 0 additions and 530 deletions
Unified View
Diff Options
-
+0 -144package/base/openldap/sasl2.patch
-
+0 -96package/kde/kdebase/sasl2-location.patch
-
+0 -79package/kde/kdepim/sasl2-location.patch
-
+0 -144package/public/multisync/ldap-sasl-2-loc.patch
-
+0 -24package/tsa/cyrus-sasl2/cyrus-sasl2.conf
-
+0 -43package/tsa/cyrus-sasl2/sasl2_includes.patch
@ -1,144 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/base/openldap/sasl2.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This patch file is dual-licensed. It is available under the license the |
|
||||
# patched project is licensed under, as long as it is an OpenSource license |
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
||||
# of the GNU General Public License as published by the Free Software |
|
||||
# Foundation; either version 2 of the License, or (at your option) any later |
|
||||
# version. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -urN openldap-2.1.28/build/openldap.m4 openldap-2.1.28-jsaw/build/openldap.m4
|
|
||||
--- openldap-2.1.28/build/openldap.m4 2003-12-02 19:05:49.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/build/openldap.m4 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -1204,7 +1204,7 @@
|
|
||||
[AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[ |
|
||||
AC_EGREP_CPP(__sasl_compat,[ |
|
||||
#ifdef HAVE_SASL_SASL_H |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#include <sasl.h> |
|
||||
#endif |
|
||||
diff -urN openldap-2.1.28/configure openldap-2.1.28-jsaw/configure
|
|
||||
--- openldap-2.1.28/configure 2004-01-18 22:25:00.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/configure 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -20834,7 +20834,7 @@
|
|
||||
ol_link_sasl=no |
|
||||
ol_link_spasswd=no |
|
||||
if test $ol_with_cyrus_sasl != no ; then |
|
||||
- for ac_hdr in sasl/sasl.h sasl.h
|
|
||||
+ for ac_hdr in sasl2/sasl.h sasl.h
|
|
||||
do |
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
|
||||
@@ -20980,7 +20980,7 @@
|
|
||||
#include "confdefs.h" |
|
||||
|
|
||||
#ifdef HAVE_SASL_SASL_H |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#include <sasl.h> |
|
||||
#endif |
|
||||
diff -urN openldap-2.1.28/configure.in openldap-2.1.28-jsaw/configure.in
|
|
||||
--- openldap-2.1.28/configure.in 2004-01-18 22:25:26.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/configure.in 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -2129,7 +2129,7 @@
|
|
||||
ol_link_sasl=no |
|
||||
ol_link_spasswd=no |
|
||||
if test $ol_with_cyrus_sasl != no ; then |
|
||||
- AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
|
|
||||
+ AC_CHECK_HEADERS(sasl2/sasl.h sasl.h)
|
|
||||
|
|
||||
if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then |
|
||||
AC_CHECK_LIB(sasl2, sasl_client_init, |
|
||||
diff -urN openldap-2.1.28/include/portable.h.in openldap-2.1.28-jsaw/include/portable.h.in
|
|
||||
--- openldap-2.1.28/include/portable.h.in 2003-03-10 03:36:10.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/include/portable.h.in 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -476,7 +476,7 @@
|
|
||||
/* Define if you have the <sasl.h> header file. */ |
|
||||
#undef HAVE_SASL_H |
|
||||
|
|
||||
-/* Define if you have the <sasl/sasl.h> header file. */
|
|
||||
+/* Define if you have the <sasl2/sasl.h> header file. */
|
|
||||
#undef HAVE_SASL_SASL_H |
|
||||
|
|
||||
/* Define if you have the <sched.h> header file. */ |
|
||||
diff -urN openldap-2.1.28/libraries/libldap/cyrus.c openldap-2.1.28-jsaw/libraries/libldap/cyrus.c
|
|
||||
--- openldap-2.1.28/libraries/libldap/cyrus.c 2004-02-12 03:41:19.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/libraries/libldap/cyrus.c 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -24,7 +24,7 @@
|
|
||||
#endif |
|
||||
|
|
||||
#ifdef HAVE_SASL_SASL_H |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#include <sasl.h> |
|
||||
#endif |
|
||||
diff -urN openldap-2.1.28/libraries/libldap/ldap-int.h openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h
|
|
||||
--- openldap-2.1.28/libraries/libldap/ldap-int.h 2003-04-29 01:41:55.000000000 +0200
|
|
||||
+++ openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -25,7 +25,7 @@
|
|
||||
#ifdef HAVE_CYRUS_SASL |
|
||||
/* the need for this should be removed */ |
|
||||
#ifdef HAVE_SASL_SASL_H |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#include <sasl.h> |
|
||||
#endif |
|
||||
diff -urN openldap-2.1.28/libraries/liblutil/passwd.c openldap-2.1.28-jsaw/libraries/liblutil/passwd.c
|
|
||||
--- openldap-2.1.28/libraries/liblutil/passwd.c 2003-12-18 03:36:40.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/libraries/liblutil/passwd.c 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -35,7 +35,7 @@
|
|
||||
|
|
||||
#ifdef SLAPD_SPASSWD |
|
||||
# ifdef HAVE_SASL_SASL_H |
|
||||
-# include <sasl/sasl.h>
|
|
||||
+# include <sasl2/sasl.h>
|
|
||||
# else |
|
||||
# include <sasl.h> |
|
||||
# endif |
|
||||
diff -urN openldap-2.1.28/libraries/liblutil/sasl.c openldap-2.1.28-jsaw/libraries/liblutil/sasl.c
|
|
||||
--- openldap-2.1.28/libraries/liblutil/sasl.c 2003-04-26 16:56:37.000000000 +0200
|
|
||||
+++ openldap-2.1.28-jsaw/libraries/liblutil/sasl.c 2004-03-29 00:57:32.000000000 +0200
|
|
||||
@@ -14,7 +14,7 @@
|
|
||||
#include <ac/unistd.h> |
|
||||
|
|
||||
#ifdef HAVE_SASL_SASL_H |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#include <sasl.h> |
|
||||
#endif |
|
||||
diff -urN openldap-2.1.28/servers/slapd/sasl.c openldap-2.1.28-jsaw/servers/slapd/sasl.c
|
|
||||
--- openldap-2.1.28/servers/slapd/sasl.c 2004-01-21 08:56:34.000000000 +0100
|
|
||||
+++ openldap-2.1.28-jsaw/servers/slapd/sasl.c 2004-03-29 00:57:33.000000000 +0200
|
|
||||
@@ -19,14 +19,14 @@
|
|
||||
|
|
||||
#ifdef HAVE_CYRUS_SASL |
|
||||
# ifdef HAVE_SASL_SASL_H |
|
||||
-# include <sasl/sasl.h>
|
|
||||
+# include <sasl2/sasl.h>
|
|
||||
# else |
|
||||
# include <sasl.h> |
|
||||
# endif |
|
||||
|
|
||||
# if SASL_VERSION_MAJOR >= 2 |
|
||||
# ifdef HAVE_SASL_SASL_H |
|
||||
-# include <sasl/saslplug.h>
|
|
||||
+# include <sasl2/saslplug.h>
|
|
||||
# else |
|
||||
# include <saslplug.h> |
|
||||
# endif |
|
||||
@ -1,96 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/kde/kdebase/sasl2-location.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This patch file is dual-licensed. It is available under the license the |
|
||||
# patched project is licensed under, as long as it is an OpenSource license |
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
||||
# of the GNU General Public License as published by the Free Software |
|
||||
# Foundation; either version 2 of the License, or (at your option) any later |
|
||||
# version. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
--- ./configure.orig 2005-03-21 12:35:09.000000000 +0100
|
|
||||
+++ ./configure 2005-03-21 12:36:27.000000000 +0100
|
|
||||
@@ -48988,7 +48988,7 @@
|
|
||||
|
|
||||
|
|
||||
|
|
||||
-for ac_header in sasl/sasl.h
|
|
||||
+for ac_header in sasl2/sasl.h
|
|
||||
do |
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` |
|
||||
if eval "test \"\${$as_ac_Header+set}\" = set"; then |
|
||||
--- ./configure.in.orig 2005-03-21 12:35:40.000000000 +0100
|
|
||||
+++ ./configure.in 2005-03-04 14:11:05.000000000 +0100
|
|
||||
@@ -1177,7 +1177,7 @@
|
|
||||
SASL2_LIBS="" |
|
||||
|
|
||||
KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap |
|
||||
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
|
||||
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
|
||||
if test "$sasl2_header" = "yes" ; then |
|
||||
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
|
||||
fi |
|
||||
--- ./kioslave/configure.in.in.orig 2004-09-30 00:30:49.000000000 +0200
|
|
||||
+++ ./kioslave/configure.in.in 2005-03-22 14:33:43.000000000 +0100
|
|
||||
@@ -4,7 +4,7 @@
|
|
||||
SASL2_LIBS="" |
|
||||
|
|
||||
KDE_CHECK_HEADERS(sasl.h)dnl SASL1 header is enough for kio_ldap |
|
||||
-KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
|
||||
+KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
|
||||
if test "$sasl2_header" = "yes" ; then |
|
||||
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
|
||||
fi |
|
||||
--- ./kioslave/ldap/kio_ldap.cpp.orig 2005-03-22 14:35:20.000000000 +0100
|
|
||||
+++ ./kioslave/ldap/kio_ldap.cpp 2005-03-22 14:36:19.000000000 +0100
|
|
||||
@@ -22,7 +22,7 @@
|
|
||||
#include <klocale.h> |
|
||||
|
|
||||
#ifdef HAVE_SASL_SASL_H //prefer libsasl2 |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
#else |
|
||||
#ifdef HAVE_SASL_H |
|
||||
#include <sasl.h> |
|
||||
--- ./kioslave/pop3/pop3.cc.orig 2005-03-22 12:08:08.000000000 +0100
|
|
||||
+++ ./kioslave/pop3/pop3.cc 2005-03-22 12:08:23.000000000 +0100
|
|
||||
@@ -43,7 +43,7 @@
|
|
||||
|
|
||||
#ifdef HAVE_LIBSASL2 |
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#endif |
|
||||
|
|
||||
--- ./kioslave/smtp/command.h.orig 2005-03-22 14:35:48.000000000 +0100
|
|
||||
+++ ./kioslave/smtp/command.h 2005-03-22 14:36:33.000000000 +0100
|
|
||||
@@ -38,7 +38,7 @@
|
|
||||
|
|
||||
#ifdef HAVE_LIBSASL2 |
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#endif |
|
||||
|
|
||||
--- ./kioslave/smtp/smtp.cc.orig 2005-03-22 14:35:56.000000000 +0100
|
|
||||
+++ ./kioslave/smtp/smtp.cc 2005-03-22 14:36:50.000000000 +0100
|
|
||||
@@ -32,7 +32,7 @@
|
|
||||
|
|
||||
#ifdef HAVE_LIBSASL2 |
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#endif |
|
||||
|
|
||||
@ -1,79 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/kde/kdepim/sasl2-location.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This patch file is dual-licensed. It is available under the license the |
|
||||
# patched project is licensed under, as long as it is an OpenSource license |
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
||||
# of the GNU General Public License as published by the Free Software |
|
||||
# Foundation; either version 2 of the License, or (at your option) any later |
|
||||
# version. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -ruN kdepim-3.5.0/configure.in kdepim-3.5.0-new/configure.in
|
|
||||
--- kdepim-3.5.0/configure.in 2005-11-26 08:34:20.000000000 +0100
|
|
||||
+++ kdepim-3.5.0-new/configure.in 2005-12-07 16:01:42.000000000 +0100
|
|
||||
@@ -325,7 +325,7 @@
|
|
||||
sasl2_header="no" |
|
||||
SASL2_LIBS="" |
|
||||
if test "x$with_sasl" != xno; then |
|
||||
- KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
|
||||
+ KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
|
||||
if test "$sasl2_header" = "yes" ; then |
|
||||
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
|
||||
fi |
|
||||
diff -ruN kdepim-3.5.0/kioslaves/configure.in.in kdepim-3.5.0-new/kioslaves/configure.in.in
|
|
||||
--- kdepim-3.5.0/kioslaves/configure.in.in 2005-10-10 17:02:21.000000000 +0200
|
|
||||
+++ kdepim-3.5.0-new/kioslaves/configure.in.in 2005-12-07 16:01:15.000000000 +0100
|
|
||||
@@ -8,7 +8,7 @@
|
|
||||
sasl2_header="no" |
|
||||
SASL2_LIBS="" |
|
||||
if test "x$with_sasl" != xno; then |
|
||||
- KDE_CHECK_HEADERS(sasl/sasl.h, sasl2_header="yes")
|
|
||||
+ KDE_CHECK_HEADERS(sasl2/sasl.h, sasl2_header="yes")
|
|
||||
if test "$sasl2_header" = "yes" ; then |
|
||||
KDE_CHECK_LIB(sasl2, sasl_client_init, SASL2_LIBS="-lsasl2") |
|
||||
fi |
|
||||
diff -ruN kdepim-3.5.0/kioslaves/imap4/imap4.cc kdepim-3.5.0-new/kioslaves/imap4/imap4.cc
|
|
||||
--- kdepim-3.5.0/kioslaves/imap4/imap4.cc 2005-10-10 17:02:21.000000000 +0200
|
|
||||
+++ kdepim-3.5.0-new/kioslaves/imap4/imap4.cc 2005-12-07 16:02:04.000000000 +0100
|
|
||||
@@ -74,7 +74,7 @@
|
|
||||
|
|
||||
#ifdef HAVE_LIBSASL2 |
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#endif |
|
||||
|
|
||||
diff -ruN kdepim-3.5.0/kioslaves/imap4/imapparser.cc kdepim-3.5.0-new/kioslaves/imap4/imapparser.cc
|
|
||||
--- kdepim-3.5.0/kioslaves/imap4/imapparser.cc 2005-09-10 10:24:05.000000000 +0200
|
|
||||
+++ kdepim-3.5.0-new/kioslaves/imap4/imapparser.cc 2005-12-07 16:02:22.000000000 +0100
|
|
||||
@@ -43,7 +43,7 @@
|
|
||||
|
|
||||
#ifdef HAVE_LIBSASL2 |
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#endif |
|
||||
|
|
||||
diff -ruN kdepim-3.5.0/kioslaves/sieve/sieve.cpp kdepim-3.5.0-new/kioslaves/sieve/sieve.cpp
|
|
||||
--- kdepim-3.5.0/kioslaves/sieve/sieve.cpp 2005-09-10 10:24:05.000000000 +0200
|
|
||||
+++ kdepim-3.5.0-new/kioslaves/sieve/sieve.cpp 2005-12-07 16:02:36.000000000 +0100
|
|
||||
@@ -29,7 +29,7 @@
|
|
||||
#endif |
|
||||
|
|
||||
extern "C" { |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
} |
|
||||
#include "sieve.h" |
|
||||
|
|
||||
@ -1,144 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/public/multisync/ldap-sasl-2-loc.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This patch file is dual-licensed. It is available under the license the |
|
||||
# patched project is licensed under, as long as it is an OpenSource license |
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
||||
# of the GNU General Public License as published by the Free Software |
|
||||
# Foundation; either version 2 of the License, or (at your option) any later |
|
||||
# version. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
--- ./plugins/ldap_plugin/configure.in.orig 2004-08-25 20:36:19.699675272 +0200
|
|
||||
+++ ./plugins/ldap_plugin/configure.in 2004-08-25 20:37:11.541794072 +0200
|
|
||||
@@ -17,7 +17,7 @@
|
|
||||
AC_PROG_LIBTOOL |
|
||||
|
|
||||
AC_CHECK_LIB(ldap,ldap_init,,AC_MSG_ERROR(You must have openldap libraries installed.)) |
|
||||
-AC_CHECK_HEADER(sasl/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed))
|
|
||||
+AC_CHECK_HEADER(sasl2/sasl.h,, AC_MSG_ERROR(You must have the libsasl2-dev package installed))
|
|
||||
|
|
||||
dnl Info for the RPM |
|
||||
MULTISYNC_TOP="../.." |
|
||||
--- ./plugins/ldap_plugin/src/ldap.c.orig 2003-12-03 02:24:07.000000000 +0100
|
|
||||
+++ ./plugins/ldap_plugin/src/ldap.c 2004-08-25 21:05:03.364638368 +0200
|
|
||||
@@ -1,5 +1,5 @@
|
|
||||
#include "ldap_plugin.h" |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
|
|
||||
int lutil_sasl_interact( |
|
||||
LDAP *ld, |
|
||||
--- ./plugins/ldap_plugin/configure.orig 2004-12-18 09:27:21.466670192 +0100
|
|
||||
+++ ./plugins/ldap_plugin/configure 2004-12-18 09:28:05.211020040 +0100
|
|
||||
@@ -20172,8 +20172,8 @@
|
|
||||
fi |
|
||||
|
|
||||
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
|
||||
- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
|
|
||||
-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
|
|
||||
+ echo "$as_me:$LINENO: checking for sasl2/sasl.h" >&5
|
|
||||
+echo $ECHO_N "checking for sasl2/sasl.h... $ECHO_C" >&6
|
|
||||
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
||||
fi |
|
||||
@@ -20181,8 +20181,8 @@
|
|
||||
echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6 |
|
||||
else |
|
||||
# Is the header compilable? |
|
||||
-echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
|
|
||||
-echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
|
|
||||
+echo "$as_me:$LINENO: checking sasl2/sasl.h usability" >&5
|
|
||||
+echo $ECHO_N "checking sasl2/sasl.h usability... $ECHO_C" >&6
|
|
||||
cat >conftest.$ac_ext <<_ACEOF |
|
||||
/* confdefs.h. */ |
|
||||
_ACEOF |
|
||||
@@ -20190,7 +20190,7 @@
|
|
||||
cat >>conftest.$ac_ext <<_ACEOF |
|
||||
/* end confdefs.h. */ |
|
||||
$ac_includes_default |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
_ACEOF |
|
||||
rm -f conftest.$ac_objext |
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |
|
||||
@@ -20225,15 +20225,15 @@
|
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6 |
|
||||
|
|
||||
# Is the header present? |
|
||||
-echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
|
|
||||
-echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
|
|
||||
+echo "$as_me:$LINENO: checking sasl2/sasl.h presence" >&5
|
|
||||
+echo $ECHO_N "checking sasl2/sasl.h presence... $ECHO_C" >&6
|
|
||||
cat >conftest.$ac_ext <<_ACEOF |
|
||||
/* confdefs.h. */ |
|
||||
_ACEOF |
|
||||
cat confdefs.h >>conftest.$ac_ext |
|
||||
cat >>conftest.$ac_ext <<_ACEOF |
|
||||
/* end confdefs.h. */ |
|
||||
-#include <sasl/sasl.h>
|
|
||||
+#include <sasl2/sasl.h>
|
|
||||
_ACEOF |
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 |
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 |
|
||||
@@ -20267,25 +20267,25 @@
|
|
||||
# So? What about this header? |
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in |
|
||||
yes:no: ) |
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the compiler's result" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the compiler's result" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the compiler's result" >&2;}
|
|
||||
ac_header_preproc=yes |
|
||||
;; |
|
||||
no:yes:* ) |
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: present but cannot be compiled" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: present but cannot be compiled" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: check for missing prerequisite headers?" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: see the Autoconf documentation" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: see the Autoconf documentation" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
|
|
||||
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
|
|
||||
-echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: present but cannot be compiled" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: present but cannot be compiled" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: check for missing prerequisite headers?" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: see the Autoconf documentation" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: see the Autoconf documentation" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: section \"Present But Cannot Be Compiled\"" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: proceeding with the preprocessor's result" >&2;}
|
|
||||
+ { echo "$as_me:$LINENO: WARNING: sasl2/sasl.h: in the future, the compiler will take precedence" >&5
|
|
||||
+echo "$as_me: WARNING: sasl2/sasl.h: in the future, the compiler will take precedence" >&2;}
|
|
||||
( |
|
||||
cat <<\_ASBOX |
|
||||
## ------------------------------------------ ## |
|
||||
@@ -20296,8 +20296,8 @@
|
|
||||
sed "s/^/$as_me: WARNING: /" >&2 |
|
||||
;; |
|
||||
esac |
|
||||
-echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
|
|
||||
-echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
|
|
||||
+echo "$as_me:$LINENO: checking for sasl2/sasl.h" >&5
|
|
||||
+echo $ECHO_N "checking for sasl2/sasl.h... $ECHO_C" >&6
|
|
||||
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then |
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6 |
|
||||
else |
|
||||
@ -1,24 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/tsa/cyrus-sasl2/cyrus-sasl2.conf |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This program is free software; you can redistribute it and/or modify |
|
||||
# it under the terms of the GNU General Public License as published by |
|
||||
# the Free Software Foundation; either version 2 of the License, or |
|
||||
# (at your option) any later version. A copy of the GNU General Public |
|
||||
# License can be found at Documentation/COPYING. |
|
||||
# |
|
||||
# Many people helped and are helping developing ROCK Linux. Please |
|
||||
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
|
||||
# file for details. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
var_append confopt ' ' '--includedir=/$prefix/include/sasl' |
|
||||
|
|
||||
@ -1,43 +0,0 @@ |
|||||
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
|
||||
# |
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
|
||||
# Please add additional copyright information _after_ the line containing |
|
||||
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
|
||||
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
|
||||
# |
|
||||
# ROCK Linux: rock-src/package/tsa/cyrus-sasl2/sasl2_includes.patch |
|
||||
# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf |
|
||||
# |
|
||||
# This patch file is dual-licensed. It is available under the license the |
|
||||
# patched project is licensed under, as long as it is an OpenSource license |
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms |
|
||||
# of the GNU General Public License as published by the Free Software |
|
||||
# Foundation; either version 2 of the License, or (at your option) any later |
|
||||
# version. |
|
||||
# |
|
||||
# --- ROCK-COPYRIGHT-NOTE-END --- |
|
||||
|
|
||||
diff -Nur cyrus-sasl-2.1.17.orig/include/Makefile.in cyrus-sasl-2.1.17/include/Makefile.in
|
|
||||
--- cyrus-sasl-2.1.17.orig/include/Makefile.in 2003-12-01 17:35:06.000000000 +0100
|
|
||||
+++ cyrus-sasl-2.1.17/include/Makefile.in 2004-01-13 22:03:41.000000000 +0100
|
|
||||
@@ -226,7 +226,7 @@
|
|
||||
|
|
||||
noinst_HEADERS = gai.h exits.h |
|
||||
|
|
||||
-saslincludedir = $(includedir)/sasl
|
|
||||
+saslincludedir = $(includedir)
|
|
||||
saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h |
|
||||
|
|
||||
noinst_PROGRAMS = makemd5 |
|
||||
diff -Nur cyrus-sasl-2.1.17.orig/utils/Makefile.in cyrus-sasl-2.1.17/utils/Makefile.in
|
|
||||
--- cyrus-sasl-2.1.17.orig/utils/Makefile.in 2003-12-01 17:35:08.000000000 +0100
|
|
||||
+++ cyrus-sasl-2.1.17/utils/Makefile.in 2004-01-13 22:05:19.000000000 +0100
|
|
||||
@@ -253,7 +253,7 @@
|
|
||||
smtptest_DEPENDENCIES = ./smtptest.lo ./libsfsasl2.la |
|
||||
smtptest_LDADD = ./smtptest.lo ./libsfsasl2.la @SFIO_LIB_FLAGS@ @DMALLOC_LIBS@ $(all_sasl_libs) |
|
||||
|
|
||||
-saslincludedir = $(includedir)/sasl
|
|
||||
+saslincludedir = $(includedir)
|
|
||||
|
|
||||
saslinclude_HEADERS = @SASL_UTIL_HEADERS_EXTRA@ |
|
||||
EXTRA_HEADERS = sfsasl.h |
|
||||