[src/trunk]: src/crypto/external/bsd/netpgp Move netpgpkeys into the correct ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/netpgp Move netpgpkeys into the correct ...
From: agc <agc%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 18:19:59 +0000
details:   https://anonhg.NetBSD.org/src/rev/189432cc94a3
branches:  trunk
changeset: 327475:189432cc94a3
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Mar 09 00:33:50 2014 +0000

description:
Move netpgpkeys into the correct place in the reachover insfrastructure

diffstat:

 crypto/external/bsd/netpgp/Makefile                |    6 +-
 crypto/external/bsd/netpgp/bin/Makefile            |    3 +-
 crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile |   24 +++
 crypto/external/bsd/netpgp/dist/configure          |  129 ++++++++++++++++++--
 crypto/external/bsd/netpgp/dist/configure.ac       |   17 ++-
 crypto/external/bsd/netpgp/dist/tst                |   30 ++--
 crypto/external/bsd/netpgp/lib/Makefile            |    4 +-
 crypto/external/bsd/netpgp/netpgpkeys/Makefile     |   24 ---
 8 files changed, 170 insertions(+), 67 deletions(-)

diffs (truncated from 433 to 300 lines):

diff -r ba78d7d23fb5 -r 189432cc94a3 crypto/external/bsd/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/Makefile       Sun Mar 09 00:27:54 2014 +0000
+++ b/crypto/external/bsd/netpgp/Makefile       Sun Mar 09 00:33:50 2014 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.6 2012/11/20 05:26:24 agc Exp $
+#      $NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
 
-SUBDIR=                libmj .WAIT
+SUBDIR+=       libmj .WAIT
 SUBDIR+=       lib/verify .WAIT
 SUBDIR+=       lib .WAIT
-SUBDIR+=       netpgp netpgpkeys bin
+SUBDIR+=       bin
 #SUBDIR+=      hkpc hkpd
 
 .include <bsd.subdir.mk>
diff -r ba78d7d23fb5 -r 189432cc94a3 crypto/external/bsd/netpgp/bin/Makefile
--- a/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:27:54 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:33:50 2014 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2014/03/09 00:24:47 agc Exp $
+#      $NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
 
 SUBDIR+=       netpgp
+SUBDIR+=       netpgpkeys
 SUBDIR+=       netpgpverify
 
 .include <bsd.subdir.mk>
diff -r ba78d7d23fb5 -r 189432cc94a3 crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile        Sun Mar 09 00:33:50 2014 +0000
@@ -0,0 +1,24 @@
+#      $NetBSD: Makefile,v 1.2 2014/03/09 00:33:50 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=          netpgpkeys
+SRCS=          netpgpkeys.c
+BINDIR=                /usr/bin
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LDADD+=                -L${LIBNETPGPDIR} -lnetpgp
+DPADD+=                ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=     cd ${.CURDIR}/../../libmj && ${PRINTOBJDIR}
+LDADD+=                -L${LIBMJDIR} -lmj
+DPADD+=                ${LIBMJDIR}/libmj.a
+
+LDADD+=                -lcrypto -lz -lbz2
+DPADD+=                ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+MAN=           netpgpkeys.1
+
+.PATH: ${.CURDIR}/../../dist/src/netpgpkeys
+
+.include <bsd.prog.mk>
diff -r ba78d7d23fb5 -r 189432cc94a3 crypto/external/bsd/netpgp/dist/configure
--- a/crypto/external/bsd/netpgp/dist/configure Sun Mar 09 00:27:54 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure Sun Mar 09 00:33:50 2014 +0000
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.40 .
+# From configure.ac Revision: 1.41 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for netpgp 20140220.
 #
@@ -3191,7 +3191,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.
@@ -4803,13 +4802,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4806: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4805: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4809: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4808: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4812: output\"" >&5)
+  (eval echo "\"\$as_me:4811: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6015,7 +6014,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6018 "configure"' > conftest.$ac_ext
+  echo '#line 6017 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7540,11 +7539,11 @@
    -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:7543: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7542: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7547: \$? = $ac_status" >&5
+   echo "$as_me:7546: \$? = $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.
@@ -7879,11 +7878,11 @@
    -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:7882: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7881: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7886: \$? = $ac_status" >&5
+   echo "$as_me:7885: \$? = $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.
@@ -7984,11 +7983,11 @@
    -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:7987: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7986: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7991: \$? = $ac_status" >&5
+   echo "$as_me:7990: \$? = $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
@@ -8039,11 +8038,11 @@
    -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:8042: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8046: \$? = $ac_status" >&5
+   echo "$as_me:8045: \$? = $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
@@ -10406,7 +10405,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10409 "configure"
+#line 10408 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10502,7 +10501,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10505 "configure"
+#line 10504 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10741,6 +10740,104 @@
 fi
 
 
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="${ac_tool_prefix}ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AR"; then
+  ac_ct_AR=$AR
+  # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="ar"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_AR" = x; then
+    AR=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+else
+  AR="$ac_cv_prog_AR"
+fi
+
+
 # Compiler characteristics
 #
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using gcc" >&5
diff -r ba78d7d23fb5 -r 189432cc94a3 crypto/external/bsd/netpgp/dist/configure.ac
--- a/crypto/external/bsd/netpgp/dist/configure.ac      Sun Mar 09 00:27:54 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/configure.ac      Sun Mar 09 00:33:50 2014 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: configure.ac,v 1.41 2014/02/21 01:55:10 agc Exp $
+# $NetBSD: configure.ac,v 1.42 2014/03/09 00:33:50 agc Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
 AC_INIT([netpgp],[20140220],[Alistair Crooks <agc%netbsd.org@localhost> c0596823])
-AC_PREREQ(2.63)
-AC_REVISION([$Revision: 1.41 $])
+AC_PREREQ(2.69)
+AC_REVISION([$Revision: 1.42 $])
 
 AS_SHELL_SANITIZE
 
@@ -22,13 +22,22 @@
 # Checks for programs.
 #
 AC_PROG_MAKE_SET
Prev by Date: [src/trunk]: src/crypto/external/bsd/netpgp/hkpc get rid of the old reachover...
Next by Date: [src/trunk]: src/external/gpl3/gcc/dist/libgcc add ia64-netbsd support.
Previous by Thread: [src/trunk]: src/crypto/external/bsd/netpgp/hkpc get rid of the old reachover...
Next by Thread: [src/trunk]: src/external/gpl3/gcc/dist/libgcc add ia64-netbsd support.
Indexes:
Home | Main Index | Thread Index | Old Index