Changeset 2191 in ProjectBuilder

Timestamp:

Mar 3, 2017, 4:07:38 AM (7 years ago)

Author:

Bruno Cornec

Message:

• Add function pb_sign_setenv_rpm calling pb_sign_setenv which just sets up env var.
• Remove usage of Crypt::OpenPGP function not available on some distros.

File:

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

devel/pb/bin/pb

@@ -4953 +4953 @@
 $ENV{'PBPASSFILE'} = $passfile->{$ENV{'PBPROJ'}} if ((not defined $ENV{'PBPASSFILE'})&& (defined $passfile->{$ENV{'PBPROJ'}})) ;
 $ENV{'PBPASSPATH'} = $passpath->{$ENV{'PBPROJ'}} if ((not defined $ENV{'PBPASSPATH'})&& (defined $passpath->{$ENV{'PBPROJ'}})) ;
+}
+
+sub pb_sign_setenv_rpm {
+
+pb_sign_setenv();
 
 eval
@@ -4966 +4971 @@
     return(undef) if (((not defined $ENV{'PBPASSPHRASE'}) and (not defined $ENV{'PBPASSFILE'})) || (not defined $ENV{'PBPACKAGER'}) || (not defined $ENV{'PBPASSPATH'}));
     my $sign = RPM4::Sign->new(
-        passphrase => $ENV{'PBPASSPHRASE'},
-        name => $ENV{'PBPACKAGER'},
+        passphrase => $ENV{'PBPASSPHRASE'},
+        name => $ENV{'PBPACKAGER'},
         path => $ENV{'PBPASSPATH'},
-        password_file => $ENV{'PBPASSFILE'}, 
+        password_file => $ENV{'PBPASSFILE'},
     );
     return(undef) if (not defined $sign);
@@ -4987 +4992 @@
 my $file = shift;
 
-eval
-{
-    require Crypt::OpenPGP;
-    Crypt::OpenPGP->import();
-};
-if ($@) {
-    # Crypt::OpenPGP not found
-    pb_log(1,"WARNING: Install Crypt::OpenPGP to benefit from debian Release file signing.\n");
-} else {
-    my $sign = pb_sign_setenv();
-    my $pgp = Crypt::OpenPGP->new;
-    my $pgpsign = $pgp->sign(
-        Filename   => $file,
-        KeyID      => $sign->{keyid},
-        Passphrase => $sign->{passphrase},
-        Detach     => 1,
-        Armour     => 1,
-    );
-    open(DEST, "> $file.gpg") || confess "Unable to write to $file.gpg";
-    print DEST $pgpsign if (defined $pgpsign);
-    close(DEST);
-}
+pb_sign_setenv();
+pb_log(0,"Signing Debian Release file as $ENV{'PBPACKAGER'}...\n");
+
+if (not defined $ENV{'PBPASSPHRASE'}) {
+    if (not defined $ENV{'PBPASSFILE'}) {
+        confess("No pbpassphrase nor pbpassfile defined, unable to handle GPG Release file\n");
+    } else {
+        open(PASS,"$ENV{'PBPASSFILE'}") || confess("Unable to open $ENV{'PBPASSFILE'}\n");
+        my $pass = <PASS>;
+        chomp($pass);
+        $ENV{'PBPASSPHRASE'} = $pass;
+        close(PASS);
+    }
+}
+
+unlink("$file.gpg");
+pb_system("echo \"$ENV{'PBPASSPHRASE'}\" | gpg --sign --detach -a -o $file.gpg -r \"$ENV{'PBPACKAGER'}\" -b --use-agent --passphrase-fd 0 $file","Creating the signed version of $file with $ENV{'PBPACKAGER'} GPG key...\n");
 }
 
@@ -5023 +5023 @@
 
 if ($pbos->{'type'} eq "rpm") {
-    my $sign = pb_sign_setenv();
+    my $sign = pb_sign_setenv_rpm();
     if (defined $sign) {
-        pb_log(0,"Signing RPM packages...\n");
+        pb_log(0,"Signing RPM packages as $ENV{'PBPACKAGER'}...\n");
         pb_log(2,"pb_sign_pkg: pkgs:".Dumper(split(/ /,$made))."\n");
         $sign->rpmssign(split(/ /,$made));
@@ -5035 +5035 @@
     }
     my $debsigncmd = pb_check_req("debsign",1);
-    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages","mayfail") if (($changes ne "") && (defined $debsigncmd));
+    pb_system("$debsigncmd -m\'$ENV{'PBPACKAGER'}\' $changes","Signing DEB packages as $ENV{'PBPACKAGER'}...","mayfail") if (($changes ne "") && (defined $debsigncmd));
 } else {
     pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");