diff --git a/irc/soju/Makefile b/irc/soju/Makefile index f4d5b823bf38..100f03777b3c 100644 --- a/irc/soju/Makefile +++ b/irc/soju/Makefile @@ -1,73 +1,72 @@ PORTNAME= soju DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 -PORTREVISION= 2 +DISTVERSION= 0.10.1 CATEGORIES= irc MAINTAINER= ashish@FreeBSD.org COMMENT= IRC bouncer WWW= https://soju.im LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules,no_targets sqlite:3 USE_GITHUB= nodefault -GH_TUPLE= golang:sys:v0.30.0:sys +GH_TUPLE= golang:sys:v0.35.0:sys OPTIONS_DEFAULT= DOCS OPTIONS_DEFINE= DOCS USERS= soju GROUPS= soju SUB_LIST= USER=${USERS} USE_RC_SUBR= ${PORTNAME} CGO_LDFLAGS+= -lsqlite3 GO_MODULE= codeberg.org/emersion/soju CONTRIBS= ./contrib/znc-import ./contrib/migrate-db \ ./contrib/migrate-logs MAKE_ENV+= ${GO_ENV} GOFLAGS="${GOFLAGS} -tags=libsqlite3,pam" \ MANDIR=share/man \ PREFIX=${PREFIX} \ RUNDIR=/var/run \ SYSCONFDIR=${ETCDIR}/.. PLIST_FILES= ${CONTRIBS:T:C/^/bin\/soju-/g} \ ${DOCSDIR_REL}/getting-started.md \ "@sample ${ETCDIR_REL}/config.sample" \ "@dir(${USERS},${GROUPS},0711) /var/db/soju" \ bin/soju \ bin/sojuctl \ bin/sojudb DOCS_BUILD_DEPENDS= scdoc:textproc/scdoc DOCS_PLIST_FILES= share/man/man1/soju.1.gz \ share/man/man1/sojuctl.1.gz pre-patch: ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys post-patch: @${REINPLACE_CMD} -r -e 's,/var/lib/soju,/var/db/soju,g' \ ${WRKSRC}/config.in @${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},' \ -e '/^sharedstatedir/s,/var/lib,/var/db,' ${WRKSRC}/Makefile post-patch-DOCS-off: @${REINPLACE_CMD} -e 's,[$$]{man_pages},,' -e '/man1$$/d' ${WRKSRC}/Makefile post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/doc/getting-started.md ${STAGEDIR}${DOCSDIR} .for EXE in ${CONTRIBS:T} ${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 1f00d3b3c644..f7df15d10d93 100644 --- a/irc/soju/distinfo +++ b/irc/soju/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1746914844 -SHA256 (go/irc_soju/soju-v0.9.0/v0.9.0.mod) = bcee67181d9b3758cc1e7451a6fcde4cdcc00c3b55c86e05d0441d1bf70a0eef -SIZE (go/irc_soju/soju-v0.9.0/v0.9.0.mod) = 1887 -SHA256 (go/irc_soju/soju-v0.9.0/v0.9.0.zip) = 03ccc560b200db3cf65f757a44107738da85100fc0dbdd74ac3c77cb09bc08dd -SIZE (go/irc_soju/soju-v0.9.0/v0.9.0.zip) = 200524 -SHA256 (go/irc_soju/soju-v0.9.0/golang-sys-v0.30.0_GH0.tar.gz) = 3e54dfe262f4f09341622679101c0f10935028cc945f78a97f898b2416edb1f0 -SIZE (go/irc_soju/soju-v0.9.0/golang-sys-v0.30.0_GH0.tar.gz) = 1523069 +TIMESTAMP = 1766932228 +SHA256 (go/irc_soju/soju-v0.10.1/v0.10.1.mod) = ffa3b9639a8f96a075fba99f8c74571c3f66d82a429c602fbc5e5d08f4504acb +SIZE (go/irc_soju/soju-v0.10.1/v0.10.1.mod) = 1720 +SHA256 (go/irc_soju/soju-v0.10.1/v0.10.1.zip) = df604796c01a25fa0319e7f19f76655cfe09b4dd33fd71b5312bc67821a09877 +SIZE (go/irc_soju/soju-v0.10.1/v0.10.1.zip) = 208984 +SHA256 (go/irc_soju/soju-v0.10.1/golang-sys-v0.35.0_GH0.tar.gz) = 08a0eed7f36ae25bfd3275b92c8542da4924ce2902c36599d5a1f87d54f3b5dd +SIZE (go/irc_soju/soju-v0.10.1/golang-sys-v0.35.0_GH0.tar.gz) = 1531316 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 deleted file mode 100644 index 177271d673ee..000000000000 --- a/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_errors.go +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index 5fa6d3313646..000000000000 --- a/irc/soju/files/patch-vendor_github.com_msteinert_pam_v2_transaction.go +++ /dev/null @@ -1,17 +0,0 @@ ---- 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.