[packages/openldap] - rediff patches

baggins baggins at pld-linux.org
Fri May 7 23:08:16 CEST 2021 

commit 0b5893271a7ce7c365142dbed385de6f80d01ae8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 7 23:08:03 2021 +0200

    - rediff patches

 openldap-cldap.patch   | 11 +++++-----
 openldap-fast.patch    | 10 ++++-----
 openldap-ldapc++.patch | 59 ++++++++++++++++++++++++++------------------------
 openldap-perl.patch    | 24 ++++++++++----------
 openldap-pie.patch     | 15 +++++--------
 5 files changed, 61 insertions(+), 58 deletions(-)
---
diff --git a/openldap-cldap.patch b/openldap-cldap.patch
index 41afbba..02969d7 100644
--- a/openldap-cldap.patch
+++ b/openldap-cldap.patch
@@ -1,10 +1,11 @@
---- openldap-1.2.11/servers/slapd/slap.h.cldap	Tue Aug  8 17:05:58 2000
-+++ openldap-1.2.11/servers/slapd/slap.h	Tue Aug  8 17:06:03 2000
-@@ -10,6 +10,7 @@
- #endif
+diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/slap.h openldap-2.4.49/servers/slapd/slap.h
+--- openldap-2.4.49.org/servers/slapd/slap.h	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/servers/slapd/slap.h	2021-05-07 23:04:41.058860207 +0200
+@@ -33,6 +33,7 @@
+ #include <ac/stdlib.h>
  
  #include <sys/types.h>
 +#include <sys/socket.h>
  #include <ac/syslog.h>
  #include <ac/regex.h>
