rpms/gnupg2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the insttools patch to apply.

Browse Source
This commit is contained in:
Tomas Mraz 2013-05-28 11:34:59 +02:00
parent 32cc451d93
commit 813fa3ff97
3 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gnupg-2.0.18-secmem.patch
View File

@ -1,33 +0,0 @@
diff -up gnupg-2.0.18/g10/gpg.c.secmem gnupg-2.0.18/g10/gpg.c
--- gnupg-2.0.18/g10/gpg.c.secmem 2011-07-22 14:00:44.000000000 +0200
+++ gnupg-2.0.18/g10/gpg.c 2011-08-17 17:35:14.000000000 +0200
@@ -790,7 +790,7 @@ make_libversion (const char *libname, co
if (maybe_setuid)
{
- gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
+ gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); /* Drop setuid. */
maybe_setuid = 0;
}
s = getfnc (NULL);
@@ -893,7 +893,7 @@ build_list( const char *text, char lette
char *list, *p, *line=NULL;
if (maybe_setuid)
- gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
+ gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); /* Drop setuid. */
for(i=0; i <= 110; i++ )
if( !chkf(i) && (s=mapf(i)) )
diff -up gnupg-2.0.18/sm/gpgsm.c.secmem gnupg-2.0.18/sm/gpgsm.c
--- gnupg-2.0.18/sm/gpgsm.c.secmem 2011-08-04 11:55:08.000000000 +0200
+++ gnupg-2.0.18/sm/gpgsm.c 2011-08-17 18:20:40.000000000 +0200
@@ -493,7 +493,7 @@ make_libversion (const char *libname, co
if (maybe_setuid)
{
- gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */
+ gcry_control (GCRYCTL_INIT_SECMEM, 4096, 0); /* Drop setuid. */
maybe_setuid = 0;
}
s = getfnc (NULL);

34
gnupg-2.0.19-insttools.patch → gnupg-2.0.20-insttools.patch
View File

@ -1,7 +1,7 @@
diff -up gnupg-2.0.19/tools/Makefile.am.insttools gnupg-2.0.19/tools/Makefile.am diff -up gnupg-2.0.20/tools/Makefile.am.insttools gnupg-2.0.20/tools/Makefile.am
--- gnupg-2.0.19/tools/Makefile.am.insttools 2012-03-27 10:00:38.000000000 +0200 --- gnupg-2.0.20/tools/Makefile.am.insttools 2013-05-10 14:55:49.000000000 +0200
+++ gnupg-2.0.19/tools/Makefile.am 2012-08-06 16:40:34.629466580 +0200 +++ gnupg-2.0.20/tools/Makefile.am 2013-05-28 11:30:22.711552140 +0200
@@ -32,8 +32,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde @@ -36,8 +36,8 @@ sbin_SCRIPTS = addgnupghome applygnupgde
bin_SCRIPTS = gpgsm-gencert.sh bin_SCRIPTS = gpgsm-gencert.sh
if HAVE_USTAR if HAVE_USTAR
@ -12,42 +12,44 @@ diff -up gnupg-2.0.19/tools/Makefile.am.insttools gnupg-2.0.19/tools/Makefile.am
endif endif
if BUILD_SYMCRYPTRUN if BUILD_SYMCRYPTRUN
@@ -49,7 +49,7 @@ else @@ -53,7 +53,7 @@ else
endif endif
-bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} -bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar}
+bin_PROGRAMS = gpgconf gpg-connect-agent gpgkey2ssh ${symcryptrun} ${gpgtar} gpgsplit +bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun} ${gpgtar} gpgsplit
if !HAVE_W32_SYSTEM if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg gpgparsemail bin_PROGRAMS += watchgnupg gpgparsemail
endif endif
@@ -58,7 +58,7 @@ if !DISABLE_REGEX @@ -62,7 +62,7 @@ if !DISABLE_REGEX
libexec_PROGRAMS = gpg-check-pattern libexec_PROGRAMS = gpg-check-pattern
endif endif
-noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit -noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
+noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert +noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgkey2ssh
common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
pwquery_libs = ../common/libsimple-pwquery.a pwquery_libs = ../common/libsimple-pwquery.a
diff -up gnupg-2.0.19/tools/Makefile.in.insttools gnupg-2.0.19/tools/Makefile.in diff -up gnupg-2.0.20/tools/Makefile.in.insttools gnupg-2.0.20/tools/Makefile.in
--- gnupg-2.0.19/tools/Makefile.in.insttools 2012-03-27 10:22:48.000000000 +0200 --- gnupg-2.0.20/tools/Makefile.in.insttools 2013-05-10 15:56:30.000000000 +0200
+++ gnupg-2.0.19/tools/Makefile.in 2012-08-06 16:41:39.535959261 +0200 +++ gnupg-2.0.20/tools/Makefile.in 2013-05-28 11:29:48.556819325 +0200
@@ -90,11 +90,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(sr @@ -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@\"" @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) \ bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \ - gpgkey2ssh$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
- $(am__EXEEXT_3) - $(am__EXEEXT_3)
+ $(am__EXEEXT_1) $(am__EXEEXT_2) \
+ $(am__EXEEXT_3) gpgsplit$(EXEEXT) + $(am__EXEEXT_3) gpgsplit$(EXEEXT)
@HAVE_W32_SYSTEM_FALSE@am__append_7 = watchgnupg gpgparsemail @HAVE_W32_SYSTEM_FALSE@am__append_8 = watchgnupg gpgparsemail
@DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) @DISABLE_REGEX_FALSE@libexec_PROGRAMS = gpg-check-pattern$(EXEEXT)
noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \ noinst_PROGRAMS = clean-sat$(EXEEXT) mk-tdata$(EXEEXT) \
- make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT) - make-dns-cert$(EXEEXT) gpgsplit$(EXEEXT)
+ make-dns-cert$(EXEEXT) + make-dns-cert$(EXEEXT) gpgkey2ssh$(EXEEXT)
subdir = tools subdir = tools
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \ am__aclocal_m4_deps = $(top_srcdir)/gl/m4/absolute-header.m4 \
@@ -454,7 +454,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER @@ -488,7 +488,7 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ER
sbin_SCRIPTS = addgnupghome applygnupgdefaults sbin_SCRIPTS = addgnupghome applygnupgdefaults
bin_SCRIPTS = gpgsm-gencert.sh bin_SCRIPTS = gpgsm-gencert.sh
# bin_SCRIPTS += gpg-zip # bin_SCRIPTS += gpg-zip

2
gnupg2.spec
View File

@ -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 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-<date>svn.tar.bz2 gnupg2 # svn export svn://cvs.gnupg.org/gnupg/trunk gnupg2; tar cjf gnupg-<date>svn.tar.bz2 gnupg2
#Source0: gnupg2-20090809svn.tar.bz2 #Source0: gnupg2-20090809svn.tar.bz2
Patch1: gnupg-2.0.19-insttools.patch Patch1: gnupg-2.0.20-insttools.patch
Patch3: gnupg-2.0.20-secmem.patch Patch3: gnupg-2.0.20-secmem.patch
Patch4: gnupg-2.0.18-protect-tool-env.patch Patch4: gnupg-2.0.18-protect-tool-env.patch
Patch5: gnupg-2.0.20-ocsp-keyusage.patch Patch5: gnupg-2.0.20-ocsp-keyusage.patch