- update to 3.0.2

- enable SSL as default
This commit is contained in:
Dirk Meyer 2012-12-10 06:25:52 +00:00
parent 23fc6f5485
commit 7e8cf32359
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=308587
3 changed files with 10 additions and 14 deletions

View file

@ -1,12 +1,8 @@
# New ports collection makefile for: vsftpd # Created by: Neil Blakey-Milner
# Date created: 03 Feb 2001
# Whom: Neil Blakey-Milner
#
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= vsftpd PORTNAME= vsftpd
PORTVERSION= 3.0.0 PORTVERSION= 3.0.2
CATEGORIES= ftp ipv6 CATEGORIES= ftp ipv6
MASTER_SITES= https://security.appspot.com/downloads/ \ MASTER_SITES= https://security.appspot.com/downloads/ \
${MASTER_SITE_GENTOO} ${MASTER_SITE_GENTOO}
@ -27,7 +23,7 @@ DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
SIZE SPEED TODO TUNING SIZE SPEED TODO TUNING
OPTIONS_DEFINE= VSFTPD_SSL PIDFILE STACKPROTECTOR OPTIONS_DEFINE= VSFTPD_SSL PIDFILE STACKPROTECTOR
OPTIONS_DEFAULT?= STACKPROTECTOR OPTIONS_DEFAULT?= VSFTPD_SSL STACKPROTECTOR
NO_OPTIONS_SORT=yes NO_OPTIONS_SORT=yes
VSFTPD_SSL_DESC=Include support for SSL VSFTPD_SSL_DESC=Include support for SSL

View file

@ -1,2 +1,2 @@
SHA256 (vsftpd-3.0.0.tar.gz) = ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8 SHA256 (vsftpd-3.0.2.tar.gz) = be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56
SIZE (vsftpd-3.0.0.tar.gz) = 193166 SIZE (vsftpd-3.0.2.tar.gz) = 192808

View file

@ -1,5 +1,5 @@
--- sysdeputil.c.orig 2010-03-26 04:25:33.000000000 +0100 --- sysdeputil.c.orig 2012-09-16 06:18:04.000000000 +0200
+++ sysdeputil.c 2012-04-14 10:31:00.000000000 +0200 +++ sysdeputil.c 2012-10-13 20:20:42.000000000 +0200
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
#endif #endif
#define VSF_SYSDEP_HAVE_SHADOW #define VSF_SYSDEP_HAVE_SHADOW
@ -12,7 +12,7 @@
@@ -323,8 +323,12 @@ @@ -323,8 +323,12 @@
const struct mystr* p_remote_host) const struct mystr* p_remote_host)
{ {
int retval; int retval = -1;
+#ifdef PAM_USER +#ifdef PAM_USER
pam_item_t item; pam_item_t item;
+#endif +#endif
@ -22,7 +22,7 @@
struct pam_conv the_conv = struct pam_conv the_conv =
{ {
&pam_conv_func, &pam_conv_func,
@@ -1213,7 +1217,9 @@ @@ -1216,7 +1220,9 @@
setutxent(); setutxent();
(void) pututxline(&s_utent); (void) pututxline(&s_utent);
endutxent(); endutxent();
@ -32,7 +32,7 @@
} }
void void
@@ -1232,7 +1238,9 @@ @@ -1235,7 +1241,9 @@
(void) pututxline(&s_utent); (void) pututxline(&s_utent);
endutxent(); endutxent();
s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec(); s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();