diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile index b1290b8a64ca..676d7e700c95 100644 --- a/ftp/pure-ftpd/Makefile +++ b/ftp/pure-ftpd/Makefile @@ -1,99 +1,98 @@ # Created by: Frank DENIS PORTNAME= pure-ftpd -PORTVERSION= 1.0.50 -PORTREVISION= 2 +PORTVERSION= 1.0.51 CATEGORIES= ftp MASTER_SITES= https://github.com/jedisct1/pure-ftpd/releases/download/${PORTVERSION}/ \ https://download.pureftpd.org/pub/pure-ftpd/releases/ MAINTAINER= sunpoet@FreeBSD.org COMMENT= Small, easy to set up, fast, and secure FTP server LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe perl5 tar:bzip2 USE_PERL5= run CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ --with-altlog --with-cookie --with-diraliases \ --with-everything --with-extauth --with-ftpwho \ --with-language=${LANGUAGE} --with-paranoidmsg --with-puredb \ --with-quotas --with-ratios GNU_CONFIGURE= yes USE_RC_SUBR= pure-ftpd SUB_FILES= pkg-message CPE_VENDOR= pureftpd LANGUAGE?= english OPTIONS_DEFINE= ANONDELETE ANONRENAME ANONRESUME DOCS EXAMPLES LARGEFILE LDAP MYSQL PAM PERUSERLIMITS PGSQL PRIVSEP SCRYPT SENDFILE THROTTLING TLS UPLOADSCRIPT VIRTUALCHROOT OPTIONS_DEFAULT=LARGEFILE PAM PERUSERLIMITS PRIVSEP SCRYPT SENDFILE THROTTLING TLS UPLOADSCRIPT VIRTUALCHROOT ANONDELETE_DESC= Allow anonymous user to delete files ANONRENAME_DESC= Allow anonymous user to rename files ANONRESUME_DESC= Allow anonymous user to resume file upload LARGEFILE_DESC= 2GB+ file download LDAP_DESC= User accounts in LDAP directories MYSQL_DESC= User accounts in MySQL database PAM_DESC= PAM authentication PGSQL_DESC= User accounts in PostgreSQL database PERUSERLIMITS_DESC= Per-user concurrency limits PRIVSEP_DESC= Privilege separation (recommended) SCRYPT_DESC= Hash passwords in PureDB with scrypt SENDFILE_DESC= Sendfile syscall THROTTLING_DESC= Bandwidth throttling UPLOADSCRIPT_DESC= Uploadscript daemon support VIRTUALCHROOT_DESC= Follow symlinks outside a chroot jail ANONDELETE_CPPFLAGS= -DANON_CAN_DELETE ANONRENAME_CPPFLAGS= -DANON_CAN_RENAME ANONRESUME_CPPFLAGS= -DANON_CAN_RESUME LARGEFILE_CONFIGURE_ENABLE= largefile LDAP_CONFIGURE_WITH= ldap LDAP_USE= OPENLDAP=yes MYSQL_CONFIGURE_WITH= mysql MYSQL_USES= mysql PAM_CONFIGURE_WITH= pam PERUSERLIMITS_CONFIGURE_WITH= peruserlimits PGSQL_CONFIGURE_WITH= pgsql PGSQL_USES= pgsql PRIVSEP_CONFIGURE_WITH= privsep SCRYPT_LIB_DEPENDS= libsodium.so:security/libsodium SENDFILE_CONFIGURE_WITH=sendfile THROTTLING_CONFIGURE_WITH= throttling TLS_CONFIGURE_WITH= tls TLS_CPPFLAGS= -I${OPENSSLINC} TLS_LDFLAGS= -L${OPENSSLLIB} TLS_USES= ssl UPLOADSCRIPT_CONFIGURE_WITH= uploadscript VIRTUALCHROOT_CONFIGURE_WITH= virtualchroot pre-fetch: @${ECHO_MSG} "You can use the following additional options:" @${ECHO_MSG} "" @${ECHO_MSG} "LANGUAGE=lang (default: english)" @${ECHO_MSG} "- Enable compilation of one language support" @${ECHO_MSG} " available lang: albanian, brazilian-portuguese, catalan, czech, danish, dutch," @${ECHO_MSG} " english, french, german, hungarian, italian, korean, norwegian, polish," @${ECHO_MSG} " romanian, russian, simplified-chinese, slovak, spanish, swedish," @${ECHO_MSG} " traditional-chinese." @${ECHO_MSG} "" post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/pure-ftpd.conf ${STAGEDIR}${PREFIX}/etc/pure-ftpd.conf.sample ${INSTALL_DATA} ${WRKSRC}/pureftpd-ldap.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-ldap.conf.sample ${INSTALL_DATA} ${WRKSRC}/pureftpd-mysql.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-mysql.conf.sample ${INSTALL_DATA} ${WRKSRC}/pureftpd-pgsql.conf ${STAGEDIR}${PREFIX}/etc/pureftpd-pgsql.conf.sample ${INSTALL_SCRIPT} ${FILESDIR}/pure-alwaysfail ${STAGEDIR}${PREFIX}/sbin/ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ post-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam.d/ ${INSTALL_DATA} ${FILESDIR}/pam.conf.5 ${STAGEDIR}${EXAMPLESDIR}/pam.d/pure-ftpd .include diff --git a/ftp/pure-ftpd/distinfo b/ftp/pure-ftpd/distinfo index cebca5041df1..bd63882c162f 100644 --- a/ftp/pure-ftpd/distinfo +++ b/ftp/pure-ftpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638556480 -SHA256 (pure-ftpd-1.0.50.tar.bz2) = 6722c7fd09fe3c9ebbd572f3d097087ec7b32aacb3df8fa3400d4c07e4f377d7 -SIZE (pure-ftpd-1.0.50.tar.bz2) = 520167 +TIMESTAMP = 1655208214 +SHA256 (pure-ftpd-1.0.51.tar.bz2) = 622360b86c60b563abe0e994f0a86cfe5ccfde597b29a14b0a79b6e5aa05a304 +SIZE (pure-ftpd-1.0.51.tar.bz2) = 520648 diff --git a/ftp/pure-ftpd/files/patch-src-log_pgsql.c b/ftp/pure-ftpd/files/patch-src-log_pgsql.c deleted file mode 100644 index b8b6a3b9ae92..000000000000 --- a/ftp/pure-ftpd/files/patch-src-log_pgsql.c +++ /dev/null @@ -1,29 +0,0 @@ -Obtained from: https://github.com/jedisct1/pure-ftpd/commit/c3f0f3c91d86939e6fabf5f65c6c6fc964e6032e - ---- src/log_pgsql.c.orig 2021-11-23 21:36:05 UTC -+++ src/log_pgsql.c -@@ -278,7 +278,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser - *id_sql_server = NULL; - - if ((escaped_server = pw_pgsql_escape_conninfo(server)) == NULL || -- (escaped_port = pw_pgsql_escape_conninfo(port)) == NULL || - (escaped_db = pw_pgsql_escape_conninfo(db)) == NULL || - (escaped_user = pw_pgsql_escape_conninfo(user)) == NULL || - (escaped_pw = pw_pgsql_escape_conninfo(pw)) == NULL) { -@@ -296,7 +295,7 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser - } - if (SNCHECK(snprintf(conninfo, sizeof_conninfo, - PGSQL_CONNECT_FMTSTRING, -- escaped_server, escaped_port, escaped_db, -+ escaped_server, port, escaped_db, - escaped_user, escaped_pw), sizeof_conninfo)) { - goto bye; - } -@@ -314,7 +313,6 @@ static int pw_pgsql_connect(PGconn ** const id_sql_ser - bye: - free(conninfo); - free(escaped_server); -- free(escaped_port); - free(escaped_db); - free(escaped_user); - free(escaped_pw);