[Pkg-openldap-devel] [openldap] 01/04: Build smbk5pwd without heimdal

Fri Nov 11 04:07:26 UTC 2016

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

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

commit dc5a5295ac90579436c6f70ca6ff061b1727bb67
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Oct 6 19:42:49 2016 -0700

    Build smbk5pwd without heimdal
---
 debian/changelog                         |  2 ++
 debian/control                           | 10 ++++------
 debian/patches/series                    |  1 -
 debian/patches/smbk5pwd-makefile         | 19 +++++++++----------
 debian/patches/smbk5pwd-makefile-manpage | 18 +++++-------------
 debian/slapd.NEWS                        |  7 ++++++-
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ecca829..8af456d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
   * Add debian/patches/set-maintainer-name to omit the builder's username and 
     working directory from version strings and thereby make the build 
     reproducible. Thanks to Daniel Shahaf for the patch. (Closes: #833179)
+  * Build smbk5pwd without Kerberos support and drop the build-dependency on 
+    heimdal. (Closes: #836885)
 
   [ Helmut Grohne ]
   * Fix policy 8.2 violation (Closes: #330695)
diff --git a/debian/control b/debian/control
index 6f5516f..1748ada 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9.20141010),
                dh-autoreconf,
                dpkg-dev (>= 1.17.14),
                groff-base,
-               heimdal-multidev <!stage1>,
                libdb5.3-dev <!stage1>,
                libgnutls28-dev,
                libltdl-dev <!stage1>,
@@ -56,11 +55,10 @@ Priority: extra
 Architecture: any
 Build-Profiles: <!stage1>
 Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Keeps Samba and Kerberos passwords in sync within slapd.
- Extends the PasswordModify Extended Operation to update Kerberos keys
- and Samba password hashes for an LDAP user. The Kerberos support is
- written for Heimdal using its hdb-ldap backend. The Samba support is
- written using the Samba 3.0 LDAP schema.
+Description: Keeps Samba passwords in sync within slapd.
+ Extends the PasswordModify Extended Operation to update Samba password hashes
+ for an LDAP user. The Samba support is written using the Samba 3.0 LDAP
+ schema.
 
 Package: ldap-utils
 Section: net
diff --git a/debian/patches/series b/debian/patches/series
index bbf6c8b..49adda9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,5 @@ fix-build-top-mk
 no-AM_INIT_AUTOMAKE
 switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
-heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
 set-maintainer-name
diff --git a/debian/patches/smbk5pwd-makefile b/debian/patches/smbk5pwd-makefile
index b7a1039..8342d46 100644
--- a/debian/patches/smbk5pwd-makefile
+++ b/debian/patches/smbk5pwd-makefile
@@ -1,6 +1,6 @@
 --- a/contrib/slapd-modules/smbk5pwd/Makefile
 +++ b/contrib/slapd-modules/smbk5pwd/Makefile
-@@ -14,34 +14,35 @@
+@@ -14,34 +14,34 @@
  
  LDAP_SRC = ../../..
  LDAP_BUILD = $(LDAP_SRC)
@@ -15,21 +15,20 @@
 -SSL_LIB = -lcrypto
 +SSL_LIB = -lnettle
  
--HEIMDAL_INC = -I/usr/heimdal/include
--HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
-+HEIMDAL_INC = $(shell krb5-config.heimdal --cflags kadm-server)
-+HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server)
+ HEIMDAL_INC = -I/usr/heimdal/include
+ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
  
 -LIBTOOL = $(LDAP_BUILD)/libtool
 +LIBTOOL = $(LDAP_BUILD)/debian/build/libtool
  CC = gcc
  OPT = -g -O2 -Wall
  # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
- DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
- INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+-DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+-INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
 -LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
-+# put /usr/lib/heimdal before /usr/lib in case libkrb5-dev is installed, #745356
-+LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB)
++DEFS = -DDO_SAMBA -DDO_SHADOW
++INCS = $(LDAP_INC) $(SSL_INC)
++LIBS = $(LDAP_LIB) $(SSL_LIB)
  
  PROGRAMS = smbk5pwd.la
  LTVER = 0:0:0