- #include <ac/time.h>
+ #include <ac/signal.h>
diff --git a/openldap-fast.patch b/openldap-fast.patch
index a1ac424..e6a94e7 100644
--- a/openldap-fast.patch
+++ b/openldap-fast.patch
@@ -1,11 +1,11 @@
-Our build machines must just be too fast....
---- openldap-2.0.1/build/openldap.m4	Fri Sep  8 19:50:44 2000
-+++ openldap-2.0.1/build/openldap.m4	Fri Sep  8 19:51:08 2000
-@@ -602,6 +602,7 @@
+diff -urNp -x '*.orig' openldap-2.4.49.org/build/openldap.m4 openldap-2.4.49/build/openldap.m4
+--- openldap-2.4.49.org/build/openldap.m4	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/build/openldap.m4	2021-05-07 23:04:39.855526618 +0200
+@@ -599,6 +599,7 @@ AC_DEFUN([OL_PTHREAD_TEST_INCLUDES], [[
  static void *task(p)
  	void *p;
  {
 +	sleep(30);
  	return (void *) (p == NULL);
  }
- ])
+ ]])
diff --git a/openldap-ldapc++.patch b/openldap-ldapc++.patch
index 51f8b70..612e967 100644
--- a/openldap-ldapc++.patch
+++ b/openldap-ldapc++.patch
@@ -1,29 +1,7 @@
---- openldap-2.4.6/contrib/ldapc++/src/Makefile.am~	2005-10-05 17:30:05.000000000 +0200
-+++ openldap-2.4.6/contrib/ldapc++/src/Makefile.am	2007-10-31 18:51:32.000000000 +0100
-@@ -44,7 +44,9 @@
- 			SaslInteractionHandler.cpp \
- 			StringList.cpp 
- 
--include_HEADERS = LDAPAsynConnection.h \
-+ldapcppincludedir = $(includedir)/ldapc++
-+
-+ldapcppinclude_HEADERS = LDAPAsynConnection.h \
- 			LDAPAttribute.h \
- 			LDAPAttributeList.h \
- 			LDAPAttrType.h \
---- openldap-2.4.16/contrib/ldapc++/src/SaslInteractionHandler.cpp~	2008-04-15 01:09:26.000000000 +0200
-+++ openldap-2.4.16/contrib/ldapc++/src/SaslInteractionHandler.cpp	2009-05-25 16:47:09.488348393 +0200
-@@ -7,6 +7,7 @@
- #include <iostream>
- #include <iomanip>
- #include <limits>
-+#include <cstdio>
- #include "config.h"
- 
- #ifdef HAVE_TERMIOS_H
---- openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp.orig	2011-11-23 20:58:23.000000000 +0100
-+++ openldap-2.4.27/contrib/ldapc++/examples/startTls.cpp	2011-11-27 10:15:54.434540198 +0100
-@@ -30,6 +30,7 @@
+diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/examples/startTls.cpp openldap-2.4.49/contrib/ldapc++/examples/startTls.cpp
+--- openldap-2.4.49.org/contrib/ldapc++/examples/startTls.cpp	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/contrib/ldapc++/examples/startTls.cpp	2021-05-07 23:04:51.668862326 +0200
+@@ -30,6 +30,7 @@ int main( int argc, char* argv[]){
  
      try {
          // 1. connect using global options
@@ -31,7 +9,7 @@
          LDAPAsynConnection l(uri);
          try {
              l.start_tls();
-@@ -38,8 +39,10 @@
+@@ -38,8 +39,10 @@ int main( int argc, char* argv[]){
          } catch ( LDAPException e ) {
              std::cerr << e << std::endl;
          }
@@ -42,7 +20,7 @@
          LDAPAsynConnection l1(uri);
          tls=l1.getTlsOptions();
          std::cout << "Current connection specific settings:" << std::endl;
-@@ -58,6 +61,7 @@
+@@ -58,6 +61,7 @@ int main( int argc, char* argv[]){
          } catch ( LDAPException e ) {
              std::cerr << e << std::endl;
          }
@@ -50,3 +28,28 @@
  
          // 3. and once again using the globals
          try {
+diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/src/Makefile.am openldap-2.4.49/contrib/ldapc++/src/Makefile.am
+--- openldap-2.4.49.org/contrib/ldapc++/src/Makefile.am	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/contrib/ldapc++/src/Makefile.am	2021-05-07 23:04:51.668862326 +0200
+@@ -51,7 +51,9 @@ libldapcpp_la_SOURCES = LDAPAddRequest.c
+ 			StringList.cpp \
+ 			TlsOptions.cpp
+ 
+-include_HEADERS = LDAPAsynConnection.h \
++ldapcppincludedir = $(includedir)/ldapc++
++
++ldapcppinclude_HEADERS = LDAPAsynConnection.h \
+ 			LDAPAttribute.h \
+ 			LDAPAttributeList.h \
+ 			LDAPAttrType.h \
+diff -urNp -x '*.orig' openldap-2.4.49.org/contrib/ldapc++/src/SaslInteractionHandler.cpp openldap-2.4.49/contrib/ldapc++/src/SaslInteractionHandler.cpp
+--- openldap-2.4.49.org/contrib/ldapc++/src/SaslInteractionHandler.cpp	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/contrib/ldapc++/src/SaslInteractionHandler.cpp	2021-05-07 23:04:51.668862326 +0200
+@@ -7,6 +7,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <limits>
++#include <cstdio>
+ #include "config.h"
+ 
+ #ifdef HAVE_TERMIOS_H
diff --git a/openldap-perl.patch b/openldap-perl.patch
index d08f0f7..e63f839 100644
--- a/openldap-perl.patch
+++ b/openldap-perl.patch
@@ -1,15 +1,16 @@
---- openldap-2.1.17/servers/slapd/back-perl/init.c.wigp	Mon Apr 14 23:51:53 2003
-+++ openldap-2.1.17/servers/slapd/back-perl/init.c	Mon Apr 14 23:55:17 2003
-@@ -25,7 +25,7 @@
- #include "perl_back.h"
- 
+diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/back-perl/init.c openldap-2.4.49/servers/slapd/back-perl/init.c
+--- openldap-2.4.49.org/servers/slapd/back-perl/init.c	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/servers/slapd/back-perl/init.c	2021-05-07 23:04:45.762194508 +0200
+@@ -23,7 +23,7 @@
+ extern char **environ;
+ #endif
  
 -static void perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
 +XSINIT_t perl_back_xs_init LDAP_P((PERL_BACK_XS_INIT_PARAMS));
  EXT void boot_DynaLoader LDAP_P((PERL_BACK_BOOT_DYNALOADER_PARAMS));
  
  PerlInterpreter *PERL_INTERPRETER = NULL;
-@@ -174,7 +174,7 @@
+@@ -159,7 +159,7 @@ perl_back_db_open(
  }
  
  
@@ -18,9 +19,10 @@
  perl_back_xs_init(PERL_BACK_XS_INIT_PARAMS)
  {
  	char *file = __FILE__;
---- openldap-2.1.17/servers/slapd/back-perl/perl_back.h.wigp	Tue Apr 15 00:19:36 2003
-+++ openldap-2.1.17/servers/slapd/back-perl/perl_back.h	Tue Apr 15 00:22:42 2003
-@@ -11,6 +11,9 @@
+diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/back-perl/perl_back.h openldap-2.4.49/servers/slapd/back-perl/perl_back.h
+--- openldap-2.4.49.org/servers/slapd/back-perl/perl_back.h	2020-01-30 18:58:35.000000000 +0100
++++ openldap-2.4.49/servers/slapd/back-perl/perl_back.h	2021-05-07 23:04:45.762194508 +0200
+@@ -36,6 +36,9 @@ LDAP_BEGIN_DECL
  #if defined(pTHX_) || (PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 6))
  #define PERL_IS_5_6
  #endif
@@ -30,8 +32,8 @@
  
  #define EVAL_BUF_SIZE 500
  
-@@ -23,7 +26,7 @@
- # define na	PL_na
+@@ -52,7 +55,7 @@ extern ldap_pvt_thread_mutex_t  perl_int
+ # define ERRSV	GvSV(errgv)
  #endif
  
 -#if defined( HAVE_WIN32_ASPERL ) || defined( USE_ITHREADS )
diff --git a/openldap-pie.patch b/openldap-pie.patch
index 00639a0..4032517 100644
--- a/openldap-pie.patch
+++ b/openldap-pie.patch
@@ -1,15 +1,12 @@
-Build slapd as position-independent executable.  This really
-should be threaded into the various autotools, but I guess this is what we have
-until that happens, if it happens.
-
---- openldap-2.2.13/servers/slapd/Makefile.in	2004-04-12 14:07:40.000000000 -0400
-+++ openldap-2.2.13/servers/slapd/Makefile.in	2004-06-15 13:45:45.000000000 -0400
-@@ -255,7 +255,7 @@
- 	cp slapi/.libs/libslapi.a .
+diff -urNp -x '*.orig' openldap-2.4.49.org/servers/slapd/Makefile.in openldap-2.4.49/servers/slapd/Makefile.in
+--- openldap-2.4.49.org/servers/slapd/Makefile.in	2021-05-07 23:04:52.388862462 +0200
++++ openldap-2.4.49/servers/slapd/Makefile.in	2021-05-07 23:04:52.822195877 +0200
+@@ -263,7 +263,7 @@ slapi/libslapi.la: FORCE
+ 	(cd slapi; $(MAKE) $(MFLAGS) all)
  
  slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
 -	$(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
 +	$(LTLINK) -pie -Wl,-z,defs -o $@ $(SLAPD_OBJECTS) $(LIBS) \
  		$(WRAP_LIBS)
- 	rm -f $(SLAPTOOLS)
+ 	$(RM) $(SLAPTOOLS)
  	for i in $(SLAPTOOLS); do \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/0b5893271a7ce7c365142dbed385de6f80d01ae8

More information about the pld-cvs-commit mailing list