X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=meta-openvuplus%2Frecipes-connectivity%2Fvsftpd%2Fvsftpd_2.3.5.bb;h=899b3682119965a7940a56b215b453340e5d689a;hb=1fc9cbaf1691ffea112097c01fc724c37bbc898d;hp=5125843fc8b9fa5a61e5c4c1e533c7bf1f001d5e;hpb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95;p=vuplus_openvuplus

diff --git a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
index 5125843..899b368 100644
--- a/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
+++ b/meta-openvuplus/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
@@ -5,13 +5,10 @@ LICENSE = "GPL-2.0-with-OpenSSL-exception"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
 DEPENDS = "libcap openssl"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = " \
         https://security.appspot.com/downloads/${BP}.tar.gz \
-        file://vsftpd@.service \
-        file://vsftpd.socket \
-        file://vsftpd.xinetd.in \
         file://01-builddefs.patch \
         file://02-config.patch \
         file://03-db-doc.patch \
@@ -28,7 +25,7 @@ SRC_URI[sha256sum] = "d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f6087
 
 S = "${WORKDIR}/${BP}"
 
-inherit systemd useradd xinetd
+inherit useradd
 
 CFLAGS = "${TARGET_CFLAGS}"
 CFLAGS += "-DVSF_BUILD_SSL=1"
@@ -72,6 +69,7 @@ do_configure() {
         set_default ls_recurse_enable YES
         set_default secure_chroot_dir "${SECURE_CHROOT_DIR}"
         set_default rsa_cert_file "${RSA_CERT_FILE}"
+	set_default local_root "/"
 }
 do_compile() {
         oe_runmake 'CFLAGS=${CFLAGS}' 'LIBS=${LIBS}' 'LINK=${LINK}'
@@ -86,15 +84,7 @@ do_install() {
         install -d ${D}${mandir}/man5
         install -m 644 vsftpd.conf.5 ${D}${mandir}/man5/vsftpd.conf.5
         install -d ${D}${SECURE_CHROOT_DIR}
-        install -d ${D}${systemd_unitdir}/system
-        ln -sf /dev/null ${D}${systemd_unitdir}/system/vsftpd.service
 }
 
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE_${PN}-systemd = "vsftpd.socket"
-
 USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--home-dir ${SECURE_CHROOT_DIR} --no-create-home --system --shell /bin/false --user-group vsftpd"
-
-XINETD_PACKAGES = "${PN}-xinetd"
-XINETD_SERVICE_${PN}-xinetd = "vsftpd"