Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Dec 2012 06:25:53 +0000 (UTC)
From:      Dirk Meyer <dinoex@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308587 - in head/ftp/vsftpd: . files
Message-ID:  <201212100625.qBA6Prf1040616@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dinoex
Date: Mon Dec 10 06:25:52 2012
New Revision: 308587
URL: http://svnweb.freebsd.org/changeset/ports/308587

Log:
  - update to 3.0.2
  - enable SSL as default

Modified:
  head/ftp/vsftpd/Makefile
  head/ftp/vsftpd/distinfo
  head/ftp/vsftpd/files/patch-sysdeputil.c

Modified: head/ftp/vsftpd/Makefile
==============================================================================
--- head/ftp/vsftpd/Makefile	Mon Dec 10 05:32:00 2012	(r308586)
+++ head/ftp/vsftpd/Makefile	Mon Dec 10 06:25:52 2012	(r308587)
@@ -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 Changelo
 		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

Modified: head/ftp/vsftpd/distinfo
==============================================================================
--- head/ftp/vsftpd/distinfo	Mon Dec 10 05:32:00 2012	(r308586)
+++ head/ftp/vsftpd/distinfo	Mon Dec 10 06:25:52 2012	(r308587)
@@ -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

Modified: head/ftp/vsftpd/files/patch-sysdeputil.c
==============================================================================
--- head/ftp/vsftpd/files/patch-sysdeputil.c	Mon Dec 10 05:32:00 2012	(r308586)
+++ head/ftp/vsftpd/files/patch-sysdeputil.c	Mon Dec 10 06:25:52 2012	(r308587)
@@ -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();



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212100625.qBA6Prf1040616>