This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit 875a4479f4d3f043b07fa3e1e275f7831ae26fe6
Author: Ryan Tandy <ryan at nardis.ca>
Date: Tue Oct 21 01:42:47 2014 +0000
build and install slapo-lastbind (#701111)
---
debian/changelog | 1 +
debian/patches/contrib-modules-use-dpkg-buildflags | 17 +++++++++++
debian/patches/lastbind-makefile | 35 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 6 ++++
5 files changed, 60 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index d22bb64..e9973f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ openldap (2.4.40-2) UNRELEASED; urgency=medium
for example if the active backend doesn't use it. Thanks Ferenc Wagner.
* On upgrade, if an access rule begins with "to * by self write", show a
debconf note warning that it should be changed. (Closes: #761406)
+ * Build and install the lastbind contrib module. (Closes: #701111)
-- Ryan Tandy <ryan at nardis.ca> Sun, 19 Oct 2014 17:34:00 -0700
diff --git a/debian/patches/contrib-modules-use-dpkg-buildflags b/debian/patches/contrib-modules-use-dpkg-buildflags
index e25c2be..f26f855 100644
--- a/debian/patches/contrib-modules-use-dpkg-buildflags
+++ b/debian/patches/contrib-modules-use-dpkg-buildflags
@@ -38,3 +38,20 @@ Bug-Debian: http://bugs.debian.org/663724
-rpath $(moduledir) -module -o $@ $? $(LIBS)
clean:
+--- a/contrib/slapd-modules/lastbind/Makefile
++++ b/contrib/slapd-modules/lastbind/Makefile
+@@ -37,12 +37,12 @@
+ .SUFFIXES: .c .o .lo
+
+ .c.lo:
+- $(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $<
++ $(LIBTOOL) --mode=compile $(CC) $(OPT) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $<
+
+ all: $(PROGRAMS)
+
+ lastbind.la: lastbind.lo
+- $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
++ $(LIBTOOL) --mode=link $(CC) $(OPT) $(LDFLAGS) -version-info $(LTVER) \
+ -rpath $(moduledir) -module -o $@ $? $(LIBS)
+
+ clean:
diff --git a/debian/patches/lastbind-makefile b/debian/patches/lastbind-makefile
new file mode 100644
index 0000000..b7f9356
--- /dev/null
+++ b/debian/patches/lastbind-makefile
@@ -0,0 +1,35 @@
+--- a/contrib/slapd-modules/lastbind/Makefile
++++ b/contrib/slapd-modules/lastbind/Makefile
+@@ -12,11 +12,11 @@
+
+ LDAP_SRC = ../../..
+ LDAP_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 \
+- $(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_INC = -I$(LDAP_BUILD)/debian/build/include -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
++LDAP_LIB = $(LDAP_BUILD)/debian/build/libraries/libldap_r/libldap_r.la \
++ $(LDAP_BUILD)/debian/build/libraries/liblber/liblber.la
+
+-LIBTOOL = $(LDAP_BUILD)/libtool
++LIBTOOL = $(LDAP_BUILD)/debian/build/libtool
+ CC = gcc
+ OPT = -g -O2 -Wall
+ DEFS = -DSLAPD_OVER_LASTBIND=SLAPD_MOD_DYNAMIC
+@@ -26,13 +26,13 @@
+ PROGRAMS = lastbind.la
+ LTVER = 0:0:0
+
+-prefix=/usr/local
++prefix=/usr
+ exec_prefix=$(prefix)
+-ldap_subdir=/openldap
++ldap_subdir=/ldap
+
+ libdir=$(exec_prefix)/lib
+ libexecdir=$(exec_prefix)/libexec
+-moduledir = $(libexecdir)$(ldap_subdir)
++moduledir = $(libdir)$(ldap_subdir)
+
+ .SUFFIXES: .c .o .lo
+
diff --git a/debian/patches/series b/debian/patches/series
index c7a6f00..ae05fa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,6 +11,7 @@ do-not-second-guess-sonames
contrib-modules-use-dpkg-buildflags
smbk5pwd-makefile
autogroup-makefile
+lastbind-makefile
ldap-conf-tls-cacertdir
add-tlscacert-option-to-ldap-conf
fix-build-top-mk
diff --git a/debian/rules b/debian/rules
index d13c75e..599b3e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,11 +89,13 @@ override_dh_auto_build:
dh_auto_build -- $(MAKEVARS)
$(MAKE) -C contrib/slapd-modules/smbk5pwd
$(MAKE) -C contrib/slapd-modules/autogroup
+ $(MAKE) -C contrib/slapd-modules/lastbind
override_dh_auto_install:
dh_auto_install -- $(MAKEVARS)
$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
+ $(MAKE) -C contrib/slapd-modules/lastbind install DESTDIR=$(installdir)
# Empty the dependency_libs file in the .la files.
for F in $(installdir)/usr/lib/ldap/*.la; do \
@@ -183,3 +185,7 @@ override_dh_auto_clean:
contrib/slapd-modules/autogroup/autogroup.lo \
contrib/slapd-modules/autogroup/autogroup.la \
contrib/slapd-modules/autogroup/autogroup.o
+ rm -rf contrib/slapd-modules/lastbind/.libs \
+ contrib/slapd-modules/lastbind/lastbind.lo \
+ contrib/slapd-modules/lastbind/lastbind.la \
+ contrib/slapd-modules/lastbind/lastbind.o
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git