[SCM] Debian package checker branch, master, updated. 2.2.0-11-gcabd8c3

["Russ Allbery" <rra@debian.org>]

The following commit has been merged in the master branch:
commit dd2b3cb06a8a69cb1719d818ef0da089af970da6
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Tue Jan 27 19:21:35 2009 -0600

    Add reporting harness option to disable signature checks
    
    Add an option to harness to "disable" the gpg check performed by
    dpkg-source prior to unpacking by pretending that /bin/true is gpg.
    
    The signature check was useless because the required gnupg setup was
    not available.
    
    This reduces time when unpacking and size in the lintian.log file, by
    assuming that the signatures are fine, as the packages would otherwise not
    be in the archive in the first place.
    
    Signed-off-by: Raphael Geissert <atomo64@gmail.com>

diff --git a/reporting/config b/reporting/config
index 026cc79..04deb3a 100644
--- a/reporting/config
+++ b/reporting/config
@@ -14,6 +14,8 @@ $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_UNPACK_LEVEL = "";
+$LINTIAN_BIN_DIR = "$HOME/bin";
+$LINTIAN_GPG_CHECK = 0;
 
 $log_file = "$LOG_DIR/harness.log";
 $changes_file = "$LOG_DIR/setup-lab.log";
diff --git a/reporting/harness b/reporting/harness
index e8ba97b..8fdccf8 100755
--- a/reporting/harness
+++ b/reporting/harness
@@ -52,13 +52,13 @@ die "Can't use other modes with reports only." if ($opt_r && ($opt_i || $opt_f |
 
 # read configuration
 require './config';
-use vars qw($LINTIAN_ROOT $LINTIAN_LAB $LINTIAN_ARCHIVEDIR $LINTIAN_DIST 
+use vars qw($LINTIAN_ROOT $LINTIAN_LAB $LINTIAN_ARCHIVEDIR $LINTIAN_DIST
             $LINTIAN_SECTION $LINTIAN_ARCH $LINTIAN_UNPACK_LEVEL $LINTIAN_CFG
             $lintian_cmd $html_reports_cmd
             $log_file $lintian_log $old_lintian_log
             $changes_file $list_file $html_reports_log
             $LOG_DIR $statistics_file
-            $HTML_DIR $HTML_TMP_DIR);
+            $HTML_DIR $HTML_TMP_DIR $LINTIAN_BIN_DIR $LINTIAN_GPG_CHECK);
 
 # import perl libraries
 unshift @INC, "$LINTIAN_ROOT/lib";
@@ -77,6 +77,8 @@ system("savelog $log_file $changes_file $list_file $html_reports_log >/dev/null"
 open(LOG, '>', $log_file)
     or Die("cannot open log file $log_file for writing: $!");
 
+system("mkdir -p -m 775 $LINTIAN_BIN_DIR") == 0 || die "$!";
+
 # export Lintian's configuration
 $ENV{'LINTIAN_ROOT'} = $LINTIAN_ROOT;
 $ENV{'LINTIAN_CFG'} = $LINTIAN_CFG;
@@ -86,6 +88,18 @@ $ENV{'LINTIAN_DIST'} = $LINTIAN_DIST;
 $ENV{'LINTIAN_UNPACK_LEVEL'} = $LINTIAN_UNPACK_LEVEL;
 $ENV{'LINTIAN_SECTION'} = $LINTIAN_SECTION;
 $ENV{'LINTIAN_ARCH'} = $LINTIAN_ARCH;
+$ENV{'PATH'} = $LINTIAN_BIN_DIR . ':' . $ENV{'PATH'};
+
+unless ($LINTIAN_GPG_CHECK) {
+  link '/bin/true', $LINTIAN_BIN_DIR . '/gpg'
+    unless(-f $LINTIAN_BIN_DIR . '/gpg');
+} else {
+  if (-l $LINTIAN_BIN_DIR . '/gpg') {
+    unlink($LINTIAN_BIN_DIR . '/gpg');
+  } else {
+    rename($LINTIAN_BIN_DIR . '/gpg', $LINTIAN_BIN_DIR . '/gpg.bkp');
+  }
+}
 
 if ($opt_c) { # purge the old packages
   system("rm -rf $LINTIAN_LAB/binary") == 0 || die "$!";

-- 
Debian package checker