git: 59d2cf878521 - main - security/softether5: Update to 5.02.5180

[Koichiro Iwao]

The branch main has been updated by meta:

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

commit 59d2cf87852112f02493c07409892409c8028dbe
Author:     Koichiro Iwao <meta at FreeBSD.org>
AuthorDate: 2021-09-01 05:28:00 +0000
Commit:     Koichiro Iwao <meta at FreeBSD.org>
CommitDate: 2021-09-01 05:28:28 +0000

    security/softether5: Update to 5.02.5180
---
 security/softether5/Makefile | 16 ++++------------
 security/softether5/distinfo | 20 +++++---------------
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index c010711c65e6..3ed91a1caedc 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	softether
-DISTVERSION=	5.02.${SE_BUILD_NUMBER}
-PORTEPOCH=	1
+DISTVERSION=	5.02.5180
+PORTEPOCH=	2
 CATEGORIES=	security net-vpn
 PKGNAMESUFFIX=	5
 DIST_SUBDIR=	${PORTNAME}
@@ -8,9 +8,7 @@ DIST_SUBDIR=	${PORTNAME}
 # Some patches are managed in my GitHub fork
 PATCH_SITES=	https://github.com/metalefty/${GH_PROJECT}/commit/
 PATCHFILES=	f4baf91.patch:-p1 5890ce9.patch:-p1 ddaffd5.patch:-p1 \
-		57aa471.patch:-p1 5b91032.patch:-p1 7a208d6.patch:-p1 \
-		89ca29f.patch:-p1 b4817fd.patch:-p1 28c90b1.patch:-p1
-
+		57aa471.patch:-p1
 MAINTAINER=	meta at FreeBSD.org
 COMMENT=	SoftEther VPN 5 (Developer Edition)
 
@@ -28,13 +26,11 @@ USE_GITHUB=	yes
 
 GH_ACCOUNT=	SoftEtherVPN
 GH_PROJECT=	SoftEtherVPN
-GH_TUPLE=	SoftEtherVPN:SoftEtherVPN:5.02.0 \
-		SoftEtherVPN:libhamcore:b7f5d8d:libhamcore/src/libhamcore \
+GH_TUPLE=	SoftEtherVPN:libhamcore:2951ae5: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}"
@@ -44,10 +40,6 @@ 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}
diff --git a/security/softether5/distinfo b/security/softether5/distinfo
index 5ab3fe3eb3fa..8c43ed3015c8 100644
--- a/security/softether5/distinfo
+++ b/security/softether5/distinfo
@@ -1,8 +1,8 @@
-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
+TIMESTAMP = 1630473463
+SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180_GH0.tar.gz) = 09bd98beb9ac1ac3bae1bfdb95064ac80866e5b3f2c338296cad90947e4d6b96
+SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180_GH0.tar.gz) = 16472314
+SHA256 (softether/SoftEtherVPN-libhamcore-2951ae5_GH0.tar.gz) = 7e95f906ca088f192a2de2f90fede3b8af394e151666ae4a0533151de3fe919c
+SIZE (softether/SoftEtherVPN-libhamcore-2951ae5_GH0.tar.gz) = 8337
 SHA256 (softether/BLAKE2-BLAKE2-b52178a_GH0.tar.gz) = 0bef79a164bda953410f474daab3241ed6461daa4fb90213b95ae60c440c6775
 SIZE (softether/BLAKE2-BLAKE2-b52178a_GH0.tar.gz) = 908803
 SHA256 (softether/cxong-tinydir-ec6bff2_GH0.tar.gz) = d9c28aecc6c12409156942c5f6293267f9fba91ab1c2727bcfe26dc8f451030f
@@ -15,13 +15,3 @@ SHA256 (softether/ddaffd5.patch) = 6ec6d035616827162ff7c58959fe491bb352c4f2ef9f2
 SIZE (softether/ddaffd5.patch) = 2014
 SHA256 (softether/57aa471.patch) = 411aee3dcd57b6d868d83710ac9be81ed0335e142fb649f39ca8e01deb67d489
 SIZE (softether/57aa471.patch) = 1118
-SHA256 (softether/5b91032.patch) = 96e1674b2fed3718b07c5734ebc95eadcf16fd0f92edc44b3cd64929bc75d74e
-SIZE (softether/5b91032.patch) = 5168
-SHA256 (softether/7a208d6.patch) = 4a909eb7bab786d2be4194633cf1eae26dbdfb71274b992cddad790567f6433b
-SIZE (softether/7a208d6.patch) = 2737
-SHA256 (softether/89ca29f.patch) = de5b06e62fb028a6b265bf5fac1c81ce5da9bdba98eac99537ebac6b95e3408a
-SIZE (softether/89ca29f.patch) = 2452
-SHA256 (softether/b4817fd.patch) = f00b1d2931cc8d13d1e55207929a6217f06b00c69059c8f70d207f5f44fe3907
-SIZE (softether/b4817fd.patch) = 3312
-SHA256 (softether/28c90b1.patch) = 83a86836a3b704a10e24bb5f19c77e957b9e6d21e5253ce6318ee6e35f0b4848
-SIZE (softether/28c90b1.patch) = 1100