[git] Poldi - branch, master, updated. release-0.4.1-28-gda5d8f0
by NIIBE Yutaka
cvs at cvs.gnupg.org
Thu May 1 07:00:10 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PAM for the OpenPGP card".
The branch, master has been updated
via da5d8f0650ec99891dacd22c83d809c2c598a6d2 (commit)
via 99618ca58f766fcd813f9d31f584a75a14f81611 (commit)
via f6a3c0a443783b5923b32d28fd67900912b6ae7d (commit)
via 5b5da41531da1304e643c93130139259b0d3fd40 (commit)
via 2e1ef35d470d50f9888029fa051e8eb2c14bf0fa (commit)
via 4eb63a2a020d3dd6796db0e259e0b431701975f4 (commit)
from fbaf642629b4a8b9e2e3b50ec9d0a98e894b7bcf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit da5d8f0650ec99891dacd22c83d809c2c598a6d2
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 14:01:39 2014 +0900
* src/scd/scd.c (unescape_status_string, unhexify_fpr): Fix type
qualifier.
diff --git a/src/scd/scd.c b/src/scd/scd.c
index f0b6d35..d54b47e 100644
--- a/src/scd/scd.c
+++ b/src/scd/scd.c
@@ -449,7 +449,7 @@ scd_set_pincb (scd_context_t scd_ctx,
silently be replaced by a 0xFF. Function returns NULL to indicate
an out of memory status. */
static char *
-unescape_status_string (const unsigned char *s)
+unescape_status_string (const char *s)
{
char *buffer, *d;
@@ -487,7 +487,7 @@ unescape_status_string (const unsigned char *s)
/* Take a 20 byte hexencoded string and put it into the the provided
20 byte buffer FPR in binary format. */
static int
-unhexify_fpr (const char *hexstr, unsigned char *fpr)
+unhexify_fpr (const char *hexstr, char *fpr)
{
const char *s;
int n;
commit 99618ca58f766fcd813f9d31f584a75a14f81611
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 14:00:52 2014 +0900
* src/pam/auth-support/getpin-cb.c (all_digitsp): Remove.
(strcpy_escaped): Fix type qualifier.
diff --git a/src/pam/auth-support/getpin-cb.c b/src/pam/auth-support/getpin-cb.c
index 5dfba9a..c5d7ba8 100644
--- a/src/pam/auth-support/getpin-cb.c
+++ b/src/pam/auth-support/getpin-cb.c
@@ -46,17 +46,6 @@
#include "getpin-cb.h"
-
-/* Returns TRUE if the string S contains only decimal digits, FALSE
- otherwise. */
-static int
-all_digitsp (const char *s)
-{
- for (; *s && *s >= '0' && *s <= '9'; s++)
- ;
- return !*s;
-}
-
/* Query the user through PAM for his PIN. Display INFO to the user.
Store the retrieved pin in PIN, which is of size PIN_SIZE. If it
does not fit, return error. */
@@ -130,7 +119,7 @@ keypad_mode_leave (poldi_ctx_t ctx)
/* Note, that it is sufficient to allocate the target string D as
long as the source string S, i.e.: strlen(s)+1; */
static void
-strcpy_escaped (char *d, const unsigned char *s)
+strcpy_escaped (char *d, const char *s)
{
while (*s)
{
commit f6a3c0a443783b5923b32d28fd67900912b6ae7d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 14:00:26 2014 +0900
* src/ctrl/poldi-ctrl.c (main): Argv type fix.
diff --git a/src/ctrl/poldi-ctrl.c b/src/ctrl/poldi-ctrl.c
index f595f01..3dc22f5 100644
--- a/src/ctrl/poldi-ctrl.c
+++ b/src/ctrl/poldi-ctrl.c
@@ -244,7 +244,7 @@ i18n_cb (void *cookie, const char *msg)
/* Main. */
int
-main (int argc, char **argv)
+main (int argc, const char **argv)
{
simpleparse_handle_t parsehandle;
unsigned int ncommands;
commit 5b5da41531da1304e643c93130139259b0d3fd40
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 13:59:48 2014 +0900
* src/assuan/assuan-handler.c (assuan_process_done): Bug fix using code.
diff --git a/src/assuan/assuan-handler.c b/src/assuan/assuan-handler.c
index b940bfd..d60e380 100644
--- a/src/assuan/assuan-handler.c
+++ b/src/assuan/assuan-handler.c
@@ -558,7 +558,7 @@ assuan_process_done (assuan_context_t ctx, int rc)
{
/* Assume this is an libgpg-error. */
sprintf (errline, "ERR %d %.50s <%.30s>%s%.100s",
- rc, ebuf, esrc,
+ code, ebuf, esrc,
text? " - ":"", text?text:"");
}
else
@@ -593,7 +593,7 @@ assuan_process_done (assuan_context_t ctx, int rc)
gpg_strerror_r (rc, ebuf, sizeof ebuf );
sprintf (errline, "ERR %d %.50s <%.30s>%s%.100s",
- rc,
+ code,
ebuf,
gpg_strsource (rc),
text? " - ":"", text?text:"");
commit 2e1ef35d470d50f9888029fa051e8eb2c14bf0fa
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 13:59:02 2014 +0900
* doc/gpl.texi: Use @center for Info.
diff --git a/doc/gpl.texi b/doc/gpl.texi
index ca0508f..92d087c 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -12,7 +12,12 @@ Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@end display
+ at iftex
@appendixsubsec Preamble
+ at end iftex
+ at ifinfo
+ at center Preamble
+ at end ifinfo
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
commit 4eb63a2a020d3dd6796db0e259e0b431701975f4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Thu May 1 13:58:11 2014 +0900
* configure.ac, m4/po.m4, src/assuan/Makefile.am: Update for newer
autotools.
diff --git a/configure.ac b/configure.ac
index c901520..0fd6acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,11 +23,12 @@ AC_PREREQ(2.52)
min_automake_version="1.7.9"
# Version number: Remember to change it immediately *after* a release.
-# Add a "-cvs" prefix for non-released code.
-AC_INIT(poldi, 0.4.2-cvs, gnupg-devel at gnupg.org)
-
-PACKAGE=$PACKAGE_NAME
-VERSION=$PACKAGE_VERSION
+# Add a "-git" prefix for non-released code.
+AC_INIT([poldi], [0.4.2-git], [gnupg-devel at gnupg.org])
+AC_CONFIG_SRCDIR(src/pam/pam_poldi.c)
+AC_CONFIG_HEADERS(config.h)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
NEED_LIBGCRYPT_VERSION=0
NEED_GPG_ERROR_VERSION=0.7
@@ -35,12 +36,6 @@ NEED_GPG_ERROR_VERSION=0.7
NEED_KSBA_API=1
NEED_KSBA_VERSION=1.0.2
-
-AC_CONFIG_SRCDIR(src/pam/pam_poldi.c)
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
-
POLDI_CONF_DIRECTORY="${sysconfdir}/poldi"
AC_SUBST(POLDI_CONF_DIRECTORY)
@@ -63,8 +58,6 @@ POLDI_ENABLE_FEATURE(enable_auth_x509, yes, x509-auth, support for X509 authenti
POLDI_ENABLE_FEATURE(enable_auth_localdb, yes, localdb-auth, support for local-db authentication)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
AC_DEFINE_UNQUOTED(PACKAGE_BUGREPORT, "$PACKAGE_BUGREPORT",
[Bug report address])
AC_DEFINE_UNQUOTED(NEED_LIBGCRYPT_VERSION, "$NEED_LIBGCRYPT_VERSION",
diff --git a/m4/po.m4 b/m4/po.m4
index 0734762..f7c9c06 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -24,7 +24,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
[
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
AC_REQUIRE([AM_NLS])dnl
dnl Release version of the gettext macros. This is used to ensure that
diff --git a/src/assuan/Makefile.am b/src/assuan/Makefile.am
index 56e2eed..f10f7a0 100644
--- a/src/assuan/Makefile.am
+++ b/src/assuan/Makefile.am
@@ -20,7 +20,7 @@
# Modified for Poldi. Based von libassuans Makefile.am.
EXTRA_DIST = mkerrors
-INCLUDES = -I.. -I$(top_srcdir)/include
+AM_CPPFLAGS = -I.. -I$(top_srcdir)/include
BUILT_SOURCES = assuan-errors.c
MOSTLYCLEANFILES = assuan-errors.c
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 19 ++++++-------------
doc/gpl.texi | 5 +++++
m4/po.m4 | 2 +-
src/assuan/Makefile.am | 2 +-
src/assuan/assuan-handler.c | 4 ++--
src/ctrl/poldi-ctrl.c | 2 +-
src/pam/auth-support/getpin-cb.c | 13 +------------
src/scd/scd.c | 4 ++--
8 files changed, 19 insertions(+), 32 deletions(-)
hooks/post-receive
--
PAM for the OpenPGP card
http://git.gnupg.org
More information about the Gnupg-commits
mailing list