Hello community,
here is the log from the commit of package mksusecd for openSUSE:Factory
checked in at 2015-02-27 11:10:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-25
02:18:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2015-02-27
11:10:16.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 26 15:21:12 CET 2015 - snw...@suse.com
+
+- replace content.key with actual signing key used
+- handle duplicate filenames
+- 1.14
+
+-------------------------------------------------------------------
Old:
----
mksusecd-1.13.tar.xz
New:
----
mksusecd-1.14.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mksusecd.spec ++++++
--- /var/tmp/diff_new_pack.Ev9tXd/_old 2015-02-27 11:10:16.000000000 +0100
+++ /var/tmp/diff_new_pack.Ev9tXd/_new 2015-02-27 11:10:16.000000000 +0100
@@ -29,7 +29,7 @@
Summary: Create SUSE Linux installation ISOs
License: GPL-3.0+
Group: Hardware/Other
-Version: 1.13
+Version: 1.14
Release: 0
Source: %{name}-%{version}.tar.xz
Url: https://github.com/wfeldt/mksusecd
++++++ mksusecd-1.13.tar.xz -> mksusecd-1.14.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.13/VERSION new/mksusecd-1.14/VERSION
--- old/mksusecd-1.13/VERSION 2015-02-24 14:20:20.000000000 +0100
+++ new/mksusecd-1.14/VERSION 2015-02-26 15:18:26.000000000 +0100
@@ -1 +1 @@
-1.13
+1.14
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.13/changelog new/mksusecd-1.14/changelog
--- old/mksusecd-1.13/changelog 2015-02-24 14:20:20.000000000 +0100
+++ new/mksusecd-1.14/changelog 2015-02-26 15:18:26.000000000 +0100
@@ -1,3 +1,7 @@
+2015-02-26: 1.14
+ - replace content.key with actual signing key used
+ - handle duplicate filenames
+
2015-02-24: 1.13
- support initrds with pre-sle12 key management
- support adding driver updates to initrd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mksusecd-1.13/mksusecd new/mksusecd-1.14/mksusecd
--- old/mksusecd-1.13/mksusecd 2015-02-24 14:20:20.000000000 +0100
+++ new/mksusecd-1.14/mksusecd 2015-02-26 15:18:26.000000000 +0100
@@ -593,7 +593,10 @@
for my $s (@sources) {
File::Find::find({
wanted => sub {
- $files->{$1} = $s->{dir} if m#^$s->{dir}/(.+)#;
+ if(m#^$s->{dir}/(.+)#) {
+ push @{$mkisofs->{exclude}}, "$files->{$1}/$1" if $files->{$1};
+ $files->{$1} = $s->{dir};
+ }
},
no_chdir => 1
}, $s->{dir});
@@ -707,7 +710,7 @@
my $f = fname($_[0]);
my $n;
- return unless defined $f;
+ return undef unless defined $f;
# we may already have a copy...
if($f eq "$tmp_new/$_[0]") {
@@ -1847,7 +1850,7 @@
%no-protection
%transient-key
Key-Type: default
-Name-Real: mksusecd
+Name-Real: mksusecd Signing Key
Name-Comment: transient key
%pubring mksusecd.pub
%secring mksusecd.sec
@@ -1942,8 +1945,15 @@
return if !$sign_key_dir;
my $c = copy_file "content";
+ return if !defined $c;
+
+ my $k = copy_file "content.key";
+ return if !defined $k;
+
copy_file "content.asc";
+ system "cp $sign_key_pub $k";
+
print "re-signing '/content'\n" if $opt_verbose >= 1;
system "gpg --homedir=$sign_key_dir --batch --yes --armor --detach-sign $c";
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
