--- builds_bin/update_repos	2010/02/24 18:17:52	1.55
+++ builds_bin/update_repos	2014/08/15 15:29:42	1.75
@@ -14,11 +14,10 @@ umask 002;
 $| = 1;
 
 my %opts;
-getopts( 'osqtr:', \%opts );
+getopts( 'ostr:', \%opts );
 $opts{r} ||= '';
 
-my $rpm_flags = RPM2->vsf_nosha1header | RPM2->vsf_nomd5header | RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader;
-$rpm_flags |= RPM2->vsf_nosha1 | RPM2->vsf_nomd5 | RPM2->vsf_nodsa | RPM2->vsf_norsa;
+my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
 my $osdir = 'SME';
 my $disttag = 'sme';
@@ -26,32 +25,36 @@ my $repotag = 'sme';
 
 my @archs = ( 'i386', 'x86_64' );
 
-my $distrepo = { '7' => { active    => 1,
-			  centos    => 4,
-			  repo      => '/releases/7/',
-			  os        => 'RPMS/',
-			  builds    => '/builds/smeserver-7-core/',
-			  community => '/builds/smeserver-7-contribs/',
-			  stage     => '/stage/7/',
-			},
-		 '8' => { active    => 1,
+my $distrepo = { '8' => { active    => 1,
 			  centos    => 5,
-			  repo      => '/releases/testing/8/',
-			  os        => '',
-			  builds    => '/builds/smeserver-8-core/',
-			  community => '/builds/smeserver-8-contribs/',
-			  stage     => '/stage/8/',
+			  repo      => '/build/smeserver/repo/8/',
+			  builds    => ['/build/builds/smeserver-8-core/'],
+			  community => '/build/builds/smeserver-8-contribs/',
+			  stage     => '/build/smeserver/stage/8/',
+			  sign      => 1,
+                          keyname   => 'SME Server 7 signing key <bugteam@contribs.org>',
+			  checksum  => 'sha',
+			},
+		 '9' => { active    => 1,
+			  centos    => 6,
+			  repo      => '/build/smeserver/repo/9/',
+			  builds    => ['/build/builds/smeserver-9-core/'],
+			  community => '/build/builds/smeserver-9-contribs/',
+			  stage     => '/build/smeserver/stage/9/',
+			  sign      => 1,
+                          keyname   => 'SME Server 7 signing key <bugteam@contribs.org>',
+			  checksum  => 'sha256',
 			},
 	       };
 
-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 },
@@ -61,44 +64,42 @@ my $repos = { "${repotag}os"
 	      'stage'                     => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
 	    };
 
-my $baserepo = { "~S${repotag}os/~A/$osdir/~O" => "${repotag}os",
-		 "~S${repotag}updates/~A/RPMS/" => "${repotag}updates",
-		 "~S${repotag}updates-testing/~A/RPMS/" => "${repotag}updates-testing",
-		 "~S${repotag}extras/~A/RPMS/" => "${repotag}extras",
-		 "~S${repotag}addons/~A/RPMS/" => "${repotag}addons",
-		 "~S${repotag}contribs/~A/RPMS/" => "${repotag}contribs",
-		 "~S${repotag}test/~A/RPMS/" => "${repotag}test",
-		 "~S${repotag}dev/~A/RPMS/" => "${repotag}dev",
-		 "/stage/~s/~A/$osdir/~O" => 'stage',
-		 '/mirrors/centos/~C/fasttrack/~A/RPMS/' => 'centos',
-		 '/mirrors/centos/~C/updates/~A/RPMS/' => 'centos',
-		 '/mirrors/centos/~C/os/~A/CentOS/~O' => 'centos',
-		 '/mirrors/centos/~C/extras/~A/RPMS/' => 'centos',
+my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os",
+		 "~S${repotag}updates/~A/" => "${repotag}updates",
+		 "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing",
+		 "~S${repotag}extras/~A/" => "${repotag}extras",
+		 "~S${repotag}addons/~A/" => "${repotag}addons",
+		 "~S${repotag}contribs/~A/" => "${repotag}contribs",
+		 "~S${repotag}test/~A/" => "${repotag}test",
+		 "~S${repotag}dev/~A/" => "${repotag}dev",
+		 "/build/smeserver/stage/~s/~A/" => 'stage',
+		 '/mirrors/centos/~C/fasttrack/~A/' => 'centos',
+		 '/mirrors/centos/~C/updates/~A/' => 'centos',
+		 '/mirrors/centos/~C/os/~A/' => 'centos',
+		 '/mirrors/centos/~C/extras/~A/' => 'centos',
+		 '/mirrors/centos-vault/~C/fasttrack/~A/' => 'centos',
+		 '/mirrors/centos-vault/~C/updates/~A/' => 'centos',
+		 '/mirrors/centos-vault/~C/os/~A/' => 'centos',
+		 '/mirrors/centos-vault/~C/extras/~A/' => 'centos',
 		 '/mirrors/fedora/epel/~C/~A/' => 'epel',
 		 '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
-		 '/mirrors/rpmforge/dag/redhat/el~C/en/~A/dag/RPMS/' => 'rpmforge',
-		 '/mirrors/rpmforge/dag/source/' => 'rpmforge',
+		 '/mirrors/rpmforge/redhat/el~C/en/~A/dag/' => 'rpmforge',
+		 '/mirrors/rpmforge/redhat/el~C/en/~A/extras/' => 'rpmforge',
+		 '/mirrors/rpmforge/source/' => 'rpmforge',
 		 '/mirrors/atrpms/el~C-~A/atrpms/stable/' => 'atrpms',
 		 '/mirrors/atrpms/el~C-~A/atrpms/testing/' => 'atrpms',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/stable/' => 'atrpms',
 		 '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms',
 	       };
 
-if ( $opts{q} ) {
-    $baserepo->{'/mirrors/centos-qa/CentOS/~C/fasttrack/~A/RPMS/'} = 'centos';
-    $baserepo->{'/mirrors/centos-qa/CentOS/~C/updates/~A/RPMS/'} = 'centos';
-    $baserepo->{'/mirrors/centos-qa/CentOS/~C/os/~A/CentOS/~O'} = 'centos';
-    $baserepo->{'/mirrors/centos-qa/CentOS/~C/extras/~A/RPMS/'} = 'centos';
-}
-
-my $skippkg = { '7' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'ocsinventory', 'perl-Compress-Bzip2', 'perl-Compress-Raw-Zlib', 'perl-Compress-Raw-Bzip2', 'perl-Crypt-OpenSSL-Bignum', 'perl-Crypt-OpenSSL-Random', 'perl-Crypt-OpenSSL-RSA', 'perl-DateTime', 'perl-Razor-Agent', 'perl-Text-Iconv', 'proftpd' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
-			 'atrpms'        => { map { $_ => 1 } ( 'check4updates', 'dovecot', 'trac', 'yum' ) },
+my $skippkg = { '8' => { 'atrpms'        => { map { $_ => 1 } ( 'clamav', 'gnupg' ) },
+			 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
+			 'epel'          => { map { $_ => 1 } ( 'clamav', 'fping', 'html2ps', '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 } ( 'dovecot', 'libtalloc', 'mod_auth_tkt', 'perl-Test-Inline', 'spamassassin' ) },
 		       },
-		'8' => { 'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
-			 'epel'          => { map { $_ => 1 } ( 'clamav', 'horde', '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', 'proftpd', 'smolt' ) },
-			 'rpmforge'      => { map { $_ => 1 } ( 'perl-Test-Inline' ) },
+		'9' => { 'atrpms'        => { map { $_ => 1 } ( 'clamav', 'perl-Pod-Escapes', 'perl-Pod-Simple' ) },
+			 'epel'          => { map { $_ => 1 } ( 'oidentd', 'perl-Razor-Agent' ) },
+			 'rpmforge'      => { map { $_ => 1 } ( 'perl-CGI', 'perl-Compress-Raw-Zlib', 'perl-ExtUtils-ParseXS', 'perl-Pod-Escapes', 'perl-Pod-Simple', 'perl-Time-HiRes', 'perl-version', 'spamassassin' ) },
 		       },
 	      };
 
@@ -117,25 +118,38 @@ foreach my $ver ( sort { $a <=> $b } key
 
     foreach my $dir  ( sort { $repos->{$baserepo->{$b}}->{prio} <=> $repos->{$baserepo->{$a}}->{prio} || $a cmp $b } keys %$baserepo ) {
 	my $bdir = $dir;
-	$bdir =~ s/~O/$distrepo->{$ver}->{os}/;
 	$bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
 	$bdir =~ s/~s/$ver/;
 	$bdir =~ s/~C/$distrepo->{$ver}->{centos}/;
 	for my $arch ( @archs, 'SRPMS/' ) {
 	    my $adir = $bdir;
 	    if ( $arch eq 'SRPMS/' ) {
-		$adir =~ s/~A.*/$arch/ if $arch eq 'SRPMS/';
+		$adir =~ s/~A.*//;
+		if ( -d "${adir}SRPMS" ) {
+		    $adir .= "SRPMS/";
+		} elsif ( -d "${adir}Source/SPackages" ) {
+		    $adir .= "Source/SPackages/";
+		}
 	    } else {
 		$adir =~ s/~A/$arch/;
+		if ( -d "${adir}RPMS" ) {
+		    $adir .= "RPMS/";
+		} elsif ( -d "${adir}Packages" ) {
+		    $adir .= "Packages/";
+		} elsif ( -d "${adir}CentOS" ) {
+		    $adir .= "CentOS/";
+		} elsif ( -d "${adir}$osdir" ) {
+		    $adir .= "$osdir/";
+		}
 	    }
-	    opendir DIR, $adir or next;
 	    next unless -d $adir;
+	    opendir DIR, $adir or next;
 	    process_rpm("$adir$_", $ver, $baserepo->{$dir}) foreach readdir DIR;
 	    closedir DIR;
 	    last unless $dir =~ m{~A};
 	}
     }
-    find( { wanted => sub { process_rpm($_, $ver, 'builds'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'builds'} );
+    find( { wanted => sub { process_rpm($_, $ver, 'builds'); }, no_chdir => 1, follow_fast => 1 }, "$_" ) foreach @{$distrepo->{$ver}->{'builds'}};
     find( { wanted => sub { process_rpm($_, $ver, 'community'); }, no_chdir => 1, follow_fast => 1 }, $distrepo->{$ver}->{'community'} ) if $distrepo->{$ver}->{'community'};
 
     foreach my $base ( sort keys %$rpms ) {
@@ -151,20 +165,41 @@ foreach my $ver ( sort { $a <=> $b } key
 	    next if $pkg->{done};
 
 	    my $tmp = $pkg->{svr};
+	    # srpm transformations to match up binary and source rpms
 	    SRC: {
-		$rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d(\.rf)$}{$1$2} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                     && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
-		($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{}                && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# Try to find the name the binary wants (no changes)
+		$rpms->{$base}->{vers}->{$tmp}                       && last SRC;
+
+		# rpmforge (.el4.rf to .rf, with rf,rfb,rft,rfx endings)
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf[btx]?)$}{$1}   && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.el4.rfx to .rf, rfb,rft,rfx switched to rf)
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]$}{$1}    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.el4.rf to .rfx, rf,rfb,rft,rfx switched to rfx)
+		($tmp = $pkg->{svr}) =~ s{\.el\d(\.rf)[btx]?$}{$1x}   && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.el4.rf to .el5) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.el5}         && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# rpmforge (.2.el4.rf to .rf, minor modification not pushed to source?) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.2\.el\d(\.rf)$}{$1}      && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+
+		# atrpms (remove .at)
+		($tmp = $pkg->{svr}) =~ s{\.at$}{}                   && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# atrpms (remove .el4.at)
+		($tmp = $pkg->{svr}) =~ s{\.el\d\.at$}{}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# atrpms (remove .el4)
+		($tmp = $pkg->{svr}) =~ s{\.el\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		# atrpms (remove .0.el5, minor modification not pushed to source?) TODO: remove when no longer needed
+		($tmp = $pkg->{svr}) =~ s{\.0\.el\d$}{}              && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+
+		# Transformations that we hopefully won't have to use anymore TODO: remove if no issues
+		#($tmp = $pkg->{svr}) =~ s{(\.el\d)\.rf$}{$1}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+(\.rf)$}{$1$2}       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d\.rf$}{.dag}             && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(\d+)\.\d+\.el\d\.rf$}{$1.dag} && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d_}{_}                    && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{(-\d+)\.\d+\.el\d$}{$1}        && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.centos\d$}{}                 && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.at$}{}                       && $rpms->{$base}->{vers}->{$tmp} && last SRC;
+		#($tmp = $pkg->{svr}) =~ s{\.el\d\.$disttag$}{            && $rpms->{$base}->{vers}->{$tmp} && last SRC;
 	    }
 	    if ( $rpms->{$base}->{vers}->{$tmp} ) {
 		foreach $tmp ( @{$rpms->{$base}->{vers}->{$tmp}} ) {
@@ -199,22 +234,53 @@ foreach my $ver ( sort { $a <=> $b } key
 			    if ($repos->{$cmp->{repo}}->{stage} ) {
 				if ( $seen{$cmp->{nvra}}->{latest} ) {
 				    $seen{$cmp->{nvra}}->{latest}++;
+				    delete $cmp->{delete} if $cmp->{delete};
 				} else {
 				    $cmp->{delete}++;
 				}
-			    } elsif ( $repos->{$cmp->{repo}}->{orig}) {
+			    } elsif ( $repos->{$cmp->{repo}}->{orig} ) {
 				$orig{$cmp->{nvra}}++;
 				unless ( $repos->{$cmp->{repo}}->{base} ) {
-				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
+                                    my $tag = dirname(dirname($cmp->{rpm}->{filename}));
 				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
 				}
-			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
-				$reposrc{$cmp->{repo}}->{srpm} = $cmp;
+			    } elsif ( $cmp->{src} ) {
+				if ( $cmp->{delete} && $cmp->{oldrepo} && $reposrc{$cmp->{oldrepo}}) {
+				    $cmp->{repo} = $cmp->{oldrepo};
+				    delete $cmp->{delete};
+				}
+				if ( $reposrc{$cmp->{repo}} ) {
+				    $reposrc{$cmp->{repo}}->{srpm} = $cmp;
+				    $srpm = $cmp if ! $srpm;
+				} elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} && ! $cmp->{done} ) {
+				    $cmp->{delete}++;
+				}
 			    } elsif ( $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo} ) {
 				$cmp->{delete}++;
 			    }
+			} elsif ( $cmp->{src} ) {
+			    if ( $reposrc{$cmp->{repo}} && $reposrc{$cmp->{repo}}->{srpm} && $reposrc{$cmp->{repo}}->{srpm}->{oldrepo} ne $cmp->{repo} ) {
+				$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src} = [ 
+				    grep { $_ ne $reposrc{$cmp->{repo}}->{srpm} } @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{src}}
+				];
+
+				if ( @{$reposrc{$cmp->{repo}}->{srpm}->{repos}} == 1 ) {
+				    $reposrc{$cmp->{repo}}->{srpm}->{repo} = $reposrc{$cmp->{repo}}->{srpm}->{oldrepo};
+				    delete $reposrc{$cmp->{repo}}->{srpm}->{oldrepo};
+				    delete $reposrc{$cmp->{repo}}->{srpm}->{delete};
+				    delete $reposrc{$cmp->{repo}}->{srpm}->{repos};
+				    delete $reposrc{$cmp->{repo}}->{srpm}->{done};
+				    $seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}} eq $reposrc{$cmp->{repo}}->{srpm};
+				} else {
+				    warn "How did I get here??";
+				}
+			    } else {
+				$seen{$cmp->{nvra}} = $cmp if $seen{$cmp->{nvra}}->{repo} ne $cmp->{repo};
+			    }
+			    $srpm = $cmp if ! $srpm && $cmp->{src};
+			    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $reposrc{$cmp->{repo}};
 			}
