From 5cea16c68dd6afa3caec5d9de3dc342bdf3684ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 2 Jul 2005 08:39:51 +0000 Subject: [PATCH] 1.9.17 (#162264). --- .cvsignore | 3 +- gnupg-1.9.16-signal-info.patch | 74 --------------------------------- gnupg-1.9.16.tar.bz2.sig | Bin 65 -> 0 bytes gnupg-1.9.17-lvalue.patch | 15 +++++++ gnupg2.spec | 26 ++++++++---- sources | 3 +- 6 files changed, 38 insertions(+), 83 deletions(-) delete mode 100644 gnupg-1.9.16-signal-info.patch delete mode 100644 gnupg-1.9.16.tar.bz2.sig create mode 100644 gnupg-1.9.17-lvalue.patch diff --git a/.cvsignore b/.cvsignore index 4e7b82d..b8906a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -gnupg-1.9.16.tar.bz2 +gnupg-1.9.17.tar.bz2 +gnupg-1.9.17.tar.bz2.sig diff --git a/gnupg-1.9.16-signal-info.patch b/gnupg-1.9.16-signal-info.patch deleted file mode 100644 index ac02f29..0000000 --- a/gnupg-1.9.16-signal-info.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -Nur gnupg-1.9.16-orig/common/signal.c gnupg-1.9.16/common/signal.c ---- gnupg-1.9.16-orig/common/signal.c 2004-12-21 11:03:00.000000000 +0100 -+++ gnupg-1.9.16/common/signal.c 2005-05-13 14:56:37.000000000 +0200 -@@ -1,5 +1,6 @@ - /* signal.c - signal handling -- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, -+ * 2005 Free Software Foundation, Inc. - * - * This file is part of GnuPG. - * -@@ -73,10 +74,12 @@ - static const char * - get_signal_name( int signum ) - { --#if defined(SYS_SIGLIST_DECLARED) && defined(NSIG) -+ /* Note that we can't use strsignal(), because it is not -+ reentrant. */ -+#if defined(HAVE_DECL_SYS_SIGLIST) && defined(NSIG) - return (signum >= 0 && signum < NSIG) ? sys_siglist[signum] : "?"; - #else -- return "some signal"; -+ return NULL; - #endif - } - #endif /*!HAVE_DOSISH_SYSTEM*/ -@@ -93,19 +96,42 @@ - - if (cleanup_fnc) - cleanup_fnc (); -- /* better don't translate these messages */ -+ /* Better don't translate these messages. */ - write (2, "\n", 1 ); - s = log_get_prefix (NULL); - if (s) - write(2, s, strlen (s)); -- write (2, ": ", 2 ); -+ write (2, ": signal ", 9 ); - s = get_signal_name(sig); -- write (2, s, strlen(s) ); -+ if (s) -+ write (2, s, strlen(s) ); -+ else -+ { -+ /* We are in a signal handler so we can't use any kind of printf -+ even not sprintf. USe a straightforward algorithm. */ -+ if (sig < 0 || sig >= 100000) -+ write (2, "?", 1); -+ else -+ { -+ int i, any=0; -+ -+ for (i=10000; i; i /= 10) -+ { -+ if (sig >= i || ((any || i==1) && !(sig/i))) -+ { -+ write (2, "0123456789"+(sig/i), 1); -+ if ((sig/i)) -+ any = 1; -+ sig %= i; -+ } -+ } -+ } -+ } - write (2, " caught ... exiting\n", 20); - -- /* reset action to default action and raise signal again */ -+ /* Reset action to default action and raise signal again */ - init_one_signal (sig, SIG_DFL, 0); -- /* fixme: remove_lockfiles ();*/ -+ /* Fixme: remove_lockfiles ();*/ - #ifdef __riscos__ - close_fds (); - #endif /* __riscos__ */ diff --git a/gnupg-1.9.16.tar.bz2.sig b/gnupg-1.9.16.tar.bz2.sig deleted file mode 100644 index 6b4bb1fef8c0f994ed855bfef25b94cc95f89453..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 65 zcmV-H0KWf-KLZ5-LTA2*Xt%40S5%G75ds2N0GtU`g?G#s5I7+Q#9A|zjKvXi0^ 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 @@ the stable gpg version 1.4 (as well as the old 1.2 series). %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 @@ fi %{_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 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 1 2005 Ville Skyttä - 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 - 1.9.16-3 - Include upstream's patch for signal.c. diff --git a/sources b/sources index c1f37b3..55af1df 100644 --- a/sources +++ b/sources @@ -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