From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 25 Feb 2010 19:14:40 +0000 (+0100)
Subject: vsftpd: General fixes.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2df8053ef715f05b8a046a0f82cc56f5f669e01;p=ipfire-3.x.git

vsftpd: General fixes.

Fixed dependency lists.
Fixed naming of pam file.
---

diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm
index 7d41a6901..9f81196eb 100644
--- a/pkgs/core/vsftpd/vsftpd.nm
+++ b/pkgs/core/vsftpd/vsftpd.nm
@@ -34,8 +34,7 @@ PKG_URL        = ftp://vsftpd.beasts.org/users/cevans/
 PKG_LICENSE    = GPLv2 with exceptions
 PKG_SUMMARY    = Very Secure Ftp Daemon.
 
-PKG_BUILD_DEPS+= openssl pam libcap
-PKG_DEPS      += openssl pam
+PKG_DEPS      += libcap openssl pam
 
 define PKG_DESCRIPTION
 	vsftpd is a Very Secure FTP daemon. It was written completely \
@@ -61,6 +60,4 @@ define STAGE_INSTALL
 	cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 $(BUILDROOT)/usr/share/man/man5
 	-mkdir -pv $(BUILDROOT)/etc/$(PKG_NAME)
 	cp -vf $(DIR_SOURCE)/$(PKG_NAME).{conf,user_list} $(BUILDROOT)/etc/$(PKG_NAME)
-	-mkdir -pv $(BUILDROOT)/etc/pam.d
-	cp -vf $(DIR_SOURCE)/$(PKG_NAME)-pam.d $(BUILDROOT)/etc/pam.d/$(PKG_NAME)
 endef
diff --git a/pkgs/core/vsftpd/vsftpd-pam.d b/pkgs/core/vsftpd/vsftpd.pam
similarity index 100%
rename from pkgs/core/vsftpd/vsftpd-pam.d
rename to pkgs/core/vsftpd/vsftpd.pam