-		    } elsif ($repos->{$cmp->{repo}}->{stage} ) {
+		    } elsif ( $repos->{$cmp->{repo}}->{stage} ) {
 			$cmp->{delete}++;
 		    } else {
 			$srpm = $cmp if ! $srpm && $cmp->{src};
@@ -226,7 +292,7 @@ foreach my $ver ( sort { $a <=> $b } key
 			    if ( $repos->{$cmp->{repo}}->{orig} ) {
 				$orig{$cmp->{nvra}}++;
 				unless ( $repos->{$cmp->{repo}}->{base} ) {
-				    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
+                                    my $tag = dirname(dirname($cmp->{rpm}->{filename}));
 				    qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
 				}
 			    } elsif ( $cmp->{src} && $reposrc{$cmp->{repo}} ) {
@@ -261,16 +327,16 @@ foreach my $ver ( sort { $a <=> $b } key
 			    $dest = pkgdest($cmp, $devel1, $dest, $rpms->{$base}->{rpms});
 			    $dest = $devel1 if verrel($cmp, $dest, \%counts);
 			    unless ( $cmp->{src} && ! $reposrc{$dest} ) {
-                                if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
-                                    unless ( $repos->{$cmp->{repo}}->{base} ) {
-                                        my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$cmp->{repo}}, $cmp->{name}, $cmp->{ver}, $cmp->{rel};
-                                        qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
-                                    }
-                                    push @{$cmp->{repos}}, $dest;
-                                    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
-                                    $cmp->{repo} = $dest;
-                                    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
-                                    $orig{$cmp->{nvra}}++;
+				if ( $repos->{$dest}->{prio} >= $repos->{$track{repo}}->{prio} && ! verrel($cmp, $dest, \%counts) ) {
+				    unless ( $repos->{$cmp->{repo}}->{base} ) {
+                                        my $tag = dirname(dirname($cmp->{rpm}->{filename}));
+					qx(touch $tag/PUSHED) if ! $opts{t} && -d $tag && ! -f "$tag/PUSHED";
+				    }
+				    push @{$cmp->{repos}}, $dest;
+				    $cmp->{oldrepo} = $cmp->{repo} unless $cmp->{oldrepo};
+				    $cmp->{repo} = $dest;
+				    $reposrc{$cmp->{repo}}->{srpm} = $cmp if $cmp->{src};
+				    $orig{$cmp->{nvra}}++;
 				}
 			    }
 			} else {
@@ -282,11 +348,11 @@ foreach my $ver ( sort { $a <=> $b } key
 		    $pkgs{$cmp->{nvra}}++;
 		    $latest{$cmp->{base}} = $cmp->{svr} if $repos->{$cmp->{repo}}->{inc} && ! $latest{$cmp->{base}};
 		    $reposrc{$cmp->{repo}} = $cmp unless $reposrc{$cmp->{repo}} || $cmp->{src} || $repos->{$cmp->{repo}}->{stage};
-		    unless ( $seen{$cmp->{nvra}} ) {
-			$seen{$cmp->{nvra}} = $cmp;
-			$cmp->{latest}++ if $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc};
+		    if ( $latest{$cmp->{base}} && $cmp->{svr} eq $latest{$cmp->{base}} && $repos->{$cmp->{repo}}->{inc} ) {
+			$cmp->{latest}++ if ! $seen{$cmp->{nvra}} || $cmp->{src};
 		    }
-		    push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp;
+		    $seen{$cmp->{nvra}} = $cmp unless $seen{$cmp->{nvra}};
+		    push @{$acnt->{$cmp->{repo}}->{$cmp->{rpm}->as_nvre}->{$cmp->{src} ? 'src' : $cmp->{rpm}->arch}}, $cmp unless $cmp->{done};
 		}
 		$cmp->{done}++;
 	    }
@@ -315,7 +381,7 @@ foreach my $ver ( sort { $a <=> $b } key
 			    push @{$p2->{repos}}, $p2->{repo};
 			}
 		    } elsif ( scalar @{$acnt->{$r}->{$p}->{$a}} != 1 ) {
-			print "\n * many packages ($r, $a, $p)\n";
+			print "\n * many packages ($r, $a, $p)\n" unless $p =~ m{^syslinux-nonlinux-[0-9]};
 		    }
 		}
 	    }
