Bug#1061992: Bug#1065315: libcurl4t64 Provides libcurl3-gnutls
I'm sorry, I have not been able to isolate the bug in the NMU scripting that
caused this. I am uploading a fixed NMU, please find the complete NMU
debdiff attached.
On Sat, Mar 02, 2024 at 08:32:02PM +0500, Andrey Rahmatullin wrote:
> Package: libcurl4t64
> Version: 8.6.0-3.1
> Severity: serious
> X-Debbugs-Cc: vor...@debian.org, aure...@debian.org
>
> Yet another case of wrong X-Time64-Compat, found by Aurelien.
>
>
> -- System Information:
> Debian Release: trixie/sid
> APT prefers unstable-debug
> APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500,
> 'unstable'), (500, 'testing'), (101, 'experimental')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 6.7-amd64 (SMP w/4 CPU threads; PREEMPT)
> Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE,
> TAINT_UNSIGNED_MODULE
> Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8), LANGUAGE not
> set
> Shell: /bin/sh linked to /usr/bin/dash
> Init: systemd (via /run/systemd/system)
> LSM: AppArmor: enabled
>
> Versions of packages libcurl4t64 depends on:
> ii libbrotli11.1.0-2+b3
> ii libc6 2.37-15.1
> ii libgssapi-krb5-2 1.20.1-5+b1
> ii libidn2-0 2.3.7-2
> ii libldap-2.5-0 2.5.13+dfsg-5+b3
> ii libnghttp2-14 1.59.0-1
> ii libpsl5 0.21.2-1+b1
> pn libpsl5t64
> ii librtmp1 2.4+20151223.gitfa8646d.1-2+b2
> ii libssh2-1t64 [libssh2-1] 1.11.0-4.1
> ii libssl3t64 [libssl3] 3.1.5-1.1
> ii libzstd1 1.5.5+dfsg2-2
> ii zlib1g1:1.3.dfsg-3.1
>
> Versions of packages libcurl4t64 recommends:
> ii ca-certificates 20240203
>
> libcurl4t64 suggests no packages.
>
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru curl-8.6.0/debian/changelog curl-8.6.0/debian/changelog
--- curl-8.6.0/debian/changelog 2024-02-19 22:16:17.0 +
+++ curl-8.6.0/debian/changelog 2024-03-02 18:43:58.0 +
@@ -1,3 +1,17 @@
+curl (8.6.0-3.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix wrong X-Time64-Compat for libcurl4t64. Closes: #1065315.
+
+ -- Steve Langasek Sat, 02 Mar 2024 18:43:58 +
+
+curl (8.6.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061992
+
+ -- Steve Langasek Sat, 02 Mar 2024 07:11:53 +
+
curl (8.6.0-3) unstable; urgency=medium
* d/p/vtls_revert_receive_max_buffer_add_test_case.patch: New patch to fix
diff -Nru curl-8.6.0/debian/control curl-8.6.0/debian/control
--- curl-8.6.0/debian/control 2024-02-19 22:16:17.0 +
+++ curl-8.6.0/debian/control 2024-03-02 18:43:46.0 +
@@ -5,7 +5,7 @@
Uploaders: Carlos Henrique Lima Melara ,
Samuel Henrique ,
Sergio Durigan Junior
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
debhelper-compat (= 13),
autoconf,
automake,
@@ -42,7 +42,7 @@
Package: curl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4t64 (= ${binary:Version})
Multi-Arch: foreign
Description: command line tool for transferring data with URL syntax
curl is a command line tool for transferring data with URL syntax, supporting
@@ -54,14 +54,17 @@
NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a
busload of other useful tricks.
-Package: libcurl4
+Package: libcurl4t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl4
+Breaks: libcurl4 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ca-certificates
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libcurl3
-Replaces: libcurl3
+Replaces: libcurl4, libcurl3
Multi-Arch: same
Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
libcurl is an easy-to-use client-side URL transfer library, supporting DICT,
@@ -79,7 +82,11 @@
.
SSL support is provided by OpenSSL.
-Package: libcurl3-gnutls
+Package: libcurl3t64-gnutls
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl3-gnutls
+Replaces: libcurl3-gnutls
+Breaks: libcurl3-gnutls (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,7 +118,7 @@
libcurl4-dev,
libcurl3-dev
Conflicts: libcurl4-gnutls-dev, libssl1.0-dev
-Depends: ${misc:Depends}, libcurl4 (= ${binary:Version})
+Depends: ${misc:Depends}, libcurl4t64 (= ${binary:Version})
Suggests: libcurl4-doc,
libidn-dev,
libkrb5-dev,
@@ -149,7 +156,7 @@
libcurl3-gnutls-dev,
libcurl4-dev
Conflicts: libcurl4-openssl-dev
Bug#1061992: marked as done (curl: NMU diff for 64-bit time_t transition)
Your message dated Sat, 02 Mar 2024 07:34:31 +
with message-id
and subject line Bug#1061992: fixed in curl 8.6.0-3.1
has caused the Debian Bug report #1061992,
regarding curl: 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.)
--
1061992: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061992
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: curl
Version: 8.5.0-2
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
curl 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 curl
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-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru curl-8.5.0/debian/changelog curl-8.5.0/debian/changelog
--- curl-8.5.0/debian/changelog 2024-01-30 18:13:57.0 +
+++ curl-8.5.0/debian/changelog 2023-12-29 18:34:11.0 +
@@ -1,10 +1,3 @@
-curl (8.5.0-2.1) experimental; urgency=medium
-
- * Non-maintainer upload.
- * Rename libraries for 64-bit time_t transition.
-
- -- Michael Hudson-Doyle Tue, 30 Jan 2024 18:13:57 +
-
curl (8.5.0-2) unstable; urgency=medium
* d/p/openldap_fix_an_LDAP_crash.patch: New patch to fix ldap segfault
diff -Nru curl-8.5.0/debian/control curl-8.5.0/debian/control
--- curl-8.5.0/debian/control 2024-01-30 18:13:57.0 +
+++ curl-8.5.0/debian/control 2023-12-29 18:34:11.0 +
@@ -42,7 +42,7 @@
Package: curl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4t64 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4 (= ${binary:Version})
Multi-Arch: foreign
Description: command line tool for transferring data with URL syntax
curl is a command line tool for transferring data with URL syntax, supporting
@@ -54,17 +54,14 @@
NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a
busload of other useful tricks.
-Package: libcurl4t64
-Provides: ${t64:Provides}
-X-Time64-Compat: libcurl3-gnutls
-Breaks: libcurl4 (<< ${source:Version})
+Package: libcurl4
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ca-certificates
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libcurl3
-Replaces: libcurl4, libcurl3
+Replaces: libcurl3
Multi-Arch: same
Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
libcurl is an easy-to-use client-side URL transfer library, supporting DICT,
@@ -82,11 +79,7 @@
.
SSL support is provided by OpenSSL.
-Package: libcurl3t64-gnutls
-Provides: ${t64:Provides}
-X-Time64-Compat: libcurl3-gnutls
-Replaces: libcurl3-gnutls
-Breaks: libcurl3-gnutls (<< ${source:Version})
+Package: libcurl3-gnutls
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${
Bug#1061992: curl: 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')
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 curl-8.6.0/debian/changelog curl-8.6.0/debian/changelog
--- curl-8.6.0/debian/changelog 2024-02-19 22:16:17.0 +
+++ curl-8.6.0/debian/changelog 2024-03-02 07:11:53.0 +
@@ -1,3 +1,10 @@
+curl (8.6.0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061992
+
+ -- Steve Langasek Sat, 02 Mar 2024 07:11:53 +
+
curl (8.6.0-3) unstable; urgency=medium
* d/p/vtls_revert_receive_max_buffer_add_test_case.patch: New patch to fix
diff -Nru curl-8.6.0/debian/control curl-8.6.0/debian/control
--- curl-8.6.0/debian/control 2024-02-19 22:16:17.0 +
+++ curl-8.6.0/debian/control 2024-03-02 07:11:53.0 +
@@ -5,7 +5,7 @@
Uploaders: Carlos Henrique Lima Melara ,
Samuel Henrique ,
Sergio Durigan Junior
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
debhelper-compat (= 13),
autoconf,
automake,
@@ -42,7 +42,7 @@
Package: curl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4t64 (= ${binary:Version})
Multi-Arch: foreign
Description: command line tool for transferring data with URL syntax
curl is a command line tool for transferring data with URL syntax, supporting
@@ -54,14 +54,17 @@
NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a
busload of other useful tricks.
-Package: libcurl4
+Package: libcurl4t64
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl3-gnutls
+Breaks: libcurl4 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ca-certificates
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libcurl3
-Replaces: libcurl3
+Replaces: libcurl4, libcurl3
Multi-Arch: same
Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
libcurl is an easy-to-use client-side URL transfer library, supporting DICT,
@@ -79,7 +82,11 @@
.
SSL support is provided by OpenSSL.
-Package: libcurl3-gnutls
+Package: libcurl3t64-gnutls
+Provides: ${t64:Provides}
+X-Time64-Compat: libcurl3-gnutls
+Replaces: libcurl3-gnutls
+Breaks: libcurl3-gnutls (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,7 +118,7 @@
libcurl4-dev,
libcurl3-dev
Conflicts: libcurl4-gnutls-dev, libssl1.0-dev
-Depends: ${misc:Depends}, libcurl4 (= ${binary:Version})
+Depends: ${misc:Depends}, libcurl4t64 (= ${binary:Version})
Suggests: libcurl4-doc,
libidn-dev,
libkrb5-dev,
@@ -149,7 +156,7 @@
libcurl3-gnutls-dev,
libcurl4-dev
Conflicts: libcurl4-openssl-dev
-Depends: ${misc:Depends}, libcurl3-gnutls (= ${binary:Version})
+Depends: ${misc:Depends}, libcurl3t64-gnutls (= ${binary:Version})
Suggests: libcurl4-doc,
libgnutls28-dev,
libidn-dev,
diff -Nru curl-8.6.0/debian/libcurl3-gnutls.install
curl-8.6.0/debian/libcurl3-gnutls.install
--- curl-8.6.0/debian/libcurl3-gnutls.install 2024-02-19 22:16:17.0
+
+++ curl-8.6.0/debian/libcurl3-gnutls.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/*/libcurl-gnutls.so.4*
diff -Nru curl-8.6.0/debian/libcurl3-gnutls.links
curl-8.6.0/debian/libcurl3-gnutls.links
--- curl-8.6.0/debian/libcurl3-gnutls.links 2024-02-19 22:16:17.0
+
+++ curl-8.6.0/debian/libcurl3-gnutls.links 1970-01-01 00:00:00.0
+
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo usr/lib/$DEB_HOST_MULTIARCH/libcurl-gnutls.so.4
usr/lib/$DEB_HOST_MULTIARCH/libcurl-gnutls.so.3
diff -Nru curl-8.6.0/debian/libcurl3-gnutls.lintian-overrides
curl-8.6.0/debian/libcurl3-gnutls.lintian-overrides
--- curl-8.6.0/debian/libcurl3-gnutls.lintian-overrides 2024-02-19
22:16:17.0 +
+++ curl-8.6.0/debian/libcurl3-gnutls.lintian-overrides 1970-01-01
00:00:00.0 +
@@ -1 +0,0 @@
-libcurl3-gnutls: package-name-doesnt-match-sonames libcurl-gnutls4
diff -Nru curl-8.6.0/debian/libcurl3-gnutls.symbols
curl-8.6.0/debian/libcurl3-gnutls.symbols
--- curl-8.6.0/debian/libcurl3-gnutls.symbols 2024-02-19 22:16:17.0
+
+++ curl-8.6.0/debian/libcurl3-gnutls.symbols 1970-01-01 00:00:00.0
+
@@ -1,97 +0,0 @@
-libcurl-gnutls.so.4 libcurl3-gnutls #MINVER#
-*
Bug#1061992:
In addition to uploading a reversed debdiff, I didn't actually upload it to experimental, I'm attaching the debdiff that I just uploaded (which I realized I forgot to add the ~exp suffix to, apologies). The upload to experimental was based on the contents of unstable, which is newer that what was in experimental before. Should I force push the contents of debian/unstable to debian/experimental and then add my changes on top? > Does this mean we should hold on pushing new uploads to testing and > experimental until this is done? If so, how long will it take? I don't think new uploads to experimental incorporating these changes would be a problem. Uploading these changes to unstable would start a transition so probably best not to do that until the bulk uploads happen (in a week or so I think). Unrelated uploads to unstable shouldn't be a problem as we'll base the time_t-transitioning uploads to unstable on what is in unstable at the time rather than assuming we can just upload the packages already uploaded to experimental but, uh, it would be an inconvenient time to completely refactor the packaging I think. Cheers, mwh nmu_curl_update.debdiff Description: Binary data
Bug#1061992:
> I believe these are the two cases: > > - The public 'struct curl_fileinfo' contains a time_t struct member, used for > FTP wildcard callbacks. > > - The public API curl_getdate() takes a time_t pointer in its second argument. > > If 'time_t' changes size, those two will not be ABI compatible. Interestingly, the latter is the only one picked up by ABI compliance checker: https://adrien.dcln.fr/misc/armhf-time_t/2024-01-17/compat_reports/libcurl4-openssl-dev/lfs_to_time_t/compat_report.html And because the time_t pointer argument to getdate is unused we could _probably_ get away with ignoring that (a bit sketchy from a purity point of view but I think ok in practice). OTOH the former (presumably not found because the "curl_fileinfo" type is not found in any public ABI) looks like a genuine ABI break to me. Hopefully there are not too many "hidden" ABI breaks like this lurking!
Bug#1061992: curl: NMU diff for 64-bit time_t transition
On Tue, 30 Jan 2024, Samuel Henrique wrote: Can you tell us which case it is? Is it confirmed affected or is this a guess? I believe these are the two cases: - The public 'struct curl_fileinfo' contains a time_t struct member, used for FTP wildcard callbacks. - The public API curl_getdate() takes a time_t pointer in its second argument. If 'time_t' changes size, those two will not be ABI compatible. -- / daniel.haxx.se
Bug#1061992: curl: NMU diff for 64-bit time_t transition
Hello Michael, > 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 > curl 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). Can you tell us which case it is? Is it confirmed affected or is this a guess? I know the curl project has put a lot of effort into this issue already but I don't know the specifics enough to understand whether this is a false positive or not. https://daniel.haxx.se/blog/2018/02/01/reducing-2038-problems-in-curl/ https://github.com/curl/curl/issues/2238 > 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. The debdiff is reversed, took me a bit to understand it. Does this mean we should hold on pushing new uploads to testing and experimental until this is done? If so, how long will it take? The curl repo is under the debian namespace on salsa, so feel free to push your commits there once the upload is done (debian/experimental branch for experimental). Regards -- Samuel Henrique
Bug#1061992: curl: NMU diff for 64-bit time_t transition
Source: curl
Version: 8.5.0-2
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
curl 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 curl
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-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru curl-8.5.0/debian/changelog curl-8.5.0/debian/changelog
--- curl-8.5.0/debian/changelog 2024-01-30 18:13:57.0 +
+++ curl-8.5.0/debian/changelog 2023-12-29 18:34:11.0 +
@@ -1,10 +1,3 @@
-curl (8.5.0-2.1) experimental; urgency=medium
-
- * Non-maintainer upload.
- * Rename libraries for 64-bit time_t transition.
-
- -- Michael Hudson-Doyle Tue, 30 Jan 2024 18:13:57 +
-
curl (8.5.0-2) unstable; urgency=medium
* d/p/openldap_fix_an_LDAP_crash.patch: New patch to fix ldap segfault
diff -Nru curl-8.5.0/debian/control curl-8.5.0/debian/control
--- curl-8.5.0/debian/control 2024-01-30 18:13:57.0 +
+++ curl-8.5.0/debian/control 2023-12-29 18:34:11.0 +
@@ -42,7 +42,7 @@
Package: curl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4t64 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcurl4 (= ${binary:Version})
Multi-Arch: foreign
Description: command line tool for transferring data with URL syntax
curl is a command line tool for transferring data with URL syntax, supporting
@@ -54,17 +54,14 @@
NTLM, Negotiate, kerberos...), file transfer resume, proxy tunneling and a
busload of other useful tricks.
-Package: libcurl4t64
-Provides: ${t64:Provides}
-X-Time64-Compat: libcurl3-gnutls
-Breaks: libcurl4 (<< ${source:Version})
+Package: libcurl4
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: ca-certificates
Pre-Depends: ${misc:Pre-Depends}
Conflicts: libcurl3
-Replaces: libcurl4, libcurl3
+Replaces: libcurl3
Multi-Arch: same
Description: easy-to-use client-side URL transfer library (OpenSSL flavour)
libcurl is an easy-to-use client-side URL transfer library, supporting DICT,
@@ -82,11 +79,7 @@
.
SSL support is provided by OpenSSL.
-Package: libcurl3t64-gnutls
-Provides: ${t64:Provides}
-X-Time64-Compat: libcurl3-gnutls
-Replaces: libcurl3-gnutls
-Breaks: libcurl3-gnutls (<< ${source:Version})
+Package: libcurl3-gnutls
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -118,7 +111,7 @@
libcurl4-dev,
libcurl3-dev
Conflicts: libcurl4-gnutls-dev, libssl1.0-dev
-Depends: ${misc:Depends}, libcurl4t64 (= ${binary:Version})
+Depends: ${misc:Depends}, libcurl4 (= ${binary:Version})
Suggests: libcurl4-doc,
libidn-dev,
libkrb5-dev,
@@ -156,7 +149,7 @@
libcurl3-gnutls-dev,
libcurl4-dev
Conflicts: libcurl4-openssl-dev
-Depends: ${misc:Depends}, libcurl3t64-gnutls (= ${binary:Version})
+Depends: ${misc:Depends}, libcurl3-gnutls (= ${binary:Version})
Suggests: libcurl4-doc,
libgnutls28-dev,
libidn-dev,
diff -Nru curl-8.5.0/debian/libcurl3-gnutls.install
curl-8.5.0/debian/libcurl3-gnutls.install
--- curl-8.5.0/debian/libcurl3-gnutls.install 1970-01-01 00:00:00.0
+
+++ curl-8.5.0/debian/libcurl3-gnutls.install 2023-12-29 18:34:11.0
