--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/06/30 17:15:21	1.12
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2021/11/30 04:57:14	1.15
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 32
+%define release 35
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -18,6 +18,18 @@ AutoReqProv: no
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Mon Nov 29 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-35.sme
+- fix node repos
+
+* Tue Nov 09 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-34.sme
+- add asterisk [SME: 11512]
+- add lemonldap [SME: 11740]
+- add bareos [SME: 11741]
+- add zabbix repo up to 55 and add scl sub repos [SME: 11744]
+
+* Tue Jul 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-33.sme
+- add migrate fragment for pwauth in epel [SME: 11639]
+
 * Wed Jun 30 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1-32.sme
 - Requires e-smith >= 10
 - exclude pwauh from EPEL [SME: 11639]
@@ -167,6 +179,42 @@ return 0
 }
 
 
+#####################
+#####################
+# asterisk
+#####################
+#####################
+for elasver  in "13" "16"  '17' '18' ; do
+REPO['reponame']="asterisk-$elasver"
+REPO['pkgname']='asterisk'
+REPO['fullreponame']="Asterisk $elasver (LTS) Packages @ tucny.com"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']=""#https://ast.tucny.com/repo/asterisk-$elasver/el\$releasever/\$basearch/
+REPO['MirrorList']="https://ast.tucny.com/mirrorlist.php?release=\$releasever&arch=\$basearch&repo=asterisk-$elasver"
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny"
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+done
+
+REPO['reponame']='asterisk-common'
+REPO['pkgname']='asterisk'
+REPO['fullreponame']='Asterisk Common Requirement Packages @ tucny.com'
+REPO['EnableGroups']='no'
+REPO['Visible']='no'
+REPO['status']='disabled'
+REPO['BaseURL']=''#https://ast.tucny.com/repo/asterisk-common/el$releasever/$basearch/
+REPO['MirrorList']='https://ast.tucny.com/mirrorlist.php?release=$releasever&arch=$basearch&repo=asterisk-common'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://ast.tucny.com/repo/RPM-GPG-KEY-dtucny'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+
 
 #####################
 #####################
@@ -189,6 +237,55 @@ createrepo
 
 #####################
 #####################
+# BareOS
+#####################
+#####################
+REPO['reponame']='bareos20'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+REPO['reponame']='bareos20-source'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced - Sources'
+REPO['EnableGroups']='no'
+REPO['Visible']='no'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/src'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+REPO['reponame']='bareos20-debuginfo'
+REPO['pkgname']='bareos'
+REPO['fullreponame']='Backup Archiving Recovery Open Sourced - Debuginfo'
+REPO['EnableGroups']='no'
+REPO['Visible']='no'
+REPO['status']='disabled'
+REPO['BaseURL']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/debug'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://download.bareos.org/bareos/release/20/CentOS_$releasever/repodata/repomd.xml.key'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+
+
+#####################
+#####################
 #centos-sclo-centos
 #####################
 #####################
@@ -401,6 +498,41 @@ createrepo
 
 #####################
 #####################
+# LemonLDAP-NG
+#####################
+#####################
+REPO['reponame']='lemonldap-ng'
+REPO['pkgname']='lemonldap'
+REPO['fullreponame']='LemonLDAP::NG packages'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/stable/$releasever/noarch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+REPO['reponame']='lemonldap-ng-extras'
+REPO['pkgname']='lemonldap'
+REPO['fullreponame']='LemonLDAP::NG extra packages'
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']='https://lemonldap-ng.org/redhat/extras/$releasever/noarch'
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://lemonldap-ng.org/_media/rpm-gpg-key-ow2'
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+
+
+
+#####################
+#####################
 # Libreswan
 #####################
 #####################
@@ -408,7 +540,7 @@ REPO['reponame']='libreswan'
 REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Libreswan'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://download.libreswan.org/binaries/rhel/$releasever/$basearch/'
 REPO['MirrorList']=''
