[PATCH] gnu: openldap: Use gnutls.

[Alex Vong <alexvong1995@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1752 bytes --]

Hello,

The following patch does what the title says. The link of the bug
<http://www.openldap.org/its/index.cgi/Incoming?id=7430;page=17> is no
longer accessible, so I assume the bug is fixd since I cannot find it on
the internet. In addition, I have checked debian's version, which is
slightly older (2.4.42), which also uses gnutls. So I think we are safe
here. Please object if there is a problem!

Please note that openldap is an input for curl, so I guess it is causing
the openssl dependency problem for octave I mentioned earlier. I haven't
test to build octave with curl though, which takes a while.

Finally, I have checked debian's build script and find the following:

======================================================================
# Download the upstream source and make changes as required for DFSG reasons.
# Assumes wget is available, as this is generally only used by the package
# maintainers.
get-orig-source:
	@if [ ! -d "debian/schema" ] ; then \
	    echo 'Run this from the top directory of the Debian source' >&2; \
	    exit 1; \
	fi
	wget $(URL)/openldap-$(VERSION).tgz
	tar xzf openldap-$(VERSION).tgz
	rm -r openldap-$(VERSION)/doc/drafts
	rm -r openldap-$(VERSION)/doc/rfc
	set -e; for schema in debian/schema/*.schema debian/schema/*.ldif ; do \
	    file=`basename "$$schema"`; \
	    rm openldap-$(VERSION)/servers/slapd/schema/$$file; \
	done
	mv openldap-$(VERSION) openldap-$(VERSION)+dfsg
	tar cf openldap_$(VERSION)+dfsg.orig.tar openldap-$(VERSION)+dfsg
	rm -r openldap-$(VERSION)+dfsg
	gzip -9 openldap_$(VERSION)+dfsg.orig.tar
======================================================================

Is the rfc documents considered fsf-free? Otherwise, we will have to
remove them and repack the source.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-openldap-Use-gnutls.patch --]
[-- Type: text/x-diff, Size: 1198 bytes --]

From ecffd2252b0f6778919b97903c5419cbd5a06f4f Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Sat, 17 Sep 2016 00:03:05 +0800
Subject: [PATCH] gnu: openldap: Use gnutls.

* gnu/packages/openldap.scm (openldap)[inputs]: Switch to gnutls.
---
 gnu/packages/openldap.scm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index 4bbc6a6..627319b 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -55,14 +55,11 @@
               "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp"))))
    (build-system gnu-build-system)
    (inputs `(("bdb" ,bdb-5.3)
-             ("openssl" ,openssl)
              ("cyrus-sasl" ,cyrus-sasl)
+             ("gnutls" ,gnutls)
              ("groff" ,groff)
              ("icu4c" ,icu4c)
              ("libgcrypt" ,libgcrypt)
-             ;; FIXME: currently, openldap requires openssl or gnutls<3, see
-             ;; http://www.openldap.org/its/index.cgi/Incoming?id=7430;page=17
-             ;; Once this is fixed, switch to gnutls.
              ("zlib" ,zlib)))
    (native-inputs `(("libtool" ,libtool)))
    (arguments
-- 
2.10.0


[-- Attachment #3: Type: text/plain, Size: 14 bytes --]


Cheers,
Alex