git: eb4461c58f4b - main - security/softether5: set the appropreate build number

[Koichiro Iwao]

The branch main has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eb4461c58f4b03ef2f85ee04a55be17e5d9d8693

commit eb4461c58f4b03ef2f85ee04a55be17e5d9d8693
Author:     Koichiro Iwao <meta at FreeBSD.org>
AuthorDate: 2021-06-24 06:48:35 +0000
Commit:     Koichiro Iwao <meta at FreeBSD.org>
CommitDate: 2021-06-24 07:01:01 +0000

    security/softether5: set the appropreate build number
    
    Despite the build number is a monotonically increasing value and never
    decreased or reset to zero, upstream accidentaly reset it to zero.
    
    As a result, The older version of SoftEtherVPN client cannot to
    connect to 5.x developer version server. To restore compatibility,
    this commit sets the appropreate build number. See also the upstream
    GitHub issue.
    
    While here, define LIB_DEPENDS pointed out by poudriere QA-test.
    
    Obtained from:  https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281
---
 security/softether5/Makefile | 12 +++++++++---
 security/softether5/distinfo |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index 1fdc8e44152e..c010711c65e6 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	softether
-DISTVERSION=	5.02.0
-PORTREVISION=	1
+DISTVERSION=	5.02.${SE_BUILD_NUMBER}
 PORTEPOCH=	1
 CATEGORIES=	security net-vpn
 PKGNAMESUFFIX=	5
@@ -29,11 +28,13 @@ USE_GITHUB=	yes
 
 GH_ACCOUNT=	SoftEtherVPN
 GH_PROJECT=	SoftEtherVPN
-GH_TUPLE=	SoftEtherVPN:libhamcore:b7f5d8d:libhamcore/src/libhamcore \
+GH_TUPLE=	SoftEtherVPN:SoftEtherVPN:5.02.0 \
+		SoftEtherVPN:libhamcore:b7f5d8d:libhamcore/src/libhamcore \
 		BLAKE2:BLAKE2:b52178a:BLAKE2/3rdparty/BLAKE2 \
 		cxong:tinydir:ec6bff2:tinydir/3rdparty/tinydir
 
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+		-DBUILD_NUMBER=${SE_BUILD_NUMBER} \
 		-DSE_DBDIR="${SE_DBDIR}" \
 		-DSE_LOGDIR="${SE_LOGDIR}" \
 		-DSE_PIDDIR="${SE_PIDDIR}"
@@ -43,6 +44,10 @@ OPTIONS_DEFINE=	DOCS
 PORTDOCS=	DISCLAIMER.md WARNING.TXT
 CONFLICTS_INSTALL=	softether-4.[0-9]* softether-devel-4.[0-9]*
 
+# The build number must be a monotonically increasing value but upstream
+# accidentally reset it to zero. So reset to the correct value.
+# See also: SoftEtherVPN/SoftEtherVPN#1392
+SE_BUILD_NUMBER=	9675
 SE_DBDIR?=	/var/db/${PORTNAME}
 SE_LOGDIR?=	/var/log/${PORTNAME}
 SE_PIDDIR?=	/var/run/${PORTNAME}
@@ -58,6 +63,7 @@ SUB_FILES=	pkg-message
 CMAKE_BOOL_ON+=	SKIP_CPU_FEATURES
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/include/cpu_features_macros.h:devel/cpu_features
+LIB_DEPENDS+=	libcpu_features.so:devel/cpu_features
 .endif
 
 post-install:
diff --git a/security/softether5/distinfo b/security/softether5/distinfo
index 11576e4f3f4b..5ab3fe3eb3fa 100644
--- a/security/softether5/distinfo
+++ b/security/softether5/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1623585157
-SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.0_GH0.tar.gz) = fc410e5ee8cc06511a214d9db083b06422dbe2deb3d6be8b9a38bc6a3dceafa8
-SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.0_GH0.tar.gz) = 16471174
+TIMESTAMP = 1624516438
+SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.9675-5.02.0_GH0.tar.gz) = fc410e5ee8cc06511a214d9db083b06422dbe2deb3d6be8b9a38bc6a3dceafa8
+SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.9675-5.02.0_GH0.tar.gz) = 16471174
 SHA256 (softether/SoftEtherVPN-libhamcore-b7f5d8d_GH0.tar.gz) = a41b6cbbc3ba562aa70024419b562f8ce502db40fc06c3bef82952133354952d
 SIZE (softether/SoftEtherVPN-libhamcore-b7f5d8d_GH0.tar.gz) = 8333
 SHA256 (softether/BLAKE2-BLAKE2-b52178a_GH0.tar.gz) = 0bef79a164bda953410f474daab3241ed6461daa4fb90213b95ae60c440c6775