[Pkg-openldap-devel] [openldap] 04/06: Update Ubuntu patches

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch ubuntu/master
in repository openldap.

commit 3165fe12230b079e997aa2267ff662de1d0d1e88
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Fri Jul 24 08:39:02 2015 -0700

    Update Ubuntu patches
---
 debian/changelog           | 2 ++
 debian/patches/gssapi.diff | 2 +-
 debian/patches/nssov-build | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e7d826..4fb3e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ openldap (2.4.41+dfsg-1ubuntu1) UNRELEASED; urgency=medium
       (ITS#8003) (LP: #1461276)
     - nssov updated to support recent nss-pam-ldapd client libraries
       (ITS#8097) (LP: #1393306)
+  * Update d/patches/nssov-build for upstream changes.
+  * Tweak d/patches/gssapi.diff to apply without fuzz.
 
  -- Ryan Tandy <ryan at nardis.ca>  Fri, 24 Jul 2015 08:28:18 -0700
 
diff --git a/debian/patches/gssapi.diff b/debian/patches/gssapi.diff
index 8ffdf52..49c0e5e 100644
--- a/debian/patches/gssapi.diff
+++ b/debian/patches/gssapi.diff
@@ -10,7 +10,7 @@ Index: openldap-2.4.23/configure.in
 +        auto, [auto yes no] )
  OL_ARG_WITH(threads,[  --with-threads	  with threads],
  	auto, [auto nt posix mach pth lwp yes no manual] )
- OL_ARG_WITH(tls,[  --with-tls		  with TLS/SSL support auto|openssl|gnutls],
+ OL_ARG_WITH(tls,[  --with-tls		  with TLS/SSL support auto|openssl|gnutls|moznss],
 @@ -584,6 +586,7 @@
  KRB4_LIBS=
  KRB5_LIBS=
diff --git a/debian/patches/nssov-build b/debian/patches/nssov-build
index 1401599..a7e91b7 100644
--- a/debian/patches/nssov-build
+++ b/debian/patches/nssov-build
@@ -4,8 +4,8 @@
  
  # Path to the OpenLDAP object tree - same as above unless
  # you're doing out-of-tree builds.
--LDAP_BUILD=../../..
-+LDAP_BUILD=../../../debian/build
+-LDAP_BUILD=$(LDAP_SRC)
++LDAP_BUILD=$(LDAP_SRC)/debian/build
  
  LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
  LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git