- new upstream release (#669611)

This commit is contained in:
Tomas Mraz 2011-01-20 17:40:44 +01:00
parent 2d4b7e86d5
commit bb009e3e1b
4 changed files with 10 additions and 23 deletions

2
.gitignore vendored
View File

@ -1,2 +1,4 @@
gnupg-2.0.16.tar.bz2
gnupg-2.0.16.tar.bz2.sig
/gnupg-2.0.17.tar.bz2
/gnupg-2.0.17.tar.bz2.sig

View File

@ -1,11 +0,0 @@
diff -up gnupg-2.0.16/kbx/keybox-blob.c.gpgsm_realloc gnupg-2.0.16/kbx/keybox-blob.c
--- gnupg-2.0.16/kbx/keybox-blob.c.gpgsm_realloc 2009-09-21 11:53:44.000000000 -0500
+++ gnupg-2.0.16/kbx/keybox-blob.c 2010-07-23 12:29:54.222718366 -0500
@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_
rc = gpg_error_from_syserror ();
goto leave;
}
+ names = tmp;
}
names[blob->nuids++] = p;
if (!i && (p=x509_email_kludge (p)))

View File

@ -1,8 +1,8 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
Version: 2.0.16
Release: 3%{?dist}
Version: 2.0.17
Release: 1%{?dist}
License: GPLv3+
Group: Applications/System
@ -16,11 +16,6 @@ Patch3: gnupg-2.0.14-secmem.patch
URL: http://www.gnupg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## upstream patches
# Security Alert for GnuPG 2.0 - Realloc bug in GPGSM
# http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html
Patch100: gnupg-2.0.16-gpgsm_realloc.patch
#BuildRequires: automake libtool texinfo transfig
BuildRequires: bzip2-devel
BuildRequires: curl-devel
@ -39,13 +34,12 @@ BuildRequires: zlib-devel
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
Requires(hint): pinentry
Requires: pinentry
%package smime
Summary: CMS encryption and signing tool and smart card support for GnuPG
Requires: gnupg2 = %{version}-%{release}
Group: Applications/Internet
Requires(hint): dirmngr
%description
@ -70,7 +64,6 @@ to the base GnuPG package
%patch2 -p1 -b .s2k
%patch3 -p1 -b .secmem
%patch100 -p1 -b .gpgsm_realloc
# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper)
# Note: this is just the name of the default shared lib to load in scdaemon,
@ -172,6 +165,9 @@ rm -rf %{buildroot}
%changelog
* Thu Jan 20 2011 Tomas Mraz <tmraz@redhat.com> - 2.0.17-1
- new upstream release (#669611)
* Tue Aug 17 2010 Tomas Mraz <tmraz@redhat.com> - 2.0.16-3
- drop the provides/obsoletes for gnupg
- drop the man page file conflicting with gnupg-1.x

View File

@ -1,2 +1,2 @@
88a4d46deca63d2eca29b2b611304afb gnupg-2.0.16.tar.bz2
1c6b0b9b04c06deb5ec4bd8c959e25b0 gnupg-2.0.16.tar.bz2.sig
123af099740fd159c73a0352a274ec81 gnupg-2.0.17.tar.bz2
83683424ad7b67e395b247fc7b23c6db gnupg-2.0.17.tar.bz2.sig