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.
1720 Commits
1 Branch
0 Tags
34 MiB
Tree: f7f121a67a
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'f7f121a67a'
${ noResults }
rocklinux/package/mnemoc/openldap/sasl2.patch

125 lines
4.4 KiB
Raw Normal View History

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. diff -urN openldap-2.1.28/build/openldap.m4 openldap-2.1.28-jsaw/build/openldap.m4
  2. --- openldap-2.1.28/build/openldap.m4 2003-12-02 19:05:49.000000000 +0100
  3. +++ openldap-2.1.28-jsaw/build/openldap.m4 2004-03-29 00:57:32.000000000 +0200
  4. @@ -1204,7 +1204,7 @@
  5. [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[
  6. AC_EGREP_CPP(__sasl_compat,[
  7. #ifdef HAVE_SASL_SASL_H
  8. -#include <sasl/sasl.h>
  9. +#include <sasl2/sasl.h>
  10. #else
  11. #include <sasl.h>
  12. #endif
  13. diff -urN openldap-2.1.28/configure openldap-2.1.28-jsaw/configure
  14. --- openldap-2.1.28/configure 2004-01-18 22:25:00.000000000 +0100
  15. +++ openldap-2.1.28-jsaw/configure 2004-03-29 00:57:32.000000000 +0200
  16. @@ -20834,7 +20834,7 @@
  17. ol_link_sasl=no
  18. ol_link_spasswd=no
  19. if test $ol_with_cyrus_sasl != no ; then
  20. - for ac_hdr in sasl/sasl.h sasl.h
  21. + for ac_hdr in sasl2/sasl.h sasl.h
  22. do
  23. ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  24. echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
  25. @@ -20980,7 +20980,7 @@
  26. #include "confdefs.h"
  28. #ifdef HAVE_SASL_SASL_H
  29. -#include <sasl/sasl.h>
  30. +#include <sasl2/sasl.h>
  31. #else
  32. #include <sasl.h>
  33. #endif
  34. diff -urN openldap-2.1.28/configure.in openldap-2.1.28-jsaw/configure.in
  35. --- openldap-2.1.28/configure.in 2004-01-18 22:25:26.000000000 +0100
  36. +++ openldap-2.1.28-jsaw/configure.in 2004-03-29 00:57:32.000000000 +0200
  37. @@ -2129,7 +2129,7 @@
  38. ol_link_sasl=no
  39. ol_link_spasswd=no
  40. if test $ol_with_cyrus_sasl != no ; then
  41. - AC_CHECK_HEADERS(sasl/sasl.h sasl.h)
  42. + AC_CHECK_HEADERS(sasl2/sasl.h sasl.h)
  44. if test $ac_cv_header_sasl_sasl_h = yes -o $ac_cv_header_sasl_h = yes; then
  45. AC_CHECK_LIB(sasl2, sasl_client_init,
  46. diff -urN openldap-2.1.28/include/portable.h.in openldap-2.1.28-jsaw/include/portable.h.in
  47. --- openldap-2.1.28/include/portable.h.in 2003-03-10 03:36:10.000000000 +0100
  48. +++ openldap-2.1.28-jsaw/include/portable.h.in 2004-03-29 00:57:32.000000000 +0200
  49. @@ -476,7 +476,7 @@
  50. /* Define if you have the <sasl.h> header file. */
  51. #undef HAVE_SASL_H
  53. -/* Define if you have the <sasl/sasl.h> header file. */
  54. +/* Define if you have the <sasl2/sasl.h> header file. */
  55. #undef HAVE_SASL_SASL_H
  57. /* Define if you have the <sched.h> header file. */
  58. diff -urN openldap-2.1.28/libraries/libldap/cyrus.c openldap-2.1.28-jsaw/libraries/libldap/cyrus.c
  59. --- openldap-2.1.28/libraries/libldap/cyrus.c 2004-02-12 03:41:19.000000000 +0100
  60. +++ openldap-2.1.28-jsaw/libraries/libldap/cyrus.c 2004-03-29 00:57:32.000000000 +0200
  61. @@ -24,7 +24,7 @@
  62. #endif
  64. #ifdef HAVE_SASL_SASL_H
  65. -#include <sasl/sasl.h>
  66. +#include <sasl2/sasl.h>
  67. #else
  68. #include <sasl.h>
  69. #endif
  70. diff -urN openldap-2.1.28/libraries/libldap/ldap-int.h openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h
  71. --- openldap-2.1.28/libraries/libldap/ldap-int.h 2003-04-29 01:41:55.000000000 +0200
  72. +++ openldap-2.1.28-jsaw/libraries/libldap/ldap-int.h 2004-03-29 00:57:32.000000000 +0200
  73. @@ -25,7 +25,7 @@
  74. #ifdef HAVE_CYRUS_SASL
  75. /* the need for this should be removed */
  76. #ifdef HAVE_SASL_SASL_H
  77. -#include <sasl/sasl.h>
  78. +#include <sasl2/sasl.h>
  79. #else
  80. #include <sasl.h>
  81. #endif
  82. diff -urN openldap-2.1.28/libraries/liblutil/passwd.c openldap-2.1.28-jsaw/libraries/liblutil/passwd.c
  83. --- openldap-2.1.28/libraries/liblutil/passwd.c 2003-12-18 03:36:40.000000000 +0100
  84. +++ openldap-2.1.28-jsaw/libraries/liblutil/passwd.c 2004-03-29 00:57:32.000000000 +0200
  85. @@ -35,7 +35,7 @@
  87. #ifdef SLAPD_SPASSWD
  88. # ifdef HAVE_SASL_SASL_H
  89. -# include <sasl/sasl.h>
  90. +# include <sasl2/sasl.h>
  91. # else
  92. # include <sasl.h>
  93. # endif
  94. diff -urN openldap-2.1.28/libraries/liblutil/sasl.c openldap-2.1.28-jsaw/libraries/liblutil/sasl.c
  95. --- openldap-2.1.28/libraries/liblutil/sasl.c 2003-04-26 16:56:37.000000000 +0200
  96. +++ openldap-2.1.28-jsaw/libraries/liblutil/sasl.c 2004-03-29 00:57:32.000000000 +0200
  97. @@ -14,7 +14,7 @@
  98. #include <ac/unistd.h>
  100. #ifdef HAVE_SASL_SASL_H
  101. -#include <sasl/sasl.h>
  102. +#include <sasl2/sasl.h>
  103. #else
  104. #include <sasl.h>
  105. #endif
  106. diff -urN openldap-2.1.28/servers/slapd/sasl.c openldap-2.1.28-jsaw/servers/slapd/sasl.c
  107. --- openldap-2.1.28/servers/slapd/sasl.c 2004-01-21 08:56:34.000000000 +0100
  108. +++ openldap-2.1.28-jsaw/servers/slapd/sasl.c 2004-03-29 00:57:33.000000000 +0200
  109. @@ -19,14 +19,14 @@
  111. #ifdef HAVE_CYRUS_SASL
  112. # ifdef HAVE_SASL_SASL_H
  113. -# include <sasl/sasl.h>
  114. +# include <sasl2/sasl.h>
  115. # else
  116. # include <sasl.h>
  117. # endif
  119. # if SASL_VERSION_MAJOR >= 2
  120. # ifdef HAVE_SASL_SASL_H
  121. -# include <sasl/saslplug.h>
  122. +# include <sasl2/saslplug.h>
  123. # else
  124. # include <saslplug.h>
  125. # endif