@@ -424,17 +556,19 @@ createrepo
 # NodeJS 4
 #####################
 #####################
-for nodever  in "4" "5" "6" "7" "8" "9" "10" "11"; do
+for nodever  in "4" "5" "6" "7" "8" "9" "10" "11" "12" "13" "14" "15" "16" "17"; do
 REPO['reponame']="node$nodever"
 REPO['pkgname']='node'
 REPO['fullreponame']="NodeJS $nodever"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
-REPO['BaseURL']='https://rpm.nodesource.com/pub_'.$nodever.'.x/el/$releasever/$basearch/'
+REPO['BaseURL']="https://rpm.nodesource.com/pub_$nodever.x/el/\$releasever/\$basearch/"
 REPO['MirrorList']=''
-REPO['GPGCheck']='no'
-REPO['GPGKey']='https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+REPO['GPGCheck']='yes'
+REPO['GPGKey']='https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
+#'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
+#'https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL'
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 createrepo
@@ -451,7 +585,7 @@ REPO['reponame']='odoo10-nightly'
 REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 10 Nightly - EL7'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://nightly.odoo.com/10.0/nightly/rpm/'
 REPO['MirrorList']=''
@@ -470,7 +604,7 @@ REPO['reponame']='odoo9-nightly'
 REPO['pkgname']='odoo'
 REPO['fullreponame']='Odoo 9 Nightly - EL7'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://nightly.odoo.com/9.0/nightly/rpm/'
 REPO['MirrorList']=''
@@ -490,7 +624,7 @@ REPO['reponame']='okay'
 REPO['pkgname']=${REPO['reponame']}
 REPO['fullreponame']='Extra OKay Packages for Enterprise Linux - Freeswitch and FusionPBX'
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='http://repo.okay.com.mx/centos/$releasever/$basearch/release'
 REPO['MirrorList']=''
@@ -529,7 +663,7 @@ REPO['reponame']="pgsql$pgsqlver"
 REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='https://yum.postgresql.org/'.$pgsqlver.'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
@@ -546,7 +680,7 @@ REPO['reponame']="pgsql$pgsqlver-nonfree
 REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/non-free/'.$pgsqlver.'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
@@ -562,7 +696,7 @@ REPO['reponame']="pgsql$pgsqlver-common"
 REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver non free"
 REPO['EnableGroups']='no'
-REPO['Visible']='no'
+REPO['Visible']='yes'
 REPO['status']='disabled'
 REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/common/'.$pgsqlver.'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
@@ -964,8 +1098,8 @@ createrepo
 #Zabbix2.4
 #####################
 #####################
-declare -A zabshort=( ['1.8']='18' ['2.0']='20' ['2.0']='20' ['2.4']='24' ['3.0']='30' ['3.2']='32' ['3.4']='34' ['4.0']='40' ['4.2']='42' ['4.4']='44' ['4.5']='45' ['5.0']='50' ['5.1']='51' ['5.2']='52' ['5.3']='53')
-for elasver  in "4.2" "4.4"  '4.5' '5.0' '5.1' '5.2' '5.3'; do
+declare -A zabshort=( ['1.8']='18' ['2.0']='20' ['2.0']='20' ['2.4']='24' ['3.0']='30' ['3.2']='32' ['3.4']='34' ['4.0']='40' ['4.2']='42' ['4.4']='44' ['4.5']='45' ['5.0']='50' ['5.1']='51' ['5.2']='52' ['5.3']='53' ['5.4']='54'  ['5.5']='55' )
+for elasver  in "4.2" "4.4"  '4.5' '5.0' '5.1' '5.2' '5.3' '5.4' '5.5'; do
 REPO['reponame']="zabbix${zabshort[$elasver]}"
 REPO['pkgname']='zabbix'
 REPO['fullreponame']="Zabbix $elasver Official Repository"
@@ -981,6 +1115,25 @@ REPO['IncludePkgs']=''
 createrepo
 done
 
