From 440e17cfd78581f1fb47faf088b28c8b0fb56a64 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 19 May 2018 18:32:34 +0000
Subject: - Update to 3.0.3.1

PR:	227491
Submitted by:	Leonid Nevecherya
Approved by:	maintainer timeout
Sponsored by:	iXsystems Inc.
---
 ftp/vsftpd-ext/Makefile              |  3 +--
 ftp/vsftpd-ext/distinfo              |  5 +++--
 ftp/vsftpd-ext/files/patch-sysstr.c  | 11 +++++++++++
 ftp/vsftpd-ext/files/patch-utility   | 13 -------------
 ftp/vsftpd-ext/files/patch-utility.c | 13 +++++++++++++
 5 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 ftp/vsftpd-ext/files/patch-sysstr.c
 delete mode 100644 ftp/vsftpd-ext/files/patch-utility
 create mode 100644 ftp/vsftpd-ext/files/patch-utility.c

diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile
index 48379d447ae2..c6250af36dfd 100644
--- a/ftp/vsftpd-ext/Makefile
+++ b/ftp/vsftpd-ext/Makefile
@@ -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". Extended build
 
 LICENSE=	GPLv2
 
-UPSTREAMVERSION=3.0.2
+UPSTREAMVERSION=3.0.3
 EXTVERSION=	1
 
 USES=		alias gmake tar:tgz
diff --git a/ftp/vsftpd-ext/distinfo b/ftp/vsftpd-ext/distinfo
index f9119bc305f5..1836b2eeb428 100644
--- a/ftp/vsftpd-ext/distinfo
+++ b/ftp/vsftpd-ext/distinfo
@@ -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
diff --git a/ftp/vsftpd-ext/files/patch-sysstr.c b/ftp/vsftpd-ext/files/patch-sysstr.c
new file mode 100644
index 000000000000..1ec241549461
--- /dev/null
+++ b/ftp/vsftpd-ext/files/patch-sysstr.c
@@ -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:
diff --git a/ftp/vsftpd-ext/files/patch-utility b/ftp/vsftpd-ext/files/patch-utility
deleted file mode 100644
index 95271ad74e9d..000000000000
--- a/ftp/vsftpd-ext/files/patch-utility
+++ /dev/null
@@ -1,13 +0,0 @@
---- utility.c.orig	2012-10-26 20:05:38 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);
diff --git a/ftp/vsftpd-ext/files/patch-utility.c b/ftp/vsftpd-ext/files/patch-utility.c
new file mode 100644
index 000000000000..5d68a4295326
--- /dev/null
+++ b/ftp/vsftpd-ext/files/patch-utility.c
@@ -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);
-- 
cgit v1.2.3