summaryrefslogtreecommitdiff
path: root/net/openldap22-server/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/openldap22-server/files')
-rw-r--r--net/openldap22-server/files/patch-build::ltmain.sh15
-rw-r--r--net/openldap22-server/files/patch-build::top.mk11
-rw-r--r--net/openldap22-server/files/patch-libraries::liblunicode::ucstr.c16
-rw-r--r--net/openldap22-server/files/patch-servers::slapd::back-perl302
4 files changed, 321 insertions, 23 deletions
diff --git a/net/openldap22-server/files/patch-build::ltmain.sh b/net/openldap22-server/files/patch-build::ltmain.sh
deleted file mode 100644
index 502d6b5db739..000000000000
--- a/net/openldap22-server/files/patch-build::ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- build/ltmain.sh.orig Sun Feb 9 23:24:29 2003
-+++ build/ltmain.sh Fri Jun 20 21:37:02 2003
-@@ -4285,12 +4285,6 @@
- IFS="$save_ifs"
- fi
-
-- # Install the pseudo-library for information purposes.
-- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-- instname="$dir/$name"i
-- $show "$install_prog $instname $destdir/$name"
-- $run eval "$install_prog $instname $destdir/$name" || exit $?
--
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
- ;;
diff --git a/net/openldap22-server/files/patch-build::top.mk b/net/openldap22-server/files/patch-build::top.mk
new file mode 100644
index 000000000000..94551ea27b27
--- /dev/null
+++ b/net/openldap22-server/files/patch-build::top.mk
@@ -0,0 +1,11 @@
+--- build/top.mk.orig Mon Apr 7 22:23:26 2003
++++ build/top.mk Mon Jul 7 05:35:52 2003
+@@ -192,6 +192,8 @@
+ SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@
+ SLURPD_LIBS = @SLURPD_LIBS@
+
++SLAPI_LIBS = @SLAPI_LIBS@
++
+ # Our Defaults
+ CC = $(AC_CC)
+ DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
diff --git a/net/openldap22-server/files/patch-libraries::liblunicode::ucstr.c b/net/openldap22-server/files/patch-libraries::liblunicode::ucstr.c
index f1074e1fe6d8..b8044b524697 100644
--- a/net/openldap22-server/files/patch-libraries::liblunicode::ucstr.c
+++ b/net/openldap22-server/files/patch-libraries::liblunicode::ucstr.c
@@ -1,11 +1,11 @@
--- libraries/liblunicode/ucstr.c.orig Fri Apr 11 03:57:10 2003
-+++ libraries/liblunicode/ucstr.c Sat Jul 5 10:53:04 2003
-@@ -15,6 +15,8 @@
++++ libraries/liblunicode/ucstr.c Sun Jul 6 02:50:32 2003
+@@ -10,7 +10,7 @@
+ #include <ac/string.h>
+ #include <ac/stdlib.h>
+
+-#include <lber.h>
++#include <lber_pvt.h>
+
#include <ldap_utf8.h>
#include <ldap_pvt_uc.h>
-
-+#include "lber_pvt.h"
-+
- #define malloc(x) ber_memalloc_x(x,ctx)
- #define realloc(x,y) ber_memrealloc_x(x,y,ctx)
- #define free(x) ber_memfree_x(x,ctx)
diff --git a/net/openldap22-server/files/patch-servers::slapd::back-perl b/net/openldap22-server/files/patch-servers::slapd::back-perl
new file mode 100644
index 000000000000..c6d024df3ed0
--- /dev/null
+++ b/net/openldap22-server/files/patch-servers::slapd::back-perl
@@ -0,0 +1,302 @@
+diff -Nur servers/slapd/back-perl/add.c.orig servers/slapd/back-perl/add.c
+--- servers/slapd/back-perl/add.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/add.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/bind.c.orig servers/slapd/back-perl/bind.c
+--- servers/slapd/back-perl/bind.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/bind.c Thu Jun 5 11:44:06 2003
+@@ -13,18 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-/* init.c - initialize Perl backend */
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/close.c.orig servers/slapd/back-perl/close.c
+--- servers/slapd/back-perl/close.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/close.c Thu Jun 5 11:44:06 2003
+@@ -13,18 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-/* init.c - initialize shell backend */
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/compare.c.orig servers/slapd/back-perl/compare.c
+--- servers/slapd/back-perl/compare.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/compare.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "lutil.h"
+ #include "perl_back.h"
+diff -Nur servers/slapd/back-perl/config.c.orig servers/slapd/back-perl/config.c
+--- servers/slapd/back-perl/config.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/config.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/delete.c.orig servers/slapd/back-perl/delete.c
+--- servers/slapd/back-perl/delete.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/delete.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/init.c.orig servers/slapd/back-perl/init.c
+--- servers/slapd/back-perl/init.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/init.c Thu Jun 12 22:25:21 2003
+@@ -13,18 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+- /* init.c - initialize shell backend */
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+@@ -37,7 +38,7 @@
+
+ #ifdef SLAPD_PERL_DYNAMIC
+
+-int back_perl_LTX_init_module(int argc, char *argv[])
++int init_module(int argc, char *argv[])
+ {
+ BackendInfo bi;
+
+diff -Nur servers/slapd/back-perl/modify.c.orig servers/slapd/back-perl/modify.c
+--- servers/slapd/back-perl/modify.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/modify.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/modrdn.c.orig servers/slapd/back-perl/modrdn.c
+--- servers/slapd/back-perl/modrdn.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/modrdn.c Thu Jun 5 11:44:06 2003
+@@ -26,17 +26,19 @@
+ *
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+
+diff -Nur servers/slapd/back-perl/search.c.orig servers/slapd/back-perl/search.c
+--- servers/slapd/back-perl/search.c.orig Sun May 25 03:56:59 2003
++++ servers/slapd/back-perl/search.c Thu Jun 5 11:44:06 2003
+@@ -13,17 +13,19 @@
+ * in file LICENSE in the top-level directory of the distribution.
+ */
+
+-#include "portable.h"
+-
+-#include <stdio.h>
++#include <EXTERN.h>
++#include <perl.h>
++#undef _ /* #defined used by both Perl and ac/localize.h */
+
+-#include "slap.h"
+ #ifdef HAVE_WIN32_ASPERL
+ #include "asperl_undefs.h"
+ #endif
+
+-#include <EXTERN.h>
+-#include <perl.h>
++#include "portable.h"
++
++#include <stdio.h>
++
++#include "slap.h"
+
+ #include "perl_back.h"
+