[Gpa-commits] r1006 - in trunk: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jun 17 18:52:13 CEST 2009
Author: werner
Date: 2009-06-17 18:52:11 +0200 (Wed, 17 Jun 2009)
New Revision: 1006
Modified:
trunk/AUTHORS
trunk/ChangeLog
trunk/INSTALL
trunk/Makefile.am
trunk/README
trunk/config.guess
trunk/config.sub
trunk/configure.ac
trunk/depcomp
trunk/install-sh
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/clipboard.c
trunk/src/fileman.c
trunk/src/gpa-key-details.c
trunk/src/gpa.c
trunk/src/gpasubkeylist.c
trunk/src/gpgmeedit.c
trunk/src/keylist.c
trunk/src/keymanager.c
Log:
Require gpgme 1.2.0.
Updated some autotools helper.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/AUTHORS 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,5 +1,5 @@
Program: GPA
-Maintainer: Miguel Coca <mcoca at gnu.org>
+Maintainer: None, check the mailing list gpa-dev at gnupg.org.
Bug reports: <bug-gpa at gnupg.org>
Security related bug reports: <security at gnupg.org>
License: GPLv3+
@@ -85,8 +85,9 @@
Maxim Britov <maxim.britov at gmail.com>
Russian translation.
-Marcus Brinkmann <marcus at g10code.de>
+Marcus Brinkmann <marcus at g10code.com>
Clipboard code, cleanups, bug fixes.
+
\ No newline at end of file
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/ChangeLog 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,3 +1,15 @@
+2009-06-17 Werner Koch <wk at g10code.com>
+
+ * config.sub, config.guess: Update to 2007-11-19 from GnuPG.
+
+ * README: Remove outdated installation info.
+
+ * configure.ac: Require at least GPGME 1.2.
+ (HAVE_GPGME_IO_WRITE): Remove test for this.
+ (HAVE_GPGME_OP_ASSUAN_TRANSACT): Ditto.
+ (HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER): Ditto.
+ (BUILD_CARD_MANAGER): Remove this conditional.
+
2009-06-09 Werner Koch <wk at g10code.com>
* configure.ac: Test for gpgme_io_write.
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/INSTALL 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +191,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/Makefile.am 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,3 +1,23 @@
+# Makefile.am - Top makefile for GPA.
+# Copyright (C) 2000, 2001 Werner Koch
+# Copyright (C) 2002, 2003, 2004 Miguel Coca
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
+#
+# This file is part of GPA.
+#
+# GPA is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+#
+# GPA is distributed in the hope that it will be useful but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
@@ -18,6 +38,7 @@
-e 's|@datadir[@]|$(pkgdatadir)|g' \
-e 's|@prefix[@]|$(prefix)|g'
+# FIXME: Let configure do this.
gpadefs.h: Makefile
rm -f $@ $@.tmp
$(edit) '$(srcdir)/$@.in' >$@.tmp
Modified: trunk/README
===================================================================
--- trunk/README 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/README 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,15 +1,15 @@
-*********************************************************
-Welcome to GPA, the GNU Privacy Assistant, version 0.5.0!
-*********************************************************
+ ******************************************************
+ Welcome to GPA, the GNU Privacy Assistant!
+ Version 0.9.0
+ ******************************************************
GPA is a graphical frontend for the GNU Privacy Guard (GnuPG,
-http://www.gnupg.org). GPA can be used to encrypt, decrypt, and
-sign files, to verify signatures and to manage the private and
-public keys.
+http://www.gnupg.org). GPA can be used to encrypt, decrypt, and sign
+files, to verify signatures and to manage the private and public keys.
Copyright (C) 2000-2002 G-N-U GmbH (http://www.g-n-u.de)
-Copyright (C) 2002-2003 Miguel Coca.
-Copyright (C) 2005 g10 Code GmbH.
+Copyright (C) 2002-2004 Miguel Coca.
+Copyright (C) 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
GPA uses fragments from the following programs and libraries:
JNLIB, Copyright (C) 1998-2000 Free Software Foundation, Inc.
@@ -17,42 +17,38 @@
WinPT, Copyright (C) 2000-2002 Timo Schulz
(For details, see the file `AUTHORS'.)
-There is a mailing list devoted to the development of GPA.
-See http://www.gnupg.org/gpa.html for more information.
+There is a mailing list devoted to the development of GPA. See
+http://www.gnupg.org/gpa.html for more information. There is also a
+project site available at: http://wald.intevation.org/projects/gpa/ .
-There is also a project site available at:
-http://wald.intevation.org/projects/gpa/
+ GPA is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ GPA is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+
-GPA is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+Installation under a Unix like operating system
+===============================================
-GPA is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+You need development versins of the GTK+ and GPGME libraries.
+See the file INSTALL for installation details; in short:
-You should have received a copy of the GNU General Public License
-along with GPA; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-
-Installation under a GNU operating system (such as GNU/Linux)
-=============================================================
-
-You need the GNU development tools plus the GTK+ library, version
-1.3 or higher, installed on your system. Unpack the tarball, `cd'
-into the new directory, configure, compile, and install GPA:
-
- tar xvzf gpa-0.5.0.tar.gz
- cd gpa-0.5.0
./configure
make
- su -c "make install"
+ make install
-In order to do anything useful with GPA you also need the
-GNU Privacy Guard (GnuPG) installed - see http://www.gnupg.org.
+The configure scrits check whether all required libraries are
+installed and that they are recent enough. In order to do anything
+useful with GPA you also need the GNU Privacy Guard (GnuPG) version 2
+installed - see http://www.gnupg.org.
Please report any problems to gpa-dev at gnupg.org.
@@ -60,135 +56,23 @@
Installation under MS-Windows
=============================
-Instead of compiling GPA by yourself, you probably want to download
-the ready-to-use installer from http://www.gnupp.de, don't you? ;-)
+Instead of building GPA by yourself, you probably want to download
+the ready-to-use installer from http://www.gpg4win.org, the light
+installer is sufficient, don't you? ;-)
-Okay - here is how to compile your own `gpa.exe'!
+If you want to do it your self, you need to have the Windows
+development version of all libraries already installed on your box.
+GPA may only be build using a cross compiler. It is best to install
+all windows stuff under a tree like ~/w32root with the usual bin, lib
+and include directories. If you did this you merely need to run
-In order to compile GPA you need the GNU development toolchain
-consisting of a compiler, linker, a `make' utility, a Unix-like
-command interpreter (shell), etc., plus the GTK+ library.
+ ./autogen.sh --build-w32
+ make
+ make install
-You can either cross-compile GPA from a Unix-like operating system
-to MS-Windows, or compile it natively under MS-Windows. For security
-reasons, we recommend to cross-compile GPA from an entirely free
-operating system (such as GNU/Linux) whose source code you have
-carefully reviewed before, line by line - or at least some
-approximation to this.
+The autogen.sh script invoked this way calls configure with all
+required arguments. Check the script to see how to adjust to your own
+environment.
-There are (at least;-) four possibilities how to build a working
-`gpa.exe' for MS-Windows:
- 1) Cross compile it from a Unix-like system to mingw32/MS-Windows.
- 2) Cross compile it from CygWin/MS-Windows to mingw32/MS-Windows.
- 3) Compile it semi-natively under CygWin with the `-mno-cygwin'
- switch to generate mingw32/MS-Windows output.
- 4) Compile it natively using the CygWin environment with the
- mingw32 compiler.
-
-For (2) through (4), you need to install the CygWin development
-tools, available from http://www.cygwin.com.
-
-In all four cases, you need GTK+ for mingw32/MS-Windows. Get it from
-http://www.gimp.org/win32/.
-
-Methods (3) and (4) are untested, but they should work more or less
-straightforward. In the following, I will explain (1) and (2).
-
-Once CygWin is installed, the procedure for (1) and (2) is exactly
-the same:
-
- * Download the source of the mingw32 GCC and binutils from
- http://www.mingw.org.
-
- * Unpack the archives. This will create two new sub-directories.
-
- * In both sub-directories, type:
-
- ./configure --host=i386-mingw32 --target=i386-mingw32'
- make
- su -c "make install"
-
- (See the GCC installation instructions for details.)
-
- * Install GTK+ for mingw32 in the /usr/local/i386-mingw32 directory.
-
- * Unarchive the GPA source and `cd' to the new subdirectory
- `gpa-0.5.0'.
-
-The next step is to "configure" GPA itself.
-
-To compensate for some bugs in older versions of `autoconf' and
-friends (and some other hacks), I call `configure' indirectly using
-the following script:
-
-8< ---- configure.pg -----------------------------------------------
-
-#!/bin/sh
-./configure --silent \
- --prefix=$HOME/usr/i386-mingw32 \
- CFLAGS="-g -O -Wall -mwindows" \
- --with-gtk-prefix=$HOME/usr/i386-mingw32 \
- --host=i386-mingw32 --target=i386-mingw32
-
-rm -f src/Makefile.orig
-mv src/Makefile src/Makefile.orig
-cat src/Makefile.orig | sed -e 's/ #PG#//g' > src/Makefile
-
-rm -f config.h.orig
-mv config.h config.h.orig
-cat config.h.orig \
- | sed -e 's/^#include "gpadefs\.h"/\/* #include "gpadefs.h" -- disabled by $0 *\//' \
- > config.h
-cat - >> config.h << EOF
-
-/* Fixes by $0 */
-
-#define HAVE_PROCESS_H 1
-#define HAVE_MEMICMP 1
-#define HAVE_DOSISH_SYSTEM 1
-#define HAVE_DRIVE_LETTERS 1
-#define USE_SIMPLE_GETTEXT 1
-#include "gpadefs.h"
-EOF
-
-echo "timestamp" > stamp-h
-
-cat - > gpadefs.h << EOF
-/* Generated by $0 */
-
-#define GPA_LOCALEDIR "C:\\\\GnuPP\\\\locale"
-#define GPA_DATADIR "C:\\\\GnuPP\\\\GPA"
-#define GPG_PROGRAM "C:\\\\GnuPP\\\\GnuPG\\\\gpg.exe"
-EOF
-
-8< ---- end of configure.pg ----------------------------------------
-
-Please save this as a file `configure.pg' and give it the
-"executable" bit:
-
- chmod +x configure.pg
-
-In this setup, the toolchain is installed in $HOME/usr, and GPA's
-fallback directories (when a registry and PATH search did not lead
-to a result) reside under "C:\GnuPP". Please do not use this script
-blindly, but instead adapt it to match your system!
-
-Now we are ready to configure and compile GPA:
-
- ./configure.pg
- make
-
-This will create `gpa.exe' in the subdirectory `src'.
-
-The version of GPA which is distributed on the GnuPP CD of March
-2002 (see http://www.gnupp.de) was cross-compiled from a GNU/Linux
-system (Debian 2.2 "Potato") to mingw32/MS-Windows this way.
-
-Please see the notes in GnuPG's README file about MS-Windows
-registry entries when installing under MS-Windows.
-
-In order to do anything useful with GPA you also need the
-GNU Privacy Guard (GnuPG) - see http://www.gnupg.org.
-
Have fun!
Modified: trunk/config.guess
===================================================================
--- trunk/config.guess 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/config.guess 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2007-11-19'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -160,6 +161,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -210,7 +212,7 @@
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -328,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -770,6 +772,8 @@
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
@@ -777,12 +781,9 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS_NT-*:*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -790,12 +791,15 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[345]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -831,6 +835,9 @@
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -947,6 +954,9 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -989,7 +999,7 @@
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -1205,6 +1215,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
Modified: trunk/config.sub
===================================================================
--- trunk/config.sub 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/config.sub 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2007-11-19'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,15 +241,16 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,21 +276,19 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,18 +318,18 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,22 +358,24 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
- m32c-*)
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
@@ -477,8 +479,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -685,6 +687,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -912,6 +918,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -923,6 +933,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1128,7 +1141,7 @@
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1230,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1382,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1397,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1406,6 +1425,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/configure.ac 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,24 +1,22 @@
# configure.ac for GPA
# Copyright (C) 2000, 2001 Werner Koch
# Copyright (C) 2002, 2003, 2004 Miguel Coca
-# Copyright (C) 2005, 2006, 2007, 2008 g10 Code GmbH
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
#
# This file is part of GPA.
#
-# GPA is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# GPA is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
#
-# GPA is distributed in the hope that it will be useful,g
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# GPA is distributed in the hope that it will be useful but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# (Process this file with autoconf to produce a configure script.)
AC_PREREQ(2.59)
@@ -42,7 +40,7 @@
NEED_LIBASSUAN_API=1
NEED_LIBASSUAN_VERSION=1.0.4
NEED_GPGME_API=1
-NEED_GPGME_VERSION=1.1.6
+NEED_GPGME_VERSION=1.2.0
AM_CONFIG_HEADER(config.h)
@@ -228,26 +226,31 @@
AM_PATH_GPGME("$NEED_GPGME_API:$NEED_GPGME_VERSION",
have_gpgme=yes,have_gpgme=no)
fi
-_save_libs=$LIBS
-_save_cflags=$CFLAGS
-LIBS="$LIBS $GPGME_LIBS"
-CFLAGS="$CFLAGS $GPGME_CFLAGS"
-AC_CHECK_FUNCS([gpgme_op_assuan_transact])
-AC_CHECK_FUNCS([gpgme_io_write])
-# Fixme: We should write a test based on gpgme_subkey_t
-# We might even want to put such a test into gpgme.m4.
-AC_CHECK_MEMBERS([struct _gpgme_subkey.card_number],,,[#include <gpgme.h>])
-LIBS=$_save_libs
-CFLAGS="$_save_cflags"
-# We build the card manager only if we have a decent libgpgme. */
-if test "x$ac_cv_func_gpgme_op_assuan_transact" = "xyes"; then
- AC_DEFINE(BUILD_CARD_MANAGER, 1,
- [Defined if the card manager shall be build.])
-fi
-AM_CONDITIONAL(BUILD_CARD_MANAGER,
- test "x$ac_cv_func_gpgme_op_assuan_transact" = "xyes")
+dnl The tests below are not anymore used because we now depend on a
+dnl gpgme which has all these features. However, I keep the code here
+dnl for future work.
+dnl
+dnl _save_libs=$LIBS
+dnl _save_cflags=$CFLAGS
+dnl LIBS="$LIBS $GPGME_LIBS"
+dnl CFLAGS="$CFLAGS $GPGME_CFLAGS"
+dnl AC_CHECK_FUNCS([gpgme_op_assuan_transact])
+dnl AC_CHECK_FUNCS([gpgme_io_write])
+dnl # Fixme: We should write a test based on gpgme_subkey_t
+dnl # We might even want to put such a test into gpgme.m4.
+dnl AC_CHECK_MEMBERS([struct _gpgme_subkey.card_number],,,[#include <gpgme.h>])
+dnl LIBS=$_save_libs
+dnl CFLAGS="$_save_cflags"
+dnl # We build the card manager only if we have a decent libgpgme. */
+dnl if test "x$ac_cv_func_gpgme_op_assuan_transact" = "xyes"; then
+dnl AC_DEFINE(BUILD_CARD_MANAGER, 1,
+dnl [Defined if the card manager shall be build.])
+dnl fi
+dnl AM_CONDITIONAL(BUILD_CARD_MANAGER,
+dnl test "x$ac_cv_func_gpgme_op_assuan_transact" = "xyes")
+
#
# Checks for header files.
#
Modified: trunk/depcomp
===================================================================
--- trunk/depcomp 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/depcomp 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -215,34 +215,39 @@
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
Modified: trunk/install-sh
===================================================================
--- trunk/install-sh 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/install-sh 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
-posix_glob=
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
+mvcmd=$mvprog
+rmcmd="$rmprog -f"
stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
+
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
- -d) dir_arg=true
- shift
- continue;;
+ -C) copy_on_change=true;;
+ -d) dir_arg=true;;
+
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,42 +458,55 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
trap '' 0
fi
done
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/ChangeLog 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,3 +1,20 @@
+2009-06-17 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (gpa_cardman_sources): Remove cpp condition on
+ BUILD_CARD_MANAGER.
+ * gpa.c (quit_if_no_window, gpa_open_cardmanager, main): Ditto.
+ * clipboard.c (clipboard_action_new): Ditto.
+ * fileman.c (fileman_action_new): Ditto.
+ * keymanager.c (key_manager_action_new)
+ (keyring_editor_action_new): Ditto.
+ * gpa-key-details.c (details_page_fill_key): Remove cpp condition
+ on HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER.
+ * gpasubkeylist.c (enum): Ditto.
+ (gpa_subkey_list_new): Ditto.
+ (gpa_subkey_list_set_key): Ditto.
+ * keylist.c (get_key_pixbuf): Ditto.
+ * gpgmeedit.c (gpgme_io_write): Remove replacement function.
+
2009-06-15 Werner Koch <wk at g10code.com>
* keygenwizard.c (name_validate_cb, email_validate_cb): Use new
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/Makefile.am 2009-06-17 16:52:11 UTC (rev 1006)
@@ -1,3 +1,23 @@
+# Makefile.am - Top makefile for GPA.
+# Copyright (C) 2000, 2001 Werner Koch
+# Copyright (C) 2002, 2003, 2004 Miguel Coca
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
+#
+# This file is part of GPA.
+#
+# GPA is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your
+# option) any later version.
+#
+# GPA is distributed in the hope that it will be useful but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
## Process this file with automake to produce Makefile.in
localedir = $(datadir)/locale
@@ -50,7 +70,6 @@
gpa_DEPENDENCIES = $(gpa_deps)
-if BUILD_CARD_MANAGER
gpa_cardman_sources = \
cardman.c cardman.h \
cm-object.c cm-object.h \
@@ -58,12 +77,8 @@
cm-geldkarte.c cm-geldkarte.h \
cm-netkey.c cm-netkey.h \
cm-dinsig.c cm-dinsig.h
-else
-gpa_cardman_sources =
-endif
-
gpa_SOURCES = get-path.h get-path.c \
gpa.c gpa.h i18n.h options.h \
gpawindowkeeper.c gpawindowkeeper.h \
Modified: trunk/src/clipboard.c
===================================================================
--- trunk/src/clipboard.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/clipboard.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -830,9 +830,7 @@
" <menuitem action='WindowsKeyringEditor'/>"
" <menuitem action='WindowsFileManager'/>"
" <menuitem action='WindowsClipboard'/>"
-#ifdef BUILD_CARD_MANAGER
" <menuitem action='WindowsCardManager'/>"
-#endif
" </menu>"
" <menu action='Help'>"
#if 0
@@ -863,9 +861,7 @@
" <separator/>"
" <toolitem action='WindowsKeyringEditor'/>"
" <toolitem action='WindowsFileManager'/>"
-#ifdef BUILD_CARD_MANAGER
" <toolitem action='WindowsCardManager'/>"
-#endif
#if 0
" <toolitem action='HelpContents'/>"
#endif
@@ -908,10 +904,8 @@
g_object_set (action, "short_label", _("Keyring"), NULL);
action = gtk_action_group_get_action (action_group, "WindowsFileManager");
g_object_set (action, "short_label", _("Files"), NULL);
-#ifdef BUILD_CARD_MANAGER
action = gtk_action_group_get_action (action_group, "WindowsCardManager");
g_object_set (action, "short_label", _("Card"), NULL);
-#endif
/* Take care of sensitiveness of widgets. */
action = gtk_action_group_get_action (action_group, "EditCut");
Modified: trunk/src/fileman.c
===================================================================
--- trunk/src/fileman.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/fileman.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -560,9 +560,7 @@
" <menuitem action='WindowsKeyringEditor'/>"
" <menuitem action='WindowsFileManager'/>"
" <menuitem action='WindowsClipboard'/>"
-#ifdef BUILD_CARD_MANAGER
" <menuitem action='WindowsCardManager'/>"
-#endif
" </menu>"
" <menu action='Help'>"
#if 0
@@ -584,9 +582,7 @@
" <separator/>"
" <toolitem action='WindowsKeyringEditor'/>"
" <toolitem action='WindowsClipboard'/>"
-#ifdef BUILD_CARD_MANAGER
" <toolitem action='WindowsCardManager'/>"
-#endif
#if 0
" <toolitem action='HelpContents'/>"
#endif
@@ -627,10 +623,8 @@
/* Fixup the icon theme labels which are too long for the toolbar. */
action = gtk_action_group_get_action (action_group, "WindowsKeyringEditor");
g_object_set (action, "short_label", _("Keyring"), NULL);
-#ifdef BUILD_CARD_MANAGER
action = gtk_action_group_get_action (action_group, "WindowsCardManager");
g_object_set (action, "short_label", _("Card"), NULL);
-#endif
/* Take care of sensitiveness of widgets. */
action = gtk_action_group_get_action (action_group, "FileSign");
Modified: trunk/src/gpa-key-details.c
===================================================================
--- trunk/src/gpa-key-details.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/gpa-key-details.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -127,13 +127,11 @@
key->subkeys->fpr);
if (seckey)
{
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
if (seckey->subkeys && seckey->subkeys->is_cardkey)
gtk_label_set_text (GTK_LABEL (kdt->detail_public_private),
_("The key has both a smartcard based private part"
" and a public part"));
else
-#endif
gtk_label_set_text (GTK_LABEL (kdt->detail_public_private),
_("The key has both a private and a public part"));
}
Modified: trunk/src/gpa.c
===================================================================
--- trunk/src/gpa.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/gpa.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -174,9 +174,7 @@
&& !gpa_key_manager_is_open ()
&& !gpa_file_manager_is_open ()
&& !gpa_clipboard_is_open ()
-#ifdef BUILD_CARD_MANAGER
&& !gpa_card_manager_is_open ()
-#endif
)
gpa_stop_server ();
}
@@ -242,7 +240,6 @@
void
gpa_open_cardmanager (GtkAction *action, void *data)
{
-#ifdef BUILD_CARD_MANAGER
/* FIXME: Shouldn't this connect only happen if the instance is
created the first time? Looks like a memory leak to me. */
g_signal_connect (G_OBJECT (gpa_card_manager_get_instance ()), "destroy",
@@ -250,7 +247,6 @@
gtk_widget_show_all (gpa_card_manager_get_instance ());
gtk_window_present (GTK_WINDOW (gpa_card_manager_get_instance ()));
-#endif /*BUILD_CARD_MANAGER*/
}
/* Show the settings dialog. */
@@ -409,9 +405,7 @@
&& !args.start_file_manager
&& !args.start_clipboard
&& !args.start_settings
-#ifdef BUILD_CARD_MANAGER
&& !args.start_card_manager
-#endif
)
args.start_key_manager = TRUE;
@@ -471,10 +465,8 @@
if (args.start_file_manager || (optind < argc))
gpa_open_filemanager (NULL, NULL);
-#ifdef BUILD_CARD_MANAGER
if (args.start_card_manager)
gpa_open_cardmanager (NULL, NULL);
-#endif
if (args.start_settings)
gpa_open_settings_dialog (NULL, NULL);
Modified: trunk/src/gpasubkeylist.c
===================================================================
--- trunk/src/gpasubkeylist.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/gpasubkeylist.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -40,10 +40,8 @@
SUBKEY_CAN_CERTIFY,
SUBKEY_CAN_ENCRYPT,
SUBKEY_CAN_AUTHENTICATE,
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
SUBKEY_IS_CARDKEY,
SUBKEY_CARD_NUMBER,
-#endif /*HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER*/
SUBKEY_STATUS,
SUBKEY_N_COLUMNS
} SubkeyListColumn;
@@ -68,10 +66,8 @@
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
G_TYPE_BOOLEAN,
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
G_TYPE_BOOLEAN,
G_TYPE_STRING,
-#endif /*HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER*/
G_TYPE_STRING);
/* The view */
@@ -135,7 +131,6 @@
gpa_set_column_title (column, _("[A]"), _("Can authenticate"));
gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
renderer = gtk_cell_renderer_toggle_new ();
column = gtk_tree_view_column_new_with_attributes
(NULL, renderer, "active", SUBKEY_IS_CARDKEY, NULL);
@@ -149,7 +144,6 @@
gpa_set_column_title (column, _("Card S/N"),
_("Serial number of the smart card."));
gtk_tree_view_append_column (GTK_TREE_VIEW (list), column);
-#endif /*HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER*/
return list;
}
@@ -230,10 +224,8 @@
SUBKEY_CAN_CERTIFY, subkey->can_certify,
SUBKEY_CAN_ENCRYPT, subkey->can_encrypt,
SUBKEY_CAN_AUTHENTICATE, subkey->can_authenticate,
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
SUBKEY_IS_CARDKEY, secsubkey? secsubkey->is_cardkey :0,
SUBKEY_CARD_NUMBER, secsubkey? secsubkey->card_number:NULL,
-#endif /*HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER*/
SUBKEY_STATUS, subkey_status (subkey),
-1);
g_free (size);
Modified: trunk/src/gpgmeedit.c
===================================================================
--- trunk/src/gpgmeedit.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/gpgmeedit.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -28,12 +28,6 @@
#include "gpgmeedit.h"
#include "passwddlg.h"
-/* Let older versions of gpgme work on Unix. */
-#ifndef HAVE_GPGME_IO_WRITE
-#define gpgme_io_write write
-#endif
-
-
/* The edit callback for all the edit operations is edit_fnc(). Each
* operation is modelled as a sequential machine (a Moore machine, to be
* precise). Therefore, for each operation you must write two functions.
Modified: trunk/src/keylist.c
===================================================================
--- trunk/src/keylist.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/keylist.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -377,10 +377,8 @@
key->subkeys->fpr);
if (seckey)
{
-#ifdef HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER
if (seckey->subkeys && seckey->subkeys->is_cardkey)
return GPA_STOCK_SECRET_CARDKEY;
-#endif
return GPA_STOCK_SECRET_KEY;
}
else
Modified: trunk/src/keymanager.c
===================================================================
--- trunk/src/keymanager.c 2009-06-15 09:12:21 UTC (rev 1005)
+++ trunk/src/keymanager.c 2009-06-17 16:52:11 UTC (rev 1006)
@@ -956,9 +956,7 @@
" <menuitem action='WindowsKeyringEditor'/>"
" <menuitem action='WindowsFileManager'/>"
" <menuitem action='WindowsClipboard'/>"
-#ifdef BUILD_CARD_MANAGER
" <menuitem action='WindowsCardManager'/>"
-#endif
" </menu>"
" <menu action='Server'>"
" <menuitem action='ServerRetrieve'/>"
@@ -987,9 +985,7 @@
" <separator/>"
" <toolitem action='WindowsFileManager'/>"
" <toolitem action='WindowsClipboard'/>"
-#ifdef BUILD_CARD_MANAGER
" <toolitem action='WindowsCardManager'/>"
-#endif
#if 0
" <toolitem action='HelpContents'/>"
#endif
@@ -1061,10 +1057,8 @@
g_object_set (action, "short_label", _("Import"), NULL);
action = gtk_action_group_get_action (action_group, "WindowsFileManager");
g_object_set (action, "short_label", _("Files"), NULL);
-#ifdef BUILD_CARD_MANAGER
action = gtk_action_group_get_action (action_group, "WindowsCardManager");
g_object_set (action, "short_label", _("Card"), NULL);
-#endif
/* Take care of sensitiveness of widgets. */
action = gtk_action_group_get_action (action_group, "EditCopy");
More information about the Gpa-commits
mailing list