Update to 1.0.49

Changes:	https://github.com/jedisct1/pure-ftpd/releases
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2019-04-05 22:43:00 +00:00
parent 7468f15e25
commit 9c8fe3089d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=498000
5 changed files with 49 additions and 77 deletions

View file

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= pure-ftpd
PORTVERSION= 1.0.47
PORTREVISION= 1
PORTVERSION= 1.0.49
CATEGORIES= ftp ipv6
MASTER_SITES= https://github.com/jedisct1/${PORTNAME}/releases/download/${PORTVERSION}/ \
MASTER_SITES= https://github.com/jedisct1/pure-ftpd/releases/download/${PORTVERSION}/ \
https://download.pureftpd.org/pub/pure-ftpd/releases/ \
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/
@ -15,6 +14,23 @@ 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 UTF8 VIRTUALCHROOT
@ -36,31 +52,6 @@ UPLOADSCRIPT_DESC= Uploadscript daemon support
UTF8_DESC= UTF-8 filenames
VIRTUALCHROOT_DESC= Follow symlinks outside a chroot jail
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_PERL5= run
USE_RC_SUBR= pure-ftpd
USES= cpe perl5 tar:bzip2
CPE_VENDOR= pureftpd
PORTDOCS= AUTHORS CONTACT COPYING HISTORY NEWS README \
README.Authentication-Modules README.Configuration-File \
README.LDAP README.MySQL README.PGSQL README.TLS \
README.Virtual-Users THANKS pure-ftpd.png pureftpd.schema
PORTEXAMPLES= *
SUB_FILES= pkg-message
SUB_LIST= PAM_DIR=${PAM_DIR} PAM_TARGET=${PAM_TARGET}
LANGUAGE?= english
PAM_DIR?= pam
PAM_TARGET?= pure-ftpd
PAM_TEMPL?= ${FILESDIR}/pam.conf.5
ANONDELETE_CPPFLAGS= -DANON_CAN_DELETE
ANONRENAME_CPPFLAGS= -DANON_CAN_RENAME
ANONRESUME_CPPFLAGS= -DANON_CAN_RESUME
@ -98,10 +89,10 @@ pre-fetch:
@${ECHO_MSG} ""
@${ECHO_MSG} "LANGUAGE=lang (default: english)"
@${ECHO_MSG} "- Enable compilation of one language support"
@${ECHO_MSG} " available lang: brazilian-portuguese, catalan, czech, danish, dutch,"
@${ECHO_MSG} " english, french, french-funny, german, hungarian, italian, korean,"
@${ECHO_MSG} " norwegian, polish, romanian, russian, simplified-chinese, slovak,"
@${ECHO_MSG} " spanish, swedish, traditional-chinese, turkish"
@${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:
@ -112,11 +103,10 @@ post-install:
${INSTALL_SCRIPT} ${FILESDIR}/pure-alwaysfail ${STAGEDIR}${PREFIX}/sbin/
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PAM_DIR}/
${INSTALL_DATA} ${PAM_TEMPL} ${STAGEDIR}${EXAMPLESDIR}/${PAM_DIR}/${PAM_TARGET}
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pam.d/
${INSTALL_DATA} ${FILESDIR}/pam.conf.5 ${STAGEDIR}${EXAMPLESDIR}/pam.d/pure-ftpd
.include <bsd.port.post.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1509131778
SHA256 (pure-ftpd-1.0.47.tar.bz2) = cb1b695e779a06e42d62d7a1a428d2f605d621dfd5afe4e192b5f9fc4e343692
SIZE (pure-ftpd-1.0.47.tar.bz2) = 489177
TIMESTAMP = 1554503301
SHA256 (pure-ftpd-1.0.49.tar.bz2) = 8a727dfef810f275fba3eb6099760d4f8a0bdeae2c1197d0d5bfeb8c1b2f61b6
SIZE (pure-ftpd-1.0.49.tar.bz2) = 487958

View file

