From f7b21bbbf73438ebf0665e8b48a572e5dabc6b7a Mon Sep 17 00:00:00 2001
From: Richard Muzik <richard.muzik@nic.cz>
Date: Mon, 29 Apr 2024 09:03:23 +0200
Subject: [PATCH] patches/packages: drop merged openssh update

Link:
- https://github.com/openwrt/packages/commit/794a9110d447d0058d2b5fdf8aea41ac30b4a1a8
---
 ...ckages-openssh-bump-to-version-9.6p1.patch | 34 -------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 patches/packages/to-upstream/0012-packages-openssh-bump-to-version-9.6p1.patch

diff --git a/patches/packages/to-upstream/0012-packages-openssh-bump-to-version-9.6p1.patch b/patches/packages/to-upstream/0012-packages-openssh-bump-to-version-9.6p1.patch
deleted file mode 100644
index bd3dba45e..000000000
--- a/patches/packages/to-upstream/0012-packages-openssh-bump-to-version-9.6p1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 978b09abccb936d3ddb958b364506470c01b5561 Mon Sep 17 00:00:00 2001
-From: Tomas Zak <tomas.zak@turris.com>
-Date: Fri, 22 Dec 2023 10:08:29 +0100
-Subject: [PATCH] packages: openssh: bump to version 9.6p1
-
-Bump openssh package to new version 9.6p1 from 8.4p1.
-More info: https://www.openssh.com/releasenotes.html
----
- net/openssh/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/net/openssh/Makefile b/net/openssh/Makefile
-index a9aa8b85e..7e2221685 100644
---- a/net/openssh/Makefile
-+++ b/net/openssh/Makefile
-@@ -8,13 +8,13 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=openssh
--PKG_VERSION:=9.3p2
--PKG_RELEASE:=1
-+PKG_VERSION:=9.6p1
-+PKG_RELEASE:=$(AUTORELEASE)
- 
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
- 		https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/
--PKG_HASH:=200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8
-+PKG_HASH:=910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
- 
- PKG_LICENSE:=BSD ISC
- PKG_LICENSE_FILES:=LICENCE
--- 
-2.43.0
-- 
GitLab