diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/vsftpd/Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/vsftpd/Makefile')
| -rw-r--r-- | package/vsftpd/Makefile | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 8f3e691ee..9cf34f1a7 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -6,15 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd -PKG_VERSION:= 2.1.0 +PKG_VERSION:= 2.1.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7890b54e7ffa6106ffbdfda53f47fa41 - -MASTER_SITES:= ftp://vsftpd.beasts.org/users/cevans/ +PKG_MD5SUM:= 6a8c8579d50adf0d0fc07226c03bfb52 +PKG_DESCR:= a fast and secure FTP server +PKG_SECTION:= net +PKG_URL:= http://vsftpd.beasts.org +PKG_SITES:= ftp://vsftpd.beasts.org/users/cevans/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,VSFTPD,vsftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE:= auto XAKE_FLAGS+= ${TARGET_CONFIGURE_OPTS} @@ -22,12 +24,8 @@ ALL_TARGET:= vsftpd INSTALL_STYLE:= auto post-install: - ${INSTALL_DIR} ${IDIR_VSFTPD}/etc/ + ${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin ${INSTALL_DATA} ./files/vsftpd.conf ${IDIR_VSFTPD}/etc/vsftpd.conf - ${INSTALL_DIR} ${IDIR_VSFTPD}/etc/init.d - ${INSTALL_BIN} ./files/vsftpd.init \ - ${IDIR_VSFTPD}/etc/init.d/vsftpd - ${INSTALL_DIR} ${IDIR_VSFTPD}/usr/sbin/ ${INSTALL_BIN} ${WRKINST}/usr/sbin/vsftpd ${IDIR_VSFTPD}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk |