diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-10-15 17:40:19 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-10-16 03:58:23 +0000 |
| commit | 02dbfbc67645e88e9865f2885b124da170688c33 (patch) | |
| tree | 0a55575dd4db1bed31ebf6db2480695367e15846 | |
| parent | 564decbe0b3a3362f7ed5574784ce42e985d33c5 (diff) | |
security/openssh-portable: libfido fix went in 505373243
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/files/extra-patch-libfido2-configure.ac | 16 |
2 files changed, 0 insertions, 18 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index b5c9e473c388..d2c9b245de3a 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -89,8 +89,6 @@ BSM_CONFIGURE_ON= --with-audit=bsm FIDO_U2F_LIB_DEPENDS= libfido2.so:security/libfido2 FIDO_U2F_CONFIGURE_ON= --with-security-key-builtin FIDO_U2F_CONFIGURE_OFF= --disable-security-key -# Until https://reviews.freebsd.org/D27289 is committed -FIDO_U2F_EXTRA_PATCHES= ${FILESDIR}/extra-patch-libfido2-configure.ac BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd diff --git a/security/openssh-portable/files/extra-patch-libfido2-configure.ac b/security/openssh-portable/files/extra-patch-libfido2-configure.ac deleted file mode 100644 index 6cd9a550119b..000000000000 --- a/security/openssh-portable/files/extra-patch-libfido2-configure.ac +++ /dev/null @@ -1,16 +0,0 @@ -Workaround libfido2 package having a libfido2.pc that requires libcrypto -even with base OpenSSL which does not provide the proper pc file. - ---- configure.ac.orig 2020-11-19 14:21:03.890890000 -0800 -+++ configure.ac 2020-11-19 14:21:57.061193000 -0800 -@@ -3256,8 +3256,8 @@ if test "x$enable_sk" = "xyes" -a "x$enable_sk_interna - fi - fi - if test "x$use_pkgconfig_for_libfido2" = "xyes"; then -- LIBFIDO2=`$PKGCONFIG --libs libfido2` -- CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libfido2`" -+ LIBFIDO2="-lfido2 -lcrypto" -+ #CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libfido2`" - else - LIBFIDO2="-lfido2 -lcbor" - fi |