Compare commits

..

No commits in common. "master" and "0.1-47.el8.sme" have entirely different histories.

2 changed files with 139 additions and 49 deletions

View File

@ -6,14 +6,7 @@ SMEServer Koozali developed git repo for smeserver-extrarepositories smecontribs
<br />https://wiki.koozali.org/Extrarepositories
## Bugzilla
Show list of outstanding bugs:
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Need Info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[In Progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&classification=Contribs&component=smeserver-extrarepositories&list_id=105781&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&product=SME+Contribs&query_format=advanced)
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-extrarepositories&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
## Description

View File

@ -1,10 +1,10 @@
%define name smeserver-extrarepositories
%define version 0.1
%define release 50
%define release 47
Summary: easy configuration of extra yum repo
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
Release: %{release}
License: GNU GPL version 2
URL: https://wiki.koozali.org
Group: SMEserver/addon
@ -20,15 +20,6 @@ Source1: https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHE
Provides configuration for external yum repository comaptible with Koozali SME Server.
%changelog
* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.1-50.sme
- add mariadb LTS repos 10.5 10.6 10.11 11.4 11.7 [SME: 12936]
* Fri Feb 14 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.1-49.sme
- remove epel as in core now [SME: 12920]
* Fri Feb 07 2025 Jean-Philippe Pialasse <jpp@koozali.org> 0.1-48.sme
- remove openfusion [SME: 12883]
* Sun Sep 08 2024 fix-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 0.1-47.sme
- Fix e-smith references in smeserver-extrarepositories [SME: 12732]
@ -513,6 +504,26 @@ REPO['IncludePkgs']=''
REPO['Priority']=''
createrepo
#####################
#####################
#EPEL
#####################
#####################
REPO['reponame']='epel'
REPO['pkgname']=${REPO['reponame']}
REPO['fullreponame']='EPEL'
REPO['EnableGroups']='no'
REPO['Visible']='no'
REPO['status']='disabled'
REPO['BaseURL']='http://download.fedoraproject.org/pub/epel/$releasever/$basearch'
REPO['MirrorList']='http://mirrors.fedoraproject.org/mirrorlist?repo=epel-$releasever&arch=$basearch'
REPO['GPGCheck']='yes'
REPO['GPGKey']='http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL'
REPO['Exclude']='perl-Razor-Agent,pwauth'
REPO['IncludePkgs']=''
REPO['Priority']=''
createrepo
#####################
#####################
#erlang
@ -715,28 +726,6 @@ REPO['IncludePkgs']=''
REPO['Priority']='10'
createrepo
#####################
#####################
# Mariadb
#####################
#####################
for nodever in "10.5" "10.6" "10.11" "11.4" "11.7"; do
REPO['reponame']="mariadb$nodever"
REPO['pkgname']='mariadb'
REPO['fullreponame']="Mariadb $nodever LTS"
REPO['EnableGroups']='no'
REPO['Visible']='yes'
REPO['status']='disabled'
REPO['BaseURL']="https://rpm.mariadb.org/$nodever/rhel/\$releasever/\$basearch"
REPO['MirrorList']=''
REPO['GPGCheck']='yes'
REPO['GPGKey']="https://rpm.mariadb.org/RPM-GPG-KEY-MariaDB"
REPO['Exclude']=''
REPO['IncludePkgs']=''
REPO['Priority']=''
createrepo
done
#####################
#####################
@ -905,6 +894,26 @@ REPO['IncludePkgs']=''
REPO['Priority']=''
createrepo
#####################
#####################
# Openfusion
#####################
#####################
REPO['reponame']='openfusion'
REPO['pkgname']=${REPO['reponame']}
REPO['fullreponame']='Openfusion'
REPO['EnableGroups']='no'
REPO['Visible']='yes'
REPO['status']='disabled'
REPO['BaseURL']='http://repo.openfusion.net/centos$releasever-$basearch'
REPO['MirrorList']=''
REPO['GPGCheck']='yes'
REPO['GPGKey']='http://repo.openfusion.net/RPM-GPG-KEY-openfusion'
REPO['Exclude']='perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-ExtUtils-Install,perl-parent'
REPO['IncludePkgs']='perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny,perl-JSON'
REPO['Priority']=''
createrepo
#####################
#####################
# Postgresql
@ -1487,6 +1496,36 @@ cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/90sogo
EOF
cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10epel
{
my @add = split(/[,; ]+/, 'pwauth');
my %remove = map { $_ => 1 } split(/[,; ]+/, 'gnustep-*,gnustep*,gnustep-base,gnustep-make');
for my $name ( qw(epel) )
{
my $repo = $DB->get($name) or next;
my @exclude = split(/,/, $repo->prop('Exclude') || '');
push @exclude, @add;
@exclude = grep(!defined $remove{$_} && !/^CENTOS_/, @exclude);
# remove duplicates
undef %saw;
@exclude = grep(!$saw{$_}++, @exclude);
if ($#exclude >= 0)
{
$repo->set_prop('Exclude', join(',', @exclude));
}
else
{
$repo->delete('Exclude');
}
}
}
EOF
cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10zmrepo
{
for my $name ( qw(zmrepo) )
@ -1503,6 +1542,56 @@ cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10zmrepo
EOF
cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10openfusion
{
my @addexclude = split(/,/,"perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-ExtUtils-Install,perl-parent");
my %removeexclude = map { $_ => 1 } split(/[,; ]+/, 'perl-version');
my @addinclude = split(/,/,"perl-Algorithm-C3,perl-App-cpanminus,perl-B-Hooks-EndOfScope,perl-B-Hooks-OP-Check,perl-CPAN-Metanoarch,perl-Carp,perl-Class-C3,perl-Class-Load,perl-Class-Load-XS,perl-Class-Method-Modifiers,perl-Class-Singleton,perl-Class-XSAccessor,perl-Clone-PP,perl-Data-Dumper-Concise,perl-Data-IEEE754,perl-Data-OptList,perl-Data-Printer,perl-Data-Validate-IP,perl-DateTime,perl-DateTime-Locale,perl-DateTime-TimeZone,perl-Devel-GlobalDestruction,perl-Dist-CheckConflicts,perl-Eval-Closure,perl-Exporter-Tiny,perl-ExtUtils-CBuilder,perl-ExtUtils-Install,perl-ExtUtils-Manifest,perl-File-HomeDir,perl-File-Which,perl-GeoIP2,perl-Hash-FieldHash,perl-IPC-Cmd,perl-Lexical-SealRequireHints,perl-List-AllUtils,perl-Locale-Maketext-Simple,perl-MRO-Compat,perl-Math-Int128,perl-Math-Int64,perl-MaxMind-DB-Common,perl-MaxMind-DB-Reader,perl-Module-Build,perl-Module-CoreList,perl-Module-Implementation,perl-Module-Load,perl-Module-Load-Conditional,perl-Module-Runtime,perl-Moo,perl-MooX-StrictConstructor,perl-MooX-Types-MooseLike,perl-Moose,perl-Net-Works,perl-Package-DeprecationManager,perl-Package-Stash,perl-Package-Stash-XS,perl-Params-Check,perl-Params-Classify,perl-Params-Validate,perl-Perl-OSType,perl-Role-Tiny,perl-Scalar-List-Utils,perl-Socket,perl-Sort-Naturally,perl-Sub-Exporter,perl-Sub-Exporter-Progressive,perl-Sub-Identify,perl-Sub-Install,perl-Sub-Name,perl-Sub-Quote,perl-Task-Weaken,perl-Term-ANSIColor,perl-Test-Warnings,perl-Throwable,perl-Try-Tiny,perl-Variable-Magic,perl-bareword-filehandles,perl-indirect,perl-multidimensional,perl-namespace-autoclean,perl-namespace-clean,perl-strictures,perl-Devel-StackTrace,perl-ExtUtils-MakeMaker,perl-List-MoreUtils,perl-parent,perl-Array-Compare,perl-Type-Tiny,perl-Filesys-DiskFree,perl-Array-Compare,perl-Type-Tiny");
my %removeinclude = map { $_ => 1 } split(/[,; ]+/, '');
for my $name ( qw(openfusion) )
{
my $repo = $DB->get($name) or next;
my @exclude = split(/,/, $repo->prop('Exclude') || '');
push @exclude, @addexclude;
@exclude = grep(!defined $removeexclude{$_} , @exclude);
# remove duplicates
undef %saw;
@exclude = grep(!$saw{$_}++, @exclude);
if ($#exclude >= 0)
{
$repo->set_prop('Exclude', join(',', @exclude));
}
else
{
$repo->delete('Exclude');
}
my @include = split(/,/, $repo->prop('IncludePkgs') || '');
push @include, @addinclude;
@include = grep(!defined $removeinclude{$_} , @include);
# remove duplicates
undef %saw;
@include = grep(!$saw{$_}++, @include);
if ($#include >= 0)
{
$repo->set_prop('IncludePkgs', join(',', @include));
}
else
{
$repo->delete('IncludePkgs');
}
}
}
EOF
cat << 'EOF' >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/30mongodbDeleteOldRepos
{
for my $dbVer (qw( 0.9 1.0 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7)) {
@ -1562,13 +1651,13 @@ cat %{name}-%{version}-filelist| grep docker-ce > %{name}-%{version}-filelist-
cat %{name}-%{version}-filelist| grep egroupware > %{name}-%{version}-filelist-egroupware
cat %{name}-%{version}-filelist| grep elastic > %{name}-%{version}-filelist-elastic
cat %{name}-%{version}-filelist| grep elrepo > %{name}-%{version}-filelist-elrepo
cat %{name}-%{version}-filelist| grep epel > %{name}-%{version}-filelist-epel
cat %{name}-%{version}-filelist| grep erlang > %{name}-%{version}-filelist-erlang
cat %{name}-%{version}-filelist| grep freeswitch > %{name}-%{version}-filelist-freeswitch
cat %{name}-%{version}-filelist| grep fws > %{name}-%{version}-filelist-fws
cat %{name}-%{version}-filelist| grep fusioninventory-agent > %{name}-%{version}-filelist-fusioninventory-agent
cat %{name}-%{version}-filelist| grep lemonldap > %{name}-%{version}-filelist-lemonldap
cat %{name}-%{version}-filelist| grep libreswan > %{name}-%{version}-filelist-libreswan
cat %{name}-%{version}-filelist| grep mariadb > %{name}-%{version}-filelist-mariadb
cat %{name}-%{version}-filelist| grep mongodb > %{name}-%{version}-filelist-mongodb
cat %{name}-%{version}-filelist| grep nginx > %{name}-%{version}-filelist-nginx
cat %{name}-%{version}-filelist| grep node > %{name}-%{version}-filelist-node
@ -1577,6 +1666,7 @@ cat %{name}-%{version}-filelist| grep odoo > %{name}-%{version}-filelist-odoo
fi
cat %{name}-%{version}-filelist| grep okay > %{name}-%{version}-filelist-okay
cat %{name}-%{version}-filelist| grep -i onlyoffice > %{name}-%{version}-filelist-onlyoffice
cat %{name}-%{version}-filelist| grep openfusion > %{name}-%{version}-filelist-openfusion
cat %{name}-%{version}-filelist| grep reetp > %{name}-%{version}-filelist-reetp
cat %{name}-%{version}-filelist| grep remi-ocsinventory > %{name}-%{version}-filelist-remi-ocsinventory
cat %{name}-%{version}-filelist| grep remi-roundcube > %{name}-%{version}-filelist-remi-roundcube
@ -1682,6 +1772,13 @@ ElRepo.org Community Enterprise Linux Repository
%files elrepo -f %{name}-%{version}-filelist-elrepo
%defattr(-,root,root)
%package epel
Summary: Fedora EPEL Repository
%description epel
Fedora EPEL Repository
%files epel -f %{name}-%{version}-filelist-epel
%defattr(-,root,root)
%package erlang
Summary: Erlang Repository
%description erlang
@ -1724,13 +1821,6 @@ Libreswan Repository
%files libreswan -f %{name}-%{version}-filelist-libreswan
%defattr(-,root,root)
%package mariadb
Summary: Mariadb Repositories
%description mariadb
MariaDB Repositories
%files mariadb -f %{name}-%{version}-filelist-mariadb
%defattr(-,root,root)
%package mongodb
Summary: MongoDB Repositories
%description mongodb
@ -1775,6 +1865,13 @@ onlyoffice Repository
%files onlyoffice -f %{name}-%{version}-filelist-onlyoffice
%defattr(-,root,root)
%package openfusion
Summary: Openfusion Repository
%description openfusion
Openfusion Repository
%files openfusion -f %{name}-%{version}-filelist-openfusion
%defattr(-,root,root)
%package pgsql
Summary: PostGreSQL Repositories
%description pgsql