From add53caa84b5d994585b36fb2c2131ca9f75ed48 Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 21 Jul 2014 19:46:34 +0300
Subject: [PATCH] vsftpd: Add TLS/SSL example options. Bump PKG_RELEASE and
 copyright year. I did not define myself as the maintainer, as the package
 already had one. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

---
 net/vsftpd/Makefile          |  4 ++--
 net/vsftpd/files/vsftpd.conf | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index e1633e953d..e1a4de0174 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2013 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vsftpd
 PKG_VERSION:=3.0.2
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://security.appspot.com/downloads/
diff --git a/net/vsftpd/files/vsftpd.conf b/net/vsftpd/files/vsftpd.conf
index f3ba34f507..7d46506e92 100644
--- a/net/vsftpd/files/vsftpd.conf
+++ b/net/vsftpd/files/vsftpd.conf
@@ -15,3 +15,16 @@ session_support=NO
 #xferlog_enable=YES
 #xferlog_file=/var/log/vsftpd.log
 #xferlog_std_format=YES
+###
+### TLS/SSL options
+### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/config/vsftpd_privkey.pem -out /etc/config/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt"
+#ssl_enable=YES
+#allow_anon_ssl=NO
+#force_local_data_ssl=NO
+#force_local_logins_ssl=NO
+#ssl_tlsv1=YES
+#ssl_sslv2=NO
+#ssl_sslv3=NO
+#rsa_cert_file=/etc/config/vsftpd_cert.pem
+#rsa_private_key_file=/etc/config/vsftpd_privkey.pem
+