From 3dd0fcf0aa26baa4e8e02c7cd298616128c4b980 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@redhat.com>
Date: Mon, 21 May 2012 18:20:58 -0400
Subject: Update the modsign patchset to the most recent version

Update to the modsign-20120510 tag in the modsign git tree.  We no longer
need to generate the GPG key in the spec file, as the kernel makefile will
do that for us.  We still provide the genkey template though, so we don't
get a generic one from upstream.
---
 kernel.spec | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'kernel.spec')

diff --git a/kernel.spec b/kernel.spec
index 204372f7..a2831a5b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -675,7 +675,7 @@ Patch700: linux-2.6-e1000-ich9-montevina.patch
 Patch800: linux-2.6-crash-driver.patch
 
 # crypto/
-Patch900: modsign-20111207.patch
+Patch900: modsign-20120510.patch
 
 # virt + ksm patches
 Patch1555: fix_xen_guest_on_old_EC2.patch
@@ -1382,7 +1382,7 @@ ApplyPatch linux-2.6-crash-driver.patch
 ApplyPatch linux-2.6-e1000-ich9-montevina.patch
 
 # crypto/
-ApplyPatch modsign-20111207.patch
+ApplyPatch modsign-20120510.patch
 
 # Assorted Virt Fixes
 ApplyPatch fix_xen_guest_on_old_EC2.patch
@@ -1495,27 +1495,7 @@ find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
 find . -name .gitignore -exec rm -f {} \; >/dev/null
 
 %if %{signmodules}
-cat <<EOF
-###
-### Now generating a PGP key pair to be used for signing modules.
-###
-### If this takes a long time, you might wish to run rngd in the background to
-### keep the supply of entropy topped up.  It needs to be run as root, and
-### should use a hardware random number generator if one is available, eg:
-###
-###     rngd -r /dev/hwrandom
-###
-### If one isn't available, the pseudo-random number generator can be used:
-###
-###     rngd -r /dev/urandom
-###
-EOF
-gpg --homedir . --batch --gen-key %{SOURCE11}
-cat <<EOF
-###
-### Key pair generated.
-###
-EOF
+cp %{SOURCE11} .
 %endif
 
 cd ..
@@ -2317,6 +2297,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon May 21 2012 Josh Boyer <jwboyer@redhat.com>
+- Update the modsign patchset to the most recent version
+
 * Mon May 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.5.0-0.rc0.git1.2
 - Linux v3.4-1622-g31a6710
 
-- 
cgit