[SCM] Debian package checker branch, master, updated. 2.5.14-85-gad03ee8

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit ad03ee811a7e18fbdc8d941738a0b1004d98aedc
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 22 15:25:18 2013 +0200

    coll/unpacked: Remove GPG signature checks
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/unpacked b/collection/unpacked
index 1322f22..25fd850 100755
--- a/collection/unpacked
+++ b/collection/unpacked
@@ -50,8 +50,7 @@ if ($type eq 'source') {
         # Ignore STDOUT of the child process because older versions of
         # dpkg-source print things out even with -q.
         my $opts = { out => '/dev/null', err => "$dir/unpacked-errors" };
-        my @args = ('-q');
-        push @args, '--no-check' if $ENV{'LINTIAN_COLL_UNPACKED_SKIP_SIG'};
+        my @args = ('-q', '--no-check');
         print "N: Using dpkg-source to unpack $pkg\n" if $ENV{'LINTIAN_DEBUG'};
         unless (spawn ($opts, ['dpkg-source', @args, '-x', "$dir/dsc", "$dir/unpacked"])) {
             dump_errors ("$dir/unpacked-errors");
@@ -106,8 +105,6 @@ sub dump_errors {
 sub libdpkg_unpack_dsc {
     my ($dsc, $target) = @_;
     my $opt = {
-        # This is used to make check_signature fatal
-        'require_valid_signature' => 1,
         'quiet' => 1
     };
     require Dpkg::Source::Package;
@@ -117,10 +114,6 @@ sub libdpkg_unpack_dsc {
 
     $srcpkg->check_checksums();
 
-    if ($srcpkg->is_signed() && !$ENV{'LINTIAN_COLL_UNPACKED_SKIP_SIG'}) {
-        $srcpkg->check_signature();
-    }
-
     # Unpack the source package (delegated to Dpkg::Source::Package::*)
     $srcpkg->extract($target);
     return 1;
diff --git a/debian/changelog b/debian/changelog
index 7582ff9..00f4d1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,9 @@ lintian (2.5.15) UNRELEASED; urgency=low
   * collection/copyright-file:
     + [NT] Avoid creating an empty copyright file when it is
       not needed.
+  * collection/unpacked:
+    + [NT] Skip signature checking of source packages.
+      (Closes: #707534)
 
   * data/fields/virtual-packages:
     + [NT] Refresh.  Thanks to Laurent Bigonville for the
@@ -127,6 +130,8 @@ lintian (2.5.15) UNRELEASED; urgency=low
   * reporting/harness:
     + [NT] Clear some variables before running Lintian in the
       hope it will reduce the memory pressure on "long runs".
+    + [NT] Remove support for "$LINTIAN_GPG_CHECK" config
+      variable.  Lintian no longer checks any signatures.
 
 
  -- Niels Thykier <niels@thykier.net>  Sat, 29 Jun 2013 21:11:09 +0200
diff --git a/reporting/config b/reporting/config
index 661ac78..b812b33 100644
--- a/reporting/config
+++ b/reporting/config
@@ -15,7 +15,6 @@ $HTML_DIR = "$HOME/www";
 $HTML_TMP_DIR = "$HTML_DIR.new";
 $LINTIAN_CFG = "$LINTIAN_ROOT/reporting/lintian-dummy.cfg";  # this config file has to be empty!
 $LINTIAN_BIN_DIR = "$HOME/bin";
-$LINTIAN_GPG_CHECK = 0;
 
 # Link to the Lintian source code
 $LINTIAN_SOURCE = "http://anonscm.debian.org/gitweb/?p=lintian/lintian.git";;
diff --git a/reporting/harness b/reporting/harness
index f2be772..27ea40e 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -98,7 +98,7 @@ use vars qw($LINTIAN_ROOT $LINTIAN_LAB $LINTIAN_ARCHIVEDIR $LINTIAN_DIST
             $log_file $lintian_log $old_lintian_log
             $html_reports_log
             $LOG_DIR $statistics_file
-            $HTML_DIR $HTML_TMP_DIR $LINTIAN_BIN_DIR $LINTIAN_GPG_CHECK
+            $HTML_DIR $HTML_TMP_DIR $LINTIAN_BIN_DIR
             $LINTIAN_AREA);
 
 # export Lintian's configuration
@@ -135,34 +135,8 @@ unless ($opt{'dry-run'}) {
 }
 # From here on we can use Log() and Die().
 
-unless ($opt{'dry-run'}) {
-    system("mkdir -p -m 775 $LINTIAN_BIN_DIR") == 0 || die "$!";
-
-    if ($LINTIAN_GPG_CHECK) {
-        foreach my $g (qw(gpg gpgv)) {
-            if (-l "$LINTIAN_BIN_DIR/$g") {
-                unlink("$LINTIAN_BIN_DIR/$g")
-                    or Die("unlink $LINTIAN_BIN_DIR/$g: $!");
-            } else {
-                rename("$LINTIAN_BIN_DIR/$g", "$LINTIAN_BIN_DIR/${g}.bkp")
-                    or Die("rename $LINTIAN_BIN_DIR/$g"
-                           . " $LINTIAN_BIN_DIR/${g}.bkp: $!");
-            }
-        }
-    } else {
-        foreach my $g (qw(gpg gpgv)) {
-            if (! -f "$LINTIAN_BIN_DIR/$g") {
-                symlink('/bin/true', "$LINTIAN_BIN_DIR/$g")
-                    or Die("symlink /bin/true $LINTIAN_BIN_DIR/$g: $!");
-            }
-
-        }
-        # Passed to coll/unpacked
-        $ENV{'LINTIAN_COLL_UNPACKED_SKIP_SIG'} = 1;
-    }
-}
-
-$ENV{'PATH'} = $LINTIAN_BIN_DIR . ':' . $ENV{'PATH'};
+$ENV{'PATH'} = $LINTIAN_BIN_DIR . ':' . $ENV{'PATH'}
+    if -d $LINTIAN_BIN_DIR;
 
 
 my $LAB = Lintian::Lab->new ($LINTIAN_LAB);

-- 
Debian package checker