diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index feaa56b..0aeebe5 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -202,9 +202,9 @@ mutt_cv_regex_broken=no"}; : ${PKG_OPENSMTPD_URL:=https://www.opensmtpd.org/archives/opensmtpd-${PKG_OPENSMTPD_VERSION}.tar.gz} : ${PKG_OPENSMTPD_CONFIGURE_ARGS_EXTRA:="--with-maildir=/var/mail --with-libz=${PREFIX_NATIVE} --with-libevent=${PREFIX_NATIVE}"}; : ${PKG_OPENSMTPD_IN_TREE:=1}; -: ${PKG_OPENSSH_DEPENDS:="libedit libressl libz"}; -: ${PKG_OPENSSH_SHA256SUM:=3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46}; -: ${PKG_OPENSSH_VERSION:=9.2p1}; +: ${PKG_OPENSSH_DEPENDS:="libedit libressl libz libmd"}; +: ${PKG_OPENSSH_SHA256SUM:=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8}; +: ${PKG_OPENSSH_VERSION:=9.3p1}; : ${PKG_OPENSSH_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PKG_OPENSSH_VERSION}.tar.gz}; : ${PKG_OPENSSH_CFLAGS_CONFIGURE_EXTRA:="-DUSE_PIPES -DUSE_LIBEDIT"}; : ${PKG_OPENSSH_CONFIGURE_ARGS_EXTRA:="--with-libedit=${PREFIX_NATIVE} --without-shadow"}; diff --git a/patches/openssh-9.2p1.local.patch b/patches/openssh-9.2p1.local.patch deleted file mode 100644 index 8e99535..0000000 --- a/patches/openssh-9.2p1.local.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/patches/openssh-9.3p1.local.patch b/patches/openssh-9.3p1.local.patch new file mode 100644 index 0000000..8e99535 --- /dev/null +++ b/patches/openssh-9.3p1.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