@ -1,36 +0,0 @@
Obtained from: https://github.com/jedisct1/pure-ftpd/commit/4a495c61ce22c893aed5ee57f6ce0b43c3be59ad
--- src/tls.c.orig 2017-08-18 23:47:43 UTC
+++ src/tls.c
@@ -228,7 +228,16 @@ static void ssl_info_cb(const SSL *cnx,
if ((where & SSL_CB_HANDSHAKE_START) != 0) {
if ((cnx == tls_cnx && tls_cnx_handshook != 0) ||
(cnx == tls_data_cnx && tls_data_cnx_handshook != 0)) {
- die(400, LOG_ERR, "TLS renegociation");
+ const SSL_CIPHER *cipher;
+ const char *cipher_version;
+ if ((cipher = SSL_get_current_cipher(cnx)) == NULL ||
+ (cipher_version = SSL_CIPHER_get_version(cipher)) == NULL) {
+ die(400, LOG_ERR, "No cipher");
+ }
+ if (strcmp(cipher_version, "TLSv1.3") != 0) {
+ die(400, LOG_ERR, "TLS renegociation");
+ return;
+ }
}
return;
}
@@ -264,10 +273,10 @@ int tls_init_library(void)
OpenSSL_add_all_algorithms();
# else
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS |
- OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
+ OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL);
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS |
- OPENSSL_INIT_ADD_ALL_DIGESTS |
- OPENSSL_INIT_LOAD_CONFIG, NULL);
+ OPENSSL_INIT_ADD_ALL_DIGESTS |
+ OPENSSL_INIT_LOAD_CONFIG, NULL);
# endif
while (RAND_status() == 0) {
rnd = zrand();

View file

@ -1,7 +1,7 @@
Now you need to examine %%EXAMPLESDIR%%%%PAM_DIR%%/%%PAM_TARGET%%
Now you need to examine %%EXAMPLESDIR%%/pam.d/pure-ftpd
and add the relevant PAM configuration lines to your /etc/pam.conf file.
If you defined call upload script in pure-ftpd config define corresponding
vars in rc.conf. pure-ftpd will not listen TCP socket without it.
See FAQ: http://pureftpd.org/FAQ
See FAQ: https://github.com/jedisct1/pure-ftpd/blob/master/FAQ

View file

@ -6,6 +6,7 @@ etc/pureftpd-ldap.conf.sample
etc/pureftpd-mysql.conf.sample
etc/pureftpd-pgsql.conf.sample
man/man8/pure-authd.8.gz
man/man8/pure-certd.8.gz
man/man8/pure-ftpd.8.gz
man/man8/pure-ftpwho.8.gz
man/man8/pure-mrtginfo.8.gz
@ -16,8 +17,25 @@ man/man8/pure-statsdecode.8.gz
man/man8/pure-uploadscript.8.gz
sbin/pure-alwaysfail
sbin/pure-authd
sbin/pure-certd
sbin/pure-ftpd
sbin/pure-ftpwho
sbin/pure-mrtginfo
sbin/pure-quotacheck
sbin/pure-uploadscript
%%PORTDOCS%%%%DOCSDIR%%/FAQ
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.Authentication-Modules
%%PORTDOCS%%%%DOCSDIR%%/README.Configuration-File
%%PORTDOCS%%%%DOCSDIR%%/README.LDAP
%%PORTDOCS%%%%DOCSDIR%%/README.MacOS-X
%%PORTDOCS%%%%DOCSDIR%%/README.MySQL
%%PORTDOCS%%%%DOCSDIR%%/README.PGSQL
%%PORTDOCS%%%%DOCSDIR%%/README.TLS
%%PORTDOCS%%%%DOCSDIR%%/README.Virtual-Users
%%PORTDOCS%%%%DOCSDIR%%/pure-ftpd.conf
%%PORTDOCS%%%%DOCSDIR%%/pureftpd-ldap.conf
%%PORTDOCS%%%%DOCSDIR%%/pureftpd-mysql.conf
%%PORTDOCS%%%%DOCSDIR%%/pureftpd-pgsql.conf
%%PORTDOCS%%%%DOCSDIR%%/pureftpd.schema
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam.d/pure-ftpd