Import buildroot 2016.02.01

firmware/buildroot/package/proftpd/0001-fix-kernel-header-capability-version.patch

@@ -0,0 +1,12 @@
+--- a/lib/libcap/libcap.h	2008-08-22 19:49:48.000000000 -0700
++++ b/lib/libcap/libcap.h	2010-10-06 15:31:11.000000000 -0700
+@@ -65,7 +65,8 @@ struct _cap_struct {
+  */
+ 
+ #if !defined(_LINUX_CAPABILITY_VERSION_1) || \
+-            (_LINUX_CAPABILITY_VERSION_1 != 0x19980330)
++            ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \
++            (_LINUX_CAPABILITY_VERSION_1 != 0x20071026))
+ 
+ # error "Kernel <linux/capability.h> does not match library"
+ # error "file "libcap.h" --> fix and recompile libcap"

firmware/buildroot/package/proftpd/0002-__mempcpy.patch

@@ -0,0 +1,54 @@
+[PATCH] pr_fnmatch.c: use mempcpy, not __mempcpy to fix linker issue with uClibc
+
+The standard name (as checked for by configure) for the function is mempcpy,
+not __mempcpy, so use that instead.
+
+The existing code happens to work on glibc, as that provides an __mempcpy
+alias, but other C libraries (E.G.  uClibc) don't:
+
+./host/usr/bin/arm-linux-nm -D ./staging/lib/libuClibc-0.9.33.2.so | grep mempcpy
+00035d2c W mempcpy
+00036cf8 W wmempcpy
+
+vs
+
+./host/usr/bin/arm-none-linux-gnueabi-nm -D staging/lib/libc-2.18.so | grep mempcpy
+0007d140 T mempcpy
+0007d140 T __mempcpy
+000e15f0 T __mempcpy_chk
+00081828 T __mempcpy_small
+00083148 W wmempcpy
+000e4e3c T __wmempcpy_chk
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ lib/pr_fnmatch.c      |    2 +-
+ lib/pr_fnmatch_loop.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: proftpd-1.3.4d/lib/pr_fnmatch.c
+===================================================================
+--- proftpd-1.3.4d.orig/lib/pr_fnmatch.c
++++ proftpd-1.3.4d/lib/pr_fnmatch.c
+@@ -250,7 +250,7 @@
+ # endif
+ # define STRLEN(S) strlen (S)
+ # define STRCAT(D, S) strcat (D, S)
+-# define MEMPCPY(D, S, N) __mempcpy (D, S, N)
++# define MEMPCPY(D, S, N) mempcpy (D, S, N)
+ # define MEMCHR(S, C, N) memchr (S, C, N)
+ # define STRCOLL(S1, S2) strcoll (S1, S2)
+ # include "pr_fnmatch_loop.c"
+Index: proftpd-1.3.4d/lib/pr_fnmatch_loop.c
+===================================================================
+--- proftpd-1.3.4d.orig/lib/pr_fnmatch_loop.c
++++ proftpd-1.3.4d/lib/pr_fnmatch_loop.c
+@@ -54,7 +54,7 @@
+ /* Copy N bytes of SRC to DEST, return pointer to bytes after the
+    last written byte.  */
+ static void *
+-__mempcpy (void *dest, const void *src, size_t n)
++mempcpy (void *dest, const void *src, size_t n)
+ {
+   return (char *) memcpy (dest, src, n) + n;
+ }

firmware/buildroot/package/proftpd/Config.in

@@ -0,0 +1,16 @@
+config BR2_PACKAGE_PROFTPD
+	bool "proftpd"
+	depends on BR2_USE_MMU # fork()
+	help
+	  ProFTPD, a highly configurable FTP server.
+
+	  http://www.proftpd.org/
+
+if BR2_PACKAGE_PROFTPD
+
+config BR2_PACKAGE_PROFTPD_MOD_REWRITE
+	bool "mod_rewrite support"
+	help
+	  Compile ProFTPD with mod_rewrite support
+
+endif

firmware/buildroot/package/proftpd/S50proftpd

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+DAEMON=/usr/sbin/proftpd
+trap "" HUP
+trap "" TERM
+test -f $DAEMON || exit 0
+[ ! -d /var/run/proftpd ] && mkdir /var/run/proftpd
+[ ! -f /var/log/wtmp ] && touch /var/log/wtmp
+
+start() {
+	printf "Starting ProFTPD: "
+	$DAEMON
+	if [ $? != 0 ]; then
+		echo "FAILED"
+		exit 1
+	else
+		echo "done"
+	fi
+}
+
+stop() {
+	printf "Stopping ProFTPD: "
+	killall proftpd
+        echo "done"
+}
+
+case "$1" in
+    start)
+	start
+	;;
+
+    stop)
+	stop
+	;;
+
+    restart)
+    	stop
+    	start
+	;;
+
+    *)
+	echo "Usage: /etc/init.d/S50proftpd {start|stop|restart}"
+	exit 1
+	;;
+esac
+
+exit 0

firmware/buildroot/package/proftpd/proftpd.hash

@@ -0,0 +1,4 @@
+# From ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.5a.tar.gz.md5
+md5	b9d3092411478415b31d435f8e26d173	proftpd-1.3.5a.tar.gz
+# Locally calculated
+sha256	a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696	proftpd-1.3.5a.tar.gz

firmware/buildroot/package/proftpd/proftpd.mk

@@ -0,0 +1,70 @@
+################################################################################
+#
+# proftpd
+#
+################################################################################
+
+PROFTPD_VERSION = 1.3.5a
+PROFTPD_SOURCE = proftpd-$(PROFTPD_VERSION).tar.gz
+PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
+PROFTPD_LICENSE = GPLv2+
+PROFTPD_LICENSE_FILES = COPYING
+
+PROFTPD_CONF_ENV = \
+	ac_cv_func_setpgrp_void=yes \
+	ac_cv_func_setgrent_void=yes
+
+PROFTPD_CONF_OPTS = \
+	--localstatedir=/var/run \
+	--disable-static \
+	--disable-curses \
+	--disable-ncurses \
+	--disable-facl \
+	--disable-dso \
+	--enable-shadow \
+	--with-gnu-ld
+
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
+PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
+endif
+
+# configure script doesn't handle detection of %llu format string
+# support for printing the file size when cross compiling, breaking
+# access for large files.
+# We unfortunately cannot AUTORECONF the package, so instead force it
+# on if we know we support it
+define PROFTPD_USE_LLU
+	$(SED) 's/HAVE_LU/HAVE_LLU/' $(@D)/configure
+endef
+PROFTPD_PRE_CONFIGURE_HOOKS += PROFTPD_USE_LLU
+
+define PROFTPD_MAKENAMES
+	$(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames
+endef
+
+PROFTPD_POST_CONFIGURE_HOOKS = PROFTPD_MAKENAMES
+
+PROFTPD_MAKE = $(MAKE1)
+
+define PROFTPD_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
+	$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf
+endef
+
+define PROFTPD_USERS
+	ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User
+endef
+
+define PROFTPD_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d/S50proftpd
+endef
+
+define PROFTPD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/proftpd/proftpd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/proftpd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/proftpd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service
+endef
+
+$(eval $(autotools-package))

firmware/buildroot/package/proftpd/proftpd.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=FTP server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/proftpd -n -q
+Restart=always
+
+[Install]
+WantedBy=multi-user.target