Date: Fri, 18 Aug 2006 17:05:53 +0200 (CEST) From: Xavier Beaudouin <kiwi@oav.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: delphij@FreeBSD.org Subject: ports/102235: [PATCH] net/openldap-server: Fix back-perl bugs Message-ID: <20060818150554.3D46F2E04F@kiwi.oav.net> Resent-Message-ID: <200608181510.k7IFADaS054999@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102235
>Category: ports
>Synopsis: [PATCH] net/openldap-server: Fix back-perl bugs
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 18 15:10:12 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Xavier Beaudouin
>Release: FreeBSD 5.4-RELEASE-p16 i386
>Organization:
Association KAZAR / The Caudium Group
>Environment:
System: FreeBSD proxy.home.oav.net 5.4-RELEASE-p16 FreeBSD 5.4-RELEASE-p16 #0: Thu Jul 20 12:51:42 CEST 2006
>Description:
back-perl doesn't work, theses patch fix it to make it work again.
Added file(s):
- files/patch-servers_slapd_back_perl_bind.c
- files/patch-servers_slapd_back_perl_init.c
- files/patch-servers_slapd_back_perl_proto_perl.h
Port maintainer (delphij@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- openldap-server-2.3.26.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_bind.c /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c
--- /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_bind.c Thu Jan 1 01:00:00 1970
+++ /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_bind.c Fri Aug 18 16:47:32 2006
@@ -0,0 +1,11 @@
+--- servers/slapd/back-perl/bind.c.orig Fri Aug 18 16:04:41 2006
++++ servers/slapd/back-perl/bind.c Fri Aug 18 16:05:14 2006
+@@ -32,7 +32,7 @@
+
+ PerlBackend *perl_back = (PerlBackend *) op->o_bd->be_private;
+
+-#ifdef HAVE_WIN32_ASPERL
++#if defined(HAVE_WIN32_ASPERL) || defined(USE_ITHREADS)
+ PERL_SET_CONTEXT( PERL_INTERPRETER );
+ #endif
+
diff -ruN --exclude=CVS /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_init.c /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_init.c
--- /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_init.c Thu Jan 1 01:00:00 1970
+++ /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_init.c Fri Aug 18 16:47:32 2006
@@ -0,0 +1,31 @@
+--- servers/slapd/back-perl/init.c.orig Fri Aug 18 16:01:34 2006
++++ servers/slapd/back-perl/init.c Fri Aug 18 16:04:28 2006
+@@ -35,7 +35,9 @@
+ BackendInfo *bi
+ )
+ {
+- bi->bi_open = perl_back_open;
++ char *embedding[] = { "", "-e", "0" };
++
++ bi->bi_open = NULL;
+ bi->bi_config = 0;
+ bi->bi_close = perl_back_close;
+ bi->bi_destroy = 0;
+@@ -63,16 +65,8 @@
+ bi->bi_connection_init = 0;
+ bi->bi_connection_destroy = 0;
+
+- return 0;
+-}
+-
+-int
+-perl_back_open(
+- BackendInfo *bi
+-)
+-{
+- char *embedding[] = { "", "-e", "0" };
+
++ // injecting code from perl_back_open, because using fonction reference (bi->bi_open) is not fonctionnal
+ Debug( LDAP_DEBUG_TRACE, "perl backend open\n", 0, 0, 0 );
+
+ if( PERL_INTERPRETER != NULL ) {
diff -ruN --exclude=CVS /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_proto_perl.h /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h
--- /usr/ports/net/openldap23-server.old/files/patch-servers_slapd_back_perl_proto_perl.h Thu Jan 1 01:00:00 1970
+++ /usr/ports/net/openldap23-server/files/patch-servers_slapd_back_perl_proto_perl.h Fri Aug 18 16:47:32 2006
@@ -0,0 +1,10 @@
+--- servers/slapd/back-perl/proto-perl.h.orig Fri Aug 18 16:05:27 2006
++++ servers/slapd/back-perl/proto-perl.h Fri Aug 18 16:05:40 2006
+@@ -22,7 +22,6 @@
+
+ extern BI_init perl_back_initialize;
+
+-extern BI_open perl_back_open;
+ extern BI_close perl_back_close;
+
+ extern BI_db_init perl_back_db_init;
--- openldap-server-2.3.26.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060818150554.3D46F2E04F>