* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
73 lines
2.1 KiB
Makefile
73 lines
2.1 KiB
Makefile
################################################################################
|
|
#
|
|
# vsftpd
|
|
#
|
|
################################################################################
|
|
|
|
VSFTPD_VERSION = 3.0.3
|
|
VSFTPD_SITE = https://security.appspot.com/downloads
|
|
VSFTPD_LIBS = -lcrypt
|
|
VSFTPD_LICENSE = GPL-2.0
|
|
VSFTPD_LICENSE_FILES = COPYING
|
|
|
|
define VSFTPD_DISABLE_UTMPX
|
|
$(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h
|
|
endef
|
|
|
|
define VSFTPD_ENABLE_SSL
|
|
$(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(@D)/builddefs.h
|
|
endef
|
|
|
|
ifeq ($(BR2_PACKAGE_VSFTPD_UTMPX),)
|
|
VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_DISABLE_UTMPX
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
VSFTPD_DEPENDENCIES += openssl host-pkgconf
|
|
VSFTPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`
|
|
VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
|
VSFTPD_DEPENDENCIES += libcap
|
|
VSFTPD_LIBS += -lcap
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
|
|
VSFTPD_DEPENDENCIES += linux-pam
|
|
VSFTPD_LIBS += -lpam
|
|
endif
|
|
|
|
define VSFTPD_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
|
LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D)
|
|
endef
|
|
|
|
define VSFTPD_USERS
|
|
ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User
|
|
endef
|
|
|
|
define VSFTPD_INSTALL_INIT_SYSTEMD
|
|
$(INSTALL) -D -m 0644 package/vsftpd/vsftpd.service \
|
|
$(TARGET_DIR)/usr/lib/systemd/system/vsftpd.service
|
|
endef
|
|
|
|
define VSFTPD_INSTALL_INIT_SYSV
|
|
$(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd
|
|
endef
|
|
|
|
# vsftpd won't work if the jail directory is writable, it has to be
|
|
# readable only otherwise you get the following error:
|
|
# 500 OOPS: vsftpd: refusing to run with writable root inside chroot()
|
|
# That's why we have to adjust the permissions of /home/ftp
|
|
define VSFTPD_INSTALL_TARGET_CMDS
|
|
$(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd
|
|
test -f $(TARGET_DIR)/etc/vsftpd.conf || \
|
|
$(INSTALL) -D -m 644 $(@D)/vsftpd.conf \
|
|
$(TARGET_DIR)/etc/vsftpd.conf
|
|
$(INSTALL) -d -m 700 $(TARGET_DIR)/usr/share/empty
|
|
$(INSTALL) -d -m 555 $(TARGET_DIR)/home/ftp
|
|
endef
|
|
|
|
$(eval $(generic-package))
|