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

[lintian] 01/01: c/files: Remove t1disasm SIGSEGV work around



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 96c6fc3a5aa3bb8441b3a1a49023d2f54363752b
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Apr 30 16:32:21 2016 +0000

    c/files: Remove t1disasm SIGSEGV work around
    
    As Debian jessie is the minimum supported Debian version, we can now
    assume t1utils (>= 1.38-4) and therefore we no longer need the work
    around.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 checks/files.pm  | 37 +------------------------------------
 debian/changelog |  3 +++
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/checks/files.pm b/checks/files.pm
index 0f51425..32f89a9 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -24,7 +24,6 @@ use warnings;
 use autodie;
 
 use Lintian::Data;
-use Lintian::Output qw(warning);
 use Lintian::Tags qw(tag);
 use Lintian::Util qw(drain_pipe fail is_string_utf8_encoded open_gz
   signal_number2name strip normalize_pkg_path);
@@ -1533,41 +1532,7 @@ sub run {
                         }
                     }
                     drain_pipe($t1pipe);
-                    eval {close($t1pipe);};
-                    if (my $err = $@) {
-                        # check if we hit #724571 (t1disasm
-                        # seg. faults on files).
-                        my $exit_code_raw = $?;
-                        fail("closing t1disasm $file: $!") if $err->errno;
-                        my $code = ($exit_code_raw >> 8) & 0xff;
-                        my $sig = $exit_code_raw & 0xff;
-                        fail("t1disasm $file exited $code") if $code;
-                        if ($sig) {
-                            my $signame = signal_number2name($sig);
-                            fail("t1disasm $file killed with signal $signame")
-                              unless $signame eq 'SEGV'
-                              or $signame eq 'BUS';
-                            # This is #724571.  The problem is that it
-                            # causes the FTP masters to Lintian
-                            # auto-reject to trigger (and lintian.d.o
-                            # to re-check packages daily if the have a
-                            # file triggering this).
-                            # Technically, t1disasm has only triggered
-                            # a SEGV so far, but it we assume it can
-                            # also get hit by a BUS.
-                            warning(
-                                join(q{ },
-                                    "t1disasm $file died with a",
-                                    'segmentation fault or bus error'),
-                                'This may hide a license-problem warning.'
-                            );
-                        } else {
-                            fail(
-                                join(q{ },
-                                    "t1disasm $file died with raw",
-                                    "exit code $exit_code_raw"));
-                        }
-                    }
+                    close($t1pipe);
                 }
             }
 
diff --git a/debian/changelog b/debian/changelog
index 7083ac3..e2050cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,9 @@ lintian (2.5.51) UNRELEASED; urgency=medium
       research behind it.  (Closes: #856857)
     + [BR] Detect symlink pointing to builddir.  (Closes: #860419)
     + [CL] Detect RData without README.source.  (Closes: #815233)
+    + [NT] Remove work around for segmentation faults in t1disasm from
+      t1utils (<< 1.38-4~).  Given Jessie is the minimum supported Debian
+      version, we can now assume t1utils to be (>= 1.38-4).
   * checks/gir.{desc,pm}:
     + [NT] Add check for gir packages written by Simon McVittie.
       (Closes: #695345)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: