From nobody Tue Feb 28 15:45:31 2023
X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PR1sl3C6gz3tbc5;
Tue, 28 Feb 2023 15:45:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4PR1sl2gx8z3DST;
Tue, 28 Feb 2023 15:45:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1677599131;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=c1Lbs5/7wc+KsJFt8/ydkqqKZN0WrLVVYJOsf1vwnWg=;
b=xSQY8z8pH4LDSNYz5C7lG0fkZT1Td9njOu5AIFuhA3y/SRjG84Ps7RixGgvKP1/AavPK96
lbIo6GJ8yHZOMYjFkpIj0kDTDKlg3fuLCTOvtS0EhpNQF7aQ78TvQeefRYGwQ1yIknl3u3
K0/9lbK7qUB02CH4jNGRJL51HG5bp8r9m4X8UZO6kXedHhXnRtWAEIb9g431xYez/2iW65
pgXsprgolZ9kOl5Hxs40sTkorb4hsio8DhqDA0lMJJyxBXbQ7ROYHzSwtBmHfAJOE7wzuu
3abs9LoQcZIus0VhnuuA4irRItJGvuO7rS+oiIcqWJrYD0V7RMIL/kUASRoQyA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1677599131;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=c1Lbs5/7wc+KsJFt8/ydkqqKZN0WrLVVYJOsf1vwnWg=;
b=gN9RX4vzVBphJP074KABtRO6gpxGucuFcf9ADEtneHIz3wHcaRdOqu+3A4tdtyvWotSGrt
hCNZcdZ7SiKrwIfuQlcg5EC3lH6Z8pSlZxF+vbE99UOXhm7IZvnnyFt3hLNRhhKCy08xcX
AKP1+YXNACcywy3brUvyqlRx+c0CAMEvBvU53SAxgi0kwoGHNBagLbkTy4ku289q7eoCMl
saitG9GYczwxTVYFEc/+ewBn8IfSrqsAJcvo6X8hpbE5hYUG2IXVqP+LUbEgJTYNcT6o5k
uM5LcmuVWDaT5VhFvqeqHxwQgqTsCA5VM+nahgFGFX2Q9pUzdIeQLeTYCkzUwQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677599131; a=rsa-sha256; cv=none;
b=YgN7mpzNHItj58d7sDle5s6Dm2QlnL8Rs1sEhP84B7srBeW0ScSdTa1DXaMa9t6x3a3pbN
26osOpCBSb4dn2QWY4Nj3dtN8VXYnAatIThEsdkIpejyB9ILWm8JOFSQkO9nbyMfKZMbli
kbuFcSz6p8zmAZfjPwxlEKPa5mVmlHAnauxl+xnlOnxCQYL87akb9cmVExYuqq5zfkkgx4
Z37aYUGU9ohS7y3hnBMklxU31MsEnwvEucWRzf33AjE+gJFou70M3z9u9ka6ZkqHfLpJxS
lCQrgM1jCJ1u8g200Jv/pMVswK/5rKSUM6wRVq+LgCLsgprNlnpCXAWMFm/5jg==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PR1sl1kc4z1CMq;
Tue, 28 Feb 2023 15:45:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31SFjVIw053949;
Tue, 28 Feb 2023 15:45:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SFjVWM053948;
Tue, 28 Feb 2023 15:45:31 GMT
(envelope-from git)
Date: Tue, 28 Feb 2023 15:45:31 GMT
Message-Id: <202302281545.31SFjVWM053948@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Koichiro Iwao
Subject: git: 10fb4c0e6419 - main - security/softether5: Update to 5.02.5180-292-g8c64dc0c
List-Id: Commits to the main branch of the FreeBSD ports repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: meta
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 10fb4c0e64198f033791afd45570f086070dc96d
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=10fb4c0e64198f033791afd45570f086070dc96d
commit 10fb4c0e64198f033791afd45570f086070dc96d
Author: Koichiro Iwao
AuthorDate: 2023-02-28 05:59:34 +0000
Commit: Koichiro Iwao
CommitDate: 2023-02-28 15:45:17 +0000
security/softether5: Update to 5.02.5180-292-g8c64dc0c
While here, apply portfmt.
---
security/softether5/Makefile | 37 ++++++++++++++++++++++++-------------
security/softether5/distinfo | 32 +++++++++++++++++---------------
2 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index c2c1b15875c4..723a7250d28f 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -1,6 +1,6 @@
PORTNAME= softether
-DISTVERSION= 5.02.5180
-PORTREVISION= 1
+DISTVERSION= 5.02.5180-292
+DISTVERSIONSUFFIX= -g8c64dc0c
PORTEPOCH= 2
CATEGORIES= security net-vpn
PKGNAMESUFFIX= 5
@@ -8,8 +8,13 @@ DIST_SUBDIR= ${PORTNAME}
# Some patches are managed in my GitHub fork
PATCH_SITES= https://github.com/metalefty/${GH_PROJECT}/commit/
-PATCHFILES= c710f2e3.patch:-p1 91b61327.patch:-p1 45192989.patch:-p1 \
- a88ddbbc.patch:-p1 97f3ac01.patch:-p1 ddda9d09.patch:-p1
+PATCHFILES= a672cffa.patch:-p1 \
+ 8b3c335c.patch:-p1 \
+ f4e64e10.patch:-p1 \
+ 0dc45a98.patch:-p1 \
+ 0ace659a.patch:-p1 \
+ d560d962.patch:-p1 \
+ c4a8b52a.patch:-p1
MAINTAINER= meta@FreeBSD.org
COMMENT= SoftEther VPN 5 (Developer Edition)
@@ -20,10 +25,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libsodium.so:security/libsodium
-USES+= cmake:noninja compiler:c11 iconv:wchar_t \
- localbase:ldflags ncurses pkgconfig readline ssl
-USE_RC_SUBR= softether_bridge softether_client \
- softether_server softether_trafficserver
+USES+= cmake:noninja compiler:c11 iconv:wchar_t localbase:ldflags \
+ ncurses pkgconfig readline ssl
+USE_RC_SUBR= softether_bridge softether_client softether_server \
+ softether_trafficserver
USE_LDCONFIG= yes
USE_GITHUB= yes
@@ -36,26 +41,32 @@ GH_TUPLE= SoftEtherVPN:libhamcore:2951ae5:libhamcore/src/libhamcore \
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSE_DBDIR="${SE_DBDIR}" \
-DSE_LOGDIR="${SE_LOGDIR}" \
- -DSE_PIDDIR="${SE_PIDDIR}"
+ -DSE_PIDDIR="${SE_PIDDIR}" \
+ -DSE_TAGNAME="${GH_TAGNAME}/freebsd"
CFLAGS+= -I${LOCALBASE}/include/cpu_features
OPTIONS_DEFINE= DOCS
-PORTDOCS= DISCLAIMER.md WARNING.TXT
+PORTDOCS= DISCLAIMER.md WARNING.TXT
CONFLICTS_INSTALL= softether-4.[0-9]* softether-devel-4.[0-9]*
SE_DBDIR?= /var/db/${PORTNAME}
SE_LOGDIR?= /var/log/${PORTNAME}
SE_PIDDIR?= /var/run/${PORTNAME}
-PLIST_SUB= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
-SUB_LIST= SE_DBDIR="${SE_DBDIR}" SE_LOGDIR="${SE_LOGDIR}" SE_PIDDIR="${SE_PIDDIR}"
+PLIST_SUB= SE_DBDIR="${SE_DBDIR}" \
+ SE_LOGDIR="${SE_LOGDIR}" \
+ SE_PIDDIR="${SE_PIDDIR}"
+SUB_LIST= SE_DBDIR="${SE_DBDIR}" \
+ SE_LOGDIR="${SE_LOGDIR}" \
+ SE_PIDDIR="${SE_PIDDIR}"
SUB_FILES= pkg-message
.include
# devel/cpu_features not available on these archs, see devel/cpu_features/Makefile
-.if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64)
+.if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || \
+ ${ARCH} == mips || ${ARCH} == mips64)
# skip cpu_features when devel/cpu_features is not available
CMAKE_ARGS+= -DSKIP_CPU_FEATURES=1
.else
diff --git a/security/softether5/distinfo b/security/softether5/distinfo
index def50cf196d0..12acb46b9835 100644
--- a/security/softether5/distinfo
+++ b/security/softether5/distinfo
@@ -1,21 +1,23 @@
-TIMESTAMP = 1669214324
-SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180_GH0.tar.gz) = 09bd98beb9ac1ac3bae1bfdb95064ac80866e5b3f2c338296cad90947e4d6b96
-SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180_GH0.tar.gz) = 16472314
+TIMESTAMP = 1677595378
+SHA256 (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180-292-g8c64dc0c_GH0.tar.gz) = c8d91f4d7b556392493e5576826886afb535a6b158666fe2dc46478850ad44cc
+SIZE (softether/SoftEtherVPN-SoftEtherVPN-5.02.5180-292-g8c64dc0c_GH0.tar.gz) = 16484848
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
SIZE (softether/cxong-tinydir-ec6bff2_GH0.tar.gz) = 24765
-SHA256 (softether/c710f2e3.patch) = 9393733b091b2c0a9d18fdf21cb0207b8ff8eae2cfa2683eeef138bbc645600c
-SIZE (softether/c710f2e3.patch) = 3844
-SHA256 (softether/91b61327.patch) = 8981326501b6cac6683c2bb8e9f4e06edc6207eacd3b5608af5ee09a83af9dc8
-SIZE (softether/91b61327.patch) = 780
-SHA256 (softether/45192989.patch) = a30df2253385eba6c5746389368b8c4152d83d383b9d68eb7e137625711e2a47
-SIZE (softether/45192989.patch) = 1118
-SHA256 (softether/a88ddbbc.patch) = 22183b6b2059d8773ca8f98a1d0bb24467695d75deb20172fa708dac988a5675
-SIZE (softether/a88ddbbc.patch) = 2014
-SHA256 (softether/97f3ac01.patch) = b2320430b0e03dc10106fbf8dde25a3a1f127752cc1441f342b5f824c2325ec9
-SIZE (softether/97f3ac01.patch) = 930
-SHA256 (softether/ddda9d09.patch) = 9436778a6af53da979288cd9108e9bec56dab834dbe61ad26d3a6993f1e8944d
-SIZE (softether/ddda9d09.patch) = 822
+SHA256 (softether/a672cffa.patch) = 3dd096ed775de888830a09f1dc0b03f96bc1c810e1e54c20c7ed0e655e06fa3c
+SIZE (softether/a672cffa.patch) = 780
+SHA256 (softether/8b3c335c.patch) = cf6a9284c37ebaacc6cf8794075fd7443bfedea60ce348a0f082317eda1e4edd
+SIZE (softether/8b3c335c.patch) = 1118
+SHA256 (softether/f4e64e10.patch) = be32ceeb9a969a3984b56b1f7fa986db65d3a35041a86d66612f8fe9fa5477d6
+SIZE (softether/f4e64e10.patch) = 2014
+SHA256 (softether/0dc45a98.patch) = b73b3f26630577ec4ea9f7d395a4a94c9438729b7a96e1b6dae1a91727310d29
+SIZE (softether/0dc45a98.patch) = 930
+SHA256 (softether/0ace659a.patch) = c5d69173ad36386b8b08f2d9bfdd3933d50f0f602bba767d1b83dc9086826774
+SIZE (softether/0ace659a.patch) = 822
+SHA256 (softether/d560d962.patch) = 0963d8b28a89eeb468d0ad33294cd44cf6ca959945a67acadbf49687e99f8236
+SIZE (softether/d560d962.patch) = 1575
+SHA256 (softether/c4a8b52a.patch) = e2aded19d20a7d657aa1d0f5494fc52c7d39e6b0a3d45e8dddd71a07b46d15d2
+SIZE (softether/c4a8b52a.patch) = 1654