* Merge from Debian unstable. Remaining changes: - Enable AppArmor support: - d/apparmor-profile: add AppArmor profile - d/rules: use dh_apparmor - d/control: Build-Depends on dh-apparmor - d/slapd.README.Debian: add note about AppArmor - d/slapd.dirs: add etc/apparmor.d/force-complain - Enable GSSAPI support (LP: #495418): - d/patches/gssapi.diff, thanks to Jerry Carter (Likewise): - Add --with-gssapi support - Make guess_service_principal() more robust when determining principal - d/configure.options: Configure with --with-gssapi - d/control: Added libkrb5-dev as a build depend - Enable ufw support (LP: #423246): - d/control: suggest ufw. - d/rules: install ufw profile. - d/slapd.ufw.profile: add ufw profile. - Enable nss overlay (LP: #675391): - d/{patches/nssov-build,/rules}: Apply, build and package the nss overlay. - d/{rules,slapd.py}: Add apport hook. (LP: #610544) - d/slapd.init.ldif: don't set olcRootDN since it's not defined in either the default DIT nor via an Authn mapping. - d/slapd.scripts-common: - add slapcat_opts to local variables. - Remove unused variable new_conf. - Fix backup directory naming for multiple reconfiguration. - d/{slapd.default,slapd.README.Debian}: use the new configuration style. - d/rules: Enable -DLDAP_CONNECTIONLESS to build CLDAP (UDP) support in the openldap library, as required by Likewise-Open (LP: #390579) - d/{control,rules}: enable PIE hardening * Dropped changes: - d/patches/its-7107-fix-Operation-init-on-reuse.diff: Included in upstream release. - d/patches/CVE-2011-4079: Included in upstream release. - d/patches/service-operational-before-detach: Included in upstream release. - d/schema/extra/misc.ldif: Included upstream. - d/{rules,schema/extra}: Fix configure and clean rules to support extra schemas shipped as part of the debian/schema/ directory; no longer required. - Included in Debian: + Document cn=config in README file. + Install a default DIT; actually a minimal configuration. + d/patches/heimdal-fix. * General tidy of d/patches to remove obsolete patches being held in Ubuntu delta.