From nobody Sat Oct 12 06:06:44 2024 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 4XQY0j1h3Sz5YrZt; Sat, 12 Oct 2024 06:06:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQY0j0l0Jz4DjK; Sat, 12 Oct 2024 06:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728713205; 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=TcxpFpoepjg0QfPw42WynEvnmrb4QSLAYknbZ2jO884=; b=FO0BYnlwfbzbpASmecm5hyew7fzNzIeD19+D9YyTHbhRtU43Kgfka/q0cDMomIs/tKMPyF 41RsysM1Md4JNeb2mCkpz1P8UTOv8Hjlg6qi69UUwhIqkDUQmWpZ/N88m/Z4zR1/9uZAgo +wGKZOe6sZPeV6yd2O/48Xpe1il62uCwipJewNCUu7vHTCTkVK5a/QClDfJxX5OuMkTHFk DFmS07zQLv+BP9ToVVlI/UpKdNdReWUYETI6LipCzKbupSu/rEIY53mfQHVeqajCpnktME sNgjqsVd/BMDToRGQHQfY1VuvvPVPhIkj7rEobsUAY5OO+cXWsXL3mlnEnRJCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728713205; 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=TcxpFpoepjg0QfPw42WynEvnmrb4QSLAYknbZ2jO884=; b=tX4a76Lo2S8OIcQlyL0yBPS6qKqREfrKLgxisX6DseTrAQ3h1xsiXUPlArHqI/uoscn6Pq cmo+4l8w0BdoQ/VSIqVuozBVEMUAWVXyKlmzbfOYNwOCsFtbkUTwOKE3VNSAbI9IwYyMSL 0tpglB7U8KjK4M+khKMs0ZAjhyEwlLtkYCC2SmecTllAVOflS9GSeKjZ5xnt4URVdny6oy uvbfLHzg2ufID+BIHgvz0osUUrGg+g2M2gS9Tye+ncw3U8dyjPwR7XSgSu+vIzYeznVwOb lOtsyuTE7DHxQ8Ro91mdDZGDsnvpTRMeMf6DUdphoa762skUO1cjKgGdosdFew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728713205; a=rsa-sha256; cv=none; b=EdGIaoTTjOl3t4Jg/CxuZTyZ6JZ68rcz38iJbOXmsrTVMY/yOpRbY5HIkMFC2uE7geUh7G 6QJBChxxscmF95mBjurozLYnDPOnmAytw8yakR1RYbuQ9MjHPBmi5WsLtmGB4Ok3HSaLEt FKSJ6BpSRED7hCAcGVAh3WDcaeql7CRqlzHYpV4q/kuy1QvBL3TMLTTB/6Sl5VvxKLB5Gt 9Y70ARUFX56xHuLOfbmy7FI+gcI7C79gAbPe6JBFggApn8OoUnF4bzv08xSvI1EXIQ7FPr e83znxkDoXXEfBUm0t7tusN1KOlzGhypWl3dAtKAiv4i+6Usk3S2fizsrErp2w== 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 4XQY0j0CV5z1CZ3; Sat, 12 Oct 2024 06:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49C66iS3032826; Sat, 12 Oct 2024 06:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49C66i6B032823; Sat, 12 Oct 2024 06:06:44 GMT (envelope-from git) Date: Sat, 12 Oct 2024 06:06:44 GMT Message-Id: <202410120606.49C66i6B032823@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Santhosh Raju Subject: git: 8b88f99cc8e4 - main - security/headscale: Update to 0.23.0 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fox X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b88f99cc8e4b8e43453ac138d2a4c06e13e6a45 Auto-Submitted: auto-generated The branch main has been updated by fox: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b88f99cc8e4b8e43453ac138d2a4c06e13e6a45 commit 8b88f99cc8e4b8e43453ac138d2a4c06e13e6a45 Author: Santhosh Raju AuthorDate: 2024-10-12 05:53:11 +0000 Commit: Santhosh Raju CommitDate: 2024-10-12 06:05:37 +0000 security/headscale: Update to 0.23.0 - Fix the service to pick up the configuration correctly Full change log: https://github.com/juanfont/headscale/compare/v0.16.4...v0.23.0 PR: 281940 Approved by: Michael Muenz (maintainer) --- security/headscale/Makefile | 11 ++++------- security/headscale/distinfo | 10 +++++----- security/headscale/files/headscale.in | 3 ++- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/security/headscale/Makefile b/security/headscale/Makefile index 87539f29b164..cea79ab57e21 100644 --- a/security/headscale/Makefile +++ b/security/headscale/Makefile @@ -1,7 +1,6 @@ PORTNAME= headscale -PORTVERSION= 0.16.4 +PORTVERSION= 0.23.0 DISTVERSIONPREFIX= v -PORTREVISION= 18 CATEGORIES= security net-vpn MAINTAINER= m.muenz@gmail.com @@ -31,13 +30,11 @@ PLIST_FILES= "@sample ${ETCDIR}/config.yaml.sample" \ post-patch: @${REINPLACE_CMD} -e 's|/etc/headscale|${PREFIX}/etc/${PORTNAME}|g' \ - ${WRKSRC}/cmd/headscale/cli/utils.go + ${WRKSRC}/cmd/headscale/cli/dump_config.go \ + ${WRKSRC}/cmd/headscale/cli/root.go \ + ${WRKSRC}/integration/hsic/hsic.go @${REINPLACE_CMD} -e 's|/var/lib/headscale/db.sqlite|/var/db/${PORTNAME}/db.sqlite|g' \ ${WRKSRC}/config-example.yaml - @${REINPLACE_CMD} -e 's|/var/lib/headscale/cache|/var/cache/${PORTNAME}|g' \ - ${WRKSRC}/config-example.yaml - @${REINPLACE_CMD} -e 's|/var/lib/headscale/private.key|${PREFIX}/etc/${PORTNAME}/private.key|g' \ - ${WRKSRC}/config-example.yaml post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} diff --git a/security/headscale/distinfo b/security/headscale/distinfo index 47cabd4a61fb..020ecc7e80c8 100644 --- a/security/headscale/distinfo +++ b/security/headscale/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1661076406 -SHA256 (go/security_headscale/headscale-v0.16.4/v0.16.4.mod) = 5a1e6a81c94588289a91ad0ed5afab20d2c472a7acaedbf5315bbfc267865bf9 -SIZE (go/security_headscale/headscale-v0.16.4/v0.16.4.mod) = 6809 -SHA256 (go/security_headscale/headscale-v0.16.4/v0.16.4.zip) = 14f0a916f5477479b73501da559c84874d5ef9bd05ad029ab16049a298aa9c63 -SIZE (go/security_headscale/headscale-v0.16.4/v0.16.4.zip) = 464386 +TIMESTAMP = 1728236395 +SHA256 (go/security_headscale/headscale-v0.23.0/v0.23.0.mod) = 0e0bbbf1abdde4221c3303d4d5e8b607fc38bf1ab4cea51a32a53a1c05775cc2 +SIZE (go/security_headscale/headscale-v0.23.0/v0.23.0.mod) = 10793 +SHA256 (go/security_headscale/headscale-v0.23.0/v0.23.0.zip) = 3751e62f64c327175bf995ac0b2c404c10adf8dd60c13e94199cb504db750c52 +SIZE (go/security_headscale/headscale-v0.23.0/v0.23.0.zip) = 727988 diff --git a/security/headscale/files/headscale.in b/security/headscale/files/headscale.in index a3f4ada0b6f4..3d94c3bbf614 100644 --- a/security/headscale/files/headscale.in +++ b/security/headscale/files/headscale.in @@ -13,6 +13,7 @@ rcvar=headscale_enable load_rc_config $name : ${headscale_enable:="NO"} +: ${headscale_config_file:="%%PREFIX%%/etc/${name}/config.yaml"} : ${headscale_syslog_output_enable:="NO"} : ${headscale_syslog_output_priority:="info"} : ${headscale_syslog_output_facility:="daemon"} @@ -35,7 +36,7 @@ procname="%%PREFIX%%/bin/${name}" start_cmd="${name}_start" headscale_start() { - /usr/sbin/daemon -f ${headscale_syslog_output_flags} -p ${pidfile} ${procname} serve + /usr/sbin/daemon -f ${headscale_syslog_output_flags} -p ${pidfile} ${procname} -c ${headscale_config_file} serve } run_rc_command "$1"