Bug#1064950: apache2: (Legacy?) "Depends: apache2-data (= ${source:Version})," in debian/control breaks binNMU builds.
Subject: apache2: (Legacy?) "Depends: apache2-data (= ${source:Version})," in
debian/control breaks binNMU builds.
Source: apache2
X-Debbugs-Cc: christof.warl...@siemens.com
Version: 2.4.57-2
Severity: serious
Justification: fails to build from source (but built successfully in the past)
Tags: patch ftbfs
Dear Maintainer,
(re)building apache2 as binNMU (i.e. with appending "+b to the
package version")
works, but installation of the resulting apache2 package fails due to the
following dependency
in debian/control:
Depends: apache2-data (= ${source:Version}),
It causes apt-get to look for the dependency "apache2-data" (= 2.4.57-2) which
does not exist
in the newly built packages. Instead, the dependency should be satisfied by
"apache2-data (= 2.4.57-2+b)".
The folliwing patch fixes the issue:
diff --git a/debian/control b/debian/control
index 2eddc60..31121fa 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Rules-Requires-Root: binary-targets
Package: apache2
Architecture: any
Depends: apache2-bin (= ${binary:Version}),
- apache2-data (= ${source:Version}),
+ apache2-data (= ${binary:Version}),
apache2-utils (= ${binary:Version}),
lsb-base,
media-types,
Please consider applying the patch.
Best regards,
Christof Warlich
P.S.: Note that the information below, being produced by "reportbug", is
irrelevant as I executed "reportbug"
on WSL2 on Windows 10. The actual Debian version is "bookworm".
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'),
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 5.10.102.1-microsoft-standard-WSL2+ (SMP w/16 CPU threads)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
Bug#1061893: marked as done (apr-util: NMU diff for 64-bit time_t transition)
Your message dated Wed, 28 Feb 2024 02:05:20 +
with message-id
and subject line Bug#1061893: fixed in apr-util 1.6.3-1.1
has caused the Debian Bug report #1061893,
regarding apr-util: NMU diff for 64-bit time_t transition
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1061893: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061893
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: apr-util
Version: 1.6.3-1
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t
Dear maintainer,
As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
apr-util as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).
To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.
Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time. Therefore I have prepared a 0-day NMU for apr-util
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.
Please find the patch for this NMU attached.
If you have any concerns about this patch, please reach out ASAP. Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apr-util-1.6.3/debian/changelog apr-util-1.6.3/debian/changelog
--- apr-util-1.6.3/debian/changelog 2023-02-03 20:15:18.0 +
+++ apr-util-1.6.3/debian/changelog 2024-01-30 00:55:31.0 +
@@ -1,3 +1,10 @@
+apr-util (1.6.3-1.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek Tue, 30 Jan 2024 00:55:31 +
+
apr-util (1.6.3-1) unstable; urgency=medium
[ Stefan Fritsch ]
diff -Nru apr-util-1.6.3/debian/control apr-util-1.6.3/debian/control
--- apr-util-1.6.3/debian/control 2023-02-02 22:42:28.0 +
+++ apr-util-1.6.3/debian/control 2024-01-30 00:55:31.0 +
@@ -22,7 +22,10 @@
Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
Homepage: https://apr.apache.org/
-Package: libaprutil1
+Package: libaprutil1t64
+Provides: ${t64:Provides}
+Replaces: libaprutil1
+Breaks: libaprutil1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
diff -Nru apr-util-1.6.3/debian/libaprutil1.docs
apr-util-1.6.3/debian/libaprutil1.docs
--- apr-util-1.6.3/debian/libaprutil1.docs 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.docs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-util-1.6.3/debian/libaprutil1.install
apr-util-1.6.3/debian/libaprutil1.install
--- apr-util-1.6.3/debian/libaprutil1.install 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.install 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-usr/lib/*/libaprutil-1.so.*
-usr/lib/*/apr-util-1/apr_dbm*.so*
-usr/lib/*/apr-util-1/apr_crypt*.so*
diff -Nru apr-util-1.6.3/debian/libaprutil1.lintian-overrides
apr-util-1.6.3/debian/libaprutil1.lintian-overrides
--- apr-util-1.6.3/debian/libaprutil1.lintian-overrides 2023-02-01
21:35:51.0 +
+++ apr-util-1.6.3/debian/libaprutil1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,2 +0,0 @@
-libaprutil1: symbols-declares-dependency-on-other-package
-libaprutil1:
Bug#1061894: marked as done (apr: NMU diff for 64-bit time_t transition)
Your message dated Wed, 28 Feb 2024 02:05:09 +
with message-id
and subject line Bug#1061894: fixed in apr 1.7.2-3.1
has caused the Debian Bug report #1061894,
regarding apr: NMU diff for 64-bit time_t transition
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
1061894: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061894
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: apr
Version: 1.7.2-3
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t
Dear maintainer,
As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
apr as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).
To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.
Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time. Therefore I have prepared a 0-day NMU for apr
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.
Please find the patch for this NMU attached.
If you have any concerns about this patch, please reach out ASAP. Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apr-1.7.2/debian/changelog apr-1.7.2/debian/changelog
--- apr-1.7.2/debian/changelog 2023-02-26 20:51:24.0 +
+++ apr-1.7.2/debian/changelog 2024-01-30 00:57:09.0 +
@@ -1,3 +1,10 @@
+apr (1.7.2-3.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek Tue, 30 Jan 2024 00:57:09 +
+
apr (1.7.2-3) unstable; urgency=medium
* Add more fixes for atomics from upstream, in particular for
diff -Nru apr-1.7.2/debian/control apr-1.7.2/debian/control
--- apr-1.7.2/debian/control2023-02-03 16:18:13.0 +
+++ apr-1.7.2/debian/control2024-01-30 00:57:09.0 +
@@ -19,7 +19,10 @@
Homepage: https://apr.apache.org/
Rules-Requires-Root: no
-Package: libapr1
+Package: libapr1t64
+Provides: ${t64:Provides}
+Replaces: libapr1
+Breaks: libapr1 (<< ${source:Version})
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
diff -Nru apr-1.7.2/debian/libapr1.docs apr-1.7.2/debian/libapr1.docs
--- apr-1.7.2/debian/libapr1.docs 2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.docs 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-1.7.2/debian/libapr1.install apr-1.7.2/debian/libapr1.install
--- apr-1.7.2/debian/libapr1.install2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.install1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libapr-1.so.*
diff -Nru apr-1.7.2/debian/libapr1.lintian-overrides
apr-1.7.2/debian/libapr1.lintian-overrides
--- apr-1.7.2/debian/libapr1.lintian-overrides 2023-02-02 21:18:42.0
+
+++ apr-1.7.2/debian/libapr1.lintian-overrides 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-libapr1: package-name-doesnt-match-sonames libapr-1-0
diff -Nru apr-1.7.2/debian/libapr1.symbols apr-1.7.2/debian/libapr1.symbols
--- apr-1.7.2/debian/libapr1.symbols2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.symbols1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-here for the purpose of tricking
apr-util_1.6.3-1.1_source.changes ACCEPTED into unstable
Thank you for your contribution to Debian. Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 28 Feb 2024 01:16:25 + Source: apr-util Architecture: source Version: 1.6.3-1.1 Distribution: unstable Urgency: medium Maintainer: Debian Apache Maintainers Changed-By: Steve Langasek Closes: 1061893 Changes: apr-util (1.6.3-1.1) unstable; urgency=medium . * Non-maintainer upload. * Rename libraries for 64-bit time_t transition. Closes: #1061893 Checksums-Sha1: 1b41aa3b6ea99dbcd6f184f12dc9243e9c5da699 2821 apr-util_1.6.3-1.1.dsc fa18f26df50933f6df3444f2ac2b72914489a0e7 340960 apr-util_1.6.3-1.1.debian.tar.xz 2f625cfae9d08526ee0b537006001595a02f8594 8440 apr-util_1.6.3-1.1_source.buildinfo Checksums-Sha256: 5d5865f51cc01cc02a4efc8e94b83d40934cf2d2f4e38487541aca3f39e624e9 2821 apr-util_1.6.3-1.1.dsc 062bce58873c4f3f6bb7054803173f2f786b03d2d220c0f98cb000a2aff51f7b 340960 apr-util_1.6.3-1.1.debian.tar.xz f5d638781a31393d86ba0cb9fe373a2ed0796fea7c3cd50f00a650e8ee162d84 8440 apr-util_1.6.3-1.1_source.buildinfo Files: 0ded55e2cf75faafa4f8bca9458565c7 2821 libs optional apr-util_1.6.3-1.1.dsc 17c8bd14d47347f328f2dc0ae181a7a1 340960 libs optional apr-util_1.6.3-1.1.debian.tar.xz f289eedcd57a9920e8fe39b0c61c76f3 8440 libs optional apr-util_1.6.3-1.1_source.buildinfo -BEGIN PGP SIGNATURE- iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmXeiYcSHHZvcmxvbkBk ZWJpYW4ub3JnAAoJEFaNMPMhshM95L4P/AvsqQNWqfjjaepXQWod/b3fdlw+tJGE U8U4e8F4Yv7KwmiQ3Qozh5Jrtlr60GPIbFFhJ2oIbQCTCygmVDTq0upMEeKTKZ6d HHRQt0u6TNAEfcQLWDMB4TcOisv4fdSaJSSZKnKeFn4dQ3MtU7XOA8kkG9HXNbtW iuKsRLt9dkXnWvVDWHD8CgfK3kCZX/VvA+g3W9VFc0aK3QO2RzhQ6y9rs+QsaoJQ PF5z2HPX6MBEKiQ9B9bhqBPzVUTD6iw6qeRt/oJsCrqI1EO/L6UMnj2YHXURogLC hfJadQblJsFozvF6HdAvBdAFkcdlrEymsMOJmTWJBCTmB28tlC74T413czJS00Oo 0pSHPdkzN/7NYFZsTE0ctE0bPKeSqaqdoREK2wFnmO/oEjovfiRDvFImaF8ytVm1 U4T6hDKzZcD4Sb4MdikTO+d6lPs3OPUE3mftAoS23EFeI9TwEMxyrQufWASjmn/l Jmbwm0AmrPxfHH3+HIUzST5v3aAmV5NOnYhQgJUwuqb3UuQdZfErnKBfPmoEjk8e AEUjwnmfAOm4DJ5opArwLJtmu201pbZwVRaT4lmeJQu1dns1lG8R5Oikct/5JqTt QClqAsSoXinz4HbwSpegk98SDjfVjx9/Q60pj6c2v0vgWBWWEqkH4WkfWaJW3Sex ab9IfKYL1KuX =p+iK -END PGP SIGNATURE- pgptRExPo5jxC.pgp Description: PGP signature
apr_1.7.2-3.1_source.changes ACCEPTED into unstable
Thank you for your contribution to Debian. Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA512 Format: 1.8 Date: Wed, 28 Feb 2024 01:17:18 + Source: apr Architecture: source Version: 1.7.2-3.1 Distribution: unstable Urgency: medium Maintainer: Debian Apache Maintainers Changed-By: Steve Langasek Closes: 1061894 Changes: apr (1.7.2-3.1) unstable; urgency=medium . * Non-maintainer upload. * Rename libraries for 64-bit time_t transition. Closes: #1061894 Checksums-Sha1: cc02267254976cf282c766c303118350230dcfe9 2323 apr_1.7.2-3.1.dsc fd40684c9c165c3adb3b696d9bd82ae006a3725b 54524 apr_1.7.2-3.1.debian.tar.xz eedd0804e2f086fe7ec370f3774749e1ccf13582 7416 apr_1.7.2-3.1_source.buildinfo Checksums-Sha256: d9836b929742ae2949c68ccb49e3578de28f85f7597cbdbcea6cc95ca7b01003 2323 apr_1.7.2-3.1.dsc c1f8f8f62ce560e863997d3e0ca755fa202f9577831951c902dcc2da9fcfe035 54524 apr_1.7.2-3.1.debian.tar.xz f0485a48b5470f5580117844a0073d017357ec784f20883e507aaa6ac3844f3d 7416 apr_1.7.2-3.1_source.buildinfo Files: 5d80729fa425ece5eb28c04c76d3bc35 2323 libs optional apr_1.7.2-3.1.dsc 0adbde40d5d86b518e0bd0f7f3b8a9be 54524 libs optional apr_1.7.2-3.1.debian.tar.xz ad89b41118e5862f12b02ef05eaad02a 7416 libs optional apr_1.7.2-3.1_source.buildinfo -BEGIN PGP SIGNATURE- iQJGBAEBCgAwFiEErEg/aN5yj0PyIC/KVo0w8yGyEz0FAmXeicgSHHZvcmxvbkBk ZWJpYW4ub3JnAAoJEFaNMPMhshM9OxYQAL2Y13A3wpEngnpmseMNnCRCyrlRDSF+ m3Gka2oDFWOFSahcHFtlHL0cQEeeuWbh41bnjv1pSMDVBdZK5Pl29HXiCl/yb0DN NECbMmaNbZ3eYi926wiTtjMitCNxzzP6ih1m86YkQvcr4tBnaBwxpS0/Ul1F6YCM H2/SoqcR3Pwe1PGOLwQVR+JK8ACnMFoaq3SP2vOu6E7g0IvO/iVTHd5elq/DoVyq asIG4ansBMBHvzK8IF4ZeCtj5clXofLym1COd2oU3CotaASCzY06xtCfgTgzxNYR pujpBx1byZT/Olyo/TOoV0X9iXtROkHLp9f6o9MketUe3C0xqRehhyNxJ/8arYAq 6BupyehZmnQX8e4eE+ugP/k4taE3iyakCMQQsz+NRsYfgqvazB75lOjIjJ/qNddP H9UIl8XUJ12K2fB/1x15KVlcHYYyEZizg0vH/HTFz0bggwUkqA58/flc6p2E+TNW KWQx3PldkO6XXB+0G/2lfRydB24BDoM4+LKMas6jGBE1zpGys7dy/gzusyMhjbTr eguZvB382RKIi3xRtyoWzTu1pe29ocwX9i9QH8fFW+e21IJ960oUVyTlXUKI0jIb O1xjXUQ3DPhyszrG5Mae9tVFAyFJPR1oxRgNLce6wlILPsjKna8gyjwa+5tCNvJ2 Jzq0a8jjor7t =HKhn -END PGP SIGNATURE- pgpMMBkfQ7Mef.pgp Description: PGP signature
Processing of apr-util_1.6.3-1.1_source.changes
apr-util_1.6.3-1.1_source.changes uploaded successfully to localhost along with the files: apr-util_1.6.3-1.1.dsc apr-util_1.6.3-1.1.debian.tar.xz apr-util_1.6.3-1.1_source.buildinfo Greetings, Your Debian queue daemon (running on host usper.debian.org)
Processing of apr_1.7.2-3.1_source.changes
apr_1.7.2-3.1_source.changes uploaded successfully to localhost along with the files: apr_1.7.2-3.1.dsc apr_1.7.2-3.1.debian.tar.xz apr_1.7.2-3.1_source.buildinfo Greetings, Your Debian queue daemon (running on host usper.debian.org)
Bug#1061894: apr: NMU diff for 64-bit time_t transition
Dear maintainer,
Please find attached a final version of this patch for the time_t
transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.
Thanks!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apr-1.7.2/debian/changelog apr-1.7.2/debian/changelog
--- apr-1.7.2/debian/changelog 2023-02-26 20:51:24.0 +
+++ apr-1.7.2/debian/changelog 2024-02-28 01:17:18.0 +
@@ -1,3 +1,10 @@
+apr (1.7.2-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061894
+
+ -- Steve Langasek Wed, 28 Feb 2024 01:17:18 +
+
apr (1.7.2-3) unstable; urgency=medium
* Add more fixes for atomics from upstream, in particular for
diff -Nru apr-1.7.2/debian/control apr-1.7.2/debian/control
--- apr-1.7.2/debian/control2023-02-03 16:18:13.0 +
+++ apr-1.7.2/debian/control2024-02-28 01:17:18.0 +
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Apache Maintainers
Uploaders: Stefan Fritsch
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
autoconf,
mawk,
uuid-dev,
@@ -19,7 +19,10 @@
Homepage: https://apr.apache.org/
Rules-Requires-Root: no
-Package: libapr1
+Package: libapr1t64
+Provides: ${t64:Provides}
+Replaces: libapr1
+Breaks: libapr1 (<< ${source:Version})
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -33,7 +36,7 @@
Package: libapr1-dev
Architecture: any
Section: libdevel
-Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev
[linux-any], python3:any
+Depends: libapr1t64 (= ${binary:Version}), uuid-dev, ${misc:Depends},
libsctp-dev [linux-any], python3:any
Conflicts: libapr1.0-dev, libapr0-dev
Description: Apache Portable Runtime Library - Development Headers
APR is Apache's Portable Runtime Library, designed to be a support library
diff -Nru apr-1.7.2/debian/libapr1.docs apr-1.7.2/debian/libapr1.docs
--- apr-1.7.2/debian/libapr1.docs 2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.docs 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-1.7.2/debian/libapr1.install apr-1.7.2/debian/libapr1.install
--- apr-1.7.2/debian/libapr1.install2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.install1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-usr/lib/*/libapr-1.so.*
diff -Nru apr-1.7.2/debian/libapr1.lintian-overrides
apr-1.7.2/debian/libapr1.lintian-overrides
--- apr-1.7.2/debian/libapr1.lintian-overrides 2023-02-02 21:18:42.0
+
+++ apr-1.7.2/debian/libapr1.lintian-overrides 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-libapr1: package-name-doesnt-match-sonames libapr-1-0
diff -Nru apr-1.7.2/debian/libapr1.symbols apr-1.7.2/debian/libapr1.symbols
--- apr-1.7.2/debian/libapr1.symbols2023-02-02 21:18:42.0 +
+++ apr-1.7.2/debian/libapr1.symbols1970-01-01 00:00:00.0 +
@@ -1,2 +0,0 @@
-here for the purpose of tricking debhelper...bwahahahaha.
-
diff -Nru apr-1.7.2/debian/libapr1t64.docs apr-1.7.2/debian/libapr1t64.docs
--- apr-1.7.2/debian/libapr1t64.docs1970-01-01 00:00:00.0 +
+++ apr-1.7.2/debian/libapr1t64.docs2023-02-02 21:18:42.0 +
@@ -0,0 +1 @@
+NOTICE
diff -Nru apr-1.7.2/debian/libapr1t64.install
apr-1.7.2/debian/libapr1t64.install
--- apr-1.7.2/debian/libapr1t64.install 1970-01-01 00:00:00.0 +
+++ apr-1.7.2/debian/libapr1t64.install 2023-02-02 21:18:42.0 +
@@ -0,0 +1 @@
+usr/lib/*/libapr-1.so.*
diff -Nru apr-1.7.2/debian/libapr1t64.lintian-overrides
apr-1.7.2/debian/libapr1t64.lintian-overrides
--- apr-1.7.2/debian/libapr1t64.lintian-overrides 1970-01-01
00:00:00.0 +
+++ apr-1.7.2/debian/libapr1t64.lintian-overrides 2024-02-28
01:17:10.0 +
@@ -0,0 +1,2 @@
+libapr1t64: package-name-doesnt-match-sonames libapr-1-0
+libapr1t64: package-name-doesnt-match-sonames libapr1
diff -Nru apr-1.7.2/debian/libapr1t64.symbols
apr-1.7.2/debian/libapr1t64.symbols
--- apr-1.7.2/debian/libapr1t64.symbols 1970-01-01 00:00:00.0 +
+++ apr-1.7.2/debian/libapr1t64.symbols 2024-02-28 01:17:10.0 +
@@ -0,0 +1,2 @@
+here for the purpose of tricking debhelper...bwahahahaha.
+
Bug#1061893: apr-util: NMU diff for 64-bit time_t transition
Dear maintainer,
Please find attached a final version of this patch for the time_t
transition. This patch is being uploaded to unstable.
Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.
Thanks!
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru apr-util-1.6.3/debian/changelog apr-util-1.6.3/debian/changelog
--- apr-util-1.6.3/debian/changelog 2023-02-03 20:15:18.0 +
+++ apr-util-1.6.3/debian/changelog 2024-02-28 01:16:25.0 +
@@ -1,3 +1,10 @@
+apr-util (1.6.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061893
+
+ -- Steve Langasek Wed, 28 Feb 2024 01:16:25 +
+
apr-util (1.6.3-1) unstable; urgency=medium
[ Stefan Fritsch ]
diff -Nru apr-util-1.6.3/debian/control apr-util-1.6.3/debian/control
--- apr-util-1.6.3/debian/control 2023-02-02 22:42:28.0 +
+++ apr-util-1.6.3/debian/control 2024-02-28 01:16:24.0 +
@@ -3,7 +3,7 @@
Uploaders: Stefan Fritsch
Section: libs
Priority: optional
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 11),
autoconf,
mawk,
libldap2-dev,
@@ -22,7 +22,10 @@
Vcs-Git: https://salsa.debian.org/apache-team/apr-util.git
Homepage: https://apr.apache.org/
-Package: libaprutil1
+Package: libaprutil1t64
+Provides: ${t64:Provides}
+Replaces: libaprutil1
+Breaks: libaprutil1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends},
@@ -39,7 +42,7 @@
Package: libaprutil1-ldap
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -56,7 +59,7 @@
Package: libaprutil1-dbd-mysql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -73,7 +76,7 @@
Package: libaprutil1-dbd-sqlite3
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -90,7 +93,7 @@
Package: libaprutil1-dbd-odbc
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -107,7 +110,7 @@
Package: libaprutil1-dbd-pgsql
Architecture: any
Multi-Arch: same
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
@@ -124,7 +127,7 @@
Package: libaprutil1-dev
Architecture: any
Section: libdevel
-Depends: libaprutil1 (= ${binary:Version}),
+Depends: libaprutil1t64 (= ${binary:Version}),
libldap2-dev,
libexpat1-dev,
libapr1-dev,
diff -Nru apr-util-1.6.3/debian/libaprutil1.docs
apr-util-1.6.3/debian/libaprutil1.docs
--- apr-util-1.6.3/debian/libaprutil1.docs 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.docs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-NOTICE
diff -Nru apr-util-1.6.3/debian/libaprutil1.install
apr-util-1.6.3/debian/libaprutil1.install
--- apr-util-1.6.3/debian/libaprutil1.install 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.install 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-usr/lib/*/libaprutil-1.so.*
-usr/lib/*/apr-util-1/apr_dbm*.so*
-usr/lib/*/apr-util-1/apr_crypt*.so*
diff -Nru apr-util-1.6.3/debian/libaprutil1.lintian-overrides
apr-util-1.6.3/debian/libaprutil1.lintian-overrides
--- apr-util-1.6.3/debian/libaprutil1.lintian-overrides 2023-02-01
21:35:51.0 +
+++ apr-util-1.6.3/debian/libaprutil1.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1,2 +0,0 @@
-libaprutil1: symbols-declares-dependency-on-other-package
-libaprutil1: package-name-doesnt-match-sonames libaprutil-1-0
diff -Nru apr-util-1.6.3/debian/libaprutil1.symbols
apr-util-1.6.3/debian/libaprutil1.symbols
--- apr-util-1.6.3/debian/libaprutil1.symbols 2023-02-01 21:35:51.0
+
+++ apr-util-1.6.3/debian/libaprutil1.symbols 1970-01-01 00:00:00.0
+
@@ -1,357 +0,0 @@
Rebuilding apache2 Package as binNMU.
I've rebuilt apache2 as a binNMU, i.e. without patching the package itself, but
only changing its build environment. Thus, I appended the string "+b1" to its
version as described in https://wiki.debian.org/binNMU
All resulting packages compile without any problem, but when I try to install
apache2 from these packages, I get the following error:
# apt install apache2
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
Some packages could not be installed. This may mean that you have
requested an impossible situation or if you are using the unstable
distribution that some required packages have not yet been created
or been moved out of Incoming.
The following information may help to resolve the situation:
The following packages have unmet dependencies:
apache2 : Depends: apache2-data (= 2.4.57-2)
Recommends: ssl-cert but it is not going to be installed
E: Unable to correct problems, you have held broken packages.
Searching for the root cause in debian/control, I see this:
Package: apache2
Architecture: any
Depends: apache2-bin (= ${binary:Version}),
apache2-data (= ${source:Version}),
apache2-utils (= ${binary:Version}),
In the apache2-data line, is $source intentionally be used instead of $binary?
If so, why? Or is this a bug? Replacing ${source:Version} with
${binary:Version} would at least fix the installation issue of my self-built
binNMU.
Thanks for any advice.
