From 69b5be681e337f4f89c15fac317c1e63295a3ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Tue, 20 Sep 2022 05:23:08 +0200 Subject: groups/241.native_packages_inet.group:openssh:${PKG_ENV_VARS_EXTRA}: adds -ltinfo. patches/openssh-9.0p1.local.patch: fix braindead configure script wrt. libedit. --- groups/241.native_packages_inet.group | 2 +- patches/openssh-9.0p1.local.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 patches/openssh-9.0p1.local.patch diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 231384ad..8eb8132f 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -205,7 +205,7 @@ mutt_cv_regex_broken=no"}; : ${PKG_OPENSSH_DEBUG_CONFIGURE_ARGS_EXTRA:=--disable-strip}; : ${PKG_OPENSSH_INSTALL_TARGET:=install-nokeys}; : ${PKG_OPENSSH_MAKEFLAGS_INSTALL_EXTRA:=STRIP_OPT=}; -: ${PKG_OPENSSH_ENV_VARS_EXTRA:="LIBEDIT=-ledit"}; +: ${PKG_OPENSSH_ENV_VARS_EXTRA:="LIBEDIT=-ledit -ltinfo"}; : ${PKG_PROXYTUNNEL_DEPENDS:="libressl"}; : ${PKG_PROXYTUNNEL_SHA256SUM:=6495430e9c60d3df53824a7a0f3bea9953a89d083a3718c72db04dc4d40755ac}; : ${PKG_PROXYTUNNEL_VERSION:=1.10.20200507} diff --git a/patches/openssh-9.0p1.local.patch b/patches/openssh-9.0p1.local.patch new file mode 100644 index 00000000..8e995354 --- /dev/null +++ b/patches/openssh-9.0p1.local.patch @@ -0,0 +1,11 @@ +--- openssh-9.0p1/configure.orig 2022-04-07 06:51:43.000000000 +0200 ++++ openssh-9.0p1/configure 2022-09-20 05:19:31.505197136 +0200 +@@ -11394,8 +11394,6 @@ + if test "x$use_pkgconfig_for_libedit" = "xyes"; then + LIBEDIT=`$PKGCONFIG --libs libedit` + CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`" +- else +- LIBEDIT="-ledit -lcurses" + fi + OTHERLIBS=`echo $LIBEDIT | sed 's/-ledit//'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for el_init in -ledit" >&5 -- cgit v1.2.3