diff --git a/ftp/sftpgo/Makefile b/ftp/sftpgo/Makefile index 0c886210c344..6db4b67fc9d7 100644 --- a/ftp/sftpgo/Makefile +++ b/ftp/sftpgo/Makefile @@ -1,67 +1,66 @@ PORTNAME= sftpgo -PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTVERSION= 2.2.3 CATEGORIES= ftp www MASTER_SITES= https://github.com/drakkan/${PORTNAME}/releases/download/v${DISTVERSION}/ DISTNAME= ${PORTNAME}_v${PORTVERSION}_src_with_deps MAINTAINER= skozlov@FreeBSD.org COMMENT= Fully featured and highly configurable SFTP, FTP/S, and WebDAV server LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules tar:xz USE_RC_SUBR= ${PORTNAME} NO_WRKSUBDIR= yes OPTIONS_DEFINE= BASH FISH ZSH MANPAGES OPTIONS_DEFAULT= BASH FISH ZSH MANPAGES OPTIONS_SUB= yes USERS= sftpgo GROUPS= sftpgo post-patch: ${REINPLACE_CMD} -e 's|"templates"|"${DATADIR}/templates"|; \ s|"static"|"${DATADIR}/static"|; \ s|"sftpgo.db"|"/var/db/${PORTNAME}/${PORTNAME}.db"|' \ ${WRKSRC}/${PORTNAME}.json post-build-BASH-on: ${GO_WRKDIR_BIN}/${PORTNAME} gen completion bash > ${WRKDIR}/bash_completions post-build-FISH-on: ${GO_WRKDIR_BIN}/${PORTNAME} gen completion fish > ${WRKDIR}/fish_completions post-build-ZSH-on: ${GO_WRKDIR_BIN}/${PORTNAME} gen completion zsh > ${WRKDIR}/zsh_completions post-build-MANPAGES-on: ${MKDIR} ${WRKDIR}/manpages ${GO_WRKDIR_BIN}/${PORTNAME} gen man --dir ${WRKDIR}/manpages post-install: @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && \ ${COPYTREE_SHARE} templates ${STAGEDIR}${DATADIR} && \ ${COPYTREE_SHARE} static ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.json ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.json.sample post-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_DATA} ${WRKDIR}/bash_completions ${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME} post-install-FISH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions ${INSTALL_DATA} ${WRKDIR}/fish_completions ${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish post-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKDIR}/zsh_completions ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME} post-install-MANPAGES-on: ${FIND} ${WRKDIR}/manpages -type f -execdir ${INSTALL_MAN} {} ${STAGEDIR}${MANPREFIX}/man/man1 \; .include diff --git a/ftp/sftpgo/distinfo b/ftp/sftpgo/distinfo index 77c9d73bc1d6..c84f83d87593 100644 --- a/ftp/sftpgo/distinfo +++ b/ftp/sftpgo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1644188900 -SHA256 (sftpgo_v2.2.2_src_with_deps.tar.xz) = c1779d6a82308540113b0de015291b05768b80a09918945e50ec914f3b99f60e -SIZE (sftpgo_v2.2.2_src_with_deps.tar.xz) = 9348860 +TIMESTAMP = 1651444299 +SHA256 (sftpgo_v2.2.3_src_with_deps.tar.xz) = 6c8676725e86ee3f6ad46a340a84f0da37cab8b6ea7b6aee86b2b96ba5e6671a +SIZE (sftpgo_v2.2.3_src_with_deps.tar.xz) = 9550020 diff --git a/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go b/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go deleted file mode 100644 index 6011ca54e942..000000000000 --- a/ftp/sftpgo/files/patch-vendor_github.com_shirou_gopsutil_v3_process_process__freebsd.go +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go.orig 2022-02-06 14:12:45 UTC -+++ vendor/github.com/shirou/gopsutil/v3/process/process_freebsd.go -@@ -115,7 +115,8 @@ func (p *Process) createTimeWithContext(ctx context.Co - if err != nil { - return 0, err - } -- return k.Start.Sec*1000 + k.Start.Usec/1000, nil -+ // Pull request: https://github.com/shirou/gopsutil/pull/1246 -+ return int64(k.Start.Sec)*1000 + int64(k.Start.Usec)/1000, nil - } - - func (p *Process) StatusWithContext(ctx context.Context) ([]string, error) {