From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/vsftpd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/vsftpd') diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index a04440bc8..2dc9164e5 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= vsftpd PKG_VERSION:= 3.0.2 PKG_RELEASE:= 2 PKG_MD5SUM:= 8b00c749719089401315bd3c44dddbb2 -PKG_DESCR:= fast and secure FTP server -PKG_SECTION:= www +PKG_DESCR:= fast and secure ftp server +PKG_SECTION:= net/http PKG_DEPENDS:= libcap PKG_BUILDDEP:= libcap PKG_URL:= http://vsftpd.beasts.org/ -- cgit v1.2.3