From nobody Wed May 22 22:16:34 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 4Vl5Hk4sMfz5L7SF; Wed, 22 May 2024 22:16:34 +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 4Vl5Hk3y7Tz4S0d; Wed, 22 May 2024 22:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716416194; 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=9/sdapojjM32aPxtuiv6DH5x0DQD3kd4NJyxyod6GJs=; b=HS+J7zKvt7uldyJzCroxANnn/m9cVQrGyE+XM9mvv7qLi+xJ1b06gIrzkT6yWw9acxD+Ts 3G1VMJ4kbqWOcivo+Kk2M3whrdFj4MrX3/VOGKP3vNNbSQbhI+7GtSrsMzFupZ9sVMdt/j cMMKKpt5vCKQEc6TOS2gECMHn56gWHY4ePFH5FAmhEe6gQsfNgh9do8vzYwHJZRnk38SJU EaCqkUUF/uQDXEJoQME60OasJ/qarC3VudnsLJXs1e0+5F8hLSzw0WBXI4x+UwuFqQetzP MF/lSY8OW3UaEKVL78rdF22s3Js08HL4ZZSTzOjmqBc3WuN5OiQ8Fx5uaJFQAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716416194; a=rsa-sha256; cv=none; b=tggGME2dOJZZw4VjrlcwgX3+HP6IeQmFM8HhJjFzhjqR5ZXX361N1fOtptzhNs2pasNelI 08z21XX5Nx2ai3a5S8eUErd/HLyObA2uuOny6+JUBsNqrUGpOAx/WMk9R09aBoyoEtLOau mkAySmw4m/aWJ6lViLSA01+LaHfLcEo5wx82HqZQpBIzSWuFpR+VEzbLE/+G1AYBnpu5ds YQ47mnw/1sKWkZgzWojWZjsJ/IHiC0hvzbFHPcYh7jN4E2NyEw8rPCXP+CYjtRHWoV2DKM vwWGrQlV2+Nl+uBN3rswi8iqMFiGfYHDh/1iVwv2MjYNwFLgxGJXghvRHCqP7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716416194; 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=9/sdapojjM32aPxtuiv6DH5x0DQD3kd4NJyxyod6GJs=; b=M2ngS5ZCSt9d/9nQlTJ15zSCZPHtOPJZXnKCtyUBFKPLrGpdybJMlHi5vr0TJy0WxQCgPi A1xLkg9EyiQmXCK+4Z52BgBKNsAI+mqPvnptBSttu51F2RSjwcO/byhuC5JaSz2GY6ODvY p09Kdr+YbjJhD3czU5JjQsCXy8q4amWbrgtd2wFRSCTcOTUm3i5KjeZFSFE+W6DQv2XZjK sbaEn6YMm17Mk93cJ+p0zZJ7KvFBh1jDmFPr70mQOqFAgHTD+mSNKDdoKF9pYWFdR/Khjd CQVPro2bEiwEgMQpJiRGJ8QkQlLWhXSrZ7NwaNS1w2o+nWK4TJ5+VnQ05NyYFw== 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 4Vl5Hk3RKSzNFP; Wed, 22 May 2024 22:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44MMGYQn001525; Wed, 22 May 2024 22:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44MMGYtQ001522; Wed, 22 May 2024 22:16:34 GMT (envelope-from git) Date: Wed, 22 May 2024 22:16:34 GMT Message-Id: <202405222216.44MMGYtQ001522@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ashish SHUKLA Subject: git: f3cdb4abac65 - main - irc/soju: Update to 0.8.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: ashish X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3cdb4abac6565355fa045817e25c3deb5cd5ecd Auto-Submitted: auto-generated The branch main has been updated by ashish: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3cdb4abac6565355fa045817e25c3deb5cd5ecd commit f3cdb4abac6565355fa045817e25c3deb5cd5ecd Author: Ashish SHUKLA AuthorDate: 2024-05-22 21:05:39 +0000 Commit: Ashish SHUKLA CommitDate: 2024-05-22 22:16:08 +0000 irc/soju: Update to 0.8.0 - strip executables - add patches for missing constants in PAM headers --- irc/soju/Makefile | 7 ++++--- irc/soju/distinfo | 14 +++++++------- irc/soju/files/patch-doc_getting-started.md | 8 ++++---- .../patch-vendor_github.com_msteinert_pam_v2_errors.go | 16 ++++++++++++++++ ...ch-vendor_github.com_msteinert_pam_v2_transaction.go | 17 +++++++++++++++++ 5 files changed, 48 insertions(+), 14 deletions(-) diff --git a/irc/soju/Makefile b/irc/soju/Makefile index 4c414677bd34..52078b468e95 100644 --- a/irc/soju/Makefile +++ b/irc/soju/Makefile @@ -1,7 +1,6 @@ PORTNAME= soju DISTVERSIONPREFIX= v -DISTVERSION= 0.7.0 -PORTREVISION= 7 +DISTVERSION= 0.8.0 CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules,no_targets sqlite:3 USE_GITHUB= nodefault -GH_TUPLE= golang:sys:v0.13.0:sys +GH_TUPLE= golang:sys:v0.18.0:sys OPTIONS_DEFAULT= DOCS OPTIONS_DEFINE= DOCS @@ -52,6 +51,7 @@ post-patch: @${REINPLACE_CMD} -r -e 's,[$$]\(([^)]+)\),$${\1},g' \ -e 's,(/cmd/sojuctl)$$,\1 ${CONTRIBS},' \ -e '/^config_path/s,=.*$$,= ${ETCDIR}/config,' \ + -e '/^RUNDIR/s,=.*$$,= /var/run,' \ -e '/^commands/s,$$, ${CONTRIBS:T},' \ -e '/^sojudb/s,^,${CONTRIBS:T} ,' \ -e '/^\.PHONY/s,$$, ${CONTRIBS:T},' \ @@ -67,5 +67,6 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/${EXE} ${STAGEDIR}${PREFIX}/bin/soju-${EXE} .endfor ${MV} ${STAGEDIR}${ETCDIR}/config ${STAGEDIR}${ETCDIR}/config.sample + ${FIND} ${STAGEDIR}${PREFIX}/bin -type f -exec ${STRIP_CMD} {} \; .include diff --git a/irc/soju/distinfo b/irc/soju/distinfo index 5e174e5ed495..5115a919eb81 100644 --- a/irc/soju/distinfo +++ b/irc/soju/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1701113515 -SHA256 (go/irc_soju/soju-v0.7.0/v0.7.0.mod) = 97993c9163614d9675c14d58e844cb315498f1617cab327d9458b7de8d0a73d0 -SIZE (go/irc_soju/soju-v0.7.0/v0.7.0.mod) = 1939 -SHA256 (go/irc_soju/soju-v0.7.0/v0.7.0.zip) = 7a3dd079a72603d2087bdd60d9ed43476d38456bd7d90bfc8a4d17d4dc7b2039 -SIZE (go/irc_soju/soju-v0.7.0/v0.7.0.zip) = 178361 -SHA256 (go/irc_soju/soju-v0.7.0/golang-sys-v0.13.0_GH0.tar.gz) = 8877d20a8f1b2533ddef00e65b6b3b9cebbcbffa319ed525df0bc229f583e2b6 -SIZE (go/irc_soju/soju-v0.7.0/golang-sys-v0.13.0_GH0.tar.gz) = 1442250 +TIMESTAMP = 1716410424 +SHA256 (go/irc_soju/soju-v0.8.0/v0.8.0.mod) = 7a59d4f81d35ba67366ca41e6222104f35264ccddcd3ec0ba650369d33825ee7 +SIZE (go/irc_soju/soju-v0.8.0/v0.8.0.mod) = 1720 +SHA256 (go/irc_soju/soju-v0.8.0/v0.8.0.zip) = 93e5173361dcd927726cb8336ad6ddcc632e73b1bc1d0ee0fe0f21658269aabc +SIZE (go/irc_soju/soju-v0.8.0/v0.8.0.zip) = 186524 +SHA256 (go/irc_soju/soju-v0.8.0/golang-sys-v0.18.0_GH0.tar.gz) = cee1944ab655ddf7eab6301e15cb6d01fdd6cd0a0f0b5896050ee60b124e084c +SIZE (go/irc_soju/soju-v0.8.0/golang-sys-v0.18.0_GH0.tar.gz) = 1448211 diff --git a/irc/soju/files/patch-doc_getting-started.md b/irc/soju/files/patch-doc_getting-started.md index 0f3db775d41b..656e0bc54be0 100644 --- a/irc/soju/files/patch-doc_getting-started.md +++ b/irc/soju/files/patch-doc_getting-started.md @@ -1,8 +1,8 @@ ---- doc/getting-started.md.orig 2021-09-17 09:56:56 UTC +--- doc/getting-started.md.orig 1979-11-30 00:00:00 UTC +++ doc/getting-started.md -@@ -12,6 +12,10 @@ channels from a ZNC config file: +@@ -20,6 +20,10 @@ channels from a ZNC config file: - go run ./contrib/znc-import.go + go run ./contrib/znc-import +For FreeBSD port users: + @@ -10,4 +10,4 @@ + ## Client side - soju can operate in two different modes: multi upstream and single upstream. + ### Client supporting `soju.im/bouncer-networks` diff --git a/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_errors.go b/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_errors.go new file mode 100644 index 000000000000..177271d673ee --- /dev/null +++ b/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_errors.go @@ -0,0 +1,16 @@ +--- vendor/github.com/msteinert/pam/v2/errors.go.orig 2024-05-22 21:03:02 UTC ++++ vendor/github.com/msteinert/pam/v2/errors.go +@@ -79,13 +79,6 @@ const ( + ErrModuleUnknown Error = C.PAM_MODULE_UNKNOWN + // ErrBadItem indicates a bad item passed to pam_*_item(). + ErrBadItem Error = C.PAM_BAD_ITEM +- // ErrConvAgain indicates a conversation function is event driven and data +- // is not available yet. +- ErrConvAgain Error = C.PAM_CONV_AGAIN +- // ErrIncomplete indicates to please call this function again to complete +- // authentication stack. Before calling again, verify that conversation +- // is completed. +- ErrIncomplete Error = C.PAM_INCOMPLETE + ) + + // Error returns the error message for the given status. diff --git a/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_transaction.go b/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_transaction.go new file mode 100644 index 000000000000..5fa6d3313646 --- /dev/null +++ b/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_transaction.go @@ -0,0 +1,17 @@ +--- vendor/github.com/msteinert/pam/v2/transaction.go.orig 2024-05-22 21:03:02 UTC ++++ vendor/github.com/msteinert/pam/v2/transaction.go +@@ -257,14 +257,6 @@ const ( + Ruser Item = C.PAM_RUSER + // UserPrompt is the string use to prompt for a username. + UserPrompt Item = C.PAM_USER_PROMPT +- // FailDelay is the app supplied function to override failure delays. +- FailDelay Item = C.PAM_FAIL_DELAY +- // Xdisplay is the X display name +- Xdisplay Item = C.PAM_XDISPLAY +- // Xauthdata is the X server authentication data. +- Xauthdata Item = C.PAM_XAUTHDATA +- // AuthtokType is the type for pam_get_authtok +- AuthtokType Item = C.PAM_AUTHTOK_TYPE + ) + + // SetItem sets a PAM information item.