[Secure-testing-commits] r12055 - bin data/packages

[Stefan Fritsch]

Author: sf
Date: 2009-06-06 08:13:13 +0000 (Sat, 06 Jun 2009)
New Revision: 12055

Modified:
   bin/check-new-issues
   data/packages/removed-packages
Log:
- make check-new-issues -U ignore removed packages
- add some packages to the removed list


Modified: bin/check-new-issues
===================================================================
--- bin/check-new-issues	2009-06-05 22:31:21 UTC (rev 12054)
+++ bin/check-new-issues	2009-06-06 08:13:13 UTC (rev 12055)
@@ -78,6 +78,7 @@
 my $datafile="$basedir/data/CVE/list";
 my $allitemsfile="gunzip -c $basedir/../allitems.txt.gz|";
 my $allitemsurl="http://cve.mitre.org/data/downloads/allitems.txt.gz";
+my $removedfile="$basedir/data/packages/removed-packages";
 
 my $issue_regexp= $opts{i} || 'CVE-20(?:0[3-9]|1[0-9])';
 my $todo_regexp= $opts{t} || ( $opts{T} ? '^\s+TODO: check' : '^\s+TODO: check$' );
@@ -112,7 +113,10 @@
 	gnutls11
 	/;
 my %ignore_missing_bug;
-$ignore_missing_bug{$_} = 1 for @ignore_missing_bug_list;
+if ($opts{u} || $opts{U}) {
+	push @ignore_missing_bug_list, read_removed_packages_file($removedfile);
+	$ignore_missing_bug{$_} = 1 for @ignore_missing_bug_list;
+}
 
 foreach my $entry (@{$entries}) {
 	my $name;
@@ -423,3 +427,20 @@
 	}
 	return $found;
 }
+
+sub read_removed_packages_file {
+	my $file = shift;
+
+	open(my $fh, "<", $file) or die "could not open $file";
+	my @packages;
+	my $line;
+	while (defined ($line = <$fh>)) {
+		chomp $line;
+		$line =~ s/^\s+//;
+		$line =~ s/\s+$//;
+		next if $line =~ /^$/;
+		next if $line =~ /^#/;
+		push @packages, $line;
+	}
+	return @packages;
+}

Modified: data/packages/removed-packages
===================================================================
--- data/packages/removed-packages	2009-06-05 22:31:21 UTC (rev 12054)
+++ data/packages/removed-packages	2009-06-06 08:13:13 UTC (rev 12055)
@@ -210,4 +210,6 @@
 libpng3
 lukemftp
 tmsnc
-amaya
\ No newline at end of file
+amaya
+tomcat5
+openssh-krb5