From 0952d005e5a61e946a0569c9e60bc525a4b1274af2551ca5c0e525a15ce830a2 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Thu, 28 Mar 2013 03:57:10 +0000
Subject: [PATCH] Accepting request 161510 from
 home:gary_lin:branches:Base:System

bnc#808594: Calculate the digest of the padded data section to be consistent with the output file

OBS-URL: https://build.opensuse.org/request/show/161510
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=16
---
 pesign-obs-integration.changes | 6 ++++++
 pesign-repackage.spec.in       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pesign-obs-integration.changes b/pesign-obs-integration.changes
index 1adfc9a..313f9b4 100644
--- a/pesign-obs-integration.changes
+++ b/pesign-obs-integration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 26 06:19:45 UTC 2013 - glin@suse.com
+
+- Calculate the digest of the padded data section to be consistent
+  with the output file (bnc#808594, bnc#811325)
+
 -------------------------------------------------------------------
 Fri Mar 15 06:19:39 UTC 2013 - coolo@suse.com
 
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
index 0b59d36..f4743c6 100644
--- a/pesign-repackage.spec.in
+++ b/pesign-repackage.spec.in
@@ -117,7 +117,7 @@ for sig in "${sigs[@]}"; do
 		infile=${sig%.sig}
 		cpio -i --to-stdout ${infile#./} <%_sourcedir/@NAME@.cpio.rsasign > ${infile}.sattrs
 		test -s ${infile}.sattrs || exit 1
-		ohash=$(pesign -n "$nss_db" -h -i "$f")
+		ohash=$(pesign -n "$nss_db" -h -P -i "$f")
 		pesign -n "$nss_db" -c cert -i "$f" -o "$f.tmp" -d sha256 -I "${infile}.sattrs" -R "$sig"
 		rm -f "${infile}.sattrs"
 		mv "$f.tmp" "$f"