@@ -47,7 +46,7 @@
  
  .SUFFIXES: .c .o .lo
  
-@@ -55,7 +56,7 @@
+@@ -55,7 +55,7 @@
  	-rpath $(moduledir) -module -o $@ $? $(LIBS)
  
  clean:
diff --git a/debian/patches/smbk5pwd-makefile-manpage b/debian/patches/smbk5pwd-makefile-manpage
index a0ed83b..815bd21 100644
--- a/debian/patches/smbk5pwd-makefile-manpage
+++ b/debian/patches/smbk5pwd-makefile-manpage
@@ -13,27 +13,25 @@ This patch is derived from the corresponding patch upstreamed in ITS#8205
  2 files changed, 192 insertions(+), 1 deletion(-)
  create mode 100644 contrib/slapd-modules/smbk5pwd/slapo-smbk5pwd.5
 
-diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
-index 676d914..0042a49 100644
 --- a/contrib/slapd-modules/smbk5pwd/Makefile
 +++ b/contrib/slapd-modules/smbk5pwd/Makefile
 @@ -25,6 +25,7 @@
- HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server)
+ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
  
  LIBTOOL = $(LDAP_BUILD)/debian/build/libtool
 +INSTALL = /usr/bin/install
  CC = gcc
  OPT = -g -O2 -Wall
  # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
-@@ -34,6 +35,7 @@
- LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB)
+@@ -33,6 +34,7 @@
+ LIBS = $(LDAP_LIB) $(SSL_LIB)
  
  PROGRAMS = smbk5pwd.la
 +MANPAGES = slapo-smbk5pwd.5
  LTVER = 0:0:0
  
  prefix=/usr
-@@ -43,6 +45,8 @@
+@@ -42,6 +44,8 @@
  libdir=$(exec_prefix)/lib
  libexecdir=$(exec_prefix)/libexec
  moduledir = $(libdir)$(ldap_subdir)
@@ -42,7 +40,7 @@ index 676d914..0042a49 100644
  
  .SUFFIXES: .c .o .lo
  
-@@ -58,9 +62,17 @@
+@@ -57,9 +61,17 @@
  clean:
  	$(LIBTOOL) --mode=clean rm -f
  
@@ -61,9 +59,6 @@ index 676d914..0042a49 100644
 +
 +FORCE:
 +
-diff --git a/contrib/slapd-modules/smbk5pwd/slapo-smbk5pwd.5 b/contrib/slapd-modules/smbk5pwd/slapo-smbk5pwd.5
-new file mode 100644
-index 0000000..431a765
 --- /dev/null
 +++ b/contrib/slapd-modules/smbk5pwd/slapo-smbk5pwd.5
 @@ -0,0 +1,179 @@
@@ -246,6 +241,3 @@ index 0000000..431a765
 +.B OpenLDAP
 +is derived from University of Michigan LDAP 3.3 Release.
 +
--- 
-2.5.0
-
diff --git a/debian/slapd.NEWS b/debian/slapd.NEWS
index 2590f7a..7a70fb7 100644
--- a/debian/slapd.NEWS
+++ b/debian/slapd.NEWS
@@ -5,7 +5,12 @@ openldap (2.4.44+dfsg-1) unstable; urgency=medium
     security concerns. Please see <https://bugs.debian.org/795428> for
     more information.
 
- -- Ryan Tandy <ryan at nardis.ca>  Tue, 15 Mar 2016 03:59:27 +0000
+    The slapd-smbk5pwd package is no longer built with Kerberos support,
+    as the heimdal package is being removed at the request of its
+    maintainers. Please see <https://bugs.debian.org/836885> for more
+    information.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Sat, 29 Oct 2016 20:36:03 -0700
 
 openldap (2.4.23-3) unstable; urgency=low
 

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

