Changeset 1278 in ProjectBuilder for devel/pb

Timestamp:

Mar 24, 2011, 10:38:17 PM (14 years ago)

Author:

Bruno Cornec

Message:

r4314@localhost: bruno | 2011-03-24 22:18:22 +0100

• Adds RPM signature support and doc

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Env.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -1440 +1440 @@
     }
 
+    # Sign packages
+    pb_sign_pkgs($pbos,$made);
+
     # Find the appropriate check cmd/opts
     my ($chkcmd,$chkopt) = pb_distro_get_param($pbos,pb_conf_get_if("oschkcmd","oschkopt"));
@@ -1963 +1966 @@
 
             # Sign packages locally
-            if ($pbos->{'type'} eq "rpm") {
-                #pb_system("rpm --addsign --define \"_signature gpg\" --define \"_gpg_name $ENV{'PBPACKAGER'}\" --define \"__gpg_sign_cmd /usr/bin/gpg --batch --no-verbose --no-armor --no-tty --no-secmem-warning -sbo %{__signature_filename} %{__plaintext_filename} --use-agent\" $made","Signing RPM packages packages");
-            } elsif ($pbos->{'type'} eq "deb") {
-                #pb_system("debsign $made","Signing DEB packages");
-            } else {
-                pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");
-            }
+            pb_sign_pkgs($pbos,$made);
 
             # We want to send them to the ssh account so overwrite what has been done before
@@ -3798 +3795 @@
 }
 
+sub pb_sign_pkgs {
+
+my $pbos = shift;
+my $made = shift;
+
+pb_log(2,"entering pb_sign_pkg: $made ".Dumper($pbos)."\n");
+my ($passfile, $passphrase, $passpath) = pb_conf_get_if("pbpassfile","pbpassphrase","pbpasspath");
+$ENV{'PBPASSPHRASE'} = $passphrase->{$ENV{'PBPROJ'}} if ((not defined $ENV{'PBPASSPHRASE'}) && (defined $passphrase->{$ENV{'PBPROJ'}}));
+$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'}})) ;
+
+if ($pbos->{'type'} eq "rpm") {
+    eval
+    {
+        require RPM4::Sign;
+        RPM4::Sign->import();
+    };
+    if ($@) {
+        # RPM4::Sign not found
+        pb_log(1,"WARNING: Install RPM4::Sign to benefit from automatic package signing.\n");
+    } else {
+        return if ((not defined $ENV{'PBPASSPHRASE'}) and (not defined $ENV{'PBPASSFILE'}));
+        my $sign = RPM4::Sign->new(
+            passphrase => $ENV{'PBPASSPHRASE'},
+            name => $ENV{'PBPACKAGER'},
+            path => $ENV{'PBPASSPATH'},
+            password_file => $ENV{'PBPASSFILE'}, 
+        );
+
+        pb_log(0,"Signing RPM packages...\n");
+        $made =~ s/ +/ /g;
+        $made =~ s/^ //g;
+        $made =~ s/ $//g;
+        pb_log(2,"pb_sign_pkg: pkgs:".Dumper(split(/ /,$made))."\n");
+        $sign->rpmssign(split(/ /,$made));
+    }
+} elsif ($pbos->{'type'} eq "deb") {
+    #pb_system("debsign $made","Signing DEB packages");
+} else {
+    pb_log(0,"I don't know yet how to sign packages for type $pbos->{'type'}.\nPlease give feedback to dev team\n");
+pb_log(2,"exiting pb_sign_pkg\n");
+}
+}
 
 1;

devel/pb/lib/ProjectBuilder/Env.pm

@@ -113 +113 @@
 #vmport pb = 2223
 #vmport example = 2224
+
+# Info on who is packaging
+#pbpackager default = William Porte <bill\@porte.org>
+#pbpassphrase default = TheScretePassPhrase
+#pbpassfile default = /home/williamporte/secret/passfile
 EOF
     }