Module Name: othersrc
Committed By: lukem
Date: Sat Jul 4 04:55:03 UTC 2020
Modified Files:
othersrc/libexec/tnftpd: configure tnftpd_config.h.in
Log Message:
regen for --with-blocklist
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 othersrc/libexec/tnftpd/configure
cvs rdiff -u -r1.5 -r1.6 othersrc/libexec/tnftpd/tnftpd_config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/libexec/tnftpd/configure
diff -u othersrc/libexec/tnftpd/configure:1.50 othersrc/libexec/tnftpd/configure:1.51
--- othersrc/libexec/tnftpd/configure:1.50 Sun Jun 2 06:54:55 2019
+++ othersrc/libexec/tnftpd/configure Sat Jul 4 04:55:03 2020
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.43 .
+# From configure.ac Revision: 1.45 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tnftpd 20190602.
#
@@ -778,7 +778,7 @@ with_sysroot
enable_libtool_lock
enable_ipv6
enable_builtinls
-with_blacklist
+with_blocklist
with_pam
with_sia
with_skey
@@ -1437,7 +1437,7 @@ Optional Packages:
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot=DIR Search for dependent libraries within DIR
(or the compiler's sysroot if not specified).
- --with-blacklist enable support for NetBSD blacklist daemon
+ --with-blocklist enable support for NetBSD blocklist daemon
[default=auto]
--with-pam enable support for Pluggable Authentication Modules
(PAM) authentication [default=auto]
@@ -11913,11 +11913,11 @@ fi
-# Check whether --with-blacklist was given.
-if test "${with_blacklist+set}" = set; then :
- withval=$with_blacklist;
+# Check whether --with-blocklist was given.
+if test "${with_blocklist+set}" = set; then :
+ withval=$with_blocklist;
else
- with_blacklist=auto
+ with_blocklist=auto
fi
@@ -11962,6 +11962,7 @@ fi
+
#
# Checks for programs.
#
@@ -15341,12 +15342,56 @@ $as_echo "using local version" >&6; }
fi
fi
-# Check for blacklist.
+# Check for blocklist, falling back to legacy blacklist name
#
-if test "$with_blacklist" != no; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: --with-blacklist=$with_blacklist; checking for required blacklist features" >&5
-$as_echo "$as_me: --with-blacklist=$with_blacklist; checking for required blacklist features" >&6;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blacklist_open in -lblacklist" >&5
+if test "$with_blocklist" != no; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: --with-blocklist=$with_blocklist; checking for required blocklist features" >&5
+$as_echo "$as_me: --with-blocklist=$with_blocklist; checking for required blocklist features" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blocklist_open in -lblocklist" >&5
+$as_echo_n "checking for blocklist_open in -lblocklist... " >&6; }
+if ${ac_cv_lib_blocklist_blocklist_open+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lblocklist $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char blocklist_open ();
+int
+main ()
+{
+return blocklist_open ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_blocklist_blocklist_open=yes
+else
+ ac_cv_lib_blocklist_blocklist_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_blocklist_blocklist_open" >&5
+$as_echo "$ac_cv_lib_blocklist_blocklist_open" >&6; }
+if test "x$ac_cv_lib_blocklist_blocklist_open" = xyes; then :
+ LIBS="-lblocklist $LIBS"
+ $as_echo "#define USE_BLOCKLIST 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: enabling blocklist support" >&5
+$as_echo "$as_me: enabling blocklist support" >&6;}
+ with_blocklist=yes
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for blacklist_open in -lblacklist" >&5
$as_echo_n "checking for blacklist_open in -lblacklist... " >&6; }
if ${ac_cv_lib_blacklist_blacklist_open+:} false; then :
$as_echo_n "(cached) " >&6
@@ -15384,21 +15429,23 @@ fi
$as_echo "$ac_cv_lib_blacklist_blacklist_open" >&6; }
if test "x$ac_cv_lib_blacklist_blacklist_open" = xyes; then :
LIBS="-lblacklist $LIBS"
- $as_echo "#define USE_BLACKLIST 1" >>confdefs.h
+ $as_echo "#define USE_BLACKLIST 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: enabling blacklist support" >&5
-$as_echo "$as_me: enabling blacklist support" >&6;}
- with_blacklist=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: enabling blocklist legacy support" >&5
+$as_echo "$as_me: enabling blocklist legacy support" >&6;}
+ with_blocklist=yes
else
- if test "$with_blacklist" != auto; then :
+ if test "$with_blocklist" != auto; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "--with-blacklist was given, but blacklist_open() was not found
+as_fn_error $? "--with-blocklist was given, but blocklist_open() was not found
See \`config.log' for more details" "$LINENO" 5; }
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: disabling --with-blacklist" >&5
-$as_echo "$as_me: disabling --with-blacklist" >&6;}
- with_blacklist=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: disabling --with-blocklist" >&5
+$as_echo "$as_me: disabling --with-blocklist" >&6;}
+ with_blocklist=no
+fi
+
fi
fi
@@ -18046,8 +18093,8 @@ $as_echo "$as_me: Prefix:
$as_echo "$as_me: IPv6 support: $opt_ipv6" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: Built-in /bin/ls: $opt_builtinls" >&5
$as_echo "$as_me: Built-in /bin/ls: $opt_builtinls" >&6;}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: blacklist support: $with_blacklist" >&5
-$as_echo "$as_me: blacklist support: $with_blacklist" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: blocklist support: $with_blocklist" >&5
+$as_echo "$as_me: blocklist support: $with_blocklist" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: PAM authentication: $with_pam" >&5
$as_echo "$as_me: PAM authentication: $with_pam" >&6;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: SIA authentication: $with_sia" >&5
Index: othersrc/libexec/tnftpd/tnftpd_config.h.in
diff -u othersrc/libexec/tnftpd/tnftpd_config.h.in:1.5 othersrc/libexec/tnftpd/tnftpd_config.h.in:1.6
--- othersrc/libexec/tnftpd/tnftpd_config.h.in:1.5 Tue Jan 29 23:21:17 2019
+++ othersrc/libexec/tnftpd/tnftpd_config.h.in Sat Jul 4 04:55:03 2020
@@ -501,6 +501,9 @@
/* Define if using blacklist. */
#undef USE_BLACKLIST
+/* Define if using blocklist. */
+#undef USE_BLOCKLIST
+
/* Define if using IPv6 support. */
#undef USE_INET6
