aboutsummaryrefslogtreecommitdiff
path: root/ftp/vsftpd
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2012-12-10 06:25:52 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2012-12-10 06:25:52 +0000
commit7e8cf323593b93433280dadb8c9c922674da224c (patch)
tree51c7922489ef36dc071b4b2680f1c74bd3d41b71 /ftp/vsftpd
parent23fc6f5485d8ed2b6eaf4fdfa5a676d75beacafc (diff)
downloadports-7e8cf323593b93433280dadb8c9c922674da224c.tar.gz
ports-7e8cf323593b93433280dadb8c9c922674da224c.zip
Notes
Diffstat (limited to 'ftp/vsftpd')
-rw-r--r--ftp/vsftpd/Makefile10
-rw-r--r--ftp/vsftpd/distinfo4
-rw-r--r--ftp/vsftpd/files/patch-sysdeputil.c10
3 files changed, 10 insertions, 14 deletions
diff --git a/ftp/vsftpd/Makefile b/ftp/vsftpd/Makefile
index 3beb2ce16a78..b53a56b863b4 100644
--- a/ftp/vsftpd/Makefile
+++ b/ftp/vsftpd/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: vsftpd
-# Date created: 03 Feb 2001
-# Whom: Neil Blakey-Milner
-#
+# Created by: Neil Blakey-Milner
# $FreeBSD$
-#
PORTNAME= vsftpd
-PORTVERSION= 3.0.0
+PORTVERSION= 3.0.2
CATEGORIES= ftp ipv6
MASTER_SITES= https://security.appspot.com/downloads/ \
${MASTER_SITE_GENTOO}
@@ -27,7 +23,7 @@ DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \
SIZE SPEED TODO TUNING
OPTIONS_DEFINE= VSFTPD_SSL PIDFILE STACKPROTECTOR
-OPTIONS_DEFAULT?= STACKPROTECTOR
+OPTIONS_DEFAULT?= VSFTPD_SSL STACKPROTECTOR
NO_OPTIONS_SORT=yes
VSFTPD_SSL_DESC=Include support for SSL
diff --git a/ftp/vsftpd/distinfo b/ftp/vsftpd/distinfo
index 3a998cbb6c13..b425e1a09bf7 100644
--- a/ftp/vsftpd/distinfo
+++ b/ftp/vsftpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vsftpd-3.0.0.tar.gz) = ef70205dcd0c7f03b008b9578fb44c0cbe31e66daab8cfafb9904747c17fc2a8
-SIZE (vsftpd-3.0.0.tar.gz) = 193166
+SHA256 (vsftpd-3.0.2.tar.gz) = be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56
+SIZE (vsftpd-3.0.2.tar.gz) = 192808
diff --git a/ftp/vsftpd/files/patch-sysdeputil.c b/ftp/vsftpd/files/patch-sysdeputil.c
index 144782bdfc0b..ffdcae5617d8 100644
--- a/ftp/vsftpd/files/patch-sysdeputil.c
+++ b/ftp/vsftpd/files/patch-sysdeputil.c
@@ -1,5 +1,5 @@
---- sysdeputil.c.orig 2010-03-26 04:25:33.000000000 +0100
-+++ sysdeputil.c 2012-04-14 10:31:00.000000000 +0200
+--- sysdeputil.c.orig 2012-09-16 06:18:04.000000000 +0200
++++ sysdeputil.c 2012-10-13 20:20:42.000000000 +0200
@@ -57,7 +57,7 @@
#endif
#define VSF_SYSDEP_HAVE_SHADOW
@@ -12,7 +12,7 @@
@@ -323,8 +323,12 @@
const struct mystr* p_remote_host)
{
- int retval;
+ int retval = -1;
+#ifdef PAM_USER
pam_item_t item;
+#endif
@@ -22,7 +22,7 @@
struct pam_conv the_conv =
{
&pam_conv_func,
-@@ -1213,7 +1217,9 @@
+@@ -1216,7 +1220,9 @@
setutxent();
(void) pututxline(&s_utent);
endutxent();
@@ -32,7 +32,7 @@
}
void
-@@ -1232,7 +1238,9 @@
+@@ -1235,7 +1241,9 @@
(void) pututxline(&s_utent);
endutxent();
s_utent.ut_tv.tv_sec = vsf_sysutil_get_time_sec();