From 59dff8939eaaaacb00535a0ea7b5109a85ce3af6 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Wed, 13 Jan 2016 16:06:33 +0100 Subject: [PATCH] rebase the insttools patch needed for full gpgv1 replacement --- gnupg-2.0.20-insttools.patch | 60 ----------------------------- gnupg-2.1.10-insttools.patch | 74 ++++++++++++++++++++++++++++++++++++ gnupg2.spec | 7 +++- 3 files changed, 79 insertions(+), 62 deletions(-) delete mode 100644 gnupg-2.0.20-insttools.patch create mode 100644 gnupg-2.1.10-insttools.patch diff --git a/gnupg-2.0.20-insttools.patch b/gnupg-2.0.20-insttools.patch deleted file mode 100644 index 80b796d..0000000 --- a/gnupg-2.0.20-insttools.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -up gnupg-2.0.20/tools/Makefile.am.insttools gnupg-2.0.20/tools/Makefile.am ---- gnupg-2.0.20/tools/Makefile.am.insttools 2013-05-10 14:55:49.000000000 +0200 -+++ gnupg-2.0.20/tools/Makefile.am 2013-05-28 11:30:22.711552140 +0200 -@@ -36,8 +36,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde - - bin_SCRIPTS = gpgsm-gencert.sh - if HAVE_USTAR --# bin_SCRIPTS += gpg-zip --noinst_SCRIPTS = gpg-zip -+bin_SCRIPTS += gpg-zip -+#noinst_SCRIPTS = gpg-zip - endif - - if BUILD_SYMCRYPTRUN -@@ -53,7 +53,7 @@ else - endif - - --bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} -+bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} ${gpgtar} gpgsplit - if !HAVE_W32_SYSTEM - bin_PROGRAMS += watchgnupg gpgparsemail - endif -@@ -62,7 +62,7 @@ if !DISABLE_REGEX - libexec_PROGRAMS = gpg-check-pattern - endif - --noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit -+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh - - common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a - pwquery_libs = ../common/libsimple-pwquery.a -diff -up gnupg-2.0.20/tools/Makefile.in.insttools gnupg-2.0.20/tools/Makefile.in ---- gnupg-2.0.20/tools/Makefile.in.insttools 2013-05-10 15:56:30.000000000 +0200 -+++ gnupg-2.0.20/tools/Makefile.in 2013-05-28 11:29:48.556819325 +0200 -@@ -107,12 +107,12 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr - @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_6 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\"" - @HAVE_W32_SYSTEM_TRUE@am__append_7 = gpg-connect-agent-w32info.o - bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \ -- gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ -- $(am__EXEEXT_3) -+ $(am__EXEEXT_1) $(am__EXEEXT_2) \ -+ $(am__EXEEXT_3) gpgsplit$(EXEEXT) - @HAVE_W32_SYSTEM_FALSE@am__append_8 = watchgnupg gpgparsemail - @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) - noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \ -- make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT) -+ make-dns-cert$(EXEEXT) gpgkey2ssh$(EXEEXT) - subdir = tools - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \ -@@ -488,7 +488,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER - sbin_SCRIPTS = addgnupghome applygnupgdefaults - bin_SCRIPTS = gpgsm-gencert.sh - # bin_SCRIPTS += gpg-zip --@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip -+@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip - @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = - @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun - @BUILD_GPGTAR_FALSE@gpgtar = diff --git a/gnupg-2.1.10-insttools.patch b/gnupg-2.1.10-insttools.patch new file mode 100644 index 0000000..604b109 --- /dev/null +++ b/gnupg-2.1.10-insttools.patch @@ -0,0 +1,74 @@ +diff -up gnupg-2.1.10/tools/Makefile.am.insttools gnupg-2.1.10/tools/Makefile.am +--- gnupg-2.1.10/tools/Makefile.am.insttools 2015-11-30 17:39:52.000000000 +0100 ++++ gnupg-2.1.10/tools/Makefile.am 2016-01-13 15:59:24.368328089 +0100 +@@ -35,8 +35,8 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER + sbin_SCRIPTS = addgnupghome applygnupgdefaults + + if HAVE_USTAR +-# bin_SCRIPTS += gpg-zip +-noinst_SCRIPTS = gpg-zip ++bin_SCRIPTS += gpg-zip ++#noinst_SCRIPTS = gpg-zip + endif + + if BUILD_SYMCRYPTRUN +@@ -51,13 +51,12 @@ else + gpgtar = + endif + +-# Fixme: We should remove the gpgkey2ssh tool. + bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} + if !HAVE_W32_SYSTEM + bin_PROGRAMS += watchgnupg gpgparsemail + endif + if !HAVE_W32CE_SYSTEM +-bin_PROGRAMS += gpgkey2ssh ${gpgtar} ++bin_PROGRAMS += ${gpgtar} gpgsplit + endif + + if !DISABLE_REGEX +@@ -65,7 +64,7 @@ libexec_PROGRAMS = gpg-check-pattern + endif + + if !HAVE_W32CE_SYSTEM +-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit ++noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh + endif + + common_libs = $(libcommon) +diff -up gnupg-2.1.10/tools/Makefile.in.insttools gnupg-2.1.10/tools/Makefile.in +--- gnupg-2.1.10/tools/Makefile.in.insttools 2015-12-04 10:57:06.000000000 +0100 ++++ gnupg-2.1.10/tools/Makefile.in 2016-01-13 16:02:57.079201039 +0100 +@@ -139,12 +139,12 @@ DIST_COMMON = $(top_srcdir)/am/cmacros.a + bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \ + $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_4) + @HAVE_W32_SYSTEM_FALSE@am__append_9 = watchgnupg gpgparsemail +-@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgkey2ssh ${gpgtar} ++@HAVE_W32CE_SYSTEM_FALSE@am__append_10 = gpgsplit ${gpgtar} + @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) + @HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \ + @HAVE_W32CE_SYSTEM_FALSE@ mk-tdata$(EXEEXT) \ + @HAVE_W32CE_SYSTEM_FALSE@ make-dns-cert$(EXEEXT) \ +-@HAVE_W32CE_SYSTEM_FALSE@ gpgsplit$(EXEEXT) ++@HAVE_W32CE_SYSTEM_FALSE@ gpgkey2ssh$(EXEEXT) + subdir = tools + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \ +@@ -170,7 +170,7 @@ CONFIG_CLEAN_VPATH_FILES = + @HAVE_W32_SYSTEM_FALSE@am__EXEEXT_2 = watchgnupg$(EXEEXT) \ + @HAVE_W32_SYSTEM_FALSE@ gpgparsemail$(EXEEXT) + @BUILD_GPGTAR_TRUE@am__EXEEXT_3 = gpgtar$(EXEEXT) +-@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgkey2ssh$(EXEEXT) \ ++@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 = gpgsplit$(EXEEXT) \ + @HAVE_W32CE_SYSTEM_FALSE@ $(am__EXEEXT_3) + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \ + "$(DESTDIR)$(sbindir)" +@@ -566,7 +566,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER + sbin_SCRIPTS = addgnupghome applygnupgdefaults + + # bin_SCRIPTS += gpg-zip +-@HAVE_USTAR_TRUE@noinst_SCRIPTS = gpg-zip ++@HAVE_USTAR_TRUE@bin_SCRIPTS += gpg-zip + @BUILD_SYMCRYPTRUN_FALSE@symcryptrun = + @BUILD_SYMCRYPTRUN_TRUE@symcryptrun = symcryptrun + @BUILD_GPGTAR_FALSE@gpgtar = diff --git a/gnupg2.spec b/gnupg2.spec index 906fdce..36d809a 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -1,7 +1,7 @@ Summary: Utility for secure communication and data storage Name: gnupg2 Version: 2.1.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/System @@ -9,7 +9,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}. Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.tar.bz2.sig # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-svn.tar.bz2 gnupg2 #Source0: gnupg2-20090809svn.tar.bz2 -Patch1: gnupg-2.0.20-insttools.patch +Patch1: gnupg-2.1.10-insttools.patch # needed for compatibility with system FIPS mode Patch3: gnupg-2.1.10-secmem.patch # non-upstreamable patch adding file-is-digest option needed for Copr @@ -213,6 +213,9 @@ fi %changelog +* Wed Jan 13 2015 Tomáš Mráz - 2.1.10-2 +- rebase the insttools patch needed for full gpgv1 replacement + * Mon Dec 7 2015 Tomáš Mráz - 2.1.10-1 - upgrade to 2.1.10