GNUPG-1-9-BRANCH gnupg (11 files)
cvs user wk
cvs at cvs.gnupg.org
Tue May 31 21:42:04 CEST 2005
Date: Tuesday, May 31, 2005 @ 22:03:04
Author: wk
Path: /cvs/gnupg/gnupg
Tag: GNUPG-1-9-BRANCH
Modified: THANKS agent/ChangeLog agent/agent.h agent/gpg-agent.c
common/ChangeLog common/dynload.h scd/ChangeLog scd/app-common.h
scd/tlv.c tools/ChangeLog tools/watchgnupg.c
* agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link.
* dynload.h: s/__inline__/inline/.
* tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of
including a gnupg 1.4 header.
* watchgnupg.c: Make sure that PF_LCOAL and AF_LOCAL are defines.
Noted by Ray Link.
--------------------+
THANKS | 1 +
agent/ChangeLog | 9 +++++++++
agent/agent.h | 2 +-
agent/gpg-agent.c | 8 +++++---
common/ChangeLog | 4 ++++
common/dynload.h | 8 ++++----
scd/ChangeLog | 10 ++++++++++
scd/app-common.h | 4 ++--
scd/tlv.c | 8 ++++++++
tools/ChangeLog | 5 +++++
tools/watchgnupg.c | 12 ++++++++++++
11 files changed, 61 insertions(+), 10 deletions(-)
Index: gnupg/THANKS
diff -u gnupg/THANKS:1.69.2.5 gnupg/THANKS:1.69.2.6
--- gnupg/THANKS:1.69.2.5 Thu Mar 3 11:15:07 2005
+++ gnupg/THANKS Tue May 31 22:03:04 2005
@@ -3,4 +3,5 @@
Andrew J. Schorr aschorr at telemetry-investments.com
Kazu Yamamoto kazu at iij.ad.jp
Michael Nottebrock michaelnottebrock at gmx.net
+Ray Link rlink at pitt.edu
Richard Lefebvre rick at cerca.umontreal.ca
Index: gnupg/agent/ChangeLog
diff -u gnupg/agent/ChangeLog:1.59.2.81 gnupg/agent/ChangeLog:1.59.2.82
--- gnupg/agent/ChangeLog:1.59.2.81 Tue May 24 14:37:36 2005
+++ gnupg/agent/ChangeLog Tue May 31 22:03:04 2005
@@ -1,3 +1,12 @@
+2005-05-31 Werner Koch <wk at g10code.com>
+
+ * agent.h (out_of_core): s/__inline__/inine. Noted by Ray Link.
+
+2005-05-25 Werner Koch <wk at g10code.com>
+
+ * gpg-agent.c (main): Do not unset the DISPLAY when we are
+ continuing as child.
+
2005-05-24 Werner Koch <wk at g10code.com>
* call-scd.c (inq_needpin): Skip leading spaces in of PIN
Index: gnupg/agent/agent.h
diff -u gnupg/agent/agent.h:1.32.2.21 gnupg/agent/agent.h:1.32.2.22
--- gnupg/agent/agent.h:1.32.2.21 Tue May 24 14:37:36 2005
+++ gnupg/agent/agent.h Tue May 31 22:03:04 2005
@@ -37,7 +37,7 @@
/* Convenience function to be used instead of returning the old
GNUPG_Out_Of_Core. */
-static __inline__ gpg_error_t
+static inline gpg_error_t
out_of_core (void)
{
return gpg_error (gpg_err_code_from_errno (errno));
Index: gnupg/agent/gpg-agent.c
diff -u gnupg/agent/gpg-agent.c:1.31.2.38 gnupg/agent/gpg-agent.c:1.31.2.39
--- gnupg/agent/gpg-agent.c:1.31.2.38 Sat May 21 20:49:00 2005
+++ gnupg/agent/gpg-agent.c Tue May 31 22:03:04 2005
@@ -490,7 +490,7 @@
opt.homedir = default_homedir ();
- /* Record the some original Denvironment settings. */
+ /* Record some of the original environment strings. */
opt.startup_display = getenv ("DISPLAY");
if (opt.startup_display)
opt.startup_display = xstrdup (opt.startup_display);
@@ -776,9 +776,11 @@
/* Remove the DISPLAY variable so that a pinentry does not
default to a specific display. There is still a default
display when gpg-agent was started using --display or a
- client requested this using an OPTION command. */
+ client requested this using an OPTION command. Note, that we
+ don't do this when running in reverse daemon mode (i.e. when
+ exec the program given as arguments). */
#ifndef HAVE_W32_SYSTEM
- if (!opt.keep_display)
+ if (!opt.keep_display && !argc)
unsetenv ("DISPLAY");
#endif
Index: gnupg/common/ChangeLog
diff -u gnupg/common/ChangeLog:1.30.2.50 gnupg/common/ChangeLog:1.30.2.51
--- gnupg/common/ChangeLog:1.30.2.50 Fri May 13 14:43:07 2005
+++ gnupg/common/ChangeLog Tue May 31 22:03:04 2005
@@ -1,3 +1,7 @@
+2005-05-31 Werner Koch <wk at g10code.com>
+
+ * dynload.h: s/__inline__/inline/.
+
2005-05-13 Werner Koch <wk at g10code.com>
* signal.c (got_fatal_signal): Print the signal number if we can't
Index: gnupg/common/dynload.h
diff -u gnupg/common/dynload.h:1.1.2.2 gnupg/common/dynload.h:1.1.2.3
--- gnupg/common/dynload.h:1.1.2.2 Tue Mar 16 11:47:08 2004
+++ gnupg/common/dynload.h Tue May 31 22:03:04 2005
@@ -27,14 +27,14 @@
#define RTLD_LAZY 0
-static __inline__ void *
+static inline void *
dlopen (const char * name, int flag)
{
void * hd = LoadLibrary (name);
return hd;
}
-static __inline__ void *
+static inline void *
dlsym (void *hd, const char *sym)
{
if (hd && sym)
@@ -48,7 +48,7 @@
}
-static __inline__ const char *
+static inline const char *
dlerror (void)
{
static char buf[32];
@@ -57,7 +57,7 @@
}
-static __inline__ int
+static inline int
dlclose (void * hd)
{
if (hd)
Index: gnupg/scd/ChangeLog
diff -u gnupg/scd/ChangeLog:1.25.2.81 gnupg/scd/ChangeLog:1.25.2.82
--- gnupg/scd/ChangeLog:1.25.2.81 Mon May 23 22:18:13 2005
+++ gnupg/scd/ChangeLog Tue May 31 22:03:03 2005
@@ -1,3 +1,13 @@
+2005-05-31 Werner Koch <wk at g10code.com>
+
+ * tlv.c [GNUPG_MAJOR_VERSION==1]: Define constants instead of
+ including a gnupg 1.4 header.
+
+2005-05-30 Werner Koch <wk at g10code.com>
+
+ * tlv.c: Add hack to compile without gpg-error.h when used with
+ GnuPG 1.4.
+
2005-05-23 Werner Koch <wk at g10code.com>
* Makefile.am: Do not build sc-copykeys anymore.
Index: gnupg/scd/app-common.h
diff -u gnupg/scd/app-common.h:1.5.2.17 gnupg/scd/app-common.h:1.5.2.18
--- gnupg/scd/app-common.h:1.5.2.17 Mon May 23 22:18:13 2005
+++ gnupg/scd/app-common.h Tue May 31 22:03:03 2005
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: app-common.h,v 1.5.2.17 2005/05/23 20:18:13 wk Exp $
+ * $Id: app-common.h,v 1.5.2.18 2005/05/31 20:03:03 wk Exp $
*/
#ifndef GNUPG_SCD_APP_COMMON_H
@@ -45,7 +45,7 @@
in case we need to divert the operation to an already running
agent. This if ASSUAN_CTX is not NULL we take this as indication
that all operations are diverted to gpg-agent. */
-#if GNUPG_MAJOR_VERSION == 1 && defined(ENABLE_AGENT_SUPPORT)
+#if GNUPG_MAJOR_VERSION == 1
assuan_context_t assuan_ctx;
#endif /*GNUPG_MAJOR_VERSION == 1*/
Index: gnupg/scd/tlv.c
diff -u gnupg/scd/tlv.c:1.1.2.4 gnupg/scd/tlv.c:1.1.2.5
--- gnupg/scd/tlv.c:1.1.2.4 Fri May 20 22:39:35 2005
+++ gnupg/scd/tlv.c Tue May 31 22:03:03 2005
@@ -25,7 +25,15 @@
#include <string.h>
#include <assert.h>
+#if GNUPG_MAJOR_VERSION == 1
+#define GPG_ERR_EOF (-1)
+#define GPG_ERR_BAD_BER (1) /*G10ERR_GENERAL*/
+#define GPG_ERR_INV_SEXP (45) /*G10ERR_INV_ARG*/
+typedef int gpg_error_t;
+#define gpg_error(n) (n)
+#else
#include <gpg-error.h>
+#endif
#include "tlv.h"
Index: gnupg/tools/ChangeLog
diff -u gnupg/tools/ChangeLog:1.25.2.76 gnupg/tools/ChangeLog:1.25.2.77
--- gnupg/tools/ChangeLog:1.25.2.76 Sat May 28 15:43:21 2005
+++ gnupg/tools/ChangeLog Tue May 31 22:03:03 2005
@@ -1,3 +1,8 @@
+2005-05-31 Werner Koch <wk at g10code.com>
+
+ * watchgnupg.c: Make sure that PF_LCOAL and AF_LOCAL are defines.
+ Noted by Ray Link.
+
2005-05-28 Moritz Schulte <moritz at g10code.com>
* gpgkey2ssh.c: New file.
Index: gnupg/tools/watchgnupg.c
diff -u gnupg/tools/watchgnupg.c:1.1.2.6 gnupg/tools/watchgnupg.c:1.1.2.7
--- gnupg/tools/watchgnupg.c:1.1.2.6 Tue Nov 23 18:09:51 2004
+++ gnupg/tools/watchgnupg.c Tue May 31 22:03:03 2005
@@ -45,6 +45,18 @@
#define BUGREPORT_LINE ""
#endif
+#ifndef PF_LOCAL
+# ifdef PF_UNIX
+# define PF_LOCAL PF_UNIX
+# else
+# define PF_LOCAL AF_UNIX
+# endif
+# ifndef AF_LOCAL
+# define AF_LOCAL AF_UNIX
+# endif
+#endif
+
+
static int verbose;
More information about the Gnupg-commits
mailing list