Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vsftpd: create directory for extra config files

Browse source 
* create /etc/vsftpd directory for extra config files
  like userlist, certificate and key
* modify config file to use that directory
* include that directory in conffiles for backup

* use PKG_HASH
* update URL

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2017-05-09 16:30:05 +03:00
parent c29c5d498e
commit 3f390c5509
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/vsftpd/Makefile
View file

@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vsftpd PKG_NAME:=vsftpd
PKG_VERSION:=3.0.3 PKG_VERSION:=3.0.3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://security.appspot.com/downloads/ PKG_SOURCE_URL:=https://security.appspot.com/downloads/
PKG_MD5SUM:=da119d084bd3f98664636ea05b5bb398 PKG_HASH:=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@ -24,8 +24,8 @@ define Package/vsftpd/Default
SUBMENU:=File Transfer SUBMENU:=File Transfer
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=A fast and secure FTP server TITLE:=Fast and secure FTP server
URL:=http://vsftpd.beasts.org/ URL:=https://security.appspot.com/vsftpd.html
MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl> MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
endef endef
@ -45,6 +45,7 @@ endef
define Package/vsftpd/conffiles define Package/vsftpd/conffiles
/etc/vsftpd.conf /etc/vsftpd.conf
/etc/vsftpd
endef endef
Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles) Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
@ -88,6 +89,7 @@ define Package/vsftpd/install
$(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf $(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
$(INSTALL_DIR) $(1)/etc/vsftpd
endef endef
Package/vsftpd-tls/install=$(Package/vsftpd/install) Package/vsftpd-tls/install=$(Package/vsftpd/install)

8
net/vsftpd/files/vsftpd.conf
View file

@ -11,13 +11,13 @@ session_support=NO
#syslog_enable=YES #syslog_enable=YES
#userlist_enable=YES #userlist_enable=YES
#userlist_deny=NO #userlist_deny=NO
#userlist_file=/etc/vsftpd.users #userlist_file=/etc/vsftpd/vsftpd.users
#xferlog_enable=YES #xferlog_enable=YES
#xferlog_file=/var/log/vsftpd.log #xferlog_file=/var/log/vsftpd.log
#xferlog_std_format=YES #xferlog_std_format=YES
### ###
### TLS/SSL options ### 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" ### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/vsftpd/vsftpd_privkey.pem -out /etc/vsftpd/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt"
#ssl_enable=YES #ssl_enable=YES
#allow_anon_ssl=NO #allow_anon_ssl=NO
#force_local_data_ssl=NO #force_local_data_ssl=NO
@ -25,6 +25,6 @@ session_support=NO
#ssl_tlsv1=YES #ssl_tlsv1=YES
#ssl_sslv2=NO #ssl_sslv2=NO
#ssl_sslv3=NO #ssl_sslv3=NO
#rsa_cert_file=/etc/config/vsftpd_cert.pem #rsa_cert_file=/etc/vsftpd/vsftpd_cert.pem
#rsa_private_key_file=/etc/config/vsftpd_privkey.pem #rsa_private_key_file=/etc/vsftpd/vsftpd_privkey.pem