OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Sep-2007 19:22:27
Branch: HEAD Handle: 2007092218222500
Modified files:
openpkg-src/openldap openldap.patch openldap.spec
Log:
add support for 'perlModule <name> <file> in addition to 'perlModule
<name>' in the slapd Perl backend to let us load Perl module from
arbitrary filenames (which have no correlation to the package it
defines)
Summary:
Revision Changes Path
1.14 +31 -18 openpkg-src/openldap/openldap.patch
1.194 +1 -1 openpkg-src/openldap/openldap.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 openldap.patch
--- openpkg-src/openldap/openldap.patch 7 Oct 2005 08:16:46 -0000
1.13
+++ openpkg-src/openldap/openldap.patch 22 Sep 2007 17:22:25 -0000
1.14
@@ -1,6 +1,36 @@
+Index: include/ac/fdset.h
+--- include/ac/fdset.h.orig 2007-01-02 22:43:47 +0100
++++ include/ac/fdset.h 2007-09-22 19:03:32 +0200
+@@ -22,6 +22,13 @@
+ #ifndef _AC_FDSET_H
+ #define _AC_FDSET_H
+
++#if defined(HAVE_SYS_TYPES_H)
++#include <sys/types.h>
++#endif
++#if defined(HAVE_SYS_SELECT_H)
++#include <sys/select.h>
++#endif
++
+ #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
+ # define OPENLDAP_FD_SETSIZE 4096
+ #endif
+Index: servers/slapd/back-perl/config.c
+--- servers/slapd/back-perl/config.c.orig 2007-01-02 22:44:06 +0100
++++ servers/slapd/back-perl/config.c 2007-09-22 19:13:23 +0200
+@@ -49,6 +49,9 @@
+ }
+
+ #ifdef PERL_IS_5_6
++ if (argc > 2)
++ snprintf( eval_str, EVAL_BUF_SIZE, "require \"%s\";",
argv[2] );
++ else
+ snprintf( eval_str, EVAL_BUF_SIZE, "use %s;", argv[1] );
+ eval_pv( eval_str, 0 );
+
Index: servers/slapd/slapd.conf
--- servers/slapd/slapd.conf.orig 2004-06-18 04:49:08 +0200
-+++ servers/slapd/slapd.conf 2005-06-18 12:26:38 +0200
++++ servers/slapd/slapd.conf 2007-09-22 19:03:32 +0200
@@ -65,3 +65,19 @@
directory %LOCALSTATEDIR%/openldap-data
# Indices to maintain
@@ -21,20 +51,3 @@
+#updatedn "cn=admin,dc=example,dc=org"
+#updateref ldap://master.example.org
+
-Index: include/ac/fdset.h
---- include/ac/fdset.h.orig 2005-01-20 19:03:49 +0100
-+++ include/ac/fdset.h 2005-10-07 10:07:52 +0200
-@@ -22,6 +22,13 @@
- #ifndef _AC_FDSET_H
- #define _AC_FDSET_H
-
-+#if defined(HAVE_SYS_TYPES_H)
-+#include <sys/types.h>
-+#endif
-+#if defined(HAVE_SYS_SELECT_H)
-+#include <sys/select.h>
-+#endif
-+
- #if !defined( OPENLDAP_FD_SETSIZE ) && !defined( FD_SETSIZE )
- # define OPENLDAP_FD_SETSIZE 4096
- #endif
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openldap/openldap.spec
============================================================================
$ cvs diff -u -r1.193 -r1.194 openldap.spec
--- openpkg-src/openldap/openldap.spec 16 Sep 2007 18:21:27 -0000
1.193
+++ openpkg-src/openldap/openldap.spec 22 Sep 2007 17:22:25 -0000
1.194
@@ -33,7 +33,7 @@
Group: LDAP
License: GPL
Version: 2.3.38
-Release: 20070916
+Release: 20070922
# package options
%option with_server yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
