Reviewed-by: Michael Tremer michael.tremer@ipfire.org
On 22 Nov 2023, at 15:04, Peter Müller peter.mueller@ipfire.org wrote:
Please refer to https://www.openssh.com/releasenotes.html#9.5p1 for the changelog of this version. The patch for fixing zlib version check has now been amended upstream and can therefore be deleted from IPFire 2.x's codebase.
Signed-off-by: Peter Müller peter.mueller@ipfire.org
lfs/openssh | 5 ++-- ...ion_check_for_1.3_and_future_version.patch | 25 ------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch
diff --git a/lfs/openssh b/lfs/openssh index d5d67dd0e..b81c2c3b1 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -24,7 +24,7 @@
include Config
-VER = 9.4p1 +VER = 9.5p1
THISAPP = openssh-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 +$(DL_FILE)_BLAKE2 = 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796
install : $(TARGET)
@@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch
cd $(DIR_APP) && autoconf cd $(DIR_APP) && sed -i "s/lkrb5 -ldes/lkrb5/" configure cd $(DIR_APP) && ./configure \ diff --git a/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch b/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch deleted file mode 100644 index ef3ff4dca..000000000 --- a/src/patches/openssh-9.4p1_Fix_zlib_version_check_for_1.3_and_future_version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From cb4ed12ffc332d1f72d054ed92655b5f1c38f621 Mon Sep 17 00:00:00 2001 -From: Darren Tucker dtucker@dtucker.net -Date: Sat, 19 Aug 2023 07:39:08 +1000 -Subject: [PATCH] Fix zlib version check for 1.3 and future version.
-bz#3604.
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/configure.ac b/configure.ac -index 07893e87065..e3128dfcbb4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1464,7 +1464,7 @@ else
- [[
- int a=0, b=0, c=0, d=0, n, v;
- n = sscanf(ZLIB_VERSION, "%d.%d.%d.%d", &a, &b, &c, &d);
-- if (n != 3 && n != 4) -+ if (n < 1)
- exit(1);
- v = a*1000000 + b*10000 + c*100 + d;
- fprintf(stderr, "found zlib version %s (%d)\n", ZLIB_VERSION, v);
-- 2.35.3