From 303a5365207ccfe6f75554be4301c2c0cdc91334f8fcba31b1e111d3a3c8a2bb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Apr 2016 14:58:40 +0000 Subject: [PATCH] Accepting request 391261 from home:gary_lin:branches:Base:System - Update to 0.112 - Refresh patches: pesign-suse-build.patch and pesign-run.patch - Drop upstreamed pesign-fix-signness.patch This fixes also gcc6 build failure. It blocks gcc6. So do you think is it OK to push it now? OBS-URL: https://build.opensuse.org/request/show/391261 OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign?expand=0&rev=38 --- pesign-0.111.tar.bz2 | 3 -- pesign-0.112.tar.bz2 | 3 ++ pesign-fix-signness.patch | 71 ----------------------------- pesign-run.patch | 96 +++++++++++++++++++++------------------ pesign-suse-build.patch | 30 ++++++------ pesign.changes | 7 +++ pesign.spec | 7 +-- 7 files changed, 80 insertions(+), 137 deletions(-) delete mode 100644 pesign-0.111.tar.bz2 create mode 100644 pesign-0.112.tar.bz2 delete mode 100644 pesign-fix-signness.patch diff --git a/pesign-0.111.tar.bz2 b/pesign-0.111.tar.bz2 deleted file mode 100644 index 5e12f14..0000000 --- a/pesign-0.111.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6d52cbf1d8551be94497a96380d3b0497be331f9eb0af6250a854c0bc2225b9 -size 89630 diff --git a/pesign-0.112.tar.bz2 b/pesign-0.112.tar.bz2 new file mode 100644 index 0000000..648b1ec --- /dev/null +++ b/pesign-0.112.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99fa1240311a802fa381eebba8d52b7106690322ac00395bf9fc149dc2cb363e +size 90251 diff --git a/pesign-fix-signness.patch b/pesign-fix-signness.patch deleted file mode 100644 index 3cdf491..0000000 --- a/pesign-fix-signness.patch +++ /dev/null @@ -1,71 +0,0 @@ -From ae2520e013caf4f5d0dae89623dc08925d6cd472 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Wed, 28 Oct 2015 15:58:07 -0400 -Subject: [PATCH] Fix one more -Wsign-compare problem I missed. - -Signed-off-by: Peter Jones ---- - src/daemon.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/daemon.c b/src/daemon.c -index 02b7352..175c874 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -194,7 +194,7 @@ malformed: - return; - } - n -= sizeof(tn->size); -- if (n < tn->size) -+ if ((size_t)n < tn->size) - goto malformed; - n -= tn->size; - -@@ -202,10 +202,10 @@ malformed: - goto malformed; - - pesignd_string *tp = pesignd_string_next(tn); -- if (n < (long long)sizeof(tp->size)) -+ if ((size_t)n < sizeof(tp->size)) - goto malformed; - n -= sizeof(tp->size); -- if (n < tp->size) -+ if ((size_t)n < tp->size) - goto malformed; - n -= tp->size; - -@@ -298,7 +298,7 @@ malformed: - return; - } - n -= sizeof(tn->size); -- if (n < tn->size) -+ if ((size_t)n < tn->size) - goto malformed; - n -= tn->size; - -@@ -487,7 +487,7 @@ malformed: - } - - n -= sizeof(tn->size); -- if (n < tn->size) -+ if ((size_t)n < tn->size) - goto malformed; - n -= tn->size; - -@@ -497,11 +497,11 @@ malformed: - if (!ctx->cms->tokenname) - goto oom; - -- if (n < (long long)sizeof(tn->size)) -+ if ((size_t)n < sizeof(tn->size)) - goto malformed; - pesignd_string *cn = pesignd_string_next(tn); - n -= sizeof(cn->size); -- if (n < cn->size) -+ if ((size_t)n < cn->size) - goto malformed; - - ctx->cms->certname = PORT_ArenaStrdup(ctx->cms->arena, --- -2.6.2 - diff --git a/pesign-run.patch b/pesign-run.patch index d5e3499..22cccc4 100644 --- a/pesign-run.patch +++ b/pesign-run.patch @@ -6,23 +6,23 @@ src/tmpfiles.conf | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) -Index: pesign-0.111/src/Makefile +Index: pesign-0.112/src/Makefile =================================================================== ---- pesign-0.111.orig/src/Makefile -+++ pesign-0.111/src/Makefile -@@ -65,7 +65,7 @@ install_sysvinit: pesign.sysvinit - +--- pesign-0.112.orig/src/Makefile ++++ pesign-0.112/src/Makefile +@@ -68,7 +68,7 @@ install_sysvinit: pesign.sysvinit install : $(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign/ + $(INSTALL) -d -m 700 $(INSTALLROOT)/etc/pki/pesign-rh-test/ - $(INSTALL) -d -m 770 $(INSTALLROOT)/var/run/pesign/ + $(INSTALL) -d -m 770 $(INSTALLROOT)/run/pesign/ $(INSTALL) -d -m 755 $(INSTALLROOT)$(bindir) $(INSTALL) -m 755 authvar $(INSTALLROOT)$(bindir) $(INSTALL) -m 755 pesign $(INSTALLROOT)$(bindir) -Index: pesign-0.111/src/daemon.h +Index: pesign-0.112/src/daemon.h =================================================================== ---- pesign-0.111.orig/src/daemon.h -+++ pesign-0.111/src/daemon.h +--- pesign-0.112.orig/src/daemon.h ++++ pesign-0.112/src/daemon.h @@ -49,7 +49,7 @@ typedef enum { } pesignd_cmd; @@ -33,11 +33,11 @@ Index: pesign-0.111/src/daemon.h +#define PIDFILE "/run/pesign.pid" #endif /* DAEMON_H */ -Index: pesign-0.111/src/macros.pesign +Index: pesign-0.112/src/macros.pesign =================================================================== ---- pesign-0.111.orig/src/macros.pesign -+++ pesign-0.111/src/macros.pesign -@@ -36,7 +36,7 @@ +--- pesign-0.112.orig/src/macros.pesign ++++ pesign-0.112/src/macros.pesign +@@ -40,7 +40,7 @@ %{_pesign} -R ${sattrs}.sig -I ${sattrs} %{-i} \\\ --certdir ${nss} -c signer %{-o} \ rm -rf ${sattrs} ${sattrs}.sig ${nss} \ @@ -46,17 +46,17 @@ Index: pesign-0.111/src/macros.pesign %{_pesign_client} -t "OpenSC Card (Fedora Signer)" \\\ -c "/CN=Fedora Secure Boot Signer" \\\ %{-i} %{-o} %{-e} %{-s} %{-C} \ -Index: pesign-0.111/src/tmpfiles.conf +Index: pesign-0.112/src/tmpfiles.conf =================================================================== ---- pesign-0.111.orig/src/tmpfiles.conf -+++ pesign-0.111/src/tmpfiles.conf +--- pesign-0.112.orig/src/tmpfiles.conf ++++ pesign-0.112/src/tmpfiles.conf @@ -1 +1 @@ -D /var/run/pesign 0770 pesign pesign - +D /run/pesign 0770 pesign pesign - -Index: pesign-0.111/src/pesign.sysvinit.in +Index: pesign-0.112/src/pesign.sysvinit.in =================================================================== ---- pesign-0.111.orig/src/pesign.sysvinit.in -+++ pesign-0.111/src/pesign.sysvinit.in +--- pesign-0.112.orig/src/pesign.sysvinit.in ++++ pesign-0.112/src/pesign.sysvinit.in @@ -4,7 +4,7 @@ # # chkconfig: - 50 50 @@ -66,10 +66,10 @@ Index: pesign-0.111/src/pesign.sysvinit.in ### BEGIN INIT INFO # Provides: pesign # Should-Start: $remote_fs -Index: pesign-0.111/src/pesign.service.in +Index: pesign-0.112/src/pesign.service.in =================================================================== ---- pesign-0.111.orig/src/pesign.service.in -+++ pesign-0.111/src/pesign.service.in +--- pesign-0.112.orig/src/pesign.service.in ++++ pesign-0.112/src/pesign.service.in @@ -4,7 +4,7 @@ Description=Pesign signing daemon [Service] PrivateTmp=true @@ -79,31 +79,41 @@ Index: pesign-0.111/src/pesign.service.in ExecStart=/usr/bin/pesign --daemonize ExecStartPost=@@LIBEXECDIR@@/pesign/pesign-authorize-users ExecStartPost=@@LIBEXECDIR@@/pesign/pesign-authorize-groups -Index: pesign-0.111/src/pesign-authorize-groups +Index: pesign-0.112/src/pesign-authorize-groups =================================================================== ---- pesign-0.111.orig/src/pesign-authorize-groups -+++ pesign-0.111/src/pesign-authorize-groups -@@ -11,7 +11,7 @@ +--- pesign-0.112.orig/src/pesign-authorize-groups ++++ pesign-0.112/src/pesign-authorize-groups +@@ -12,10 +12,10 @@ set -e - if [[ -r /etc/pesign/groups ]]; then + if [ -r /etc/pesign/groups ]; then for group in $(cat /etc/pesign/groups); do -- setfacl -m g:${group}:rx /var/run/pesign -- setfacl -m g:${group}:rw /var/run/pesign/socket -+ setfacl -m g:${group}:rx /run/pesign -+ setfacl -m g:${group}:rw /run/pesign/socket - done - fi -Index: pesign-0.111/src/pesign-authorize-users +- if [ -d /var/run/pesign ]; then +- setfacl -m g:${group}:rx /var/run/pesign +- if [ -e /var/run/pesign/socket ]; then +- setfacl -m g:${group}:rw /var/run/pesign/socket ++ if [ -d /run/pesign ]; then ++ setfacl -m g:${group}:rx /run/pesign ++ if [ -e /run/pesign/socket ]; then ++ setfacl -m g:${group}:rw /run/pesign/socket + fi + fi + for x in /etc/pki/pesign* ; do +Index: pesign-0.112/src/pesign-authorize-users =================================================================== ---- pesign-0.111.orig/src/pesign-authorize-users -+++ pesign-0.111/src/pesign-authorize-users -@@ -11,7 +11,7 @@ +--- pesign-0.112.orig/src/pesign-authorize-users ++++ pesign-0.112/src/pesign-authorize-users +@@ -12,10 +12,10 @@ set -e - if [[ -r /etc/pesign/users ]]; then + if [ -r /etc/pesign/users ]; then for username in $(cat /etc/pesign/users); do -- setfacl -m u:${username}:rx /var/run/pesign -- setfacl -m u:${username}:rw /var/run/pesign/socket -+ setfacl -m u:${username}:rx /run/pesign -+ setfacl -m u:${username}:rw /run/pesign/socket - done - fi +- if [ -d /var/run/pesign ]; then +- setfacl -m g:${username}:rx /var/run/pesign +- if [ -e /var/run/pesign/socket ]; then +- setfacl -m g:${username}:rw /var/run/pesign/socket ++ if [ -d /run/pesign ]; then ++ setfacl -m g:${username}:rx /run/pesign ++ if [ -e /run/pesign/socket ]; then ++ setfacl -m g:${username}:rw /run/pesign/socket + fi + fi + for x in /etc/pki/pesign* ; do diff --git a/pesign-suse-build.patch b/pesign-suse-build.patch index ea61d83..37a6df6 100644 --- a/pesign-suse-build.patch +++ b/pesign-suse-build.patch @@ -1,7 +1,7 @@ -Index: pesign-0.111/util/Makefile +Index: pesign-0.112/util/Makefile =================================================================== ---- pesign-0.111.orig/util/Makefile -+++ pesign-0.111/util/Makefile +--- pesign-0.112.orig/util/Makefile ++++ pesign-0.112/util/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/Make.efirules include $(TOPDIR)/Make.defaults @@ -22,10 +22,10 @@ Index: pesign-0.111/util/Makefile install_systemd: -Index: pesign-0.111/src/pesign.sysvinit.in +Index: pesign-0.112/src/pesign.sysvinit.in =================================================================== ---- pesign-0.111.orig/src/pesign.sysvinit.in -+++ pesign-0.111/src/pesign.sysvinit.in +--- pesign-0.112.orig/src/pesign.sysvinit.in ++++ pesign-0.112/src/pesign.sysvinit.in @@ -6,21 +6,24 @@ # processname: /usr/bin/pesign # pidfile: /var/run/pesign.pid @@ -65,11 +65,11 @@ Index: pesign-0.111/src/pesign.sysvinit.in RETVAL=$? echo rm -f /var/lock/subsys/pesign -Index: pesign-0.111/Make.defaults +Index: pesign-0.112/Make.defaults =================================================================== ---- pesign-0.111.orig/Make.defaults -+++ pesign-0.111/Make.defaults -@@ -55,7 +55,7 @@ efi_cflags = $(cflags) +--- pesign-0.112.orig/Make.defaults ++++ pesign-0.112/Make.defaults +@@ -57,7 +57,7 @@ efi_cflags = $(cflags) ASFLAGS = $(ARCH3264) CPPFLAGS ?= @@ -78,15 +78,15 @@ Index: pesign-0.111/Make.defaults ifeq ($(ARCH),ia64) efi_cflags += -mfixed-range=f32-f127 -Index: pesign-0.111/Makefile +Index: pesign-0.112/Makefile =================================================================== ---- pesign-0.111.orig/Makefile -+++ pesign-0.111/Makefile +--- pesign-0.112.orig/Makefile ++++ pesign-0.112/Makefile @@ -9,7 +9,6 @@ SUBDIRS := include libdpe src install : - $(INSTALL) -d -m 755 $(INSTALLROOT)$(prefix)$(docdir)/pesign-$(VERSION)/ -- $(INSTALL) -pm 644 COPYING $(INSTALLROOT)$(prefix)$(docdir)/pesign-$(VERSION)/ + $(INSTALL) -d -m 755 $(INSTALLROOT)$(docdir)/pesign-$(VERSION)/ +- $(INSTALL) -pm 644 COPYING $(INSTALLROOT)$(docdir)/pesign-$(VERSION)/ @set -e ; for x in $(SUBDIRS) ; do \ $(MAKE) -C $$x $@ ; \ done diff --git a/pesign.changes b/pesign.changes index 78128ae..07f5d6e 100644 --- a/pesign.changes +++ b/pesign.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 21 09:36:23 UTC 2016 - glin@suse.com + +- Update to 0.112 +- Refresh patches: pesign-suse-build.patch and pesign-run.patch +- Drop upstreamed pesign-fix-signness.patch + ------------------------------------------------------------------- Tue Nov 10 07:59:48 UTC 2015 - glin@suse.com diff --git a/pesign.spec b/pesign.spec index 463d07f..0ec477f 100644 --- a/pesign.spec +++ b/pesign.spec @@ -1,7 +1,7 @@ # # spec file for package pesign # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: pesign -Version: 0.111 +Version: 0.112 Release: 0 Summary: Signing tool for PE-COFF binaries License: GPL-2.0 @@ -34,8 +34,6 @@ Patch3: pesign-privkey_unneeded.diff Patch5: pesign-run.patch # PATCH-FIX-UPSTREAM pesign-fix-authvar-write-loop.patch glin@suse.com -- Fix the write loop in authvar Patch6: pesign-fix-authvar-write-loop.patch -# PATCH-FIX-UPSTREAM pesign-fix-signness.patch glin@suse.com -- Fix the signness comparison -Patch7: pesign-fix-signness.patch BuildRequires: efivar-devel BuildRequires: libuuid-devel BuildRequires: mozilla-nss-devel @@ -57,7 +55,6 @@ with the PE and Authenticode specifications. %patch3 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %build make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"