From e2128eac859427245d78218ed78debd208a4640508dd6c4ed88d70ace1b48e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 20 Sep 2013 12:28:04 +0000 Subject: [PATCH 1/2] Accepting request 199377 from home:oertel:branches:Base:System - added future signing key for SLES (fate#314767) (bnc#801055) using 2048 bit rsa key - added reserve key for SLES (fate#312896) 50A3DD1C SuSE Package Signing Key (reserve key) valid until (2017-01-13) - reduced key list. remaining keys: 307E3D54 SuSE Package Signing Key 3D25D3D9 SuSE Security Team 9C800ACA SuSE Package Signing Key B37B98A9 SUSE PTF Signing Key - if we have to set $HOME, we also have to export the variable (bnc#665912) OBS-URL: https://build.opensuse.org/request/show/199377 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-build-key?expand=0&rev=6 --- suse-build-key.changes | 27 +++++++++++++++++++++++++-- suse-build-key.gpg | 4 ++-- suse-build-key.spec | 13 +++---------- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/suse-build-key.changes b/suse-build-key.changes index 22aeb6f..d10fcc9 100644 --- a/suse-build-key.changes +++ b/suse-build-key.changes @@ -1,7 +1,30 @@ ------------------------------------------------------------------- -Sun Oct 21 23:03:01 CEST 2012 - ro@suse.de +Thu Jan 31 17:11:08 CET 2013 - ro@suse.de -- export keys to single files in /usr/lib/rpm/gnupg/keys +- added future signing key for SLES (fate#314767) (bnc#801055) + using 2048 bit rsa key + +------------------------------------------------------------------- +Mon Jan 14 01:55:36 CET 2013 - ro@suse.de + +- added reserve key for SLES (fate#312896) + 50A3DD1C SuSE Package Signing Key (reserve key) + valid until (2017-01-13) + +------------------------------------------------------------------- +Mon Dec 12 12:02:49 CET 2011 - ro@suse.de + +- reduced key list. remaining keys: + 307E3D54 SuSE Package Signing Key + 3D25D3D9 SuSE Security Team + 9C800ACA SuSE Package Signing Key + B37B98A9 SUSE PTF Signing Key + +------------------------------------------------------------------- +Fri Jan 28 13:02:42 CET 2011 - ro@suse.de + +- if we have to set $HOME, we also have to export the variable + (bnc#665912) ------------------------------------------------------------------- Tue May 4 16:11:41 CEST 2010 - ro@suse.de diff --git a/suse-build-key.gpg b/suse-build-key.gpg index 553a727..433a858 100644 --- a/suse-build-key.gpg +++ b/suse-build-key.gpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59c8d0592205de77964cbda7dbd3b9db9bfd343cbc347fa7756985f7a8a6b7cd -size 6774 +oid sha256:ba8d43b18026eef3278fa0f112d8d11a5b96f935caadfb9222474f5165486db3 +size 4945 diff --git a/suse-build-key.spec b/suse-build-key.spec index b0f5404..b892fba 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -1,7 +1,7 @@ # # spec file for package suse-build-key # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: The public gpg key for rpm package signature verification License: GPL-2.0+ Group: System/Packages Version: 1.0 -Release: 0 +Release: 907. Source0: suse-build-key.gpg Source1: dumpsigs BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,13 +57,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/gnupg install %{SOURCE0} $RPM_BUILD_ROOT/%{susering} install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg -install -d $RPM_BUILD_ROOT%{keydir} -mkdir keys -cd keys -$RPM_BUILD_ROOT/usr/lib/rpm/gnupg/dumpsigs $RPM_BUILD_ROOT/%{susering} -cd .. -cp -a keys $RPM_BUILD_ROOT/usr/lib/rpm/gnupg - touch $RPM_BUILD_ROOT/%{pubring} touch $RPM_BUILD_ROOT/%{pubring}~ @@ -71,7 +64,6 @@ touch $RPM_BUILD_ROOT/%{pubring}~ %defattr(644,root,root) %attr(755,root,root) %dir /usr/lib/rpm/gnupg %attr(755,root,root) /usr/lib/rpm/gnupg/dumpsigs -/usr/lib/rpm/gnupg/keys %config /%{susering} %ghost /%{pubring} %ghost /%{pubring}~ @@ -88,6 +80,7 @@ if [ -z "$TF" ]; then fi if [ -z "$HOME" ]; then HOME=/root + export HOME fi if [ ! -d "$HOME" ]; then mkdir "$HOME" From 8016e44ace9ed09b6a6beac3119b190b392c0552d40f8e082b26c70745a17873 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 20 Sep 2013 13:24:41 +0000 Subject: [PATCH 2/2] - export keys to single files in /usr/lib/rpm/gnupg/keys OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-build-key?expand=0&rev=7 --- suse-build-key.changes | 5 +++++ suse-build-key.gpg | 4 ++-- suse-build-key.spec | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/suse-build-key.changes b/suse-build-key.changes index d10fcc9..b38c86d 100644 --- a/suse-build-key.changes +++ b/suse-build-key.changes @@ -11,6 +11,11 @@ Mon Jan 14 01:55:36 CET 2013 - ro@suse.de 50A3DD1C SuSE Package Signing Key (reserve key) valid until (2017-01-13) +------------------------------------------------------------------- +Sun Oct 21 23:03:01 CEST 2012 - ro@suse.de + +- export keys to single files in /usr/lib/rpm/gnupg/keys + ------------------------------------------------------------------- Mon Dec 12 12:02:49 CET 2011 - ro@suse.de diff --git a/suse-build-key.gpg b/suse-build-key.gpg index 433a858..553a727 100644 --- a/suse-build-key.gpg +++ b/suse-build-key.gpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba8d43b18026eef3278fa0f112d8d11a5b96f935caadfb9222474f5165486db3 -size 4945 +oid sha256:59c8d0592205de77964cbda7dbd3b9db9bfd343cbc347fa7756985f7a8a6b7cd +size 6774 diff --git a/suse-build-key.spec b/suse-build-key.spec index b892fba..db81a69 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -57,6 +57,12 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/gnupg install %{SOURCE0} $RPM_BUILD_ROOT/%{susering} install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg +mkdir keys +cd keys +$RPM_BUILD_ROOT/usr/lib/rpm/gnupg/dumpsigs $RPM_BUILD_ROOT/%{susering} +cd .. +cp -a keys $RPM_BUILD_ROOT/usr/lib/rpm/gnupg + touch $RPM_BUILD_ROOT/%{pubring} touch $RPM_BUILD_ROOT/%{pubring}~ @@ -64,6 +70,7 @@ touch $RPM_BUILD_ROOT/%{pubring}~ %defattr(644,root,root) %attr(755,root,root) %dir /usr/lib/rpm/gnupg %attr(755,root,root) /usr/lib/rpm/gnupg/dumpsigs +/usr/lib/rpm/gnupg/keys %config /%{susering} %ghost /%{pubring} %ghost /%{pubring}~