d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f4cf3aa68b
freebsd-skq/crypto/openssh/freebsd-configure.sh

44 lines
1.1 KiB
Bash
Raw Normal View History

Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
#!/bin/sh
#
# $FreeBSD$
#
configure_args="
--prefix=/usr
--sysconfdir=/etc/ssh
--with-pam
Take care not to pick up the wrong version of OpenSSL when running in an environment that has OpenSSL from ports in addition to the base version.
2016-01-21 10:57:45 +00:00
--with-ssl-dir=/usr
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
--with-tcp-wrappers
--with-libedit
--with-ssl-engine
--without-xauth
Upgrade to OpenSSH 7.5p1.
2017-08-04 12:57:24 +00:00
"
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
set -e
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
openssh=$(dirname $(realpath $0))
cd $openssh
Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removed upstream) and a number of security fixes which we had already backported. MFC after: 1 week
2016-01-19 16:18:26 +00:00
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
# Run autotools before we drop LOCALBASE out of PATH
(cd $openssh && libtoolize --copy && autoheader && autoconf)
Now that we have local modifications in configure.ac and configure, run autoheader and autoconf to avoid having to patch configure manually.
2016-01-19 17:20:07 +00:00
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
# 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
Take care not to pick up the wrong version of OpenSSL when running in an environment that has OpenSSL from ports in addition to the base version.
2016-01-21 10:57:45 +00:00
export PATH=/bin:/sbin:/usr/bin:/usr/sbin
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
# Generate config.h with krb5 and stash it
Avoid picking up MIT Kerberos from ports (if installed).
2017-02-26 19:00:55 +00:00
sh configure $configure_args --with-kerberos5=/usr
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
mv config.log config.log.orig
mv config.h config.h.orig
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
# Generate config.h without krb5
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
sh configure $configure_args --without-kerberos5
Try harder to sanitize the environment before running configure. Remove a workaround for older Unbound versions that used sbrk. Approved by: re (gjb)
2018-10-10 22:29:06 +00:00
# Extract the difference
Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
2013-09-23 20:35:54 +00:00
echo '/* $Free''BSD$ */' > krb5_config.h
diff -u config.h.orig config.h |
sed -n '/^-#define/s/^-//p' |
grep -Ff /dev/stdin config.h.orig >> krb5_config.h
Reference in New Issue Copy Permalink