vsftpd: move from meta-oe to meta-networking and tweak

* Fix stripped file QA warning
* Add proper headers to patches (and split makefile.patch into two
  parts, one of which may be upstreamable)
* Use PV in SRC_URI instead of hardcoded version
* Move SRC_URI checksums up next to SRC_URI
* Set SUMMARY instead of DESCRIPTION

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 0 insertions, 256 deletions

diff --git a/meta-oe/recipes-connectivity/vsftpd/files/init b/meta-oe/recipes-connectivity/vsftpd/files/init
deleted file mode 100755
index d0ec010dc..000000000
--- a/meta-oe/recipes-connectivity/vsftpd/files/init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/vsftpd
-NAME=vsftpd
-DESC="FTP Server"
-ARGS=""
-FTPDIR=/var/lib/ftp
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-        echo -n "* starting $DESC: $NAME... "
-        if ! test -d $FTPDIR; then
-            mkdir -p $FTPDIR/in
-            chown ftp $FTPDIR -R
-            chmod a-w $FTPDIR
-            chmod u+w $FTPDIR/in
-        fi
-        start-stop-daemon -S -b -x $DAEMON -- $ARGS
-        echo "done."
-        ;;
-    stop)
-        echo -n "* stopping $DESC: $NAME... "
-        start-stop-daemon -K -x $DAEMON
-        echo "done."
-        ;;
-    restart)
-        echo "* restarting $DESC: $NAME... "
-        $0 stop
-        $0 start
-        echo "done."
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/meta-oe/recipes-connectivity/vsftpd/files/vsftpd.conf b/meta-oe/recipes-connectivity/vsftpd/files/vsftpd.conf
deleted file mode 100755
index 08f91e048..000000000
--- a/meta-oe/recipes-connectivity/vsftpd/files/vsftpd.conf
+++ /dev/null
@@ -1,108 +0,0 @@
-# Example config file /etc/vsftpd.conf
-#
-# The default compiled in settings are fairly paranoid. This sample file
-# loosens things up a bit, to make the ftp daemon more usable.
-# Please see vsftpd.conf.5 for all compiled in defaults.
-#
-# READ THIS: This example file is NOT an exhaustive list of vsftpd options.
-# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
-# capabilities.
-
-# run standalone
-listen=YES
-
-# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
-anonymous_enable=YES
-#
-# Uncomment this to allow local users to log in.
-#local_enable=YES
-#
-# Uncomment this to enable any form of FTP write command.
-write_enable=YES
-#
-# Default umask for local users is 077. You may wish to change this to 022,
-# if your users expect that (022 is used by most other ftpd's)
-#local_umask=022
-#
-# Uncomment this to allow the anonymous FTP user to upload files. This only
-# has an effect if the above global write enable is activated. Also, you will
-# obviously need to create a directory writable by the FTP user.
-#anon_upload_enable=YES
-#
-# Uncomment this if you want the anonymous FTP user to be able to create
-# new directories.
-#anon_mkdir_write_enable=YES
-#
-# Activate directory messages - messages given to remote users when they
-# go into a certain directory.
-dirmessage_enable=YES
-#
-# Activate logging of uploads/downloads.
-xferlog_enable=YES
-#
-# Make sure PORT transfer connections originate from port 20 (ftp-data).
-connect_from_port_20=YES
-#
-# If you want, you can arrange for uploaded anonymous files to be owned by
-# a different user. Note! Using "root" for uploaded files is not
-# recommended!
-#chown_uploads=YES
-#chown_username=whoever
-#
-# You may override where the log file goes if you like. The default is shown
-# below.
-#xferlog_file=/var/log/vsftpd.log
-#
-# If you want, you can have your log file in standard ftpd xferlog format
-#xferlog_std_format=YES
-#
-# You may change the default value for timing out an idle session.
-#idle_session_timeout=600
-#
-# You may change the default value for timing out a data connection.
-#data_connection_timeout=120
-#
-# It is recommended that you define on your system a unique user which the
-# ftp server can use as a totally isolated and unprivileged user.
-#nopriv_user=ftpsecure
-#
-# Enable this and the server will recognise asynchronous ABOR requests. Not
-# recommended for security (the code is non-trivial). Not enabling it,
-# however, may confuse older FTP clients.
-#async_abor_enable=YES
-#
-# By default the server will pretend to allow ASCII mode but in fact ignore
-# the request. Turn on the below options to have the server actually do ASCII
-# mangling on files when in ASCII mode.
-# Beware that turning on ascii_download_enable enables malicious remote parties
-# to consume your I/O resources, by issuing the command "SIZE /big/file" in
-# ASCII mode.
-# These ASCII options are split into upload and download because you may wish
-# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking),
-# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
-# on the client anyway..
-#ascii_upload_enable=YES
-#ascii_download_enable=YES
-#
-# You may fully customise the login banner string:
-#ftpd_banner=Welcome to blah FTP service.
-#
-# You may specify a file of disallowed anonymous e-mail addresses. Apparently
-# useful for combatting certain DoS attacks.
-#deny_email_enable=YES
-# (default follows)
-#banned_email_file=/etc/vsftpd.banned_emails
-#
-# You may specify an explicit list of local users to chroot() to their home
-# directory. If chroot_local_user is YES, then this list becomes a list of
-# users to NOT chroot().
-#chroot_list_enable=YES
-# (default follows)
-#chroot_list_file=/etc/vsftpd.chroot_list
-#
-# You may activate the "-R" option to the builtin ls. This is disabled by
-# default to avoid remote users being able to cause excessive I/O on large
-# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
-# the presence of the "-R" option, so there is a strong case for enabling it.
-#ls_recurse_enable=YES
-
diff --git a/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch b/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch
deleted file mode 100644
index 3bf8f9767..000000000
--- a/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/makefile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -ur vsftpd-2.0.1_org/Makefile vsftpd-2.0.1_patch/Makefile
---- vsftpd-2.0.1_org/Makefile   2004-06-06 18:21:27.000000000 +0200
-+++ vsftpd-2.0.1_patch/Makefile 2004-07-21 09:50:25.245576352 +0200
-@@ -5,7 +5,7 @@
- #CFLAGS = -g
- CFLAGS =       -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
- 
--LIBS   =       `./vsf_findlibs.sh`
-+LIBS   =       -lssl -lcrypto -lnsl -lresolv
- LINK   =       -Wl,-s
- 
- OBJS   =       main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
-@@ -24,21 +24,21 @@
-        $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
- 
- install:
--       if [ -x /usr/local/sbin ]; then \
--               $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
-+       if [ -x ${DESTDIR}/usr/local/sbin ]; then \
-+               $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/local/sbin/vsftpd; \
-        else \
--               $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
--       if [ -x /usr/local/man ]; then \
--               $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
--               $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
--       elif [ -x /usr/share/man ]; then \
--               $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
--               $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
-+               $(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi
-+       if [ -x ${DESTDIR}/usr/local/man ]; then \
-+               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \
-+               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \
-+       elif [ -x ${DESTDIR}/usr/share/man ]; then \
-+               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \
-+               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/share/man/man5/vsftpd.conf.5; \
-        else \
--               $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
--               $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
--       if [ -x /etc/xinetd.d ]; then \
--               $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
-+               $(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \
-+               $(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi
-+       if [ -x ${DESTDIR}/etc/xinetd.d ]; then \
-+               $(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi
- 
- clean:
-        rm -f *.o *.swp vsftpd
diff --git a/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/nopam.patch b/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/nopam.patch
deleted file mode 100644
index 8e0559cad..000000000
--- a/meta-oe/recipes-connectivity/vsftpd/vsftpd-2.3.5/nopam.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h
---- vsftpd-2.0.1_org/builddefs.h        2004-07-02 16:36:59.000000000 +0200
-+++ vsftpd-2.0.1_patch/builddefs.h      2004-07-21 09:34:49.044900488 +0200
-@@ -2,7 +2,7 @@
- #define VSF_BUILDDEFS_H
- 
- #undef VSF_BUILD_TCPWRAPPERS
--#define VSF_BUILD_PAM
-+#undef VSF_BUILD_PAM
- #undef VSF_BUILD_SSL
- 
- #endif /* VSF_BUILDDEFS_H */
diff --git a/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb b/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
deleted file mode 100644
index 1669d96f8..000000000
--- a/meta-oe/recipes-connectivity/vsftpd/vsftpd_2.3.5.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "Secure ftp server"
-HOMEPAGE="https://security.appspot.com/vsftpd.html"
-SECTION = "network"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271"
-
-DEPENDS = "libcap"
-
-SRC_URI = "https://security.appspot.com/downloads/vsftpd-2.3.5.tar.gz \
-           file://makefile.patch \
-           file://nopam.patch \
-           file://init \
-           file://vsftpd.conf"
-
-inherit update-rc.d useradd
-
-CONFFILES_${PN} = "${sysconfdir}/vsftpd.conf"
-LDFLAGS_append =" -lcrypt -lcap"
-
-do_configure() {
-    # Fix hardcoded /usr, /etc, /var mess.
-    cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \
-    |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new
-    mv tunables.c.new tunables.c
-}
-
-do_install() {
-    install -d ${D}${sbindir}
-    install -d ${D}${mandir}/man8
-    install -d ${D}${mandir}/man5
-    oe_runmake 'DESTDIR=${D}' install
-    install -d ${D}${sysconfdir}
-    install -m 0755 ${WORKDIR}/vsftpd.conf ${D}${sysconfdir}/vsftpd.conf
-    install -d ${D}${sysconfdir}/init.d/
-    install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/vsftpd
-}
-
-INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "vsftpd"
-INITSCRIPT_PARAMS_${PN} = "defaults 80"
-
-USERADD_PACKAGES = "${PN}"
-USERADD_PARAM_${PN} = "--system --home-dir /var/lib/ftp --no-create-home -g ftp \
-                       --shell /bin/false ftp "
-GROUPADD_PARAM_${PN} = "-r ftp"
-                     
-SRC_URI[md5sum] = "01398a5bef8e85b6cf2c213a4b011eca"
-SRC_URI[sha256sum] = "d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1"