[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#996482: marked as done (tardy: FTBFS on x32)

Your message dated Fri, 12 Apr 2024 09:51:40 +0000
with message-id <E1rvDZM-00Epc8-Ub@fasolo.debian.org>
and subject line Bug#996482: fixed in tardy 1.25-3
has caused the Debian Bug report #996482,
regarding tardy: FTBFS on x32
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 owner@bugs.debian.org
immediately.)


-- 
996482: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=996482
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: tardy
Version: 1.25-1
Severity: important
Tags: patch

Dear Maintainer,

Picking important because tardy seems to've never built on x32,
and hence doesn't qualify for serious.

See buildd log:
  https://buildd.debian.org/status/fetch.php?pkg=tardy&arch=x32&ver=1.25-1&stamp=1634152898&raw=0

Attached are two patches. One fixes the problem itself by declaring
tardy_mtime() properly, the other fixes time_t-formatting-related
warnings (and, presumably, saves us from correctness erorrs and UB).

These make tardy build mostly-cleanly on sid. There's one warning left:
-- >8 --
g++ -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -ffile-prefix-map=/tmp/tardy-1.25=. -specs=/usr/share/dpkg/pie-compile.specs -fstack-protector-strong -Wformat -Werror=format-security -I. -c \
        libtardy/tar/output/cpio/oldascii.cc
libtardy/tar/output/cpio/oldascii.cc: In member function ‘virtual void tar_output_cpio_oldascii::write_header(const tar_header&)’:
libtardy/tar/output/cpio/oldascii.cc:54:65: warning: ‘__builtin___snprintf_chk’ output may be truncated before the last format character [-Wformat-truncation=]
   54 |         "%06o%06o%06lo%06lo%06lo%06lo%06lo%06o%011llo%06lo%011lo",
      |                                                                 ^
In file included from /usr/include/stdio.h:866,
                 from ./libtardy/ac/stdio.h:37,
                 from libtardy/tar/output/cpio/oldascii.cc:19:
/usr/include/x86_64-linux-gnux32/bits/stdio2.h:70:35: note: ‘__builtin___snprintf_chk’ output between 77 and 84 bytes into a destination of size 78
   70 |   return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
      |          ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   71 |        __bos (__s), __fmt, __va_arg_pack ());
      |        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
mv oldascii.o libtardy/tar/output/cpio/oldascii.o
-- >8 --
But that seems to be by design. All tests pass.

I tried to build for 1.28.D001-1 from the repository at
https://alioth-archive.debian.org/git/collab-maint/tardy.git.tar.xz,
but it seems liblzma-dev no longer provides BZ2_*() interfaces,
and tardy fails to even configure, so.

Best,
наб

-- System Information:
Debian Release: bookworm/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: x32 (x86_64)
Foreign Architectures: amd64, i386

Kernel: Linux 5.14.0-2-amd64 (SMP w/2 CPU threads)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.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

--- tardy-1.25.orig/tardy/tardy.h
+++ tardy-1.25/tardy/tardy.h
@@ -38,7 +38,7 @@ void tardy_mode_set(int);
 void tardy_no_directories(void);
 void tardy_no_fix_type(void);
 void tardy_now(void);
-void tardy_mtime(long when);
+void tardy_mtime(time_t when);
 void tardy_prefix(const char *);
 void tardy_remove_prefix(const char *);
 void tardy_remove_prefix(long);

--- tardy-1.25.orig/libtardy/file/input.cc
+++ tardy-1.25/libtardy/file/input.cc
@@ -145,7 +145,7 @@ file_input::skip(size_t nbytes)
         {
             fatal
             (
-                "short padding read (requested %ld, got %ld)",
+                "short padding read (requested %zu, got %zu)",
                 tot + n,
                 tot + n2
             );
--- tardy-1.25.orig/libtardy/tar/input/filter/ar_long_names.cc
+++ tardy-1.25/libtardy/tar/input/filter/ar_long_names.cc
@@ -98,7 +98,7 @@ tar_input_filter_ar_long_names::read_and
             want = size;
         size_t nbytes = tar_input_filter::read_data(buffer, want);
         if (nbytes != want)
-            fatal("short read (expected %lu, got %lu)", want, nbytes);
+            fatal("short read (expected %zu, got %zu)", want, nbytes);
         data.push_back(buffer, nbytes);
         size -= nbytes;
     }