+# webfront sclo
+for elasver  in '5.0' '5.1'; do
+REPO['reponame']="zabbix${zabshort[$elasver]}-frontend"
+REPO['pkgname']='zabbix'
+REPO['fullreponame']="Zabbix $elasver Official Repository"
+REPO['EnableGroups']='no'
+REPO['Visible']='yes'
+REPO['status']='disabled'
+REPO['BaseURL']="http://repo.zabbix.com/zabbix/$elasver/rhel/\$releasever/\$basearch/frontend/"
+REPO['MirrorList']=''
+REPO['GPGCheck']='yes'
+REPO['GPGKey']="http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-A14FE591"
+REPO['Exclude']=''
+REPO['IncludePkgs']=''
+createrepo
+done
+
+
+
 #####################
 #####################
 #zmrepo
@@ -1038,7 +1191,7 @@ EOF
 
 cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/10epel
 {
-    my @add = split(/[,; ]+/, '');
+    my @add = split(/[,; ]+/, 'pwauth');
     my %remove = map { $_ => 1 } split(/[,; ]+/, 'gnustep-*,gnustep*,gnustep-base,gnustep-make');
 
     for my $name ( qw(epel) )
@@ -1139,7 +1292,9 @@ EOF
 
 rm -f %{name}-%{version}-filelist*
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT 			> %{name}-%{version}-filelist
+cat %{name}-%{version}-filelist|grep asterisk 			> %{name}-%{version}-filelist-asterisk
 cat %{name}-%{version}-filelist| grep atomic			> %{name}-%{version}-filelist-atomic
+cat %{name}-%{version}-filelist| grep bareos			> %{name}-%{version}-filelist-bareos
 cat %{name}-%{version}-filelist| grep centos-sclo		> %{name}-%{version}-filelist-centos-sclo
 cat %{name}-%{version}-filelist| grep egroupware 		> %{name}-%{version}-filelist-egroupware
 cat %{name}-%{version}-filelist| grep elastic			> %{name}-%{version}-filelist-elastic
@@ -1148,6 +1303,7 @@ cat %{name}-%{version}-filelist| grep ep
 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 lemonldap			> %{name}-%{version}-filelist-lemonldap
 cat %{name}-%{version}-filelist| grep libreswan			> %{name}-%{version}-filelist-libreswan
 if  ( "%{?dist}"  == "el7" ); then
 cat %{name}-%{version}-filelist| grep odoo			> %{name}-%{version}-filelist-odoo
@@ -1196,6 +1352,13 @@ case "$1" in
 		# this is an upgrade
 	;;
 esac
+%package asterisk
+Summary: Asterisk Repository tucny.com
+%description asterisk
+Asterisk Repository tucny.com
+%files asterisk -f  %{name}-%{version}-filelist-asterisk
+%defattr(-,root,root)
+
 %package atomic
 Summary: Atomic Repository
 %description atomic
@@ -1203,6 +1366,13 @@ Atomic Repository
 %files atomic -f  %{name}-%{version}-filelist-atomic
 %defattr(-,root,root)
 
+%package bareos
+Summary: Backup Archiving Recovery Open Sourced 
+%description bareos
+Backup Archiving Recovery Open Sourced  repository
+%files bareos -f  %{name}-%{version}-filelist-bareos
+%defattr(-,root,root)
+
 %package centos-sclo
 Summary: CentOS Red-Hat software collection repository
 %description centos-sclo
@@ -1259,6 +1429,13 @@ Firewall Services repository
 %files fws -f  %{name}-%{version}-filelist-fws
 %defattr(-,root,root)
 
+%package lemonldap
+Summary: Lemonldap NG Repository
+%description lemonldap
+LemonLDAP::NG Repository
+%files lemonldap -f  %{name}-%{version}-filelist-lemonldap
+%defattr(-,root,root)
+
 %package libreswan
 Summary: Libreswan Repository
 %description libreswan