OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=2

gnupg-1.9.22-warnings-fix.diff

@@ -1,66 +0,0 @@
-Index: agent/gpg-agent.c
-===================================================================
---- agent/gpg-agent.c.orig
-+++ agent/gpg-agent.c
-@@ -1621,7 +1621,7 @@ check_for_running_agent (int mode)
-   int rc;
-   char *infostr, *p;
-   assuan_context_t ctx;
--  int prot, pid;
-+  int prot=0, pid=0;
- 
-   if (!mode)
-     {
-Index: g10/pubkey-enc.c
-===================================================================
---- g10/pubkey-enc.c.orig
-+++ g10/pubkey-enc.c
-@@ -154,7 +154,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P
-   int rc;
-   gcry_mpi_t plain_dek  = NULL;
-   byte *frame = NULL;
--  unsigned n, nframe;
-+  size_t n, nframe;
-   u16 csum, csum2;
-   
-   int card = 0;
-@@ -166,7 +166,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, P
-       size_t rbuflen;
-       char *snbuf;
-       unsigned char *indata = NULL;
--      unsigned int indatalen;
-+      size_t int indatalen;
- 
-       snbuf = serialno_and_fpr_from_sk (sk->protect.iv, sk->protect.ivlen, sk);
- 
-Index: g10/seckey-cert.c
-===================================================================
---- g10/seckey-cert.c.orig
-+++ g10/seckey-cert.c
-@@ -107,7 +107,7 @@ do_check( PKT_secret_key *sk, const char
- 
- 	csum = 0;
- 	if( sk->version >= 4 ) {
--            int ndata;
-+            size_t ndata;
- 	    unsigned int ndatabits;
- 	    byte *p, *data;
-             u16 csumc = 0;
-@@ -337,7 +337,7 @@ protect_secret_key( PKT_secret_key *sk, 
- {
-     int i,j, rc = 0;
-     byte *buffer;
--    unsigned nbytes;
-+    size_t nbytes;
-     u16 csum;
- 
-     if( !dek )
-@@ -370,7 +370,7 @@ protect_secret_key( PKT_secret_key *sk, 
- 	    gcry_cipher_setiv (cipher_hd, sk->protect.iv, sk->protect.ivlen);
- 	    if( sk->version >= 4 ) {
-                 byte *bufarr[PUBKEY_MAX_NSKEY];
--		unsigned narr[PUBKEY_MAX_NSKEY];
-+		size_t narr[PUBKEY_MAX_NSKEY];
- 		unsigned nbits[PUBKEY_MAX_NSKEY];
- 		int ndata=0;
- 		byte *p, *data;

gnupg-1.9.22.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e4472e00c14c881ee1f93deddbe91d3c520311839f30d336ca48a51939e45cf
-size 1908546

gnupg-2.0.1rc1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7b24f620eff77f929510b248877c2135e716cdfb01a434dc0761f87b70f331d
+size 3926131

gnupg-vasprintf.diff

@@ -0,0 +1,12 @@
+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)
+     {

gpg2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jan 29 16:22:15 CET 2007 - ltinkl@suse.cz
+
+- fix #221212 - gpg2 is not updated and do not contain documentation
+- fix #233525 - gpg1/2: bug in vasprintf() implementation
+
 -------------------------------------------------------------------
 Thu Nov 30 16:59:25 CET 2006 - anicka@suse.cz
 

gpg2.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package gpg2 (Version 1.9.22)
+# spec file for package gpg2 (Version 2.0.1rc1)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           gpg2
-BuildRequires:  expect krb5 libassuan libgcrypt-devel libksba-devel pcsc-lite
+BuildRequires:  expect krb5 libassuan libgcrypt-devel libksba-devel pcsc-lite pth readline-devel
 URL:            http://www.gnupg.org/aegypten2/
 License:        GNU General Public License (GPL)
 Group:          Productivity/Networking/Security
@@ -21,17 +21,15 @@ Requires:       pinentry, dirmngr, gpg
 Provides:       newpg
 Obsoletes:      newpg
 Summary:        GnuPG 2
-Version:        1.9.22
+Version:        2.0.1rc1
-Release:        20
+Release:        1
-%define pthversion 2.0.7
 Source:         gnupg-%{version}.tar.bz2
-Source1:        pth-%{pthversion}.tar.bz2
 %define nld_build 0
 Patch2:         nld-build.diff
-Patch4:         gnupg-1.9.22-warnings-fix.diff
+Patch4:         gnupg-vasprintf.diff
 Patch5:         gnupg-1.9.22-ccid-driver-fix.diff
 Patch6:         gnupg-1.9.18-tmpdir.diff
-Patch7:         %{name}-%{version}-CVE-2006-6169.diff
+Patch7:         %{name}-1.9.22-CVE-2006-6169.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,7 +44,7 @@ Authors:
     Neal H. Walfield  <neal@g10code.de>
 
 %prep
-%setup -q -n gnupg-%{version} -b 1
+%setup -q -n gnupg-%{version}
 %if %nld_build
 %patch2
 %endif
@@ -57,16 +55,8 @@ Authors:
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-cd ../pth-%pthversion
-./configure --disable-shared
-make
-make test
-cd -
 # opensc should be added to neededforbuild, but the support
 # in gpg2 is broken atm.
-export CFLAGS="$RPM_OPT_FLAGS -I$PWD/../pth-%pthversion"
-export LDFLAGS="-L$PWD/../pth-%pthversion/.libs"
-export PATH="$PWD/../pth-%pthversion/:$PATH"
 autoreconf -fi
 ./configure \
                 --prefix=%{_prefix} \
@@ -104,15 +94,17 @@ rm $RPM_BUILD_ROOT/usr/share/info/dir
 %defattr(-,root,root)
 %doc ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION
 %doc %_infodir/gnupg*
+%doc %{_mandir}/*/*.gz
 /usr/bin/*
-%{_libdir}/gnupg
+%{_libdir}/*
-%{_libdir}/gpg-protect-tool
-%{_libdir}/gpg-preset-passphrase
 /usr/sbin/addgnupghome
-/usr/share/locale/de/LC_MESSAGES/gnupg2.mo
+/usr/share/locale/*/LC_MESSAGES/gnupg2.mo
 /usr/share/gnupg
 
 %changelog -n gpg2
+* Mon Jan 29 2007 - ltinkl@suse.cz
+- fix #221212 - gpg2 is not updated and do not contain documentation
+- fix #233525 - gpg1/2: bug in vasprintf() implementation
 * Thu Nov 30 2006 - anicka@suse.cz
 - fix overflow in openfile.c (CVE-2006-6169, #224108)
 * Mon Sep 11 2006 - pnemec@suse.cz

pth-2.0.7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:075705004ec9a6b19fe8b00af4f2c45ec2a0008d78cedea571265d0b544c7a90
-size 507473