aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-02-09 20:00:33 +0000
committerNicolas Vigier <boklm@mageia.org>2011-02-09 20:00:33 +0000
commit6da75de997dcb3e48d67c55c5bdf090712ebfc48 (patch)
treed26096bdfb7ba0af1116d7d5ecfc1b9a7f1fe097
parent19bc6552a79d673efbaf48044a9274d8b9798710 (diff)
downloadpuppet-6da75de997dcb3e48d67c55c5bdf090712ebfc48.tar
puppet-6da75de997dcb3e48d67c55c5bdf090712ebfc48.tar.gz
puppet-6da75de997dcb3e48d67c55c5bdf090712ebfc48.tar.bz2
puppet-6da75de997dcb3e48d67c55c5bdf090712ebfc48.tar.xz
puppet-6da75de997dcb3e48d67c55c5bdf090712ebfc48.zip
Redefine %__gpg_sign_cmd in rpm config for signbot to force V3 signatures
with --force-v3-sigs. V4 signatures are causing problems with the version of rpm used on Mandriva. https://bugzilla.redhat.com/show_bug.cgi?id=436812
-rw-r--r--modules/buildsystem/manifests/init.pp8
-rw-r--r--modules/buildsystem/templates/signbot-rpmmacros3
2 files changed, 11 insertions, 0 deletions
diff --git a/modules/buildsystem/manifests/init.pp b/modules/buildsystem/manifests/init.pp
index ea2fbcaa..7df10179 100644
--- a/modules/buildsystem/manifests/init.pp
+++ b/modules/buildsystem/manifests/init.pp
@@ -80,6 +80,14 @@ class buildsystem {
sudo::sudoers_config { "signpackage":
content => template("buildsystem/sudoers.signpackage")
}
+
+ file { "$sign_home_dir/.rpmmacros":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 644,
+ content => template("buildsystem/signbot-rpmmacros")
+ }
}
class scheduler {
diff --git a/modules/buildsystem/templates/signbot-rpmmacros b/modules/buildsystem/templates/signbot-rpmmacros
new file mode 100644
index 00000000..aab7e389
--- /dev/null
+++ b/modules/buildsystem/templates/signbot-rpmmacros
@@ -0,0 +1,3 @@
+%__gpg_sign_cmd %{__gpg} \
+ gpg --batch --force-v3-sigs --no-verbose --no-armor --passphrase-fd 3 --no-secmem-warning \
+ -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}