commit mksusecd for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package mksusecd for openSUSE:Factory 
checked in at 2015-05-10 10:47:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mksusecd (Old)
 and      /work/SRC/openSUSE:Factory/.mksusecd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mksusecd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes        2015-04-27 
13:05:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes   2015-05-10 
10:47:15.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May  8 11:05:32 CEST 2015 - snw...@suse.com
+
+- fix key generation issues with different gpg2 versions
+- 1.20
+
+-------------------------------------------------------------------

Old:
----
  mksusecd-1.19.tar.xz

New:
----
  mksusecd-1.20.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mksusecd.spec ++++++
--- /var/tmp/diff_new_pack.2oO1S3/_old  2015-05-10 10:47:15.000000000 +0200
+++ /var/tmp/diff_new_pack.2oO1S3/_new  2015-05-10 10:47:15.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           mksusecd
-Version:        1.19
+Version:        1.20
 Release:        0
 Summary:        Create SUSE Linux installation ISOs
 License:        GPL-3.0+

++++++ mksusecd-1.19.tar.xz -> mksusecd-1.20.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.19/VERSION new/mksusecd-1.20/VERSION
--- old/mksusecd-1.19/VERSION   2015-04-23 16:10:54.000000000 +0200
+++ new/mksusecd-1.20/VERSION   2015-05-08 11:04:34.000000000 +0200
@@ -1 +1 @@
-1.19
+1.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.19/changelog new/mksusecd-1.20/changelog
--- old/mksusecd-1.19/changelog 2015-04-23 16:10:54.000000000 +0200
+++ new/mksusecd-1.20/changelog 2015-05-08 11:04:34.000000000 +0200
@@ -1,3 +1,6 @@
+2015-05-08:    1.20
+       - fix key generation issues with different gpg2 versions
+
 2015-04-23:    1.19
        - fix Makefile
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/mksusecd-1.19/mksusecd new/mksusecd-1.20/mksusecd
--- old/mksusecd-1.19/mksusecd  2015-04-23 16:10:54.000000000 +0200
+++ new/mksusecd-1.20/mksusecd  2015-05-08 11:04:34.000000000 +0200
@@ -315,7 +315,7 @@
     }
     elsif(-f _) {
       my $t = `file -b -k -L $_ 2>/dev/null`;
-      if($t =~ / ISO 9660 CD-ROM /) {
+      if($t =~ /ISO 9660 CD-ROM/) {
         check_root "Sorry, can't access ISO images; you need root privileges.";
         $iso_cnt++;
         my $d = $tmp->mnt(sprintf("mnt_%04d", $iso_cnt));
@@ -1913,7 +1913,8 @@
 %no-ask-passphrase
 %no-protection
 %transient-key
-Key-Type: default
+Key-Type: RSA
+Key-Length: 2048
 Name-Real: mksusecd Signing Key
 Name-Comment: transient key
 %pubring mksusecd.pub
@@ -1922,6 +1923,7 @@
 = = = = = = = =
 
   my $key;
+  my $is_gpg21;
 
   if($opt_sign_key) {
     $key = $opt_sign_key;
@@ -1929,11 +1931,15 @@
     die "$key: no such key file\n" unless -f $key;
   }
   else {
-    if(open my $p, "| cd $gpg_dir ; gpg --no-tty --batch --armor 
--debug-quick-random --gen-key - 2>/dev/null") {
+    if(open my $p, "| cd $gpg_dir ; gpg --homedir=$gpg_dir --batch --armor 
--debug-quick-random --gen-key - 2>/dev/null") {
       print $p $c;
       close $p;
     }
     $key = "$gpg_dir/mksusecd.sec";
+    if(!-f $key) {
+      $key = "$gpg_dir/mksusecd.pub";
+      $is_gpg21 = 1;
+    }
   }
 
   my $keyid;
@@ -1951,7 +1957,7 @@
     close $p;
   }
 
-  if($priv && $date) {
+  if(($priv || ($is_gpg21 && $pub)) && $date) {
     $sign_key_dir = $gpg_dir;
 
     system "gpg --homedir=$gpg_dir --import $key >/dev/null 2>&1";