aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2020-01-04 01:09:33 +0000
committerCy Schubert <cy@FreeBSD.org>2020-01-04 01:09:33 +0000
commit2d969843e94289977be3d0cce3421e1789e2a675 (patch)
tree9dd8b8a1897646f2ce07f4e9ad86cf5477bb2026 /crypto
parent27046d78a2289c1dd7f844d8525010053c6cde80 (diff)
downloadsrc-2d969843e94289977be3d0cce3421e1789e2a675.tar.gz
src-2d969843e94289977be3d0cce3421e1789e2a675.zip
MFC r333552,333558-333568,333573,338568-338569,339275,339278,339294,340037,
r349720,356228: r333552 (des): Upgrade Unbound to 1.6.0. More to follow. r333558 (des): Upgrade Unbound to 1.6.1. More to follow. r333559 (des): Upgrade Unbound to 1.6.2. More to follow. r333560 (des): Upgrade Unbound to 1.6.3. More to follow. r333561 (des): Upgrade Unbound to 1.6.4. More to follow. r333562 (des): Upgrade Unbound to 1.6.5. More to follow. r333563 (des): Upgrade Unbound to 1.6.6. More to follow. r333564 (des): Upgrade Unbound to 1.6.7. More to follow. r333565 (des): No reason to keep this around. r333566 (des): Upgrade Unbound to 1.6.8. More to follow. r333567 (des): Upgrade Unbound to 1.7.0. More to follow. r333568 (des): Upgrade Unbound to 1.7.1. r333573 (des): Rename all Unbound binaries and man pages from unbound* to local-unbound*. PR: 222902 r338568 (des): Upgrade Unbound to 1.7.2. More to follow. r338569 (des): Upgrade Unbound to 1.7.3. More to follow. r339275 (des): Upgrade Unbound to 1.8.0. More to follow. r339278 (des): Upgrade to 1.8.1. r339294 (des): Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. r340037 (des): Merge upstream r4932: turn so-reuseport option off by default. r349720 (des): Upgrade Unbound to 1.9.2. MFC r356228 (cy): MFV r356143: Update unbound 1.9.2 --> 1.9.6. Security: CVE-2017-15105 (fixed by 1.6.7) CVE-2019-18934 (fixed by 1.9.5)
Notes
Notes: svn path=/stable/11/; revision=356345
Diffstat (limited to 'crypto')
-rwxr-xr-xcrypto/openssh/freebsd-configure.sh23
1 files changed, 11 insertions, 12 deletions
diff --git a/crypto/openssh/freebsd-configure.sh b/crypto/openssh/freebsd-configure.sh
index d2c63e170ffe..fbc0f5139c88 100755
--- a/crypto/openssh/freebsd-configure.sh
+++ b/crypto/openssh/freebsd-configure.sh
@@ -16,28 +16,27 @@ configure_args="
set -e
-# make sure configure uses the correct compiler
-export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC)
-export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP)
-unset CFLAGS CPPFLAGS LDFLAGS LIBS
+openssh=$(dirname $(realpath $0))
+cd $openssh
-# regenerate configure and config.h.in
-autoheader
-autoconf
+# Run autotools before we drop LOCALBASE out of PATH
+(cd $openssh && libtoolize --copy && autoheader && autoconf)
-# reset PATH to avoid picking up the wrong libraries
+# Ensure we use the correct toolchain and clean our environment
+export CC=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCC)
+export CPP=$(echo ".include <bsd.lib.mk>" | make -f /dev/stdin -VCPP)
+unset CFLAGS CPPFLAGS LDFLAGS LD_LIBRARY_PATH LIBS
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
-unset LD_LIBRARY_PATH
-# generate config.h with krb5 and stash it
+# Generate config.h with krb5 and stash it
sh configure $configure_args --with-kerberos5=/usr
mv config.log config.log.orig
mv config.h config.h.orig
-# generate config.h without krb5
+# Generate config.h without krb5
sh configure $configure_args --without-kerberos5
-# extract the difference
+# Extract the difference
echo '/* $Free''BSD$ */' > krb5_config.h
diff -u config.h.orig config.h |
sed -n '/^-#define/s/^-//p' |