--- builds_bin/update_repos	2016/12/01 17:36:44	1.87
+++ builds_bin/update_repos	2017/02/14 21:38:34	1.88
@@ -16,6 +16,11 @@ $| = 1;
 my %opts;
 getopts( 'ostr:', \%opts );
 $opts{r} ||= '';
+#available options
+#-o = verify we have originals of the packages in repos (not really used anymore)
+#-s = verify every package has a source package (so we can rebuild if necessary)
+#-t = test run (don't do anything just print out what would be done)
+#-r {regex} = regex of packages to run the script against
 
 my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
@@ -58,6 +63,13 @@ my $distrepo = { '8' => { active    => 1
                         },
                };
 
+# list here repo and priority
+# prio: highest priority will hide lowest priority
+# inc: include for iso ?
+# ver:
+# rel:
+# orig:
+# base, os, stage:
 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 },
@@ -67,7 +79,9 @@ my $repos = { "${repotag}os"
               "${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 },
+              'remi'                      => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+              'remisafe'                  => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+              'epel'                      => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'rpmforge'                  => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'atrpms'                    => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'builds'                    => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1 },
@@ -75,6 +89,9 @@ my $repos = { "${repotag}os"
               'stage'                     => { prio =>  1, inc => 0, ver => 0, rel => 0, stage => 1, os => 1 },
             };
 
+# list here the path on our local mirror to each upstream and our mirrors
+# ~A will be expanded to architecture
+# ~C will be expanded to Centos main version number, i.e. 7 for SME 10. 
 my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os",
                  "~S${repotag}updates/~A/" => "${repotag}updates",
                  "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing",
@@ -94,6 +111,10 @@ my $baserepo = { "~S${repotag}os/~A/" =>
                  '/mirrors/centos-vault/~C/extras/~A/' => 'centos',
                  '/mirrors/fedora/epel/~C/~A/' => 'epel',
                  '/mirrors/fedora/epel/testing/~C/~A/' => 'epel',
+                 '/mirrors/remi/enterprise/~C/remi/~A/' => 'remi',
+                 '/mirrors/remi/SRPMS/' => 'remi',
+                 '/mirrors/remi/enterprise/~C/safe/~A/' => 'remisafe',
+                 '/mirrors/remi/SRPMS/' => 'remisafe',
                  '/mirrors/rpmforge/redhat/el~C/en/~A/dag/' => 'rpmforge',
                  '/mirrors/rpmforge/redhat/el~C/en/~A/extras/' => 'rpmforge',
                  '/mirrors/rpmforge/source/' => 'rpmforge',
@@ -103,6 +124,8 @@ my $baserepo = { "~S${repotag}os/~A/" =>
                  '/mirrors/atrpms/src/el~C-~A/atrpms/testing/' => 'atrpms',
                };
 
+# add here packages to exclude
+# for each version, if a repo is listed and rpm are listed they will be ignored fromt his repo
 my $skippkg = { '8'  => { 'atrpms'        => { map { $_ => 1 } ( 'clamav', 'gnupg' ) },
                           'centos'        => { map { $_ => 1 } ( 'horde', 'imp-h3', 'ingo-h3', 'turba-h3' ) },
                           'epel'          => { map { $_ => 1 } ( 'clamav', 'cppunit', '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' ) },
@@ -116,6 +139,20 @@ my $skippkg = { '8'  => { 'atrpms'
                         },
               };
 
+# add here include only conditions
+# for each version if a repo is listed here, only listed rpm will be considered
+my $onlypkg = { '8' => {
+                          'remi' => { },
+                          'remisafe' => { },
+			},
+		'9'  => {
+			  'remi' => { },
+			},
+                '10' => {
+			  'remi' => { map { $_ => 1 } ( 'php-pear' )},
+                        },
+};
+
 my ($stage) = sort { $repos->{$a}->{stage} <=> $repos->{$b}->{stage} } grep { $repos->{$_}->{stage} } keys %$repos;
 my ($devel1, $devel2) = sort { $repos->{$a}->{devel} <=> $repos->{$b}->{devel} } grep { $repos->{$_}->{devel} } keys %$repos;
 $devel2 ||= $devel1;
@@ -604,6 +641,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 $onlypkg->{$ver}->{$repo} && !( $onlypkg->{$ver}->{$repo}->{$src} || $onlypkg->{$ver}->{$repo}->{$pkg->name} );
     return if $repos->{$repo}->{base} && $nosig && $baserepo->{$ver}->{sign};
     if ( $nosig && ! -f "$HOME/.rpmpass" ) { print " * missing signature (" .$pkg->filename . ")\n"; return; }
     my $arch = 'unknown';