Update to version 20140220

Changes from previous version:

+ portability fixes from xtraeme for his Linux distribution:
	+ add search for ar(1) into autoconf
	+ define __printflike if it's not already defined
	+ fix missing asprintf (I fixed this differently)
This commit is contained in:
agc 2014-02-21 01:55:10 +00:00
parent 6ea2c0761e
commit 08dd6cefdd
7 changed files with 46 additions and 28 deletions

View File

@ -1,7 +1,7 @@
#! /bin/sh
# From configure.ac Revision: 1.40 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for netpgp 20140210.
# Generated by GNU Autoconf 2.69 for netpgp 20140220.
#
# Report bugs to <Alistair Crooks <agc@netbsd.org> c0596823>.
#
@ -730,8 +730,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='netpgp'
PACKAGE_TARNAME='netpgp'
PACKAGE_VERSION='20140210'
PACKAGE_STRING='netpgp 20140210'
PACKAGE_VERSION='20140220'
PACKAGE_STRING='netpgp 20140220'
PACKAGE_BUGREPORT='Alistair Crooks <agc@netbsd.org> c0596823'
PACKAGE_URL=''
@ -1451,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures netpgp 20140210 to adapt to many kinds of systems.
\`configure' configures netpgp 20140220 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1521,7 +1521,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of netpgp 20140210:";;
short | recursive ) echo "Configuration of netpgp 20140220:";;
esac
cat <<\_ACEOF
@ -1623,7 +1623,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
netpgp configure 20140210
netpgp configure 20140220
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -2100,7 +2100,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by netpgp $as_me 20140210, which was
It was created by netpgp $as_me 20140220, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2919,7 +2919,7 @@ fi
# Define the identity of the package.
PACKAGE='netpgp'
VERSION='20140210'
VERSION='20140220'
cat >>confdefs.h <<_ACEOF
@ -3191,6 +3191,7 @@ $as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
AM_PROG_AR
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@ -4802,13 +4803,13 @@ if ${lt_cv_nm_interface+:} false; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:4805: $ac_compile\"" >&5)
(eval echo "\"\$as_me:4806: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
(eval echo "\"\$as_me:4808: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval echo "\"\$as_me:4809: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
(eval echo "\"\$as_me:4811: output\"" >&5)
(eval echo "\"\$as_me:4812: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@ -6014,7 +6015,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6017 "configure"' > conftest.$ac_ext
echo '#line 6018 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -7539,11 +7540,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7542: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7543: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7546: \$? = $ac_status" >&5
echo "$as_me:7547: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -7878,11 +7879,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7881: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7882: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:7885: \$? = $ac_status" >&5
echo "$as_me:7886: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -7983,11 +7984,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:7986: $lt_compile\"" >&5)
(eval echo "\"\$as_me:7987: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:7990: \$? = $ac_status" >&5
echo "$as_me:7991: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -8038,11 +8039,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8042: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:8045: \$? = $ac_status" >&5
echo "$as_me:8046: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -10405,7 +10406,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10408 "configure"
#line 10409 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -10501,7 +10502,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10504 "configure"
#line 10505 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12127,7 +12128,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by netpgp $as_me 20140210, which was
This file was extended by netpgp $as_me 20140220, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12193,7 +12194,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
netpgp config.status 20140210
netpgp config.status 20140220
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

View File

@ -1,10 +1,10 @@
# $NetBSD: configure.ac,v 1.40 2014/02/17 06:38:07 agc Exp $
# $NetBSD: configure.ac,v 1.41 2014/02/21 01:55:10 agc Exp $
#
# Process this file with autoconf to produce a configure script.
AC_INIT([netpgp],[20140210],[Alistair Crooks <agc@netbsd.org> c0596823])
AC_INIT([netpgp],[20140220],[Alistair Crooks <agc@netbsd.org> c0596823])
AC_PREREQ(2.63)
AC_REVISION([$Revision: 1.40 $])
AC_REVISION([$Revision: 1.41 $])
AS_SHELL_SANITIZE
@ -22,6 +22,7 @@ AC_SUBST([CANONICAL_HOST])
# Checks for programs.
#
AC_PROG_MAKE_SET
AM_PROG_AR
AC_PROG_AWK
AC_PROG_CC
AC_PROG_INSTALL

View File

@ -55,6 +55,10 @@
#include <errno.h>
#ifndef __printflike
#define __printflike(n, m) __attribute__((format(printf,n,m)))
#endif
/** error codes */
/* Remember to add names to map in errors.c */
typedef enum {

View File

@ -34,6 +34,10 @@
#include "signature.h"
#include "packet-show.h"
#ifndef __printflike
#define __printflike(n, m) __attribute__((format(printf,n,m)))
#endif
typedef struct pgp_validation_t {
unsigned validc;
pgp_sig_info_t *valid_sigs;

View File

@ -58,7 +58,7 @@
#endif
/* development versions have .99 suffix */
#define NETPGP_BASE_VERSION "3.99.16"
#define NETPGP_BASE_VERSION "3.99.17"
#define NETPGP_VERSION_CAT(a, b) "NetPGP portable " a "/[" b "]"
#define NETPGP_VERSION_STRING \

View File

@ -45,6 +45,10 @@ void *netpgp_allocate(size_t /*n*/, size_t /*nels*/);
void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
#ifndef _KERNEL
# ifndef __printflike
# define __printflike(n, m) __attribute__((format(printf,n,m)))
# endif
void logmessage(const int /*level*/, const char */*fmt*/, ...)
__printflike(2, 3);
#endif

View File

@ -50,6 +50,10 @@
#define USE_ARG(x) /*LINTED*/(void)&(x)
#endif
#ifndef __printflike
#define __printflike(n, m) __attribute__((format(printf,n,m)))
#endif
#define BITS_TO_BYTES(b) (((b) + (CHAR_BIT - 1)) / CHAR_BIT)
/* packet types */