rpms/gnupg2/F-8 gnupg2-2.0.9-gcc43.patch, NONE, 1.1 .cvsignore, 1.25, 1.26 gnupg2.spec, 1.78, 1.79 sources, 1.27, 1.28
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Jul 16 15:42:44 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/gnupg2/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv903
Modified Files:
.cvsignore gnupg2.spec sources
Added Files:
gnupg2-2.0.9-gcc43.patch
Log Message:
sync w/devel branch
gnupg2-2.0.9-gcc43.patch:
--- NEW FILE gnupg2-2.0.9-gcc43.patch ---
diff -up gnupg-2.0.9/keyserver/gpgkeys_curl.c.BAD gnupg-2.0.9/keyserver/gpgkeys_curl.c
--- gnupg-2.0.9/keyserver/gpgkeys_curl.c.BAD 2008-05-24 12:22:13.000000000 -0500
+++ gnupg-2.0.9/keyserver/gpgkeys_curl.c 2008-05-24 12:23:06.000000000 -0500
@@ -285,7 +285,7 @@ main(int argc,char *argv[])
if(follow_redirects)
{
- curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1);
+ curl_easy_setopt(curl,CURLOPT_FOLLOWLOCATION,1L);
if(follow_redirects>0)
curl_easy_setopt(curl,CURLOPT_MAXREDIRS,follow_redirects);
}
@@ -297,10 +297,10 @@ main(int argc,char *argv[])
{
fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
curl_easy_setopt(curl,CURLOPT_STDERR,console);
- curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
}
- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
+ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert);
curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
if(proxy)
diff -up gnupg-2.0.9/keyserver/gpgkeys_hkp.c.BAD gnupg-2.0.9/keyserver/gpgkeys_hkp.c
--- gnupg-2.0.9/keyserver/gpgkeys_hkp.c.BAD 2008-05-24 12:23:18.000000000 -0500
+++ gnupg-2.0.9/keyserver/gpgkeys_hkp.c 2008-05-24 12:23:51.000000000 -0500
@@ -197,9 +197,9 @@ send_key(int *r_eof)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
curl_easy_setopt(curl,CURLOPT_URL,request);
- curl_easy_setopt(curl,CURLOPT_POST,1);
+ curl_easy_setopt(curl,CURLOPT_POST,1L);
curl_easy_setopt(curl,CURLOPT_POSTFIELDS,key);
- curl_easy_setopt(curl,CURLOPT_FAILONERROR,1);
+ curl_easy_setopt(curl,CURLOPT_FAILONERROR,1L);
res=curl_easy_perform(curl);
if(res!=0)
@@ -656,7 +656,7 @@ main(int argc,char *argv[])
{
fprintf(console,"gpgkeys: curl version = %s\n",curl_version());
curl_easy_setopt(curl,CURLOPT_STDERR,console);
- curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+ curl_easy_setopt(curl,CURLOPT_VERBOSE,1L);
}
if(proxy)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-8/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 21 Dec 2007 21:33:16 -0000 1.25
+++ .cvsignore 16 Jul 2008 15:41:50 -0000 1.26
@@ -1,3 +1,2 @@
-clog
-gnupg-2.0.8.tar.bz2
-gnupg-2.0.8.tar.bz2.sig
+gnupg-2.0.9.tar.bz2
+gnupg-2.0.9.tar.bz2.sig
Index: gnupg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-8/gnupg2.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gnupg2.spec 24 Jan 2008 03:41:03 -0000 1.78
+++ gnupg2.spec 16 Jul 2008 15:41:50 -0000 1.79
@@ -1,7 +1,7 @@
Summary: Utility for secure communication and data storage
Name: gnupg2
-Version: 2.0.8
+Version: 2.0.9
Release: 2%{?dist}
License: GPLv3+
@@ -13,11 +13,18 @@
Patch1: gnupg-1.9.16-testverbose.patch
+# Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
+# http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
+Patch2: gnupg2-2.0.9-gcc43.patch
+
BuildRequires: bzip2-devel
BuildRequires: curl-devel
BuildRequires: docbook-utils
BuildRequires: gettext
BuildRequires: libassuan-devel >= 1.0.4
+# libgcrypt-devel >= 1.4.0 is preferred, see http://bugzilla.redhat.com/435320
+#BuildRequires: libgcrypt-devel >= 1.4.0
+#Requires(hint): libgcrypt >= 1.4.0
BuildRequires: libgcrypt-devel => 1.2.2
BuildRequires: libgpg-error-devel => 1.4
BuildRequires: libksba-devel >= 1.0.2
@@ -25,6 +32,8 @@
BuildRequires: openldap-devel
%if 0%{?fedora} > 3 || 0%{?rhel} > 4
BuildRequires: pcsc-lite-libs
+%else
+%define pcsclib libpcsclite.so.0
%endif
BuildRequires: pth-devel
BuildRequires: readline-devel ncurses-devel
@@ -33,13 +42,10 @@
Requires(post): /sbin/install-info
Requires(postun): /sbin/install-info
Requires(hint): dirmngr
-Requires: pinentry
+Requires(hint): pinentry
-# ancient, deprecated
-#Obsoletes: newpg < 0.9.5
-
-Provides: gpg
-Provides: openpgp
+# pgp-tools, perl-GnuPG-Interface requires 'gpg' (not sure why) -- Rex
+Provides: gpg = %{version}-%{release}
%description
GnuPG is GNU's tool for secure communication and data storage. It can
@@ -67,14 +73,13 @@
%setup -q -n gnupg-%{version}%{?pre}
#patch1 -p1 -b .testverbose
+%patch2 -p1 -b .gcc43
# 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).
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
+%if "%{?pcsclib}" == "%{nil}"
%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null )
-%else
-%define pcsclib libpcsclite.so.0
%endif
sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c
@@ -94,18 +99,25 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} \
+ INSTALL="install -p"
%find_lang %{name}
-# file conflicts with gnupg-1.x
-rm -f $RPM_BUILD_ROOT%{_bindir}/{gpgsplit,gpg-zip}
-rm -f $RPM_BUILD_ROOT%{_datadir}/gnupg/{FAQ,faq.html}
+# gpgconf.conf
+mkdir -p %{buildroot}%{_sysconfdir}/gnupg
+touch %{buildroot}%{_sysconfdir}/gnupg/gpgconf.conf
+
+## Unpackaged files
+# file conflicts with gnupg-1.x
+# shouldn't gnupg2 be providing these now (maybe only f9+)? -- Rex
+rm -f %{buildroot}%{_bindir}/{gpgsplit,gpg-zip}
+rm -f %{buildroot}%{_datadir}/gnupg/{FAQ,faq.html}
-# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+# info dir
+rm -f %{buildroot}%{_infodir}/dir
%check
@@ -127,6 +139,8 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%dir %{_sysconfdir}/gnupg
+%ghost %config(noreplace) %{_sysconfdir}/gnupg/gpgconf.conf
#docs say to install suid root, but we won't, for now.
#attr(4755,root,root) %{_bindir}/gpg2
%{_bindir}/gpg2
@@ -145,15 +159,30 @@
%{_sbindir}/*
%{_datadir}/gnupg/
%{_libexecdir}/*
-%{_infodir}/*
+%{_infodir}/*.info*
%{_mandir}/man?/*
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%changelog
+* Sat May 24 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.9-2
+- Patch from upstream to fix curl 7.18.1+ and gcc4.3+ compile error
+
+* Mon May 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.9-1.1
+- minor release bump for sparc rebuild
+
+* Wed Mar 26 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.9-1
+- gnupg2-2.0.9
+- drop Provides: openpgp
+- versioned Provides: gpg
+- own %%_sysconfdir/gnupg
+
+* Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-3
+- respin (gcc43)
+
* Wed Jan 23 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.8-2
- avoid kde-filesystem dep (#427316)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg2/F-8/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 21 Dec 2007 21:33:16 -0000 1.27
+++ sources 16 Jul 2008 15:41:50 -0000 1.28
@@ -1,2 +1,2 @@
-fc4377ca67e1bf687eeaf22e79c0b9d1 gnupg-2.0.8.tar.bz2
-5f4fefbca2568910e3628b4d8ea3d485 gnupg-2.0.8.tar.bz2.sig
+b41f3f6716a74c46a609a71853e85c7b gnupg-2.0.9.tar.bz2
+29a90f2bdd27d79b7e9a0885f119832a gnupg-2.0.9.tar.bz2.sig
More information about the fedora-extras-commits
mailing list