--- rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2023/10/28 03:25:39	1.27
+++ rpms/smeserver-extrarepositories/contribs10/smeserver-extrarepositories.spec	2024/02/20 21:31:15	1.29
@@ -1,6 +1,6 @@
 %define name smeserver-extrarepositories
 %define version 0.1
-%define release 43
+%define release 44
 Summary: easy configuration of extra yum repo
 Name: %{name}
 Version: %{version}
@@ -14,11 +14,15 @@ BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 10.0
 AutoReqProv: no
 Source0: https://raw.githubusercontent.com/ONLYOFFICE/repo/master/centos/RPM-GPG-KEY-ONLYOFFICE
+Source1: https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7
 
 %description
 Provides configuration for external yum repository comaptible with Koozali SME Server.
 
 %changelog
+* Tue Feb 20 2024 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-44.sme
+- update pgsql gpg keys and add new versions [SME: 12473]
+
 * Fri Oct 27 2023 Jean-Philippe Pialasse <tests@pialasse.com> 0.1-43.sme
 - add new elastic repos [SME: 12422]
 - add wandisco distribution of git [SME: 12345]
@@ -172,7 +176,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/rpm-g
 #cp %source0 $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/ 
 #/usr/share/rpm-gpg-keys/RPM-GPG-KEY-${REPO['reponame']}
 cp %SOURCE0  $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/
-
+cp %SOURCE1  $RPM_BUILD_ROOT/usr/share/rpm-gpg-keys/PGDG-RPM-GPG-KEY-RHEL7-pgsql
 
 # if needing to migrate something :
 #mkdir -p $RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate
@@ -905,7 +909,7 @@ createrepo
 # Postgresql
 #####################
 #####################
-for pgsqlver  in  "9.6" "10" "11" "12" "13"; do
+for pgsqlver  in   "12" "13" "14" "15" "16"; do
 REPO['reponame']="pgsql$pgsqlver"
 REPO['pkgname']='pgsql'
 REPO['fullreponame']="Postgresql $pgsqlver"
@@ -915,9 +919,9 @@ REPO['status']='disabled'
 REPO['BaseURL']='https://yum.postgresql.org/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'$ext
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 REPO['Priority']=''
@@ -933,9 +937,8 @@ REPO['status']='disabled'
 REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/non-free/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'$ext
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7-nonfree'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL-nonfree
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 REPO['Priority']=''
@@ -950,9 +953,9 @@ REPO['status']='disabled'
 REPO['BaseURL']='https://download.postgresql.org/pub/repos/yum/common/'$pgsqlver'/redhat/rhel-$releasever-$basearch/'
 REPO['MirrorList']=''
 REPO['GPGCheck']='yes'
-ext=$pgsqlver;
-[[ "$pgsqlver" == "9.6" ]] && ext="96";
-REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-'$ext
+REPO['GPGKey']='https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7'
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL
+#https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-AARCH64-RHEL
 REPO['Exclude']=''
 REPO['IncludePkgs']=''
 REPO['Priority']=''
@@ -1590,6 +1593,38 @@ cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smi
 
 EOF
 
+cat << 'EOF'  >$RPM_BUILD_ROOT/etc/e-smith/db/yum_repositories/migrate/30pgsql
+{
+    # delete old repos
+    for my $dbVer (qw( 9.6 10 11)) {
+        $dataBase = "pgsql$dbVer";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+        $dataBase = "pgsql$dbVer-common";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+        $dataBase = "pgsql$dbVer-nonfree";
+        my $repo = $DB->get($dataBase);
+        $repo->delete if $repo;
+    }
+    # update keys
+    #old was https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-** 
+    #new is https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7
+    for my $dbVer (qw( 12 13)) {
+       for my $case (qw(nonfree common)) {
+           $dataBase = "pgsql$dbVer-$case"; 
+           my $repo = $DB->get($dataBase) or next;
+           my $gpgurl = $repo->prop('GPGKey');
+           $repo->setprop('GPGKey','https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7') if (index($gpgurl, "keys") == -1)       
+       }
+       $dataBase = "pgsql$dbVer";
+       my $repo = $DB->get($dataBase) or next;
+       my $gpgurl = $repo->prop('GPGKey');
+       $repo->set_prop('GPGKey','https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL7') if (index($gpgurl, "keys") == -1)
+    }
+}
+
+EOF