From 711ee7fd45a4ada1b11c736bc6073968258ddd2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Wed, 4 Oct 2023 17:07:33 +0200 Subject: groups.d/241.native_packages_inet.group: openssh: bump to v9.5p1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups.d/241.native_packages_inet.group | 4 ++-- patches/openssh-9.4p1.local.patch | 11 ----------- patches/openssh-9.5p1.local.patch | 11 +++++++++++ 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 patches/openssh-9.4p1.local.patch create mode 100644 patches/openssh-9.5p1.local.patch diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index f665eb98..c7ca138b 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -203,8 +203,8 @@ mutt_cv_regex_broken=no"}; : ${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 libmd"}; -: ${PKG_OPENSSH_SHA256SUM:=3608fd9088db2163ceb3e600c85ab79d0de3d221e59192ea1923e23263866a85}; -: ${PKG_OPENSSH_VERSION:=9.4p1}; +: ${PKG_OPENSSH_SHA256SUM:=f026e7b79ba7fb540f75182af96dc8a8f1db395f922bbc9f6ca603672686086b}; +: ${PKG_OPENSSH_VERSION:=9.5p1}; : ${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.4p1.local.patch b/patches/openssh-9.4p1.local.patch deleted file mode 100644 index 8e995354..00000000 --- a/patches/openssh-9.4p1.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.5p1.local.patch b/patches/openssh-9.5p1.local.patch new file mode 100644 index 00000000..8e995354 --- /dev/null +++ b/patches/openssh-9.5p1.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