--- builds_bin/update_repos	2011/06/14 18:20:44	1.66
+++ builds_bin/update_repos	2011/10/04 19:48:59	1.67
@@ -33,6 +33,7 @@ my $distrepo = { '7' => { active    => 1
 			  builds    => '/builds/smeserver-7-core/',
 			  community => '/builds/smeserver-7-contribs/',
 			  stage     => '/stage/7/',
+			  sign      => 1,
 			  checksum  => 'sha',
 			},
 		 '8' => { active    => 1,
@@ -42,18 +43,19 @@ my $distrepo = { '7' => { active    => 1
 			  builds    => '/builds/smeserver-8-core/',
 			  community => '/builds/smeserver-8-contribs/',
 			  stage     => '/stage/8/',
+			  sign      => 1,
 			  checksum  => 'sha',
 			},
 	       };
 
-my $repos = { "${repotag}os"              => { prio => 18, inc => 1, ver => 1, rel => 1, os => 1 },
-	      "${repotag}updates"         => { prio => 17, inc => 1, ver => 1, rel => 1 },
-	      "${repotag}updates-testing" => { prio => 16, inc => 1, ver => 1, rel => 3 },
-	      "${repotag}extras"          => { prio => 15, inc => 0, ver => 1, rel => 1 },
-	      "${repotag}addons"          => { prio => 14, inc => 0, ver => 1, rel => 1 },
-	      "${repotag}contribs"        => { prio => 13, inc => 0, ver => 1, rel => 1 },
-	      "${repotag}test"            => { prio => 12, inc => 0, ver => 2, rel => 3, devel => 2 },
-	      "${repotag}dev"             => { prio => 11, inc => 0, ver => 1, rel => 1, devel => 1 },
+my $repos = { "${repotag}os"              => { prio => 19, inc => 1, ver => 1, rel => 1, os => 1 },
+	      "${repotag}updates"         => { prio => 18, inc => 1, ver => 1, rel => 1 },
+	      "${repotag}updates-testing" => { prio => 17, inc => 1, ver => 1, rel => 3 },
+	      "${repotag}extras"          => { prio => 16, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}addons"          => { prio => 15, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}contribs"        => { prio => 14, inc => 0, ver => 1, rel => 1 },
+	      "${repotag}test"            => { prio => 13, inc => 0, ver => 2, rel => 3, devel => 2 },
+	      "${repotag}dev"             => { prio => 12, inc => 0, ver => 1, rel => 1, devel => 1 },
 	      'centos'                    => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'epel'                      => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'rpmforge'                  => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
@@ -76,6 +78,10 @@ my $baserepo = { "~S${repotag}os/~A/$osd
 		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
 		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
 		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-vault/~C/fasttrack/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-vault/~C/updates/~A/RPMS/' => 'centos',
+		 '/mirrors/centos-vault/~C/os/~A/CentOS/~O' => 'centos',
+		 '/mirrors/centos-vault/~C/extras/~A/RPMS/' => 'centos',
 		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
 		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
 		 '/mirrors/rpmforge/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
@@ -102,7 +108,7 @@ my $skippkg = { '7' => { 'centos'
 		'8' => { 'atrpms'        => { map { $_ => 1 } ( 'gnupg' ) },
 			 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
 			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', 'libtalloc', 'libtdb', 'oidentd', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-Razor-Agent', 'smolt' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'dovecot', 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
 	      };
 
@@ -385,13 +391,13 @@ foreach my $ver ( sort { $a <=> $b } key
 		    push @{$pkg->{repos}}, $stage;
 		}
 	    }
-	    if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
+	    if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) {
 		print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
 		$print++;
 	    }
 
 	    my $src = $pkg->{rpm}->filename;
-	    if ( $pkg->{nosig} ) {
+	    if ( $pkg->{nosig} && $distrepo->{$ver}->{sign} ) {
 		print "sign package (", basename($pkg->{rpm}->filename), ")\n";
 		unless ( $opts{t} ) {
 		    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null);
@@ -451,7 +457,7 @@ foreach my $ver ( sort { $a <=> $b } key
 		next if $pkg->{done} || $repos->{$pkg->{repo}}->{orig} || $repos->{$pkg->{repo}}->{base};
 		$pkg->{delete}++;
 		my $src = $pkg->{rpm}->filename;
-		if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
+		if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) {
 		    print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
 		    $print++;
 		}
@@ -551,7 +557,7 @@ sub process_rpm {
     }
     my ($src, $version, $release) = ($pkg->is_source_package ? $pkg->filename : $pkg->sourcerpm) =~ m{(?:^|/)([^/]*)-([^-]+)-([^-]+)\.\w+\.rpm$};
     return if $skippkg->{$ver}->{$repo} && ( $skippkg->{$ver}->{$repo}->{$src} || $skippkg->{$ver}->{$repo}->{$pkg->name} );
-    return if $repos->{$repo}->{base} && $nosig;
+    return if $repos->{$repo}->{base} &&  $nosig && $baserepo->{$ver}->{sign};
     if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
     my $arch = 'unknown';
     $arch = 'SRPMS' if $pkg->filename =~ m{[/-](SRPMS?|src|source)/};