From 49fdabe2403070c23af18c4faae7b414a75b6460 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 1 Sep 2024 11:19:21 +0300 Subject: [PATCH] openssh: Use apk-compatible versioning Adjust openssh's versioning to be compatible with apk: 8.9p1-r2 --> 8.9_p1-r2 "_p" is an allowed semantic suffix, so use that. (Alternative might have been 8.9.1-r2) Signed-off-by: Hannu Nyman --- net/openssh/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 5a5550143..399dabfc4 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -8,13 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=9.8p1 +PKG_REALVERSION:=9.8p1 +PKG_VERSION:=9.8_p1 PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_REALVERSION).tar.gz PKG_SOURCE_URL:=https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ PKG_HASH:=dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)-$(PKG_REALVERSION) PKG_LICENSE:=BSD ISC PKG_LICENSE_FILES:=LICENCE