--- Begin Message ---
Package: sponsorship-requests
Severity: normal
Package: sponsorship-requests
Severity: normal
Dear mentors,
I am looking for a sponsor to upload an updated openldap package.
Changes since the last upload:
* Apply upstream patch to fix FTBFS on kFreeBSD. (Closes: #845394)
* Restore heimdal support to the smbk5pwd overlay.
I am aware there is still a slight chance heimdal may not be released with
stretch. However, heimdal in unstable has all the RC bugs fixed, so it should
migrate as soon as #844357 in binutils is fixed and mips* are given back; and
I'd rather have to disable the dependency again after the freeze than risk
entering the freeze with the current crippled package.
The package can be obtained from:
https://pkg-openldap.alioth.debian.org/stretch/openldap_2.4.44+dfsg-3.dsc
The git history may be obtained from or browsed at:
https://anonscm.debian.org/git/pkg-openldap/openldap.git
The debdiff relative to 2.4.44+dfsg-2 is attached.
The test suite for openldap takes over an hour to run. You may want to
build locally with DEB_BUILD_OPTIONS=nocheck and let the buildds take
care of running the tests.
thanks,
Ryan
diff -Nru openldap-2.4.44+dfsg/debian/changelog openldap-2.4.44+dfsg/debian/changelog
--- openldap-2.4.44+dfsg/debian/changelog 2016-12-01 19:40:20.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/changelog 2017-01-01 19:47:36.000000000 -0800
@@ -1,3 +1,10 @@
+openldap (2.4.44+dfsg-3) unstable; urgency=medium
+
+ * Apply upstream patch to fix FTBFS on kFreeBSD. (Closes: #845394)
+ * Restore heimdal support to the smbk5pwd overlay.
+
+ -- Ryan Tandy <r...@nardis.ca> Sun, 01 Jan 2017 19:47:36 -0800
+
openldap (2.4.44+dfsg-2) unstable; urgency=medium
[ Ryan Tandy ]
diff -Nru openldap-2.4.44+dfsg/debian/control openldap-2.4.44+dfsg/debian/control
--- openldap-2.4.44+dfsg/debian/control 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/control 2017-01-01 19:46:51.000000000 -0800
@@ -12,6 +12,7 @@
dh-autoreconf,
dpkg-dev (>= 1.17.14),
groff-base,
+ heimdal-multidev <!stage1>,
libdb5.3-dev <!stage1>,
libgnutls28-dev,
libltdl-dev <!stage1>,
@@ -55,10 +56,11 @@
Architecture: any
Build-Profiles: <!stage1>
Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-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.
+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.
Package: ldap-utils
Section: net
diff -Nru openldap-2.4.44+dfsg/debian/dh_installscripts-common openldap-2.4.44+dfsg/debian/dh_installscripts-common
--- openldap-2.4.44+dfsg/debian/dh_installscripts-common 2016-11-10 20:10:26.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/dh_installscripts-common 2017-01-01 19:46:51.000000000 -0800
@@ -5,10 +5,9 @@
init();
-my $scriptscommon = $ARGV[0];
-
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
+ my $ext=pkgext($package);
if (! -d "$tmp/DEBIAN") {
next;
@@ -16,10 +15,8 @@
foreach my $file (qw{postinst preinst prerm postrm config}) {
my $f="$tmp/DEBIAN/$file";
- if (! -e $f) {
- next;
+ if ($f) {
+ complex_doit("perl -pe 's~#SCRIPTSCOMMON#~qx{cat debian/${ext}scripts-common}~eg' -i $f");
}
- print "changing $f with $scriptscommon\n";
- complex_doit("perl -pe 's~#SCRIPTSCOMMON#~qx{cat $scriptscommon}~eg' -i $f");
}
}
diff -Nru openldap-2.4.44+dfsg/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch openldap-2.4.44+dfsg/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch
--- openldap-2.4.44+dfsg/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch 1969-12-31 16:00:00.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/patches/ITS-8554-kFreeBSD-is-like-BSD.patch 2016-12-28 10:56:32.000000000 -0800
@@ -0,0 +1,26 @@
+From 74d64d0eb245ce07383abcd444c23e7438e8a083 Mon Sep 17 00:00:00 2001
+From: Howard Chu <h...@openldap.org>
+Date: Wed, 28 Dec 2016 18:32:14 +0000
+Subject: [PATCH] ITS#8554 kFreeBSD is like BSD
+
+Doesn't have POSIX robust mutexes - GNU userland on BSD kernel
+---
+ libraries/liblmdb/mdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
+index 7a181d4..23c1f00 100644
+--- a/libraries/liblmdb/mdb.c
++++ b/libraries/liblmdb/mdb.c
+@@ -120,7 +120,7 @@ typedef SSIZE_T ssize_t;
+ #include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */
+ #endif
+
+-#if defined(__APPLE__) || defined (BSD)
++#if defined(__APPLE__) || defined (BSD) || defined(__FreeBSD_kernel__)
+ # define MDB_USE_POSIX_SEM 1
+ # define MDB_FDATASYNC fsync
+ #elif defined(ANDROID)
+--
+2.1.4
+
diff -Nru openldap-2.4.44+dfsg/debian/patches/series openldap-2.4.44+dfsg/debian/patches/series
--- openldap-2.4.44+dfsg/debian/patches/series 2016-11-10 19:28:37.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/patches/series 2017-01-01 19:46:51.000000000 -0800
@@ -21,5 +21,7 @@
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
+ITS-8554-kFreeBSD-is-like-BSD.patch
diff -Nru openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile
--- openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile 2016-11-10 19:28:37.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile 2017-01-01 19:46:51.000000000 -0800
@@ -1,6 +1,6 @@
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
-@@ -14,34 +14,34 @@
+@@ -14,34 +14,35 @@
LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC)
@@ -15,20 +15,21 @@
-SSL_LIB = -lcrypto
+SSL_LIB = -lnettle
- HEIMDAL_INC = -I/usr/heimdal/include
- HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
+-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)
-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)
-+DEFS = -DDO_SAMBA -DDO_SHADOW
-+INCS = $(LDAP_INC) $(SSL_INC)
-+LIBS = $(LDAP_LIB) $(SSL_LIB)
++# put /usr/lib/heimdal before /usr/lib in case libkrb5-dev is installed, #745356
++LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB)
PROGRAMS = smbk5pwd.la
LTVER = 0:0:0
@@ -46,7 +47,7 @@
.SUFFIXES: .c .o .lo
-@@ -55,7 +55,7 @@
+@@ -55,7 +56,7 @@
-rpath $(moduledir) -module -o $@ $? $(LIBS)
clean:
diff -Nru openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile-manpage openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile-manpage
--- openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile-manpage 2016-11-10 19:28:37.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/patches/smbk5pwd-makefile-manpage 2017-01-01 19:46:51.000000000 -0800
@@ -13,25 +13,27 @@
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 = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
+ HEIMDAL_LIB = $(shell krb5-config.heimdal --libs kadm-server)
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.
-@@ -33,6 +34,7 @@
- LIBS = $(LDAP_LIB) $(SSL_LIB)
+@@ -34,6 +35,7 @@
+ LIBS = $(HEIMDAL_LIB) $(LDAP_LIB) $(SSL_LIB)
PROGRAMS = smbk5pwd.la
+MANPAGES = slapo-smbk5pwd.5
LTVER = 0:0:0
prefix=/usr
-@@ -42,6 +44,8 @@
+@@ -43,6 +45,8 @@
libdir=$(exec_prefix)/lib
libexecdir=$(exec_prefix)/libexec
moduledir = $(libdir)$(ldap_subdir)
@@ -40,7 +42,7 @@
.SUFFIXES: .c .o .lo
-@@ -57,9 +61,17 @@
+@@ -58,9 +62,17 @@
clean:
$(LIBTOOL) --mode=clean rm -f
@@ -59,6 +61,9 @@
+
+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 @@
@@ -241,3 +246,6 @@
+.B OpenLDAP
+is derived from University of Michigan LDAP 3.3 Release.
+
+--
+2.5.0
+
diff -Nru openldap-2.4.44+dfsg/debian/po/ca.po openldap-2.4.44+dfsg/debian/po/ca.po
--- openldap-2.4.44+dfsg/debian/po/ca.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/ca.po 2017-01-01 19:46:51.000000000 -0800
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: 2.4.40-2\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-08 17:50+0100\n"
"Last-Translator: Innocent De Marchi <tangram.pe...@gmail.com>\n"
"Language-Team: catalan <debian-l10n-cata...@lists.debian.org>\n"
@@ -426,36 +426,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Desitjau permetre el protocol LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/cs.po openldap-2.4.44+dfsg/debian/po/cs.po
--- openldap-2.4.44+dfsg/debian/po/cs.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/cs.po 2017-01-01 19:46:51.000000000 -0800
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-08 16:21+0100\n"
"Last-Translator: Miroslav Kure <ku...@debian.cz>\n"
"Language-Team: Czech <debian-l10n-cz...@lists.debian.org>\n"
@@ -426,36 +426,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Povolit protokol LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/da.po openldap-2.4.44+dfsg/debian/po/da.po
--- openldap-2.4.44+dfsg/debian/po/da.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/da.po 2017-01-01 19:46:51.000000000 -0800
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 05:26+0100\n"
"Last-Translator: Joe Hansen <joedalt...@yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-dan...@lists.debian.org> \n"
@@ -419,36 +419,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Tillad LDAPv2-protokollen?"
diff -Nru openldap-2.4.44+dfsg/debian/po/de.po openldap-2.4.44+dfsg/debian/po/de.po
--- openldap-2.4.44+dfsg/debian/po/de.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/de.po 2017-01-01 19:46:51.000000000 -0800
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.21-1\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-01 18:34+0100\n"
"Last-Translator: Helge Kreutzmann <deb...@helgefjell.de>\n"
"Language-Team: de <debian-l10n-ger...@lists.debian.org>\n"
@@ -434,36 +434,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "LDAPv2-Protokoll erlauben?"
diff -Nru openldap-2.4.44+dfsg/debian/po/es.po openldap-2.4.44+dfsg/debian/po/es.po
--- openldap-2.4.44+dfsg/debian/po/es.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/es.po 2017-01-01 19:46:51.000000000 -0800
@@ -38,7 +38,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.23-3exp1\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-20 17:45+0100\n"
"Last-Translator: Camaleón <noela...@gmail.com>\n"
"Language-Team: Debian Spanish <debian-l10n-span...@lists.debian.org>\n"
@@ -458,36 +458,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "¿Desea permitir el protocolo LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/eu.po openldap-2.4.44+dfsg/debian/po/eu.po
--- openldap-2.4.44+dfsg/debian/po/eu.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/eu.po 2017-01-01 19:46:51.000000000 -0800
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap_2.4.40-2_eu\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-28 10:15+0100\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <doo...@zundan.com>\n"
"Language-Team: Basque <debian-l10n-bas...@lists.debian.org>\n"
@@ -424,36 +424,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Onartu LDAPv2 protokoloa?"
diff -Nru openldap-2.4.44+dfsg/debian/po/fi.po openldap-2.4.44+dfsg/debian/po/fi.po
--- openldap-2.4.44+dfsg/debian/po/fi.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/fi.po 2017-01-01 19:46:51.000000000 -0800
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2008-04-09 20:55+0200\n"
"Last-Translator: Esko Arajärvi <e...@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finn...@lists.debian.org>\n"
@@ -434,36 +434,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Sallitaanko LDAPv2-yhteyskäytäntö?"
diff -Nru openldap-2.4.44+dfsg/debian/po/fr.po openldap-2.4.44+dfsg/debian/po/fr.po
--- openldap-2.4.44+dfsg/debian/po/fr.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/fr.po 2017-01-01 19:46:51.000000000 -0800
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 10:15+0100\n"
"Last-Translator: Christian Perrier <bubu...@debian.org>\n"
"Language-Team: French <debian-l10n-fre...@lists.debian.org>\n"
@@ -435,36 +435,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Faut-il autoriser le protocole LDAPv2 ?"
diff -Nru openldap-2.4.44+dfsg/debian/po/gl.po openldap-2.4.44+dfsg/debian/po/gl.po
--- openldap-2.4.44+dfsg/debian/po/gl.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/gl.po 2017-01-01 19:46:51.000000000 -0800
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap_2.4.40-2_gl\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-17 00:40+0100\n"
"Last-Translator: Jorge Barreiro <yortx.ba...@gmail.com>\n"
"Language-Team: Galician <proxe...@trasno.net>\n"
@@ -426,36 +426,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Admitir o protocolo LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/it.po openldap-2.4.44+dfsg/debian/po/it.po
--- openldap-2.4.44+dfsg/debian/po/it.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/it.po 2017-01-01 19:46:51.000000000 -0800
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.40-2 italian debconf templates\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-01 11:45+0100\n"
"Last-Translator: Luca Monducci <luca...@tiscali.it>\n"
"Language-Team: Italian <debian-l10n-ital...@lists.debian.org>\n"
@@ -424,36 +424,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Abilitare il protocollo LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/ja.po openldap-2.4.44+dfsg/debian/po/ja.po
--- openldap-2.4.44+dfsg/debian/po/ja.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/ja.po 2017-01-01 19:46:51.000000000 -0800
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 13:17+0900\n"
"Last-Translator: Kenshi Muto <km...@debian.org>\n"
"Language-Team: Japanese <debian-japan...@lists.debian.org>\n"
@@ -421,36 +421,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "LDAPv2 プロトコルを許可しますか?"
diff -Nru openldap-2.4.44+dfsg/debian/po/nl.po openldap-2.4.44+dfsg/debian/po/nl.po
--- openldap-2.4.44+dfsg/debian/po/nl.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/nl.po 2017-01-01 19:46:51.000000000 -0800
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.25-4\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-04 10:58+0100\n"
"Last-Translator: Frans Spiesschaert <frans.spiesscha...@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-du...@lists.debian.org>\n"
@@ -433,36 +433,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "LDAPv2-protocol toelaten?"
diff -Nru openldap-2.4.44+dfsg/debian/po/pt_BR.po openldap-2.4.44+dfsg/debian/po/pt_BR.po
--- openldap-2.4.44+dfsg/debian/po/pt_BR.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/pt_BR.po 2017-01-01 19:46:51.000000000 -0800
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.40-2\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-15 18:15-0200\n"
"Last-Translator: Adriano Rafael Gomes <adrian...@arg.eti.br>\n"
"Language-Team: l10n Portuguese <debian-l10n-portugu...@lists.debian.org>\n"
@@ -434,36 +434,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Permitir o protocolo LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/pt.po openldap-2.4.44+dfsg/debian/po/pt.po
--- openldap-2.4.44+dfsg/debian/po/pt.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/pt.po 2017-01-01 19:46:51.000000000 -0800
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openldap 2.3.38-2\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 23:07-0000\n"
"Last-Translator: Tiago Fernandes <tjg.fernan...@gmail.com>\n"
"Language-Team: pt <l...@debianpt.org>\n"
@@ -429,36 +429,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Permitir o protocolo LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/ru.po openldap-2.4.44+dfsg/debian/po/ru.po
--- openldap-2.4.44+dfsg/debian/po/ru.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/ru.po 2017-01-01 19:46:51.000000000 -0800
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.40-2\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 08:52+0300\n"
"Last-Translator: Yuri Kozlov <yu...@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russ...@lists.debian.org>\n"
@@ -432,36 +432,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Включить протокол LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/sk.po openldap-2.4.44+dfsg/debian/po/sk.po
--- openldap-2.4.44+dfsg/debian/po/sk.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/sk.po 2017-01-01 19:46:51.000000000 -0800
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.23-7\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2011-01-02 20:34+0100\n"
"Last-Translator: Slavko <li...@slavino.sk>\n"
"Language-Team: Slovak <nomail>\n"
@@ -431,36 +431,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Povoliť protokol LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/po/sv.po openldap-2.4.44+dfsg/debian/po/sv.po
--- openldap-2.4.44+dfsg/debian/po/sv.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/sv.po 2017-01-01 19:46:51.000000000 -0800
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap_2.4.10-2_sv\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-17 10:35+0100\n"
"Last-Translator: Martin Bagge / brother <brot...@bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swed...@lists.debian.org>\n"
@@ -420,36 +420,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Tillåt LDAPv2-protokollet?"
diff -Nru openldap-2.4.44+dfsg/debian/po/templates.pot openldap-2.4.44+dfsg/debian/po/templates.pot
--- openldap-2.4.44+dfsg/debian/po/templates.pot 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/templates.pot 2017-01-01 19:46:51.000000000 -0800
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -366,33 +366,3 @@
"before upgrading slapd. If replication is in use, the schema update should "
"be applied on every server before continuing with the upgrade."
msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
diff -Nru openldap-2.4.44+dfsg/debian/po/tr.po openldap-2.4.44+dfsg/debian/po/tr.po
--- openldap-2.4.44+dfsg/debian/po/tr.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/tr.po 2017-01-01 19:46:51.000000000 -0800
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-11-04 13:40+0200\n"
"Last-Translator: Atila KOÇ <k...@artielektronik.com.tr>\n"
"Language-Team: Turkish <debian-l10n-turk...@lists.debian.org>\n"
@@ -424,36 +424,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "LDAPv2 iletişim kuralına izin verilsin mi?"
diff -Nru openldap-2.4.44+dfsg/debian/po/vi.po openldap-2.4.44+dfsg/debian/po/vi.po
--- openldap-2.4.44+dfsg/debian/po/vi.po 2016-11-23 21:57:19.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/po/vi.po 2017-01-01 19:46:51.000000000 -0800
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openldap 2.4.40-2\n"
"Report-Msgid-Bugs-To: openl...@packages.debian.org\n"
-"POT-Creation-Date: 2016-11-23 05:25+0000\n"
+"POT-Creation-Date: 2016-12-29 00:04+0000\n"
"PO-Revision-Date: 2014-10-26 08:53+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwild...@gmail.com>\n"
"Language-Team: Vietnamese <debian-l10n-vietnam...@lists.debian.org>\n"
@@ -423,36 +423,6 @@
"be applied on every server before continuing with the upgrade."
msgstr ""
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid "Kerberos support disabled for smbk5pwd overlay"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"smbk5pwd-enable krb5\" setting has been automatically disabled in the "
-"slapd configuration file."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid "Disable Kerberos in smbk5pwd before upgrading slapd"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../slapd.templates:19001
-msgid ""
-"The smbk5pwd overlay is no longer built with Kerberos support. The "
-"\"olcSmbK5PwdEnable: krb5\" setting must be removed from any instances of "
-"the smbk5pwd overlay before upgrading slapd."
-msgstr ""
-
#~ msgid "Allow LDAPv2 protocol?"
#~ msgstr "Cho phép giao thức LDAPv2?"
diff -Nru openldap-2.4.44+dfsg/debian/rules openldap-2.4.44+dfsg/debian/rules
--- openldap-2.4.44+dfsg/debian/rules 2016-11-28 18:32:20.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/rules 2017-01-01 19:46:51.000000000 -0800
@@ -194,7 +194,7 @@
ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
override_dh_installdeb:
dh_installdeb
- perl -w debian/dh_installscripts-common -pslapd -pslapd-smbk5pwd debian/slapd.scripts-common
+ perl -w debian/dh_installscripts-common -p slapd
endif
override_dh_auto_clean:
diff -Nru openldap-2.4.44+dfsg/debian/slapd.NEWS openldap-2.4.44+dfsg/debian/slapd.NEWS
--- openldap-2.4.44+dfsg/debian/slapd.NEWS 2016-11-10 20:39:57.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd.NEWS 2017-01-01 19:46:51.000000000 -0800
@@ -5,16 +5,7 @@
security concerns. Please see <https://bugs.debian.org/795428> for
more information.
- The slapd-smbk5pwd package is no longer built with Kerberos support,
- as the heimdal package is being removed at the request of its
- maintainers. On upgrade, if slapd is using a slapd.conf file, any
- instances of 'smbk5pwd-enable krb5' will be commented out
- automatically. If slapd is using dynamic configuration (cn=config),
- any instances of 'olcSmbK5PwdEnable: krb5' must be disabled manually
- before upgrading. Please see <https://bugs.debian.org/836885> for
- more information.
-
- -- Ryan Tandy <r...@nardis.ca> Sat, 29 Oct 2016 20:36:03 -0700
+ -- Ryan Tandy <r...@nardis.ca> Tue, 15 Mar 2016 03:59:27 +0000
openldap (2.4.23-3) unstable; urgency=low
diff -Nru openldap-2.4.44+dfsg/debian/slapd.postinst openldap-2.4.44+dfsg/debian/slapd.postinst
--- openldap-2.4.44+dfsg/debian/slapd.postinst 2016-11-13 17:24:22.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd.postinst 2017-01-01 19:46:51.000000000 -0800
@@ -8,33 +8,12 @@
# various helper functions and $OLD_VERSION and $SLAPD_CONF
#SCRIPTSCOMMON#
-disable_smbk5pwd_krb5() { # {{{
-# Disable smbk5pwd's Kerberos support in slapd.conf
- if ! read_slapd_conf < "$SLAPD_CONF" | grep -q '^smbk5pwd-enable\s\+krb5'; then
- return 0
- fi
-
- write_slapd_conf "$SLAPD_CONF" 's/^(smbk5pwd-enable\s+krb5)/#$1/i'
- update_slapd_conf_permissions
-
- db_input critical slapd/smbk5pwd_krb5_disabled || true
- db_go
-}
-# }}}
-
postinst_upgrade_cn_config() { # {{{
if previous_version_older '2.4.44+dfsg-1~'; then
upgrade_cnconfig_ppolicy_schema
fi
}
# }}}
-postinst_upgrade_slapd_conf() { # {{{
- if previous_version_older '2.4.44+dfsg-1~'; then
- disable_smbk5pwd_krb5
- fi
-}
-# }}}
-
postinst_initial_configuration() { # {{{
# Configure slapd for the first time (when first installed)
# Usage: postinst_initial_configuration
@@ -60,8 +39,6 @@
# Complete any config updates before trying to use slapadd
if [ -d "$SLAPD_CONF" ]; then
postinst_upgrade_cn_config
- else
- postinst_upgrade_slapd_conf
fi
# Check if the database format has changed.
diff -Nru openldap-2.4.44+dfsg/debian/slapd.preinst openldap-2.4.44+dfsg/debian/slapd.preinst
--- openldap-2.4.44+dfsg/debian/slapd.preinst 2016-11-10 20:44:47.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd.preinst 2017-01-01 19:46:51.000000000 -0800
@@ -70,17 +70,6 @@
# schema automatically in postinst.
}
# }}}
-ensure_smbk5pwd_krb5_disabled() { # {{{
- local config_ldif="$1"
-
- if grep -q '^olcSmbK5PwdEnable:\s\+krb5' "$config_ldif"; then
- db_fset slapd/must_disable_smbk5pwd_krb5 seen false
- db_input critical slapd/must_disable_smbk5pwd_krb5 || true
- db_go || true
- exit 1
- fi
-}
-# }}}
preinst_check_config() { # {{{
# Check whether manual config changes are required before upgrading
if ! previous_version_older '2.4.44+dfsg-1~'; then
@@ -101,7 +90,6 @@
normalize_ldif "$dumped_ldif" > "$config_ldif"
check_ppolicy_schema "$config_ldif"
- ensure_smbk5pwd_krb5_disabled "$config_ldif"
}
# }}}
diff -Nru openldap-2.4.44+dfsg/debian/slapd.scripts-common openldap-2.4.44+dfsg/debian/slapd.scripts-common
--- openldap-2.4.44+dfsg/debian/slapd.scripts-common 2016-11-10 19:28:38.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd.scripts-common 2017-01-01 19:46:51.000000000 -0800
@@ -107,20 +107,6 @@
done
}
# }}}
-update_slapd_conf_permissions() { # {{{
- if [ -n "$SLAPD_USER" ] && [ -n "$SLAPD_GROUP" ] ; then
- if perl -e '
- ($o, $m) = (stat $ARGV[0])[4,2];
- exit 1 unless defined $o;
- exit 0 if ($o == 0 && ($m & 040) == 0);
- exit 1;
- ' "$SLAPD_CONF"; then
- chgrp "$SLAPD_GROUP" "$SLAPD_CONF"
- chmod g+r "$SLAPD_CONF"
- fi
- fi
-}
-# }}}
# }}}
# ----- Dumping and loading the data ------------------------------------ {{{
@@ -291,86 +277,6 @@
# For some operations we have to know the slapd configuration. These
# functions are for parsing the slapd configuration file.
-merge_logical_lines() { # {{{
-# slapd supports continuation lines in the slapd.conf. Continuation lines
-# start with spaces and are merged with the preceding line. This function
-# uses perl to merge physical lines into logical lines as seen by the
-# slapd config parser.
-# Usage: merge_logical_lines < input > output
-
- perl -pe 'BEGIN { undef $/ }; s/\n(?!\n)\s+/ /g;'
-}
-
-# }}}
-read_slapd_conf() { # {{{
-# read slapd.conf file and evaluate include statements
-# FIXME: circular loops will cause this to block forever
- merge_logical_lines | while read command data; do
- if [ "$command" = "include" ]; then
- file=`eval echo $data`
- read_slapd_conf < $file
- else
- echo $command $data
- fi
- done
-}
-
-# }}}
-write_slapd_conf() { # {{{
-# Change a configuration setting in a configuration file, follow includes.
-# Usage: write_slapd_conf configuration_file regexpression
-# FIXME: circular loops will cause this to block forever
-
- conf=$1
- reg=$2
-
- # Perl script to change configuration files.
- script='
- use File::Temp;
- use File::Compare;
- use File::Copy;
-
- sub changeConfig {
- my ($conf, $regexp) = @_;
- my ($fh, $name) = mkstemp("/tmp/tmp.XXXXXX");
-
- open(HANDLE, "<". $conf) || return;
- my @data = <HANDLE>;
- close(HANDLE);
-
- foreach $line (@data) {
-
- # Parse includes, but forget the schema files.
- if ($line =~ /^include/ && $line !~ /\/etc\/ldap\/schema\//) {
- my @file = split(/\s+/, $line);
- changeConfig($file[1], $regexp);
- }
-
- # Modify the config with the given regexpression.
- $doit = "\$line =~ $regexp";
- eval $doit;
- print $fh $line;
- }
-
- # Close the tempfile handle opened by mkstemp.
- close($fh);
-
- # If file is changed by the regexp replace the original file.
- if (compare($conf, $name) != 0) {
- move($name, $conf);
- } else {
- unlink($name);
- }
- }
-
- $config = shift;
- $regexp = shift;
- changeConfig($config, $regexp);'
-
- # Use perl to execute the function above.
- perl -e "$script" "$conf" "$reg"
-}
-# }}}
# The following two functions need to support slapd.conf installations
# as long as upgrading from slapd.conf environment is supported.
# They're used to dump database in preinst which may have a slapd.conf file.
diff -Nru openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.lintian-overrides openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.lintian-overrides
--- openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.lintian-overrides 2016-11-26 19:00:12.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.lintian-overrides 2017-01-01 19:46:51.000000000 -0800
@@ -1,5 +1,2 @@
-# The call to adduser is in a functions library inlined at build time.
-# adduser is not actually called from this script.
-slapd-smbk5pwd: maintainer-script-needs-depends-on-adduser preinst
# #204975
slapd-smbk5pwd: package-has-unnecessary-activation-of-ldconfig-trigger
diff -Nru openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.preinst openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.preinst
--- openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.preinst 2016-12-01 19:37:49.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd-smbk5pwd.preinst 1969-12-31 16:00:00.000000000 -0800
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# This will be replaced with debian/slapd.scripts-common which includes
-# various helper functions and $OLD_VERSION and $SLAPD_CONF
-#SCRIPTSCOMMON#
-
-is_krb5_enabled() { # {{{
-# Cannot depend on a working slapcat here. If a new slapd was already
-# unpacked, slap* binaries may be broken until it is configured.
- grep -qri --include='olcOverlay=*smbk5pwd.ldif' \
- '^olcSmbK5PwdEnable:\s\+krb5' "$SLAPD_CONF"
-}
-# }}}
-ensure_krb5_disabled() { # {{{
-# Prevent upgrading smbk5pwd with krb5 still enabled
-# This is to avoid a case where a new smbk5pwd (without krb5 support)
-# has already been unpacked, but slapd.preinst stops the upgrade because
-# manual config changes are needed.
- if [ ! -d "$SLAPD_CONF" ]; then
- # slapd.conf is handled automatically in postinst
- return
- fi
-
- if ! is_krb5_enabled; then
- return
- fi
-
- # A more detailed message is shown from slapd.preinst.
- echo 'smbk5pwd overlay must have krb5 disabled before upgrading' >&2
- exit 1
-}
-# }}}
-
-if [ "$MODE" = upgrade ] && previous_version_older '2.44+dfsg-1~'; then
- ensure_krb5_disabled
-fi
-
-#DEBHELPER#
-
-exit 0
-
-# vim: set sw=8 foldmethod=marker:
diff -Nru openldap-2.4.44+dfsg/debian/slapd.templates openldap-2.4.44+dfsg/debian/slapd.templates
--- openldap-2.4.44+dfsg/debian/slapd.templates 2016-11-10 20:45:29.000000000 -0800
+++ openldap-2.4.44+dfsg/debian/slapd.templates 2017-01-01 19:46:51.000000000 -0800
@@ -182,18 +182,3 @@
schema before upgrading slapd. If replication is in use, the schema
update should be applied on every server before continuing with the
upgrade.
-
-Template: slapd/smbk5pwd_krb5_disabled
-Type: error
-_Description: Kerberos support disabled for smbk5pwd overlay
- The smbk5pwd overlay is no longer built with Kerberos support. The
- "smbk5pwd-enable krb5" setting has been automatically disabled in the
- slapd configuration file.
-
-Template: slapd/must_disable_smbk5pwd_krb5
-Type: error
-#flag:translate!:4,6
-_Description: Disable Kerberos in smbk5pwd before upgrading slapd
- The smbk5pwd overlay is no longer built with Kerberos support. The
- "olcSmbK5PwdEnable: krb5" setting must be removed from any instances of
- the smbk5pwd overlay before upgrading slapd.
--- End Message ---
