From bb2bc0e9e6a23b2bfb90ec3b09aa6e512d23f2ccaee54b6e800aa1a025c3f95d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 4 Apr 2007 18:30:29 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=6

---
 gnupg-2.0.1rc1.tar.bz2         |  3 ---
 gnupg-2.0.3.tar.bz2            |  3 +++
 gnupg-vasprintf.diff           | 12 ------------
 gpg2-1.9.22-CVE-2006-6169.diff | 13 -------------
 gpg2.changes                   |  7 +++++++
 gpg2.spec                      | 15 ++++++++-------
 6 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 gnupg-2.0.1rc1.tar.bz2
 create mode 100644 gnupg-2.0.3.tar.bz2
 delete mode 100644 gnupg-vasprintf.diff
 delete mode 100644 gpg2-1.9.22-CVE-2006-6169.diff

diff --git a/gnupg-2.0.1rc1.tar.bz2 b/gnupg-2.0.1rc1.tar.bz2
deleted file mode 100644
index a9e2793..0000000
--- a/gnupg-2.0.1rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7b24f620eff77f929510b248877c2135e716cdfb01a434dc0761f87b70f331d
-size 3926131
diff --git a/gnupg-2.0.3.tar.bz2 b/gnupg-2.0.3.tar.bz2
new file mode 100644
index 0000000..5ed6e22
--- /dev/null
+++ b/gnupg-2.0.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6c45386458d04cd56ceedad998f5aaf67e46e18d408a8e3658160aaf7751a86
+size 3965529
diff --git a/gnupg-vasprintf.diff b/gnupg-vasprintf.diff
deleted file mode 100644
index 7331987..0000000
--- a/gnupg-vasprintf.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnupg-1.4.6-orig/g10/parse-packet.c gnupg-1.4.6/g10/parse-packet.c
---- g10/parse-packet.c 2006-10-23 15:45:54.000000000 +0200
-+++ g10/parse-packet.c      2007-01-14 03:59:11.089877376 +0100
-@@ -1533,7 +1533,7 @@
-   buf = p = xmalloc (2 + nbytes);
-   *p++ = nbits >> 8;
-   *p++ = nbits;
--  for (; nbytes && length; nbytes--, --*length)
-+  for (; nbytes && *length; nbytes--, --*length)
-     *p++ = iobuf_get (inp);
-   if (nbytes)
-     {
diff --git a/gpg2-1.9.22-CVE-2006-6169.diff b/gpg2-1.9.22-CVE-2006-6169.diff
deleted file mode 100644
index 80311f2..0000000
--- a/gpg2-1.9.22-CVE-2006-6169.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- g10/openfile.c
-+++ g10/openfile.c
-@@ -144,8 +144,8 @@
- 
-     s = _("Enter new filename");
- 
--    n = strlen(s) + namelen + 10;
-     defname = name && namelen? make_printable_string( name, namelen, 0): NULL;
-+    n = strlen(s) + (defname?strlen (defname):0) + 10;
-     prompt = xmalloc(n);
-     if( defname )
-        sprintf(prompt, "%s [%s]: ", s, defname );
-
diff --git a/gpg2.changes b/gpg2.changes
index 0ae0a71..ba8eabd 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  4 12:42:06 CEST 2007 - ltinkl@suse.cz
+
+- update to 2.0.3
+- fixed #251605 - VUL-0: signing issues within GNUPG
+- removed outdated patches
+
 -------------------------------------------------------------------
 Fri Mar 30 01:58:56 CEST 2007 - ro@suse.de
 
diff --git a/gpg2.spec b/gpg2.spec
index 340a7a3..1bc42d1 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gpg2 (Version 2.0.1rc1)
+# spec file for package gpg2 (Version 2.0.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -21,15 +21,13 @@ Requires:       pinentry, dirmngr, gpg
 Provides:       newpg
 Obsoletes:      newpg
 Summary:        GnuPG 2
-Version:        2.0.1rc1
-Release:        10
+Version:        2.0.3
+Release:        1
 Source:         gnupg-%{version}.tar.bz2
 %define nld_build 0
 Patch2:         nld-build.diff
-Patch4:         gnupg-vasprintf.diff
 Patch5:         gnupg-1.9.22-ccid-driver-fix.diff
 Patch6:         gnupg-1.9.18-tmpdir.diff
-Patch7:         %{name}-1.9.22-CVE-2006-6169.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,10 +46,8 @@ Authors:
 %if %nld_build
 %patch2
 %endif
-%patch4
 %patch5
 %patch6
-%patch7
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -100,10 +96,15 @@ rm $RPM_BUILD_ROOT/usr/share/gnupg/faq.html
 /usr/bin/*
 %{_libdir}/[^d]*
 /usr/sbin/addgnupghome
+/usr/sbin/applygnupgdefaults
 /usr/share/locale/*/LC_MESSAGES/gnupg2.mo
 /usr/share/gnupg
 
 %changelog
+* Wed Apr 04 2007 - ltinkl@suse.cz
+- update to 2.0.3
+- fixed #251605 - VUL-0: signing issues within GNUPG
+- removed outdated patches
 * Fri Mar 30 2007 - ro@suse.de
 - added zlib-devel to buildreq
 * Wed Feb 14 2007 - ltinkl@suse.cz