lp:~yolanda.robla/ubuntu/saucy/openldap/server_banner

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/saucy/openldap at revision 57

Ubuntu branches: Pending requested 2013-07-08

Diff: 65 lines (+33/-1)

4 files modified

debian/changelog (+7/-0)
debian/control (+1/-1)
debian/patches/fix-ldap-distribution.patch (+24/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

57. By Yolanda Robla on 2013-07-08

* debian/control: added lsb-release
* debian/patches/fix-ldap-distribution.patch: show distribution in version

56. By Marc Deslauriers on 2013-05-30

* 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:
    - 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:
    - d/control: suggest ufw.
    - d/rules: install ufw profile.
    - d/slapd.ufw.profile: add ufw profile.
  - Enable nss overlay:
    - d/{patches/nssov-build,/rules}: Apply, build and package the
      nss overlay.
  - d/{rules,slapd.py}: Add apport hook.
  - 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
  - d/{control,rules}: enable PIE hardening

55. By Marc Deslauriers on 2012-08-20

debian/slapd.py: Add AppArmor info and logs to apport hook.

54. By James Page on 2012-07-20

* 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.

53. By Pierre Fersing <email address hidden> on 2012-07-19

* Fix issue with intermittent connection issues when using LDAPv3
  protocol (LP: #1023025):
  - d/patches/its-7107-fix-Operation-init-on-reuse.diff: Cherry picked
    patch from upstream VCS which ensures objects are initialized before
    re-use.

52. By Stéphane Graber on 2012-07-18

releasing version 2.4.28-1.1ubuntu5

51. By Stéphane Graber on 2012-07-18

Re-introduce slapd-smbk5pwd as we now have heimdal-dev in main

50. By Jamie Strandboge on 2012-04-05

debian/control: Build-Depends on dh-apparmor (LP: #948481)

49. By Timo Aaltonen on 2012-02-21

Add its-7176-only-poll-sockets-for-write-as-needed.diff
(LP: #932823).

48. By Daniel T Chen on 2012-01-25

Remove debian/patches/CVE-2011-4079; it's already in this upstream
version. Fixes FTBFS.