--- tardy-1.25.orig/libtardy/tar/output/cpio/crc.cc
+++ tardy-1.25/libtardy/tar/output/cpio/crc.cc
@@ -73,14 +73,14 @@ tar_output_cpio_crc::write_data_padding(
     (
         buffer,
         sizeof(buffer),
-        "%6s%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
+        "%6s%08lx%08lx%08lx%08lx%08lx%08llx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
         "070702",
         current_header.inode_number,
         (long)calculate_mode(current_header),
         current_header.user_id,
         current_header.group_id,
         current_header.link_count,
-        current_header.mtime,
+        (long long)current_header.mtime,
         current_header.size,
         current_header.device_major,
         current_header.device_minor,
--- tardy-1.25.orig/libtardy/tar/output/cpio/newascii.cc
+++ tardy-1.25/libtardy/tar/output/cpio/newascii.cc
@@ -49,14 +49,14 @@ tar_output_cpio_newascii::write_header(c
     (
         buffer,
         sizeof(buffer),
-        "%6s%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
+        "%6s%08lx%08lx%08lx%08lx%08lx%08llx%08lx%08lx%08lx%08lx%08lx%08lx%08lx",
         "070701",
         h.inode_number,
         (long)calculate_mode(h),
         h.user_id,
         h.group_id,
         h.link_count,
-        h.mtime,
+        (long long)h.mtime,
         h.size,
         h.device_major,
         h.device_minor,
--- tardy-1.25.orig/libtardy/tar/output/cpio/oldascii.cc
+++ tardy-1.25/libtardy/tar/output/cpio/oldascii.cc
@@ -51,7 +51,7 @@ tar_output_cpio_oldascii::write_header(c
     (
         buffer,
         sizeof(buffer),
-        "%06o%06o%06lo%06lo%06lo%06lo%06lo%06o%011lo%06lo%011lo",
+        "%06o%06o%06lo%06lo%06lo%06lo%06lo%06o%011llo%06lo%011lo",
         070707,
         dev & 0777777,
         h.inode_number & 0x777777,
@@ -60,7 +60,7 @@ tar_output_cpio_oldascii::write_header(c
         h.group_id & 0777777,
         h.link_count & 0777777,
         rdev & 0777777,
-        h.mtime & 07777777777,
+        (long long)h.mtime & 07777777777,
         (long)h.name.size() + 1,
         h.size
     );
--- tardy-1.25.orig/libtardy/tar/output/filter/ar_long_names2.cc
+++ tardy-1.25/libtardy/tar/output/filter/ar_long_names2.cc
@@ -90,7 +90,7 @@ tar_output_filter_ar_long_names2::write_
         //
         name_cache = hdr.name;
         tar_header h2 = hdr;
-        h2.name = rcstring::printf("#1/%lu", hdr.name.size());
+        h2.name = rcstring::printf("#1/%zu", hdr.name.size());
         h2.size += hdr.name.size();
         tar_output_filter::write_header(h2);
     }
--- tardy-1.25.orig/libtardy/mprintf.cc
+++ tardy-1.25/libtardy/mprintf.cc
@@ -306,6 +306,7 @@ vmprintf_errok(const char *fmt, va_list
         case 'l':
         case 'h':
         case 'L':
+        case 'z':
             qualifier = c;
             c = *s++;
             break;

--- End Message ---
--- Begin Message --- 
Source: tardy
Source-Version: 1.25-3
Done: Andreas Beckmann <anbe@debian.org>

We believe that the bug you reported is fixed in the latest version of
tardy, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 996482@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Andreas Beckmann <anbe@debian.org> (supplier of updated tardy package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 12 Apr 2024 11:24:17 +0200
Source: tardy
Architecture: source
Version: 1.25-3
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Andreas Beckmann <anbe@debian.org>
Closes: 996482 1068115
Changes:
 tardy (1.25-3) unstable; urgency=medium
 .
   * QA upload.
   * Import more history and move repository to salsa.debian.org.
   * Fix tardy_mtime declaration and format strings, thanks to наб.
     (Closes: #996482, #1068115)
   * The bullseye toolchain defaults to --as-needed.
   * Declare Rules-Requires-Root: no.
Checksums-Sha1:
 d04d42f4026642daa6fdc60209c839cf7cac3534 1886 tardy_1.25-3.dsc
 409cfe28ba97f99bb25afec0ab28bc5081920573 5512 tardy_1.25-3.debian.tar.xz
 4c3e873d873265104de8339eb1a435d4fcdc8057 6133 tardy_1.25-3_source.buildinfo
Checksums-Sha256:
 2796a3d8202cc28f74911c3836f5807252c0e5e52a6f82b193a3fc77958cdaec 1886 tardy_1.25-3.dsc
 f52d814ed7efc3f9f339ee527e452aa0a85033fd7c0446551e937d4d4792fdf0 5512 tardy_1.25-3.debian.tar.xz
 2118cde17549f5f6a77feea85e35cbbdeef0160bdecf3e0c5b2025e27aa7e632 6133 tardy_1.25-3_source.buildinfo
Files:
 1889a6a49b7dfc4a82825e2a8abbed06 1886 utils optional tardy_1.25-3.dsc
 1e4e06d936db629f8cc9f87c88e64e91 5512 utils optional tardy_1.25-3.debian.tar.xz
 f3ad33af4966940a48f51b419ca56a93 6133 utils optional tardy_1.25-3_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJEBAEBCAAuFiEE6/MKMKjZxjvaRMaUX7M/k1np7QgFAmYY/i4QHGFuYmVAZGVi
aWFuLm9yZwAKCRBfsz+TWentCLVPD/0UpaXZzCnzOpqCkdHZS58UBz8CPh54322c
WJic7vPospI+kqOfUFrAW/M5w+c3cZtSdZZMkA7yUKtHAl4uwVstEtR6f8sfSgvI
ytFLRkp5G+Sxubt4iz93xI1Wr1BQcQn4IdGUrRU+s6x5iBpR/z8FBXnIAwBF0bjf
LHSXZiDBQzFAiXR0KPP3PXLqVmo7jfU4DKAoDwC0BiTDISawQ+7KMC0wKusLA0AY
06SY6+FVM62A2zMBPXeIEa+k67yTAGiR7t8GTxaZewR4I6n9b48beyqOVoEYp5o4
awT2wGDPT9aNr9ZhlZGUqkTqbY4viS3Z8+YxoLf4PHnaAxyrTbs4ulxNr/q102FH
wfgXMdov8WexGOGl8WxwS5Uh4woano9qjOC0byAyQ2I2oC6OKWNMACeJX2gyxa+C
7kTsk8It2p1ccMP5kBx3Sw4PWKY7Au4pN88zOxmhXFpZ69Im67BtEbPKO92JAq1N
sDn5HFsi5qxkjrYRFO0Mgr4Df0OJtZEMP7/Xi+2Qr48Wj/3w/LhdOv9fJ2wXNsJW
E5bwx8pap7Lcw4H699Gb2mDmlj8Ex8Q1dVt04OUG2/xo2NnE61OupANQIJI4NDou
iWjoSgSIGtXHetvSSgOsXOQkwLAbXeQwJvlbEbLlO34HHClBVqPRq3lvIO2EthfH
EpfNvpdl5w==
=wtQL
-----END PGP SIGNATURE-----

Attachment: pgpR5tX4fbj6H.pgp
Description: PGP signature


--- End Message ---
Reply to: