svn commit: r470422 - in head/ftp/vsftpd-ext: . files

[Martin Wilke]

Author: miwi
Date: Sat May 19 18:32:34 2018
New Revision: 470422
URL: https://svnweb.freebsd.org/changeset/ports/470422

Log:
  - Update to 3.0.3.1
  
  PR:	227491
  Submitted by:	Leonid Nevecherya
  Approved by:	maintainer timeout
  Sponsored by:	iXsystems Inc.

Added:
  head/ftp/vsftpd-ext/files/patch-sysstr.c   (contents, props changed)
  head/ftp/vsftpd-ext/files/patch-utility.c   (contents, props changed)
Deleted:
  head/ftp/vsftpd-ext/files/patch-utility
Modified:
  head/ftp/vsftpd-ext/Makefile
  head/ftp/vsftpd-ext/distinfo

Modified: head/ftp/vsftpd-ext/Makefile
==============================================================================
--- head/ftp/vsftpd-ext/Makefile	Sat May 19 16:35:48 2018	(r470421)
+++ head/ftp/vsftpd-ext/Makefile	Sat May 19 18:32:34 2018	(r470422)
@@ -3,7 +3,6 @@
 
 PORTNAME=	vsftpd-ext
 PORTVERSION=	${UPSTREAMVERSION}.${EXTVERSION}
-PORTREVISION=	2
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
@@ -14,7 +13,7 @@ COMMENT=	FTP daemon that aims to be "very secure". Ext
 
 LICENSE=	GPLv2
 
-UPSTREAMVERSION=3.0.2
+UPSTREAMVERSION=3.0.3
 EXTVERSION=	1
 
 USES=		alias gmake tar:tgz

Modified: head/ftp/vsftpd-ext/distinfo
==============================================================================
--- head/ftp/vsftpd-ext/distinfo	Sat May 19 16:35:48 2018	(r470421)
+++ head/ftp/vsftpd-ext/distinfo	Sat May 19 18:32:34 2018	(r470422)
@@ -1,2 +1,3 @@
-SHA256 (vsFTPd-3.0.2-ext1.tgz) = c276f25e5525dc1b104bde8c437a5a9c0cb0efed16056519214d1b9d71497c7d
-SIZE (vsFTPd-3.0.2-ext1.tgz) = 227801
+TIMESTAMP = 1523611798
+SHA256 (vsFTPd-3.0.3-ext1.tgz) = 9d0e83657d51b58a91c1d138375e10ed03555fc061f357b15e37dc89de71b593
+SIZE (vsFTPd-3.0.3-ext1.tgz) = 230764

Added: head/ftp/vsftpd-ext/files/patch-sysstr.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/vsftpd-ext/files/patch-sysstr.c	Sat May 19 18:32:34 2018	(r470422)
@@ -0,0 +1,11 @@
+--- sysstr.c.orig	2012-01-03 09:51:23 UTC
++++ sysstr.c
+@@ -74,7 +74,7 @@ str_chdir(const struct mystr* p_str)
+ int
+ str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
+ {
+-  enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
++  enum EVSFSysUtilOpenMode open_mode = (enum EVSFSysUtilOpenMode) kVSFSysStrOpenUnknown;
+   switch (mode)
+   {
+     case kVSFSysStrOpenReadOnly:

Added: head/ftp/vsftpd-ext/files/patch-utility.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/vsftpd-ext/files/patch-utility.c	Sat May 19 18:32:34 2018	(r470422)
@@ -0,0 +1,13 @@
+--- utility.c.orig	2012-09-23 00:14:36 UTC
++++ utility.c
+@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
+ void
+ bug(const char* p_text)
+ {
++  static int inside_bug = 0;
++  if (inside_bug)
++    vsf_sysutil_exit(1);
++  inside_bug++;
+   /* Rats. Try and write the reason to the network for diagnostics */
+   vsf_sysutil_activate_noblock(VSFTP_COMMAND_FD);
+   (void) vsf_sysutil_write_loop(VSFTP_COMMAND_FD, "500 OOPS: ", 10);