diff -u openldap-2.4.25/debian/libldap-2.4-2.install openldap-2.4.25/debian/libldap-2.4-2.install --- openldap-2.4.25/debian/libldap-2.4-2.install +++ openldap-2.4.25/debian/libldap-2.4-2.install @@ -1,5 +1,5 @@ -usr/lib/*/liblber-2.4.so.2 -usr/lib/*/liblber-2.4.so.2.*.* -usr/lib/*/libldap_r-2.4.so.2 -usr/lib/*/libldap_r-2.4.so.2.*.* +usr/lib/liblber-2.4.so.2 +usr/lib/liblber-2.4.so.2.*.* +usr/lib/libldap_r-2.4.so.2 +usr/lib/libldap_r-2.4.so.2.*.* etc/ldap/ldap.conf diff -u openldap-2.4.25/debian/libldap2-dev.install openldap-2.4.25/debian/libldap2-dev.install --- openldap-2.4.25/debian/libldap2-dev.install +++ openldap-2.4.25/debian/libldap2-dev.install @@ -8,4 +8,4 @@ -usr/lib/*/liblber.a -usr/lib/*/liblber.so -usr/lib/*/libldap_r.a -usr/lib/*/libldap_r.so +usr/lib/liblber.a +usr/lib/liblber.so +usr/lib/libldap_r.a +usr/lib/libldap_r.so diff -u openldap-2.4.25/debian/slapd.install openldap-2.4.25/debian/slapd.install --- openldap-2.4.25/debian/slapd.install +++ openldap-2.4.25/debian/slapd.install @@ -2,7 +2,7 @@ usr/lib/slapd usr/sbin usr/lib/ldap/*.so* usr/lib/ldap/*.la -usr/lib/*/libslapi-*.so.* +usr/lib/libslapi-*.so.* debian/ldiftopasswd usr/share/slapd debian/DB_CONFIG usr/share/slapd debian/slapd.conf usr/share/slapd diff -u openldap-2.4.25/debian/control openldap-2.4.25/debian/control --- openldap-2.4.25/debian/control +++ openldap-2.4.25/debian/control @@ -9,7 +9,7 @@ Torsten Landschoff , Matthijs Möhlmann , Russ Allbery -Build-Depends: debhelper (>= 8.1.3), libdb4.8-dev (>= 4.8.30), libgcrypt-dev, +Build-Depends: debhelper (>= 7.4.15), libdb4.8-dev (>= 4.8.24), libgcrypt-dev, libgnutls-dev (>= 1.7), unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0), libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3), libkrb5-dev, libwrap0-dev, perl, debconf-utils, po-debconf, quilt (>= 0.40), @@ -28,7 +28,7 @@ Pre-Depends: debconf (>= 0.5) | debconf-2.0, ${misc:Pre-Depends} Depends: ${shlibs:Depends}, libldap-2.4-2 (= ${binary:Version}), coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, - adduser, lsb-base (>= 3.2-13), ${misc:Depends}, libdb4.8 (>= 4.8.30) + adduser, lsb-base (>= 3.2-13), ${misc:Depends}, libdb4.8 (>= 4.8.24) Recommends: libsasl2-modules Suggests: ldap-utils, ufw Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1) @@ -58,9 +58,7 @@ Section: libs Priority: standard Architecture: any -Multi-Arch: same Conflicts: ldap-utils (<= 2.1.23-1) -Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libldap2, libldap-2.3-0 Description: OpenLDAP libraries @@ -71,7 +69,6 @@ Section: debug Priority: extra Architecture: any -Multi-Arch: same Depends: libldap-2.4-2 (= ${binary:Version}), ${misc:Depends} Description: Debugging information for OpenLDAP libraries This package provides detached debugging information for the OpenLDAP @@ -84,7 +81,6 @@ Section: libdevel Priority: extra Architecture: any -Multi-Arch: same Conflicts: libldap-dev, libopenldap-dev Replaces: libopenldap-dev Provides: libldap-dev diff -u openldap-2.4.25/debian/changelog openldap-2.4.25/debian/changelog --- openldap-2.4.25/debian/changelog +++ openldap-2.4.25/debian/changelog @@ -1,3 +1,11 @@ +openldap (2.4.25-1.1ubuntu4.1~lucid1) lucid-proposed; urgency=low + + * Backport from oneiric to lucid. (LP: #968612) + - Remove DEB_HOST_MULTIARCH support. + - Remove dh_apparmor command. + + -- Chris J Arges Fri, 13 Apr 2012 15:03:55 -0500 + openldap (2.4.25-1.1ubuntu4.1) oneiric-security; urgency=low * SECURITY UPDATE: potential denial of service (LP: #884163) diff -u openldap-2.4.25/debian/rules openldap-2.4.25/debian/rules --- openldap-2.4.25/debian/rules +++ openldap-2.4.25/debian/rules @@ -29,9 +29,6 @@ SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -SYSTEM += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) - CONFIG = $(shell grep -v "^\#" debian/configure.options) installdir := $(CURDIR)/debian/install @@ -128,12 +125,11 @@ for F in $(installdir)/usr/lib/ldap/*.la; do \ sed -i "s/^dependency_libs=.*/dependency_libs=''/" $$F; \ done - - for F in $(installdir)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*.*.*; do \ + for F in $(installdir)/usr/lib/*.so.*.*.*; do \ if echo "$$F" | grep -q libslapi ; then \ continue; \ fi; \ - if LD_LIBRARY_PATH=$(installdir)/usr/lib/$(DEB_HOST_MULTIARCH) ldd -d -r $$F 2>&1 | grep '^undefined symbol:'; then \ + if LD_LIBRARY_PATH=$(installdir)/usr/lib ldd -d -r $$F 2>&1 | grep '^undefined symbol:'; then \ echo; \ echo "library $$F has undefined references. Please fix this before continuing."; \ exit 1; \ @@ -172,16 +168,12 @@ dh_installdocs -a dh_installexamples -a dh_installman -a - dh_apparmor -pslapd --profile-name=usr.sbin.slapd dh_installinit -Xslapd.prerm -a -- "defaults 19 80" dh_installdebconf -a dh_lintian -a dh_strip -plibldap-2.4-2 --dbg-package=libldap-2.4-2-dbg dh_strip -pslapd --dbg-package=slapd-dbg dh_strip -pldap-utils - for pkg in libldap2-dev libldap-2.4-2; do \ - sed -e"s/\$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/g" < debian/$$pkg.links.in > debian/$$pkg.links; \ - done dh_link -a # hardlink these so not confined by apparmor @@ -195,14 +187,14 @@ # at all, but that requires adjusting the build scripts first to # link against libldap_r, otherwise dh_shlibdeps fails #dh_makeshlibs -plibldap-2.4-2 -V 'libldap-2.4-2 (>= 2.4.7)' - echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/$(DEB_HOST_MULTIARCH)/libslapi-*.so.* \ + echo "slapd:Provides=$$(objdump -p debian/slapd/usr/lib/libslapi-*.so.* \ | sed -ne '/SONAME/ { s/[[:space:]]*SONAME[[:space:]]*//; \ s/\.so\./-/; p; q }' \ )" >> debian/slapd.substvars dh_makeshlibs -pslapd -X/usr/lib/ldap/ -V "$$(sed -ne's/slapd:Provides=//p' debian/slapd.substvars)" dh_installdeb -a perl -w debian/dh_installscripts-common -p slapd - dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib/$(DEB_HOST_MULTIARCH) + dh_shlibdeps -a -L libldap-2.4-2 -l $(installdir)/usr/lib # Strip duplicate dependency out of substvars. sed -i -e 's/ libldap-2.4-2,//' debian/*.substvars dh_gencontrol -a diff -u openldap-2.4.25/debian/slapi-dev.install openldap-2.4.25/debian/slapi-dev.install --- openldap-2.4.25/debian/slapi-dev.install +++ openldap-2.4.25/debian/slapi-dev.install @@ -2 +2 @@ -usr/lib/*/libslapi.so +usr/lib/libslapi.so diff -u openldap-2.4.25/debian/libldap-2.4-2.links.in openldap-2.4.25/debian/libldap-2.4-2.links.in --- openldap-2.4.25/debian/libldap-2.4-2.links.in +++ openldap-2.4.25/debian/libldap-2.4-2.links.in @@ -1 +1 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libldap_r-2.4.so.2 usr/lib/${DEB_HOST_MULTIARCH}/libldap-2.4.so.2 +usr/lib/libldap_r-2.4.so.2 usr/lib/libldap-2.4.so.2 diff -u openldap-2.4.25/debian/libldap2-dev.links.in openldap-2.4.25/debian/libldap2-dev.links.in --- openldap-2.4.25/debian/libldap2-dev.links.in +++ openldap-2.4.25/debian/libldap2-dev.links.in @@ -11,2 +11,2 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libldap_r.so usr/lib/${DEB_HOST_MULTIARCH}/libldap.so -usr/lib/${DEB_HOST_MULTIARCH}/libldap_r.a usr/lib/${DEB_HOST_MULTIARCH}/libldap.a +usr/lib/libldap_r.so usr/lib/libldap.so +usr/lib/libldap_r.a usr/lib/libldap.a