GNUPG-1-9-BRANCH gnupg (9 files)
cvs user wk
cvs at cvs.gnupg.org
Mon Dec 6 14:41:17 CET 2004
Date: Monday, December 6, 2004 @ 14:49:14
Author: wk
Path: /cvs/gnupg/gnupg
Tag: GNUPG-1-9-BRANCH
Added: jnlib/w32-pth.h
Modified: ChangeLog NEWS build-w32.sh configure.ac scd/ChangeLog
scd/Makefile.am sm/ChangeLog sm/keydb.c
* configure.ac (have_w32_system): New. Disable Pth checks for W32.
Link jnlib/w32-pth.h to pth.h.
* Makefile.am (pkglib_PROGRAMS): Build only for W32.
* keydb.c: Don't define DIRSEP_S here.
-----------------+
ChangeLog | 5 +++++
NEWS | 2 +-
build-w32.sh | 19 ++++++++++++-------
configure.ac | 40 ++++++++++++++++++++++++++++------------
jnlib/w32-pth.h | 29 +++++++++++++++++++++++++++++
scd/ChangeLog | 4 ++++
scd/Makefile.am | 2 ++
sm/ChangeLog | 4 ++++
sm/keydb.c | 2 --
9 files changed, 85 insertions(+), 22 deletions(-)
Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.131.2.59 gnupg/ChangeLog:1.131.2.60
--- gnupg/ChangeLog:1.131.2.59 Fri Dec 3 18:44:57 2004
+++ gnupg/ChangeLog Mon Dec 6 14:49:14 2004
@@ -1,3 +1,8 @@
+2004-12-06 Werner Koch <wk at g10code.com>
+
+ * configure.ac (have_w32_system): New. Disable Pth checks for W32.
+ Link jnlib/w32-pth.h to pth.h.
+
2004-12-03 Werner Koch <wk at g10code.com>
Released 1.9.13.
Index: gnupg/NEWS
diff -u gnupg/NEWS:1.165.2.59 gnupg/NEWS:1.165.2.60
--- gnupg/NEWS:1.165.2.59 Fri Dec 3 20:43:11 2004
+++ gnupg/NEWS Mon Dec 6 14:49:14 2004
@@ -7,7 +7,7 @@
* [gpgsm] New option --prefer-system-dirmngr.
- * Minor cleanups and debbuging aids.
+ * Minor cleanups and debugging aids.
Noteworthy changes in version 1.9.12 (2004-10-22)
Index: gnupg/build-w32.sh
diff -u gnupg/build-w32.sh:1.1.2.1 gnupg/build-w32.sh:1.1.2.2
--- gnupg/build-w32.sh:1.1.2.1 Fri Dec 3 18:44:57 2004
+++ gnupg/build-w32.sh Mon Dec 6 14:49:14 2004
@@ -1,10 +1,15 @@
- ./configure --enable-maintainer-mode --prefix=/home/wk/w32root \
+#!/bin/sh
+
+[ -z "$w32root" ] && w32root="$HOME/w32root"
+
+ ./configure --enable-maintainer-mode --prefix=${w32root} \
--host=i586-mingw32msvc --build=`scripts/config.guess` \
- --with-gpg-error-prefix=/home/wk/w32root \
- --with-ksba-prefix=/home/wk/w32root \
- --with-libgcrypt-prefix=/home/wk/w32root \
- --with-libassuan-prefix=/home/wk/w32root \
- --with-zlib=/home/wk/w32root
-
+ --with-gpg-error-prefix=${w32root} \
+ --with-ksba-prefix=${w32root} \
+ --with-libgcrypt-prefix=${w32root} \
+ --with-libassuan-prefix=${w32root} \
+ --with-zlib=${w32root} \
+ --with-pth-prefix=${w32root}
+
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.36.2.70 gnupg/configure.ac:1.36.2.71
--- gnupg/configure.ac:1.36.2.70 Fri Dec 3 20:43:11 2004
+++ gnupg/configure.ac Mon Dec 6 14:49:14 2004
@@ -141,7 +141,7 @@
build_agent_only=$enableval)
-# Configure option to allow ot disallow execution of external
+# Configure option to allow or disallow execution of external
# programs, like a photo viewer.
AC_MSG_CHECKING([whether to enable external program execution])
AC_ARG_ENABLE(exec,
@@ -343,6 +343,7 @@
try_gettext=yes
have_dosish_system=no
+have_w32_system=no
case "${host}" in
*-*-mingw32*)
# special stuff for Windoze NT
@@ -356,6 +357,7 @@
MingW32 systems and these systems lack Posix functions,
we use a simplified version of gettext])
have_dosish_system=yes
+ have_w32_system=yes
try_gettext="no"
;;
i?86-emx-os2 | i?86-*-os2*emx )
@@ -409,12 +411,18 @@
if test "$have_dosish_system" = yes; then
AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
- [defined if we run on some of the PCDOS like systems
+ [Defined if we run on some of the PCDOS like systems
(DOS, Windoze. OS/2) with special properties like
no file modes])
fi
AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
+if test "$have_w32_system" = yes; then
+ AC_DEFINE(HAVE_W32_SYSTEM,1, [Defined if we run on a W32 API based system])
+fi
+AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
+
+
#
# Checks for libraries.
@@ -480,6 +488,7 @@
#
# Check whether the (highly desirable) GNU Pth library is available
+# Note, that we include a Pth emulation for W32.
#
AC_ARG_WITH(pth-prefix,
AC_HELP_STRING([--with-pth-prefix=PFX],
@@ -489,7 +498,8 @@
PTH_CONFIG="$pth_config_prefix/bin/pth-config"
fi
AC_PATH_PROG(PTH_CONFIG, pth-config, no)
-if test "$PTH_CONFIG" = "no"; then
+if test "$have_w32_system" = no; then
+ if test "$PTH_CONFIG" = "no"; then
AC_MSG_WARN([[
***
*** To support concurrent access to the gpg-agent and the SCdaemon
@@ -498,7 +508,7 @@
*** On a Debian GNU/Linux system you might want to try
*** apt-get install libpth-dev
***]])
-else
+ else
GNUPG_PTH_VERSION_CHECK(1.3.7)
if test $have_pth = yes; then
PTH_CFLAGS=`$PTH_CONFIG --cflags`
@@ -507,6 +517,12 @@
AC_DEFINE(USE_GNU_PTH, 1,
[Defined if the GNU Portable Thread Library should be used])
fi
+ fi
+else
+ have_pth=yes
+ PTH_CFLAGS=""
+ PTH_LIBS=""
+ AC_DEFINE(USE_GNU_PTH, 1)
fi
AC_SUBST(PTH_CFLAGS)
AC_SUBST(PTH_LIBS)
@@ -968,15 +984,11 @@
GNUPG_CHECK_GNUMAKE
-# add some extra libs here so that previous tests don't fail for
+# Add some extra libs here so that previous tests don't fail for
# mysterious reasons - the final link step should bail out.
-case "${host}" in
- *-*-mingw32*)
- W32LIBS="-lwsock32"
- ;;
- *)
- ;;
-esac
+if test "$have_w32_system" = yes; then
+ W32LIBS="-lwsock32"
+fi
if test "$GCC" = yes; then
@@ -996,6 +1008,10 @@
AC_DEFINE(HAVE_JNLIB_LOGGING, 1,
[Defined if jnlib style logging functions are available])
+# For W32 we need to use our Pth emulation code
+if test "$have_w32_system" = yes; then
+ AC_CONFIG_LINKS(pth.h:jnlib/w32-pth.h)
+fi
#
Index: gnupg/jnlib/w32-pth.h
diff -u /dev/null gnupg/jnlib/w32-pth.h:1.1.2.1
--- /dev/null Mon Dec 6 14:49:15 2004
+++ gnupg/jnlib/w32-pth.h Mon Dec 6 14:49:14 2004
@@ -0,0 +1,29 @@
+/* w32-pth.h - GNU Pth emulation for W32 (MS Windows).
+ * Copyright (C) 2004 g10 Code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * GnuPG 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/* Note that this header is usually through a symlinked pth.h file.
+ This is needed so that we don't have a pth.h file here which would
+ conflict if a system really has pth available. */
+#ifndef W32_PTH_H
+#define W32_PTH_H
+
+
+
+#endif /*W32_PTH_H*/
Index: gnupg/scd/ChangeLog
diff -u gnupg/scd/ChangeLog:1.25.2.58 gnupg/scd/ChangeLog:1.25.2.59
--- gnupg/scd/ChangeLog:1.25.2.58 Fri Oct 22 18:03:03 2004
+++ gnupg/scd/ChangeLog Mon Dec 6 14:49:14 2004
@@ -1,3 +1,7 @@
+2004-12-06 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (pkglib_PROGRAMS): Build only for W32.
+
2004-10-22 Werner Koch <wk at g10code.com>
* app-openpgp.c (verify_chv3): The minium length for CHV3 is
Index: gnupg/scd/Makefile.am
diff -u gnupg/scd/Makefile.am:1.15.2.10 gnupg/scd/Makefile.am:1.15.2.11
--- gnupg/scd/Makefile.am:1.15.2.10 Wed Oct 20 10:54:45 2004
+++ gnupg/scd/Makefile.am Mon Dec 6 14:49:14 2004
@@ -19,7 +19,9 @@
## Process this file with automake to produce Makefile.in
bin_PROGRAMS = scdaemon sc-copykeys
+if HAVE_W32_SYSTEM
pkglib_PROGRAMS = pcsc-wrapper
+endif
AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/common
Index: gnupg/sm/ChangeLog
diff -u gnupg/sm/ChangeLog:1.101.2.76 gnupg/sm/ChangeLog:1.101.2.77
--- gnupg/sm/ChangeLog:1.101.2.76 Fri Dec 3 18:44:54 2004
+++ gnupg/sm/ChangeLog Mon Dec 6 14:49:14 2004
@@ -1,3 +1,7 @@
+2004-12-06 Werner Koch <wk at g10code.com>
+
+ * keydb.c: Don't define DIRSEP_S here.
+
2004-12-02 Werner Koch <wk at g10code.com>
* certchain.c (gpgsm_basic_cert_check): Dump certs with bad
Index: gnupg/sm/keydb.c
diff -u gnupg/sm/keydb.c:1.20.2.7 gnupg/sm/keydb.c:1.20.2.8
--- gnupg/sm/keydb.c:1.20.2.7 Sun Jun 6 15:00:58 2004
+++ gnupg/sm/keydb.c Mon Dec 6 14:49:14 2004
@@ -33,8 +33,6 @@
#include "keydb.h"
#include "i18n.h"
-#define DIRSEP_C '/'
-
static int active_handles;
typedef enum {
More information about the Gnupg-commits
mailing list