Changeset 2248 in ProjectBuilder

Timestamp:

Aug 30, 2017, 4:52:08 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix #163 by adding support for additional GPG keys to export and for YUM repos (backport from 0.14.6 to 0.15.x branch aka devel)

File:

• devel/pb/bin/pb (modified) (5 diffs)

devel/pb/bin/pb

@@ -5 +5 @@
 # $Id$
 #
-# Copyright B. Cornec 2007-2016
+# Copyright B. Cornec 2007-today
 # Eric Anderson's changes are (c) Copyright 2012 Hewlett Packard
 # Provided under the GPL v2
@@ -448 +448 @@
 =item B<getvar>
 
-Print the full variables expanded based on the distrubution tuple. Help to debug conf issues.
+Print the full variables expanded based on the distribution tuple. Help to debug conf issues.
 Also accepts a parameter to display only the values for this package, and a VM/VE/RM
 
@@ -2230 +2230 @@
         chmod 0644,"$ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}.pubkey";
         $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}.pubkey";
+
+        my ($gpgaddkey) = pb_conf_get_if("pbadditionalgpg");
+        my $pbadditionalgpg;
+        $pbadditionalgpg = $gpgaddkey->{$ENV{PBPROJ}} if (defined $gpgaddkey);
+        if (defined $pbadditionalgpg) {
+            foreach my $k (split(/,/,$pbadditionalgpg)) {
+                pb_log(0,"Exporting public key $k\n");
+                system("gpg --export -a \'$k\' > $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}-$k.pubkey");
+                $src = "$src $ENV{'PBDESTDIR'}/$ENV{'PBPROJ'}-$k.pubkey";
+            }
+        }
     }
     # Remove potential leading spaces (cause problem with basename)
@@ -2317 +2328 @@
         if ($pbos->{'type'} eq "rpm") {
             my $pbsha = pb_distro_get_param($pbos,pb_conf_get("ossha"));
-            my $gpgcheck = pb_conf_get_if("pbgpgcheck");
+            my ($gpgcheck) = pb_conf_get_if("pbgpgcheck");
             my $pbgpgcheck;
             $pbgpgcheck = $gpgcheck->{$ENV{PBPROJ}} if (defined $gpgcheck);
+            my $pbgpgkey = "$pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}.pubkey";
+            my ($gpgaddpkey) = pb_conf_get_if("pbadditionalgpg");
+            my $pbadditionalgpg;
+            $pbadditionalgpg = $gpgaddpkey->{$ENV{PBPROJ}} if (defined $gpgaddpkey);
+            if (defined $pbadditionalgpg) {
+                foreach my $k (split(/,/,$pbadditionalgpg)) {
+                    $pbgpgkey .= " $pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}-$k.pubkey";
+                }
+            }
             # By default force GPG check in repo even if we support signature of packages to fail. This is a best practice
             $pbgpgcheck = 1 if (not defined $pbgpgcheck);
@@ -2335 +2355 @@
 enabled=1
 gpgcheck=$pbgpgcheck
-gpgkey=$pbrepo->{$ENV{'PBPROJ'}}/$repodir/$ENV{'PBPROJ'}.pubkey
+gpgkey=$pbgpgkey
 EOT
 chmod 644 $ENV{'PBPROJ'}$repotag.repo