@@ -323,27 +389,30 @@ foreach my $ver ( sort { $a <=> $b } key
 
 	foreach my $pkg ( sort { $a->{nvra} cmp $b->{nvra} } @{$rpms->{$base}->{rpms}} ) {
 	    if ( $pkg->{latest} && $pkg->{latest} == 1 ) {
-		$pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo};
-		$pkg->{repo} = $stage;
-		push @{$pkg->{repos}}, $stage;
-	    }
-	    if ( ! $print && ($pkg->{delete} || $pkg->{repos} || $pkg->{nosig} ) ) {
-		print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
-		$print++;
-	    }
-
-	    my $src = $pkg->{rpm}->filename;
-	    if ( $pkg->{nosig} ) {
-		print "sign package (", basename($pkg->{rpm}->filename), ")\n";
-		unless ( $opts{t} ) {
-		    qx(cat $HOME/.rpmpass | setsid rpm --addsign $src >& /dev/null);
-		    if ($?) {
-			print " * failed to sign package\n";
-			next;
-		    }
+		unless ( grep { $_->{nvra} eq $pkg->{nvra} && $_->{repo} eq $stage } @{$rpms->{$base}->{rpms}} ) {
+		    $pkg->{oldrepo} = $pkg->{repo} unless $pkg->{oldrepo};
+		    $pkg->{repo} = $stage;
+		    push @{$pkg->{repos}}, $stage;
 		}
 	    }
 
+            if ( ! $print && ($pkg->{delete} || $pkg->{repos} || ( ! $repos->{$pkg->{repo}}->{base} && $pkg->{nosig} && $distrepo->{$ver}->{sign} ) ) ) {
+                print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
+                $print++;
+            }
+
+            my $src = $pkg->{rpm}->filename;
+            if ( ! $repos->{$pkg->{repo}}->{base} && $pkg->{nosig} && $distrepo->{$ver}->{sign} ) {
+                print "sign package (", basename($pkg->{rpm}->filename), ")\n";
+                unless ( $opts{t} ) {
+                    qx(cat $HOME/.rpmpass | setsid rpm -D '_gpg_name  $distrepo->{$ver}->{keyname}' --addsign $src >& /dev/null);
+                    if ($?) {
+                        print " * failed to sign package\n";
+                        next;
+                    }
+                }
+            }
+
 	    if ( $pkg->{repos} ) {
 		foreach my $repo ( @{$pkg->{repos}} ) {
 		    if ( $pkg->{delete} ) { 
@@ -361,7 +430,7 @@ foreach my $ver ( sort { $a <=> $b } key
 		    my @d = ();
 		    my $head = $distrepo->{$ver}->{repo} . $repo . '/';
 		    $head = $distrepo->{$ver}->{stage} if $repos->{$repo}->{stage};
-		    my $tail = $repos->{$repo}->{os} ? "$osdir/" . $distrepo->{$ver}->{os} : 'RPMS/';
+		    my $tail = $repos->{$repo}->{os} ? "$osdir/" : 'RPMS/';
 		    if ( $pkg->{src} ) {
 			push @d, "${head}SRPMS/" . basename($pkg->{rpm}->filename);
 		    } elsif ( $pkg->{rpm}->arch eq 'noarch' ) {
@@ -382,11 +451,26 @@ foreach my $ver ( sort { $a <=> $b } key
 		qx(rm -f $src) unless $opts{t};
 		$repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage};
 		if ( $repos->{$pkg->{repo}}->{orig} && ! $repos->{$pkg->{repo}}->{base} ) {
-		    my $tag = sprintf '%s%s/%s-%s', $distrepo->{$ver}->{$pkg->{repo}}, $pkg->{name}, $pkg->{ver}, $pkg->{rel};
+                    my $tag = dirname(dirname($pkg->{rpm}->{filename}));
 		    qx(rm -f $tag/PUSHED) if ! $opts{t} && -d $tag && -f "$tag/PUSHED";
 		}
 	    }
 	}
+
+	if ( $rpms->{$base}->{srpms} ) {
+	    foreach my $pkg ( sort { $b->{rpm} cmp $a->{rpm} } @{$rpms->{$base}->{srpms}} ) {
+		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} && $distrepo->{$ver}->{sign} ) ) ) {
+		    print "\n$base ($disttag$ver)\n", "=" x length("$base ($disttag$ver)"), "\n";
+		    $print++;
+		}
+		print "delete from ", $pkg->{repo}, " (", $pkg->{arch}, ", ", basename($pkg->{rpm}->filename), ")\n";
+		qx(rm -f $src) unless $opts{t};
+		$repochg{$pkg->{repo}}++ unless $repos->{$pkg->{repo}}->{base} || $repos->{$pkg->{repo}}->{stage};
+	    }
+	}
     }
 
     if ( %repochg ) {
@@ -397,22 +481,38 @@ foreach my $ver ( sort { $a <=> $b } key
 	foreach my $arch ( @archs ) {
 	    my $dir = $distrepo->{$ver}->{repo} . "$repo/$arch";
 	    $dir = qx(readlink -f $dir);
-	    chomp $dir;
+	    if ( $dir ) {
+		chomp $dir;
+	    } else {
+		$dir = $distrepo->{$ver}->{repo} . "$repo/$arch";
+	    }
 	    print "rebuild $repo/$arch\n";
 	    unless ( $opts{t} ) {
-		if ( -f "$dir/repodata/comps.xml" ) {
-		    qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm --groupfile repodata/comps.xml $dir);
-		} else {
-		    qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $dir);
-		}
+                my $checksum = "--checksum $distrepo->{$ver}->{checksum}";
+
+                my $exclude = "";
+                $exclude .= " --exclude ${osdir}/*" if -d "$dir/Packages";
+                $exclude .= " --exclude *smeserver-release*.rpm" if $dir =~ m{test/|-testing/};
+
+                my $groupfile = "";
+                $groupfile = "--simple-md-filenames --groupfile repodata/comps.xml" if -f "$dir/repodata/comps.xml";
+
+                qx(createrepo --update --database --exclude *.src.rpm --exclude *-debuginfo-*.rpm $checksum $exclude $groupfile $dir);
 		qx(repoview $dir);
+
 		qx(rm -rf $dir/.olddata) if -d "$dir/.olddata";
 		qx(rm -rf $dir/.repodata) if -d "$dir/.repodata";
+		qx(rm -rf $dir/repodata/index.html) if -f "$dir/repodata/index.html";
+		qx(rm -rf $dir/repodata/update-info) if -d "$dir/repodata/update-info";
+		qx(rm -rf $dir/repodata/repoview) if -d "$dir/repodata/repoview";
 	    }
 	}
     }
     unless ( $opts{t} ) {
-	finddepth(sub{rmdir}, $distrepo->{$ver}->{builds}) if -d "$distrepo->{$ver}->{builds}";
+        foreach (@{$distrepo->{$ver}->{builds}})
+        {
+            finddepth(sub{rmdir}, "$_") if -d "$_";
+        }
 	finddepth(sub{rmdir}, $distrepo->{$ver}->{community}) if -d "$distrepo->{$ver}->{community}";
     }
 }
@@ -461,8 +561,13 @@ sub process_rpm {
     eval { $pkg = RPM2->open_package($rpm, $rpm_flags); };
     if ($@) { print " * corrupt package ($rpm)\n"; return; }
     eval { my $sig = $pkg->siggpg };
-    my $nosig = ! $@;
-    
+
+    my $nosig = 1;
+    eval { my $sig = $pkg->dsaheader };   $nosig &= ! $@;
+    eval { my $sig = $pkg->rsaheader };   $nosig &= ! $@;
+    eval { my $sig = $pkg->siggpg };      $nosig &= ! $@;
+    eval { my $sig = $pkg->sigpgp };      $nosig &= ! $@;
+
     my $cmp = $latest{$pkg->name};
     if ( $repos->{$repo}->{base} && ! $pkg->is_source_package ) {
 	return unless $cmp;
@@ -470,7 +575,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)/};