rpms/gnupg2/devel gnupg-1.9.17-lvalue.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gnupg2.spec, 1.11, 1.12 sources, 1.4, 1.5 gnupg-1.9.16-signal-info.patch, 1.1, NONE gnupg-1.9.16.tar.bz2.sig, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/gnupg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13881

Modified Files:
	.cvsignore gnupg2.spec sources 
Added Files:
	gnupg-1.9.17-lvalue.patch 
Removed Files:
	gnupg-1.9.16-signal-info.patch gnupg-1.9.16.tar.bz2.sig 
Log Message:
1.9.17 (#162264).

gnupg-1.9.17-lvalue.patch:

--- NEW FILE gnupg-1.9.17-lvalue.patch ---
--- g10/misc.c~	2005-06-15 18:34:29.000000000 +0300
+++ g10/misc.c	2005-07-01 21:02:05.000000000 +0300
@@ -986,10 +986,10 @@
     }
     else {
 	int rc;
-	char *buffer;
+	unsigned char *buffer;
 
 	rc = gcry_mpi_aprint( GCRYMPI_FMT_HEX,
-                              &(unsigned char*)buffer, NULL, a );
+                              &buffer, NULL, a );
 	assert( !rc );
 	fputs( buffer, fp );
 	n += strlen(buffer);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 May 2005 16:23:11 -0000	1.3
+++ .cvsignore	2 Jul 2005 08:39:51 -0000	1.4
@@ -1 +1,2 @@
-gnupg-1.9.16.tar.bz2
+gnupg-1.9.17.tar.bz2
+gnupg-1.9.17.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnupg2.spec	13 May 2005 18:01:21 -0000	1.11
+++ gnupg2.spec	2 Jul 2005 08:39:51 -0000	1.12
@@ -1,7 +1,12 @@
+# 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,
+# it can use other implementations too (including non-pcsc ones).
+%define pcsc_lib libpcsclite.so.0
+
 Summary: GNU utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.16
-Release: 4%{?dist}
+Version: 1.9.17
+Release: 1%{?dist}
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -10,7 +15,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0: gnupg-1.9.16-pth.patch
-Patch1: gnupg-1.9.16-signal-info.patch
+Patch1: gnupg-1.9.17-lvalue.patch
 Patch2: gnupg-1.9.16-testverbose.patch
 
 Obsoletes: newpg < 0.9.5
@@ -28,10 +33,9 @@
 BuildRequires: libgcrypt-devel => 1.2.0
 BuildRequires: libgpg-error-devel => 1.0
 Requires: libgpg-error >= 1.0
-BuildRequires: libassuan-devel >= 0.6.9
+BuildRequires: libassuan-devel >= 0.6.10
 BuildRequires: libksba-devel >= 0.9.11
 BuildRequires: opensc-devel >= 0.9
-BuildRequires: pcsc-lite-devel
 BuildRequires: gettext
 BuildRequires: openldap-devel
 BuildRequires: libusb-devel
@@ -64,9 +68,11 @@
 %setup -q -n gnupg-%{version}
 
 %patch0 -p1 -b .pth
-%patch1 -p1 -b .strsignal
+%patch1 -p0 -b .lvalue
 %patch2 -p1 -b .testverbose
 
+sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
+
 
 %build
 
@@ -114,10 +120,10 @@
 %{_bindir}/gpg-connect-agent
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
+%{_bindir}/gpgkey2ssh
 %{_bindir}/gpgsm*
 %{_bindir}/gpgv2
 %{_bindir}/kbxutil
-%{_bindir}/sc-copykeys
 %{_bindir}/scdaemon
 %{_bindir}/watchgnupg
 %{_sbindir}/*
@@ -132,6 +138,12 @@
 
 
 %changelog
+* Fri Jul  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.9.17-1
+- 1.9.17, signal info patch applied upstream (#162264).
+- Patch to fix lvalue build error with gcc4 (upstream #485).
+- Patch scdaemon and pcsc-wrapper to load the versioned (non-devel)
+  pcsc-lite lib by default.
+
 * Fri May 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.9.16-3
 - Include upstream's patch for signal.c.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 May 2005 16:23:11 -0000	1.4
+++ sources	2 Jul 2005 08:39:51 -0000	1.5
@@ -1 +1,2 @@
-1282755dce9cf4a84e904ca0191017a3  gnupg-1.9.16.tar.bz2
+a1bf98c5ec0c5c316b4ae6f017f02fa3  gnupg-1.9.17.tar.bz2
+9c60e57f39a65d7be048344f2c03a4b2  gnupg-1.9.17.tar.bz2.sig


--- gnupg-1.9.16-signal-info.patch DELETED ---


--- gnupg-1.9.16.tar.bz2.sig DELETED ---