~sergiodj/ubuntu/+source/openldap:mre-2.5.12-JAMMY

Branch merges

Propose for merging

Merged into ubuntu/+source/openldap:ubuntu/jammy-devel at revision c185122b7e63f18dfba2f59df2b30af3d837bc63

Athos Ribeiro (community): Approve on 2022-06-13

Canonical Server: Pending requested 2022-06-13

git-ubuntu bot: Pending requested 2022-06-13

Canonical Server packageset reviewers: Pending requested 2022-06-13

Diff: 1976 lines (+489/-393)

36 files modified

CHANGES (+30/-0)
build/dir.mk (+5/-5)
build/version.var (+4/-4)
contrib/slapd-modules/vc/vc.c (+2/-4)
debian/changelog (+14/-0)
debian/patches/series (+0/-1)
dev/null (+0/-274)
doc/guide/admin/guide.html (+1/-1)
doc/man/man3/ldap_get_option.3 (+22/-1)
doc/man/man5/slapd-config.5 (+2/-3)
doc/man/man5/slapd.conf.5 (+2/-3)
include/ldap_pvt.h (+2/-2)
libraries/libldap/ldif.c (+5/-0)
libraries/libldap/result.c (+10/-4)
libraries/libldap/tls_o.c (+4/-0)
servers/slapd/back-asyncmeta/add.c (+1/-0)
servers/slapd/back-asyncmeta/config.c (+5/-3)
servers/slapd/back-asyncmeta/meta_result.c (+11/-4)
servers/slapd/back-asyncmeta/search.c (+1/-0)
servers/slapd/back-ldap/config.c (+5/-3)
servers/slapd/back-mdb/monitor.c (+2/-1)
servers/slapd/back-meta/config.c (+17/-13)
servers/slapd/back-sql/search.c (+105/-18)
servers/slapd/bconfig.c (+24/-7)
servers/slapd/connection.c (+10/-8)
servers/slapd/daemon.c (+13/-1)
servers/slapd/overlays/dynlist.c (+7/-4)
servers/slapd/overlays/pcache.c (+3/-2)
servers/slapd/overlays/ppolicy.c (+12/-8)
servers/slapd/overlays/syncprov.c (+1/-0)
servers/slapd/overlays/translucent.c (+23/-1)
servers/slapd/proto-slap.h (+1/-0)
servers/slapd/syncrepl.c (+122/-18)
tests/data/dynlist.out (+4/-0)
tests/scripts/test034-translucent (+8/-0)
tests/scripts/test044-dynlist (+11/-0)

api

Superseded for merging into ubuntu/+source/openldap:ubuntu/jammy-devel

git-ubuntu bot: Approve on 2022-06-13

Athos Ribeiro (community): Approve on 2022-06-10

Canonical Server: Pending requested 2022-06-10

Canonical Server packageset reviewers: Pending requested 2022-06-10

Diff: 1976 lines (+489/-393)

36 files modified

CHANGES (+30/-0)
build/dir.mk (+5/-5)
build/version.var (+4/-4)
contrib/slapd-modules/vc/vc.c (+2/-4)
debian/changelog (+14/-0)
debian/patches/series (+0/-1)
dev/null (+0/-274)
doc/guide/admin/guide.html (+1/-1)
doc/man/man3/ldap_get_option.3 (+22/-1)
doc/man/man5/slapd-config.5 (+2/-3)
doc/man/man5/slapd.conf.5 (+2/-3)
include/ldap_pvt.h (+2/-2)
libraries/libldap/ldif.c (+5/-0)
libraries/libldap/result.c (+10/-4)
libraries/libldap/tls_o.c (+4/-0)
servers/slapd/back-asyncmeta/add.c (+1/-0)
servers/slapd/back-asyncmeta/config.c (+5/-3)
servers/slapd/back-asyncmeta/meta_result.c (+11/-4)
servers/slapd/back-asyncmeta/search.c (+1/-0)
servers/slapd/back-ldap/config.c (+5/-3)
servers/slapd/back-mdb/monitor.c (+2/-1)
servers/slapd/back-meta/config.c (+17/-13)
servers/slapd/back-sql/search.c (+105/-18)
servers/slapd/bconfig.c (+24/-7)
servers/slapd/connection.c (+10/-8)
servers/slapd/daemon.c (+13/-1)
servers/slapd/overlays/dynlist.c (+7/-4)
servers/slapd/overlays/pcache.c (+3/-2)
servers/slapd/overlays/ppolicy.c (+12/-8)
servers/slapd/overlays/syncprov.c (+1/-0)
servers/slapd/overlays/translucent.c (+23/-1)
servers/slapd/proto-slap.h (+1/-0)
servers/slapd/syncrepl.c (+122/-18)
tests/data/dynlist.out (+4/-0)
tests/scripts/test034-translucent (+8/-0)
tests/scripts/test044-dynlist (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

Related rock recipes

c185122... by Sergio Durigan Junior on 2022-06-13

changelog

7ec8d25... by Sergio Durigan Junior on 2022-06-13

d/p/CVE-2022-29155.patch: Dropped patch; included in this new upstream version.

8174743... by Sergio Durigan Junior on 2022-06-13

New upstream version 2.5.12+dfsg

a4fabee... by Marc Deslauriers on 2022-05-12

2.5.11+dfsg-1~exp1ubuntu3.1 (patches unapplied)

Imported using git-ubuntu import.

161aeb8... by Dave Jones on 2022-02-16

2.5.11+dfsg-1~exp1ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

a97d300... by Matthias Klose on 2022-02-07

2.5.11+dfsg-1~exp1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

3173e44... by Sergio Durigan Junior on 2022-01-25

update-maintainer

bde78a9... by Sergio Durigan Junior on 2022-01-25

reconstruct-changelog

ebb71f5... by Sergio Durigan Junior on 2022-01-25

merge-changelogs

088607e... by Sergio Durigan Junior on 2021-06-15

    - d/rules: better regexp to match the Maintainer tag in d/control,
      needed in the Ubuntu case because of XSBC-Original-Maintainer
      (Closes #960448, LP #1875697)