From 6319b7f2ab1f249b216fdad0536792ba8e2da1df9af84eaebff220c0da168d4c Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Fri, 23 Feb 2018 02:47:20 +0000
Subject: [PATCH] Accepting request 579228 from
 home:gary_lin:branches:Base:System

Provide password file for 'certutil -A' due to the change in mozilla-nss 3.35 (boo#1082235)

OBS-URL: https://build.opensuse.org/request/show/579228
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=55
---
 pesign-obs-integration.changes | 6 ++++++
 pesign-obs-integration.spec    | 2 +-
 pesign-repackage.spec.in       | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pesign-obs-integration.changes b/pesign-obs-integration.changes
index 975fc0d..f4a162a 100644
--- a/pesign-obs-integration.changes
+++ b/pesign-obs-integration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 22 09:16:35 UTC 2018 - glin@suse.com
+
+- Provide password file for 'certutil -A' due to the change in
+  mozilla-nss 3.35 (boo#1082235)
+
 -------------------------------------------------------------------
 Wed Nov  8 04:35:57 UTC 2017 - jlee@suse.com
 
diff --git a/pesign-obs-integration.spec b/pesign-obs-integration.spec
index 311d509..0aefce4 100644
--- a/pesign-obs-integration.spec
+++ b/pesign-obs-integration.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pesign-obs-integration
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
index ed07436..5e2d2d3 100644
--- a/pesign-repackage.spec.in
+++ b/pesign-repackage.spec.in
@@ -112,7 +112,7 @@ mkdir nss-db
 nss_db=$PWD/nss-db
 echo foofoofoo > "$nss_db/passwd"
 certutil -N -d "$nss_db" -f "$nss_db/passwd"
-certutil -A -d "$nss_db" -n cert -t CT,CT,CT -i "$cert"
+certutil -A -d "$nss_db" -f "$nss_db/passwd" -n cert -t CT,CT,CT -i "$cert"
 
 sigs=($(find -type f -name '*.sig' -printf '%%P\n'))
 for sig in "${sigs[@]}"; do