diff -Nru 389-ds-base-2.4.4+dfsg1/debian/changelog 389-ds-base-2.4.4+dfsg1/debian/changelog --- 389-ds-base-2.4.4+dfsg1/debian/changelog 2024-01-08 08:04:08.000000000 -0800 +++ 389-ds-base-2.4.4+dfsg1/debian/changelog 2024-02-07 12:16:23.000000000 -0800 @@ -1,3 +1,9 @@ +389-ds-base (2.4.4+dfsg1-1ubuntu1) noble; urgency=medium + + * 32bit-support.diff: Fixes support for 32-bit architectures (LP: #2052578) + + -- Chris Peterson Wed, 07 Feb 2024 12:16:23 -0800 + 389-ds-base (2.4.4+dfsg1-1) unstable; urgency=medium * New upstream release. diff -Nru 389-ds-base-2.4.4+dfsg1/debian/control 389-ds-base-2.4.4+dfsg1/debian/control --- 389-ds-base-2.4.4+dfsg1/debian/control 2024-01-08 07:13:23.000000000 -0800 +++ 389-ds-base-2.4.4+dfsg1/debian/control 2024-02-07 12:16:19.000000000 -0800 @@ -1,7 +1,8 @@ Source: 389-ds-base Section: net Priority: optional -Maintainer: Debian FreeIPA Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian FreeIPA Team Uploaders: Timo Aaltonen , Build-Depends: diff -Nru 389-ds-base-2.4.4+dfsg1/debian/patches/32bit-support.diff 389-ds-base-2.4.4+dfsg1/debian/patches/32bit-support.diff --- 389-ds-base-2.4.4+dfsg1/debian/patches/32bit-support.diff 1969-12-31 16:00:00.000000000 -0800 +++ 389-ds-base-2.4.4+dfsg1/debian/patches/32bit-support.diff 2024-02-07 12:16:23.000000000 -0800 @@ -0,0 +1,60 @@ +Description: Move 32-bit support logic to support armhf + The logic to support 32-bit architectures was correctly written (define + _LARGEFILE64_SOURCE) but placed too "late". If a standard library header + (e.g., ) is included before _LARGEFILE64_SOURCE is defined, then + the correct symbols will not be made available during compliation. In this + instance, armhf builds were failing due to off64_t not getting defined + correctly. +Author: Chris Peterson +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/389-ds-base/+bug/2052578 +Last-Update: 2024-02-07 + +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h ++++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h +@@ -16,21 +16,6 @@ + #ifndef _BACK_LDBM_H_ + #define _BACK_LDBM_H_ + +-#if defined(HPUX11) || defined(OS_solaris) || defined(linux) +-/* built-in 64-bit file I/O support */ +-#if ! defined(__LP64__) +-/* But not on 64-bit arch: It is needless and build fails since gcc 13.2.1-4 */ +-#define DB_USE_64LFS +-#endif +-#endif +- +-/* needed by at least HPUX and Solaris, to define off64_t */ +-#ifdef DB_USE_64LFS +-#if !defined(_LARGEFILE64_SOURCE) +-#define _LARGEFILE64_SOURCE +-#endif +-#endif +- + /* Provides our int types and platform specific requirements. */ + #include + +--- a/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c ++++ b/ldap/servers/slapd/back-ldbm/db-bdb/bdb_layer.c +@@ -6,6 +6,20 @@ + * See LICENSE for details. + * END COPYRIGHT BLOCK **/ + ++#if defined(HPUX11) || defined(OS_solaris) || defined(linux) ++/* built-in 64-bit file I/O support */ ++#if ! defined(__LP64__) ++/* But not on 64-bit arch: It is needless and build fails since gcc 13.2.1-4 */ ++#define DB_USE_64LFS ++#endif ++#endif ++ ++/* needed by at least HPUX and Solaris, to define off64_t */ ++#ifdef DB_USE_64LFS ++#if !defined(_LARGEFILE64_SOURCE) ++#define _LARGEFILE64_SOURCE ++#endif ++#endif + + #include + #include diff -Nru 389-ds-base-2.4.4+dfsg1/debian/patches/series 389-ds-base-2.4.4+dfsg1/debian/patches/series --- 389-ds-base-2.4.4+dfsg1/debian/patches/series 2024-01-08 07:13:23.000000000 -0800 +++ 389-ds-base-2.4.4+dfsg1/debian/patches/series 2024-02-07 12:02:56.000000000 -0800 @@ -2,3 +2,4 @@ use-packaged-rust-registry.diff allow-newer-crates.diff base64-0.21.diff +32bit-support.diff