--- builds_bin/update_repos	2019/02/08 06:26:29	1.90
+++ builds_bin/update_repos	2024/04/28 18:53:35	1.94
@@ -24,7 +24,7 @@ $opts{r} ||= '';
 
 my $rpm_flags = RPM2->vsf_nodsaheader | RPM2->vsf_norsaheader | RPM2->vsf_nodsa | RPM2->vsf_norsa;
 
-my $osdir = 'SME';
+my $osdir = 'Packages';
 my $disttag = 'sme';
 my $repotag = 'sme';
 
@@ -39,7 +39,7 @@ my $distrepo = { '8' => { active    => 0
                           keyname   => 'SME Server 7 signing key <bugteam@contribs.org>',
                           checksum  => 'sha',
                         },
-                 '9' => { active    => 1,
+                 '9' => { active    => 0,
                           centos    => 6,
                           archs     => [ 'i386', 'x86_64' ],
                           repo      => '/build/smeserver/repo/9/',
@@ -53,7 +53,7 @@ my $distrepo = { '8' => { active    => 0
                  '10' => { active   => 1,
                           centos    => 7,
                           archs     => [ 'x86_64' ],
-                          repo      => '/build/smeserver/repo/testing/10/',
+                          repo      => '/build/smeserver/repo/10/',
                           builds    => ['/build/builds/smeserver-10-core/'],
                           community => '/build/builds/smeserver-10-contribs/',
                           stage     => '/build/smeserver/stage/10/',
@@ -84,6 +84,7 @@ my $repos = { "${repotag}os"
               'epel'                      => { prio => 10, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'epeltesting'               => { prio =>  9, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
 	      'rpmfusion'		  => { prio =>  8, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
+	      'openfusion'		  => { prio =>  7, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'rpmforge'                  => { prio =>  6, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'atrpms'                    => { prio =>  5, inc => 0, ver => 0, rel => 0, orig => 1, base => 1 },
               'builds'                    => { prio =>  4, inc => 0, ver => 0, rel => 0, orig => 1 },
@@ -94,6 +95,8 @@ my $repos = { "${repotag}os"
 # 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. 
+# ~s will be expanded to SME version
+# ~S expanded to repo root
 my $baserepo = { "~S${repotag}os/~A/" => "${repotag}os",
                  "~S${repotag}updates/~A/" => "${repotag}updates",
                  "~S${repotag}updates-testing/~A/" => "${repotag}updates-testing",
@@ -124,6 +127,8 @@ my $baserepo = { "~S${repotag}os/~A/" =>
                  '/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',
+		 '/mirrors/openfusion/centos~C-~A/' => 'openfusion',
+ 		 '/mirrors/openfusion/srpms/' => 'openfusion',
                };
 
 # add here packages to exclude
@@ -140,26 +145,29 @@ my $skippkg = { '8'  => { 'atrpms'
                           'rpmforge'      => { map { $_ => 1 } ( 'perl-CGI', 'perl-Compress-Raw-Zlib', 'perl-ExtUtils-ParseXS', 'perl-Pod-Escapes', 'perl-Pod-Simple', 'perl-Time-HiRes', 'perl-version', 'spamassassin', 'portreserve', 'perl-libwww-perl' , 'lzo', 'perl-BSD-Resource', 'perl-Convert-ASN1', 'perl-DBD-SQLite', 'perl-Devel-StackTrace', 'perl-Digest-SHA1', 'perl-JSON', 'perl-MIME-tools', 'perl-MailTools', 'perl-PPI', 'perl-URI', 'perl-XML-NamespaceSupport', 'perl-XML-Parser', 'perl-XML-SAX-Writer', 'perl-YAML-Syck', 'proftpd', 'syslinux') },
                         },
                 '10' => {
-			  'centos'        => { map { $_ => 1 } ( 'samba' ) },
-			  'epel'	  => { map { $_ => 1 } ( 'clamav') }, 
+			  #'epel'	  => { map { $_ => 1 } ( 'clamav') }, 
                           'epeltesting'   => { map { $_ => 1 } ( 'clamav', 'tidy') }, 
+			  'openfusion'    => { map { $_ => 1 } ( 'daemontools-encore' , 'daemontool', 'perl-Apache-AuthTkt', 'perl-Data-Validate-Domain', 'perl-HTML-Tabulate', 'perl-IP-Country', 'perl-Object-Accessor','perl-Archive-Tar', 'perl-Authen-SASL', 'perl-Business-ISBN', 'perl-Business-ISBN-Data', 'perl-Config-Tiny', 'perl-Convert-ASN1', 'perl-DBD-MySQL', 'perl-DB_File', 'perl-Data-Dumper', 'perl-Date-Manip', 'perl-Email-Address', 'perl-Encode', 'perl-ExtUtils-MakeMaker', 'perl-ExtUtils-Manifest', 'perl-ExtUtils-ParseXS', 'perl-File-ShareDir', 'perl-Getopt-Long', 'perl-HTML-Parser', 'perl-HTTP-Message', 'perl-IO-HTML', 'perl-IO-Socket-INET6', 'perl-MailTools', 'perl-Mozilla-CA', 'perl-Net-SSLeay', 'perl-NetAddr-IP', 'perl-PathTools', 'perl-Readonly', 'perl-Storable', 'perl-Test-Simple', 'perl-Text-Unidecode', 'perl-XML-Parser', 'perl-libwww-perl', 'perl-parent' ) },
                         },
               };
 
 # add here include only conditions
 # for each version if a repo is listed here, only listed rpm will be considered
 my $onlypkg = { '8' => {
+                          'openfusion' => { },
 			  'remi' => { },
                           'remisafe' => { },
 			},
 		'9'  => {
+			  'openfusion' => { map { $_ => 1 } ( 'perl-Carp', 'perl-Scalar-List-Utils', 'perl-Class-Method-Modifiers', 'perl-B-Hooks-OP-Check', 'perl-Sub-Exporter-Progressive', 'perl-Devel-GlobalDestruction', 'perl-Socket', 'perl-Data-Validate-IP', 'perl-Eval-Closure', 'perl-Params-Classify', 'perl-Module-Runtime', 'perl-Module-Implementation', 'perl-Class-Load-XS', 'perl-MooX-Types-MooseLike', 'perl-Hash-FieldHash', 'perl-Algorithm-C3', 'perl-Class-C3', 'perl-MRO-Compat', 'perl-Class-XSAccessor', 'perl-ExtUtils-Manifest', 'perl-IPC-Cmd', 'perl-Module-Build', 'perl-ExtUtils-CBuilder', 'perl-Perl-OSType', 'perl-ExtUtils-Install', 'perl-Params-Validate', 'perl-Sub-Name', 'perl-Sub-Quote', 'perl-Sub-Identify', 'perl-Role-Tiny', 'perl-File-HomeDir', 'perl-Data-Dumper-Concise', 'perl-multidimensional', 'perl-Test-Warnings', 'perl-Term-ANSIColor', 'perl-Task-Weaken', 'perl-Clone-PP', 'perl-Data-IEEE754', 'perl-DateTime-TimeZone', 'perl-Exporter-Tiny', 'perl-List-AllUtils', 'perl-Dist-CheckConflicts', 'perl-Moose', 'perl-DateTime-Locale', 'perl-DateTime', 'perl-Variable-Magic', 'perl-B-Hooks-EndOfScope', 'perl-namespace-clean', 'perl-namespace-autoclean', 'perl-Lexical-SealRequireHints', 'perl-bareword-filehandles', 'perl-indirect', 'perl-strictures', 'perl-Moo', 'perl-MooX-StrictConstructor', 'perl-Throwable', 'perl-Math-Int64', 'perl-Math-Int128', 'perl-MaxMind-DB-Common', 'perl-Net-Works', 'perl-Sort-Naturally', 'perl-Data-Printer', 'perl-MaxMind-DB-Reader', 'perl-GeoIP2', 'perl-Data-OptList','perl-Class-Load', 'perl-App-cpanminus' )}, # not for moment : perl-Devel-StackTrace perl-parent perl-ExtUtils-MakeMaker perl-List-MoreUtils
 			  'remi' => { },
 			},
                 '10' => {
-			  'remi' => { map { $_ => 1 } ( 'php-pear' )},
+			  '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;
@@ -179,7 +187,7 @@ 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;
+        my $bdir = $dir; 
         $bdir =~ s/~S/$distrepo->{$ver}->{repo}/;
         $bdir =~ s/~s/$ver/;
         $bdir =~ s/~C/$distrepo->{$ver}->{centos}/;
@@ -564,7 +572,7 @@ foreach my $ver ( sort { $a <=> $b } key
                 my $checksum = "--checksum $distrepo->{$ver}->{checksum}";
 
                 my $exclude = "";
-                $exclude .= " --exclude ${osdir}/*" if -d "$dir/Packages";
+                $exclude .= " --exclude ${osdir}/*" if ( -d "$dir/Packages" &&  ${osdir} ne "Packages" );
                 $exclude .= " --exclude *smeserver-release*.rpm" if $dir =~ m{test/|-testing/};
 
                 my $groupfile = "";