Date: Wed, 25 Mar 2026 14:43:18 +0000 From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 302962d9e8c0 - main - ftp/pure-ftpd: fix pureftpd_flags and config mutual exclusion Message-ID: <69c3f486.1e824.3298ac38@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by tz: URL: https://cgit.FreeBSD.org/ports/commit/?id=302962d9e8c0b2c70958dd770a66d80cfdd580ff commit 302962d9e8c0b2c70958dd770a66d80cfdd580ff Author: Torsten Zuehlsdorff <tz@FreeBSD.org> AuthorDate: 2026-03-23 20:10:23 +0000 Commit: Torsten Zuehlsdorff <tz@FreeBSD.org> CommitDate: 2026-03-25 14:42:58 +0000 ftp/pure-ftpd: fix pureftpd_flags and config mutual exclusion Make flags and config file mutually exclusive in the rc script to prevent "421 Invalid argument" errors. PR: 239391 --- ftp/pure-ftpd/Makefile | 1 + ftp/pure-ftpd/files/pure-ftpd.in | 3 +-- ftp/pure-ftpd/pkg-plist | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index bc8c1e93a8db..f79ea5b2cea8 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -1,5 +1,6 @@ PORTNAME= pure-ftpd PORTVERSION= 1.0.53 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= https://download.pureftpd.org/pub/pure-ftpd/releases/ diff --git a/ftp/pure-ftpd/files/pure-ftpd.in b/ftp/pure-ftpd/files/pure-ftpd.in index fb71a8f84dd3..ee6e348759be 100644 --- a/ftp/pure-ftpd/files/pure-ftpd.in +++ b/ftp/pure-ftpd/files/pure-ftpd.in @@ -31,6 +31,7 @@ load_rc_config $name command=%%PREFIX%%/sbin/pure-ftpd procname=pure-ftpd pureftpd_config=${pureftpd_config:-"%%PREFIX%%/etc/pure-ftpd.conf"} +: ${pureftpd_flags:=$pureftpd_config} pureftpd_enable=${pureftpd_enable:-"no"} pureftpd_pidfile=${pureftpd_pidfile:-"/var/run/pure-ftpd.pid"} required_files=${pureftpd_config} @@ -46,8 +47,6 @@ pidfile_uploadscript=${pidfile_uploadscript:-"/var/run/pure-uploadscript.pid"} pureftpd_upload_enable=${pureftpd_upload_enable:-"no"} pureftpd_uploadscript=${pureftpd_uploadscript:-"/usr/bin/touch"} # command_args -flags="${pureftpd_config}" -command_args="${pureftpd_flags}" command_authd_args="-B -p ${pidfile_authd} -r ${pureftpd_authdscript} -s ${pureftpd_authsocket}" command_upload_args="-B -p ${pidfile_uploadscript} -r ${pureftpd_uploadscript}" diff --git a/ftp/pure-ftpd/pkg-plist b/ftp/pure-ftpd/pkg-plist index b87239c7b0a2..aa53006c4768 100644 --- a/ftp/pure-ftpd/pkg-plist +++ b/ftp/pure-ftpd/pkg-plist @@ -1,10 +1,10 @@ bin/pure-pw bin/pure-pwconvert bin/pure-statsdecode -etc/pure-ftpd.conf.sample -etc/pureftpd-ldap.conf.sample -etc/pureftpd-mysql.conf.sample -etc/pureftpd-pgsql.conf.sample +@sample etc/pure-ftpd.conf.sample +@sample etc/pureftpd-ldap.conf.sample +@sample etc/pureftpd-mysql.conf.sample +@sample etc/pureftpd-pgsql.conf.sample sbin/pure-alwaysfail sbin/pure-authd sbin/pure-certdhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69c3f486.1e824.3298ac38>