[gentoo-commits] repo/proj/prefix:master commit in: net-nds/openldap/files/, net-nds/openldap/

2019-06-14 Thread Michael Haubenwallner 
commit: cca651c42af37ab0695b1073828a00aed3e8bee2
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jun 14 08:48:21 2019 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jun 14 08:49:12 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=cca651c4

net-nds/openldap: add winnt patch

Package-Manager: Portage-2.3.66, Repoman-2.3.11
Signed-off-by: Michael Haubenwallner  gentoo.org>

 net-nds/openldap/files/openldap-2.4.45-winnt.patch | 80 ++
 net-nds/openldap/openldap-2.4.45.ebuild|  5 +-
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/net-nds/openldap/files/openldap-2.4.45-winnt.patch 
b/net-nds/openldap/files/openldap-2.4.45-winnt.patch
new file mode 100644
index 00..e4af03e5fc
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.45-winnt.patch
@@ -0,0 +1,80 @@
+diff -ru openldap-2.4.45.gentoo/configure.in openldap-2.4.45/configure.in
+--- openldap-2.4.45.gentoo/configure.in2019-06-14 09:59:09.295425100 
+0200
 openldap-2.4.45/configure.in   2019-06-14 10:02:08.279864200 +0200
+@@ -821,6 +821,7 @@
+   locale.h\
+   malloc.h\
+   memory.h\
++  netinet/in.h\
+   psap.h  \
+   pwd.h   \
+   process.h   \
+@@ -862,12 +863,16 @@
+ 
+ AC_CHECK_HEADERS( resolv.h, [], [],
+ [$ac_includes_default
++#ifdef HAVE_NETINET_IN_H
+ #include 
++#endif
+ ])
+ 
+ AC_CHECK_HEADERS( netinet/tcp.h, [], [],
+ [$ac_includes_default
++#ifdef HAVE_NETINET_IN_H
+ #include 
++#endif
+ ])
+ 
+ AC_CHECK_HEADERS( sys/ucred.h, [], [],
+@@ -2429,9 +2434,11 @@
+ dnl Check for NT specific routines
+ AC_CHECK_FUNC(_spawnlp, AC_DEFINE(HAVE_SPAWNLP,1,[if you have spawnlp()]))
+ 
+-AC_CHECK_FUNC(_snprintf, [ac_cv_func_snprintf=yes
++AC_CHECK_FUNCS(snprintf)
++
++AC_CHECK_FUNC(_snprintf, [if test $ac_cv_func_snprintf = no ; then
+   AC_DEFINE(snprintf, _snprintf, [define to snprintf routine])
+-])
++fi])
+ 
+ AC_CHECK_FUNCS(vsnprintf _vsnprintf)
+ 
+@@ -2444,7 +2451,7 @@
+ 
+ if test $ac_cv_func_vprintf = yes ; then
+   dnl check for vsnprintf
+-  AC_CHECK_FUNCS(snprintf vsnprintf)
++  AC_CHECK_FUNCS(vsnprintf)
+ fi
+ 
+ AC_CHECK_FUNCS(   \
+diff -ru openldap-2.4.45.gentoo/include/ac/socket.h 
openldap-2.4.45/include/ac/socket.h
+--- openldap-2.4.45.gentoo/include/ac/socket.h 2017-06-01 22:01:07.0 
+0200
 openldap-2.4.45/include/ac/socket.h2019-06-14 10:02:08.279864200 
+0200
+@@ -38,7 +38,9 @@
+ #include 
+ #endif
+ 
++#ifdef HAVE_NETINET_IN_H
+ #include 
++#endif
+ 
+ #ifdef HAVE_NETINET_TCP_H
+ #include 
+@@ -98,9 +100,15 @@
+ # define tcp_close( s )   closesocket( s )
+ # endif
+ 
++#ifndef EWOULDBLOCK
+ #define EWOULDBLOCK WSAEWOULDBLOCK
++#endif
++#ifndef EINPROGRESS
+ #define EINPROGRESS WSAEINPROGRESS
++#endif
++#ifndef ETIMEDOUT
+ #define ETIMEDOUT WSAETIMEDOUT
++#endif
+ 
+ #undefsock_errno
+ #undefsock_errstr

diff --git a/net-nds/openldap/openldap-2.4.45.ebuild 
b/net-nds/openldap/openldap-2.4.45.ebuild
index e6bf0b44ed..b765d60650 100644
--- a/net-nds/openldap/openldap-2.4.45.ebuild
+++ b/net-nds/openldap/openldap-2.4.45.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -343,6 +343,9 @@ src_prepare() {
# bug #622464
epatch "${FILESDIR}"/${PN}-2.4.45-libressl.patch
 
+   # winnt (using parity)
+   epatch "${FILESDIR}"/${PN}-2.4.45-winnt.patch
+
# unbundle lmdb
epatch "${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
rm -rf "${S}"/libraries/liblmdb

[gentoo-commits] repo/proj/prefix:master commit in: net-nds/openldap/files/, net-nds/openldap/

2018-07-04 Thread Michael Haubenwallner 
commit: 7c8eedf78630843a63ef9789672916708aa9aba0
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Wed Jul  4 10:01:04 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Wed Jul  4 10:01:04 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c8eedf7

net-nds/openldap: re-add for stacked windows prefix

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-nds/openldap/Manifest  |   2 +
 net-nds/openldap/files/DB_CONFIG.fast.example  |  25 +
 .../files/openldap-2.2.14-perlthreadsfix.patch |  12 +
 .../openldap/files/openldap-2.4.11-libldap_r.patch |  11 +
 .../openldap/files/openldap-2.4.15-ppolicy.patch   |  12 +
 net-nds/openldap/files/openldap-2.4.17-gcc44.patch |  11 +
 .../openldap/files/openldap-2.4.28-fix-dash.patch  |  26 +
 .../files/openldap-2.4.28-gnutls-gcrypt.patch  |  11 +
 net-nds/openldap/files/openldap-2.4.31-gcc47.patch |  16 +
 .../files/openldap-2.4.35-contrib-samba4.patch |  38 +
 .../files/openldap-2.4.35-contrib-smbk5pwd.patch   |  48 ++
 net-nds/openldap/files/openldap-2.4.40-slapd-conf  |  64 ++
 .../files/openldap-2.4.42-mdb-unbundle.patch   | 136 
 ...enldap-2.4.45-fix-lmpasswd-gnutls-symbols.patch | 109 +++
 .../openldap/files/openldap-2.4.45-libressl.patch  |  65 ++
 .../files/openldap-2.4.6-evolution-ntlm.patch  | 192 +
 net-nds/openldap/files/slapd-confd-2.4.28-r1   |  26 +
 net-nds/openldap/files/slapd-initd-2.4.40-r2   |  64 ++
 net-nds/openldap/files/slapd.service   |  12 +
 net-nds/openldap/files/slapd.service.conf  |  12 +
 net-nds/openldap/files/slapd.tmpfilesd |   2 +
 net-nds/openldap/metadata.xml  |  20 +
 net-nds/openldap/openldap-2.4.45.ebuild| 886 +
 23 files changed, 1800 insertions(+)

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
new file mode 100644
index 00..d0a81c6ed5
--- /dev/null
+++ b/net-nds/openldap/Manifest
@@ -0,0 +1,2 @@
+DIST openldap-2.4.45.tgz 5672845 BLAKE2B 
e1f97553482a2e8630b62bc0f439af2484f1a2349a1a077382a124354424fe510ab55f32c073565b142d0c9318870fe31a2652268ebabd97d3afd8c833bc7aab
 SHA512 
1c9fc84efed8998f107ce6e1c6be3f5466388241afdca0cb3847720c9def0bc263a2dbc15bf0f9112d1b4c391fd01e8531a4fb08c5532c30fb86924c08daedab
+DIST rfc2307bis.schema-20140524 12262 BLAKE2B 
98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99
 SHA512 
83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e

diff --git a/net-nds/openldap/files/DB_CONFIG.fast.example 
b/net-nds/openldap/files/DB_CONFIG.fast.example
new file mode 100644
index 00..8b52062c9c
--- /dev/null
+++ b/net-nds/openldap/files/DB_CONFIG.fast.example
@@ -0,0 +1,25 @@
+# $OpenLDAP: pkg/ldap/servers/slapd/DB_CONFIG,v 1.1 2004/06/18 02:49:08 kurt 
Exp $
+# Example DB_CONFIG file for use with slapd(8) BDB/HDB databases.
+#
+# See Sleepycat Berkeley DB documentation
+#   
+# for detail description of DB_CONFIG syntax and semantics.
+#
+# Hints can also be found in the OpenLDAP Software FAQ
+#  
+
+# one 0.25 GB cache
+set_cachesize 0 16777216 0
+
+# Data Directory
+#set_data_dir db
+
+# Transaction Log settings
+set_lg_regionmax 262144
+set_lg_bsize 524288
+#set_lg_dir logs
+
+# When using (and only when using) slapadd(8) or slapindex(8),
+# the following flags may be useful:
+#set_flags DB_TXN_NOSYNC
+#set_flags DB_TXN_NOT_DURABLE

diff --git a/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch 
b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
new file mode 100644
index 00..ddb6672a5f
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.2.14-perlthreadsfix.patch
@@ -0,0 +1,12 @@
+diff -ur openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in 
openldap-2.2.14/servers/slapd/back-perl/Makefile.in
+--- openldap-2.2.14.orig/servers/slapd/back-perl/Makefile.in   2004-04-12 
11:20:14.0 -0700
 openldap-2.2.14/servers/slapd/back-perl/Makefile.in2004-06-20 
18:43:41.0 -0700
+@@ -31,7 +31,7 @@
+ 
+ shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+-UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
++UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) `perl -MExtUtils::Embed -e 
ldopts`
+ 
+ LIBBASE = back_perl
+ 

diff --git a/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch 
b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
new file mode 100644
index 00..448249a3b5
--- /dev/null
+++ b/net-nds/openldap/files/openldap-2.4.11-libldap_r.patch
@@ -0,0 +1,11 @@
+diff -Nuar openldap-2.4.11.orig/servers/slapd/slapi/Makefile.in 
openldap-2.4.11/servers/slapd/slapi/Makefile.in