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

new upstream release (#728481)

Browse Source
This commit is contained in:
Tomas Mraz 2011-08-17 18:45:24 +02:00
parent fbf259bb8a
commit b6ff65176d
5 changed files with 19 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -2,3 +2,5 @@ gnupg-2.0.16.tar.bz2
gnupg-2.0.16.tar.bz2.sig gnupg-2.0.16.tar.bz2.sig
/gnupg-2.0.17.tar.bz2 /gnupg-2.0.17.tar.bz2
/gnupg-2.0.17.tar.bz2.sig /gnupg-2.0.17.tar.bz2.sig
/gnupg-2.0.18.tar.bz2
/gnupg-2.0.18.tar.bz2.sig

28
gnupg-2.0.17-libgcrypt-mpi.patch
View File

@ -1,28 +0,0 @@
X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blobdiff_plain;f=g10%2Fpkglue.c;h=5c47511f7236cbde17a2a983bc597950be830475;hp=cbfe21ea89f4088033e660c5210178a535fb86c9;hb=13290b0e0fcf3a493e4848b29329d56b69bc4dd9;hpb=af497d52c3c88d1cdbedf1c7c2ce2f21f2bc9ad4
diff --git a/g10/pkglue.c b/g10/pkglue.c
index cbfe21e..5c47511 100644
--- a/g10/pkglue.c
+++ b/g10/pkglue.c
@@ -34,10 +34,10 @@ mpi_from_sexp (gcry_sexp_t sexp, const char * item)
{
gcry_sexp_t list;
gcry_mpi_t data;
-
+
list = gcry_sexp_find_token (sexp, item, 0);
assert (list);
- data = gcry_sexp_nth_mpi (list, 1, 0);
+ data = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
assert (data);
gcry_sexp_release (list);
return data;
@@ -293,7 +293,7 @@ pk_decrypt (int algo, gcry_mpi_t * result, gcry_mpi_t * data,
if (rc)
return rc;
- *result = gcry_sexp_nth_mpi (s_plain, 0, 0);
+ *result = gcry_sexp_nth_mpi (s_plain, 0, GCRYMPI_FMT_USG);
gcry_sexp_release (s_plain);
if (!*result)
return -1; /* oops */

18
gnupg-2.0.14-secmem.patch → gnupg-2.0.18-secmem.patch
View File

@ -1,7 +1,7 @@
diff -up gnupg-2.0.14/g10/gpg.c.secmem gnupg-2.0.14/g10/gpg.c diff -up gnupg-2.0.18/g10/gpg.c.secmem gnupg-2.0.18/g10/gpg.c
--- gnupg-2.0.14/g10/gpg.c.secmem 2009-12-21 15:00:55.000000000 +0100 --- gnupg-2.0.18/g10/gpg.c.secmem 2011-07-22 14:00:44.000000000 +0200
+++ gnupg-2.0.14/g10/gpg.c 2010-06-18 18:03:24.000000000 +0200 +++ gnupg-2.0.18/g10/gpg.c 2011-08-17 17:35:14.000000000 +0200
@@ -789,7 +789,7 @@ make_libversion (const char *libname, co @@ -790,7 +790,7 @@ make_libversion (const char *libname, co
if (maybe_setuid) if (maybe_setuid)
{ {
@ -10,7 +10,7 @@ diff -up gnupg-2.0.14/g10/gpg.c.secmem gnupg-2.0.14/g10/gpg.c
maybe_setuid = 0; maybe_setuid = 0;
} }
s = getfnc (NULL); s = getfnc (NULL);
@@ -892,7 +892,7 @@ build_list( const char *text, char lette @@ -893,7 +893,7 @@ build_list( const char *text, char lette
char *list, *p, *line=NULL; char *list, *p, *line=NULL;
if (maybe_setuid) if (maybe_setuid)
@ -19,11 +19,11 @@ diff -up gnupg-2.0.14/g10/gpg.c.secmem gnupg-2.0.14/g10/gpg.c
for(i=0; i <= 110; i++ ) for(i=0; i <= 110; i++ )
if( !chkf(i) && (s=mapf(i)) ) if( !chkf(i) && (s=mapf(i)) )
diff -up gnupg-2.0.14/sm/gpgsm.c.secmem gnupg-2.0.14/sm/gpgsm.c diff -up gnupg-2.0.18/sm/gpgsm.c.secmem gnupg-2.0.18/sm/gpgsm.c
--- gnupg-2.0.14/sm/gpgsm.c.secmem 2009-12-10 12:35:43.000000000 +0100 --- gnupg-2.0.18/sm/gpgsm.c.secmem 2011-08-04 11:55:08.000000000 +0200
+++ gnupg-2.0.14/sm/gpgsm.c 2010-06-18 18:03:07.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 @@ -493,7 +493,7 @@ make_libversion (const char *libname, co
if (maybe_setuid) if (maybe_setuid)
{ {
- gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */ - gcry_control (GCRYCTL_INIT_SECMEM, 0, 0); /* Drop setuid. */

9
gnupg2.spec
View File

@ -1,7 +1,7 @@
Summary: Utility for secure communication and data storage Summary: Utility for secure communication and data storage
Name: gnupg2 Name: gnupg2
Version: 2.0.17 Version: 2.0.18
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
@ -10,7 +10,7 @@ Source1: ftp://ftp.gnupg.org/gcrypt/%{?pre:alpha/}gnupg/gnupg-%{version}%{?pre}.
# 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
Patch2: gnupg-2.0.16-tests-s2kcount.patch Patch2: gnupg-2.0.16-tests-s2kcount.patch
Patch3: gnupg-2.0.14-secmem.patch Patch3: gnupg-2.0.18-secmem.patch
# This is already in upstream sources # This is already in upstream sources
Patch4: gnupg-2.0.17-libgcrypt-mpi.patch Patch4: gnupg-2.0.17-libgcrypt-mpi.patch
@ -167,6 +167,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Wed Aug 17 2011 Tomas Mraz <tmraz@redhat.com> - 2.0.18-1
- new upstream release (#728481)
* Mon Jul 25 2011 Tomas Mraz <tmraz@redhat.com> - 2.0.17-2 * Mon Jul 25 2011 Tomas Mraz <tmraz@redhat.com> - 2.0.17-2
- fix a bug that shows up with the new libgcrypt release (#725369) - fix a bug that shows up with the new libgcrypt release (#725369)

4
sources
View File

@ -1,2 +1,2 @@
123af099740fd159c73a0352a274ec81 gnupg-2.0.17.tar.bz2 2f37e0722666a0fedbe4d9f9227ac4d7 gnupg-2.0.18.tar.bz2
83683424ad7b67e395b247fc7b23c6db gnupg-2.0.17.tar.bz2.sig ddca149279811a3a4572fc90f92bbcf6 gnupg-2.0.18.tar.bz2.sig