[pesign/el6: 3/3] Merge branch 'f18' into el6

[Peter Jones]

commit ed092acb993ea2f8affa3cf64f2fc67c01708770
Merge: 04a114f 9e2491c
Author: Peter Jones <pjones at redhat.com>
Date:   Thu Oct 18 15:24:57 2012 -0400

    Merge branch 'f18' into el6
    
    Conflicts:
    	0001-Use-PK11_TraverseCertsForNicknameInSlot-after-all.patch
    	0002-Remove-an-unused-field.patch
    	0003-Free-the-certificate-list-we-make-once-we-re-done-us.patch
    	0004-Make-sure-we-actually-look-up-the-certificate-when-n.patch
    	0005-Fix-check-for-allocations-on-tokenname-certname.patch
    	0006-Update-valgrind.supp-for-newer-codepaths.patch
    	0007-Free-the-pid-string-once-we-re-done-writing-it.patch
    	0008-valgrind-Don-t-complain-about-unlocking-a-key-and-ke.patch
    	0009-Only-try-to-register-OIDs-once.patch
    	0010-Check-for-NSS_Shutdown-failure.patch
    	0011-Don-t-destroy-stdin-stdout-stderr-if-we-don-t-fork.patch
    	0012-valgrind-Add-SECMOD_LoadModule-codepath.patch
    	0013-Don-t-set-up-digests-in-cms_context_init.patch
    	0014-Do-register_oids-where-we-re-doing-NSS_Init.patch
    	0015-Make-daemon-shutdown-actually-close-the-NSS-database.patch
    	0016-Reformat-a-bunch-of-error-messages-to-be-vaguely-con.patch
    	0017-Use-PORT_ArenaStrdup-where-appropriate.patch
    	0018-Minor-whitespace-fixes.patch
    	0019-daemon-Make-sure-inpe-is-initialized-before-all-erro.patch
    	0020-Allocate-pesign_context-rather-than-having-it-on-the.patch
    	0021-pesign-initialize-nss-only-if-we-re-not-a-daemon.patch
    	0022-Handle-errors-on-pesign_context_init.patch
    	0023-Add-sanity-checking-to-make-sure-we-don-t-emit-unini.patch
    	0024-Make-sure-we-free-the-token-cert-we-get-from-the-com.patch
    	0025-pesign-Only-shut-down-nss-in-pesign.c-if-we-re-not-t.patch
    	0026-Rework-setup_digests-and-teardown_digests.patch
    	0027-We-shouldn-t-need-Environment-NSS_STRICT_NOFORK-DISA.patch
    	0028-Fix-errors-found-by-coverity.patch
    	0029-Don-t-keep-the-DEPS-list-twice.patch
    	0030-Don-t-build-util-right-now.patch
    	0031-Make-install_systemd-and-install_sysvinit-separate-t.patch
    	0032-Get-rid-of-an-unnecessary-allocation.patch
    	pesign.spec

 ..._TraverseCertsForNicknameInSlot-after-all.patch |    2 +-
 0002-Remove-an-unused-field.patch                  |    2 +-
 ...rtificate-list-we-make-once-we-re-done-us.patch |    2 +-
 ...e-actually-look-up-the-certificate-when-n.patch |    2 +-
 ...eck-for-allocations-on-tokenname-certname.patch |    2 +-
 ...-Update-valgrind.supp-for-newer-codepaths.patch |    2 +-
 ...the-pid-string-once-we-re-done-writing-it.patch |    2 +-
 ...n-t-complain-about-unlocking-a-key-and-ke.patch |    2 +-
 0009-Only-try-to-register-OIDs-once.patch          |    2 +-
 0010-Check-for-NSS_Shutdown-failure.patch          |    2 +-
 ...troy-stdin-stdout-stderr-if-we-don-t-fork.patch |    2 +-
 0012-valgrind-Add-SECMOD_LoadModule-codepath.patch |    2 +-
 ...-Don-t-set-up-digests-in-cms_context_init.patch |    2 +-
 ...-register_oids-where-we-re-doing-NSS_Init.patch |    2 +-
 ...-shutdown-actually-close-the-NSS-database.patch |    2 +-
 ...bunch-of-error-messages-to-be-vaguely-con.patch |    2 +-
 0017-Use-PORT_ArenaStrdup-where-appropriate.patch  |    2 +-
 0018-Minor-whitespace-fixes.patch                  |    2 +-
 ...-sure-inpe-is-initialized-before-all-erro.patch |    2 +-
 ...sign_context-rather-than-having-it-on-the.patch |    2 +-
 ...initialize-nss-only-if-we-re-not-a-daemon.patch |    2 +-
 0022-Handle-errors-on-pesign_context_init.patch    |    2 +-
 ...checking-to-make-sure-we-don-t-emit-unini.patch |    2 +-
 ...e-free-the-token-cert-we-get-from-the-com.patch |    2 +-
 ...-shut-down-nss-in-pesign.c-if-we-re-not-t.patch |    2 +-
 ...Rework-setup_digests-and-teardown_digests.patch |    2 +-
 ...t-need-Environment-NSS_STRICT_NOFORK-DISA.patch |    2 +-
 0028-Fix-errors-found-by-coverity.patch            |    2 +-
 0029-Don-t-keep-the-DEPS-list-twice.patch          |    2 +-
 0030-Don-t-build-util-right-now.patch              |    2 +-
 ...l_systemd-and-install_sysvinit-separate-t.patch |    2 +-
 0032-Get-rid-of-an-unnecessary-allocation.patch    |    2 +-
 0033-Allow-use-of-e-from-rpm-macro.patch           |   29 ++++++
 ...-use-e-like-pesign-does-rather-than-detac.patch |   81 +++++++++++++++++
 ...n-by-systemd-to-remove-socket-and-pidfile.patch |   93 ++++++++++++++++++++
 ...cros-use-the-default-fedora-signer-if-the.patch |   42 +++++++++
 pesign.spec                                        |   10 ++-
 37 files changed, 286 insertions(+), 33 deletions(-)
---
diff --cc pesign.spec
index 70f4ac6,12b8e51..2379e5a
--- a/pesign.spec
+++ b/pesign.spec
@@@ -1,7 -1,7 +1,8 @@@
  Summary: Signing utility for UEFI binaries
  Name: pesign
  Version: 0.99
- Release: 5%{?dist}
+ Release: 6%{?dist}
++>>>>>>> f18
  Group: Development/System
  License: GPLv2
  URL: https://github.com/vathpela/pesign