OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
3991 Commits
1 Branch
0 Tags
34 MiB
Tree: f0d07470bd
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f0d07470bd'
${ noResults }
rocklinux/package/mnemoc/openldap/sasl2.patch

144 lines
5.2 KiB
Raw Normal View History

Clifford Wolf: Updated Copyright Notes git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4570 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Juergen Sawinski: mnemoc/openldap: use cyrus-sasl2 headers for ver 2.1.28 (diff based on Chris' patch sent to the ML) [2004032901081511614] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2670 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
21 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/mnemoc/openldap/sasl2.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  20. diff -urN openldap-2.1.28/build/openldap.m4 openldap-2.1.28-jsaw/build/openldap.m4
  21. --- openldap-2.1.28/build/openldap.m4 2003-12-02 19:05:49.000000000 +0100
  22. +++ openldap-2.1.28-jsaw/build/openldap.m4 2004-03-29 00:57:32.000000000 +0200
  23. @@ -1204,7 +1204,7 @@
  24. [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
  25. AC_EGREP_CPP(__sasl_compat,[
  26. #ifdef HAVE_SASL_SASL_H
  27. -#include <sasl/sasl.h>
  28. +#include <sasl2/sasl.h>
  29. #else
  30. #include <sasl.h>
  31. #endif
  32. diff -urN openldap-2.1.28/configure openldap-2.1.28-jsaw/configure
  33. --- openldap-2.1.28/configure 2004-01-18 22:25:00.000000000 +0100
  34. +++ openldap-2.1.28-jsaw/configure 2004-03-29 00:57:32.000000000 +0200
  35. @@ -20834,7 +20834,7 @@
  36. ol_link_sasl=no
  37. ol_link_spasswd=no
  38. if test $ol_with_cyrus_sasl != no ; then
  39. - for ac_hdr in sasl/sasl.h sasl.h
  40. + for ac_hdr in sasl2/sasl.h sasl.h
  41. do
  42. ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  43. echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  44. @@ -20980,7 +20980,7 @@
  45. #include "confdefs.h"
  47. #ifdef HAVE_SASL_SASL_H
  48. -#include <sasl/sasl.h>
  49. +#include <sasl2/sasl.h>
  50. #else
  51. #include <sasl.h>
  52. #endif
  53. diff -urN openldap-2.1.28/configure.in openldap-2.1.28-jsaw/configure.in
  54. --- openldap-2.1.28/configure.in 2004-01-18 22:25:26.000000000 +0100
  55. +++ openldap-2.1.28-jsaw/configure.in 2004-03-29 00:57:32.000000000 +0200
  56. @@ -2129,7 +2129,7 @@
  57. ol_link_sasl=no
  58. ol_link_spasswd=no
  59. if test $ol_with_cyrus_sasl != no ; then
  60. - AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
  61. + AC_CHECK_HEADERS(sasl2/sasl.h sasl.h)
  63. if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then
  64. AC_CHECK_LIB(sasl2, sasl_client_init,
  65. diff -urN openldap-2.1.28/include/portable.h.in openldap-2.1.28-jsaw/include/portable.h.in
  66. --- openldap-2.1.28/include/portable.h.in 2003-03-10 03:36:10.000000000 +0100
  67. +++ openldap-2.1.28-jsaw/include/portable.h.in 2004-03-29 00:57:32.000000000 +0200
  68. @@ -476,7 +476,7 @@
  69. /* Define if you have the <sasl.h> header file. */
  70. #undef HAVE_SASL_H
  72. -/* Define if you have the <sasl/sasl.h> header file. */
  73. +/* Define if you have the <sasl2/sasl.h> header file. */
  74. #undef HAVE_SASL_SASL_H
  76. /* Define if you have the <sched.h> header file. */
  77. diff -urN openldap-2.1.28/libraries/libldap/cyrus.c openldap-2.1.28-jsaw/libraries/libldap/cyrus.c
  78. --- openldap-2.1.28/libraries/libldap/cyrus.c 2004-02-12 03:41:19.000000000 +0100
  79. +++ openldap-2.1.28-jsaw/libraries/libldap/cyrus.c 2004-03-29 00:57:32.000000000 +0200
  80. @@ -24,7 +24,7 @@
  81. #endif
  83. #ifdef HAVE_SASL_SASL_H
  84. -#include <sasl/sasl.h>
  85. +#include <sasl2/sasl.h>
  86. #else
  87. #include <sasl.h>
  88. #endif
  89. diff -urN openldap-2.1.28/libraries/libldap/ldap-int.h openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h
  90. --- openldap-2.1.28/libraries/libldap/ldap-int.h 2003-04-29 01:41:55.000000000 +0200
  91. +++ openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h 2004-03-29 00:57:32.000000000 +0200
  92. @@ -25,7 +25,7 @@
  93. #ifdef HAVE_CYRUS_SASL
  94. /* the need for this should be removed */
  95. #ifdef HAVE_SASL_SASL_H
  96. -#include <sasl/sasl.h>
  97. +#include <sasl2/sasl.h>
  98. #else
  99. #include <sasl.h>
  100. #endif
  101. diff -urN openldap-2.1.28/libraries/liblutil/passwd.c openldap-2.1.28-jsaw/libraries/liblutil/passwd.c
  102. --- openldap-2.1.28/libraries/liblutil/passwd.c 2003-12-18 03:36:40.000000000 +0100
  103. +++ openldap-2.1.28-jsaw/libraries/liblutil/passwd.c 2004-03-29 00:57:32.000000000 +0200
  104. @@ -35,7 +35,7 @@
  106. #ifdef SLAPD_SPASSWD
  107. # ifdef HAVE_SASL_SASL_H
  108. -# include <sasl/sasl.h>
  109. +# include <sasl2/sasl.h>
  110. # else
  111. # include <sasl.h>
  112. # endif
  113. diff -urN openldap-2.1.28/libraries/liblutil/sasl.c openldap-2.1.28-jsaw/libraries/liblutil/sasl.c
  114. --- openldap-2.1.28/libraries/liblutil/sasl.c 2003-04-26 16:56:37.000000000 +0200
  115. +++ openldap-2.1.28-jsaw/libraries/liblutil/sasl.c 2004-03-29 00:57:32.000000000 +0200
  116. @@ -14,7 +14,7 @@
  117. #include <ac/unistd.h>
  119. #ifdef HAVE_SASL_SASL_H
  120. -#include <sasl/sasl.h>
  121. +#include <sasl2/sasl.h>
  122. #else
  123. #include <sasl.h>
  124. #endif
  125. diff -urN openldap-2.1.28/servers/slapd/sasl.c openldap-2.1.28-jsaw/servers/slapd/sasl.c
  126. --- openldap-2.1.28/servers/slapd/sasl.c 2004-01-21 08:56:34.000000000 +0100
  127. +++ openldap-2.1.28-jsaw/servers/slapd/sasl.c 2004-03-29 00:57:33.000000000 +0200
  128. @@ -19,14 +19,14 @@
  130. #ifdef HAVE_CYRUS_SASL
  131. # ifdef HAVE_SASL_SASL_H
  132. -# include <sasl/sasl.h>
  133. +# include <sasl2/sasl.h>
  134. # else
  135. # include <sasl.h>
  136. # endif
  138. # if SASL_VERSION_MAJOR >= 2
  139. # ifdef HAVE_SASL_SASL_H
  140. -# include <sasl/saslplug.h>
  141. +# include <sasl2/saslplug.h>
  142. # else
  143. # include <saslplug.h>
  144. # endif