jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/proftpd: add mod_cap option

Browse Source 
Add an option to enable or disable mod_cap and select libcap accordingly
instead of using bundled libcap which raise a build failure with headers
< 4.3 due to PR_CAP_AMBIENT and will be removed in version 1.3.7:
8c845703fc

Fixes:
 - http://autobuild.buildroot.org/results/4d680d8204bdf1f3deec2c3eeb9a2d9e6eabe4d5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2020-03-08 00:27:35 +01:00 committed by Thomas Petazzoni
parent 04ce57ed24
commit eed76c5178
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/proftpd/Config.in
View File

@ -8,6 +8,12 @@ config BR2_PACKAGE_PROFTPD
if BR2_PACKAGE_PROFTPD if BR2_PACKAGE_PROFTPD
config BR2_PACKAGE_PROFTPD_MOD_CAP
bool "mod_cap support"
select BR2_PACKAGE_LIBCAP
help
Compile ProFTPD with mod_cap support
config BR2_PACKAGE_PROFTPD_MOD_REWRITE config BR2_PACKAGE_PROFTPD_MOD_REWRITE
bool "mod_rewrite support" bool "mod_rewrite support"
help help

13
package/proftpd/proftpd.mk
View File

@ -25,6 +25,13 @@ PROFTPD_CONF_OPTS = \
--with-gnu-ld \ --with-gnu-ld \
--without-openssl-cmdline --without-openssl-cmdline
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_CAP),y)
PROFTPD_CONF_OPTS += --enable-cap
PROFTPD_DEPENDENCIES += libcap
else
PROFTPD_CONF_OPTS += --disable-cap
endif
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y) ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
PROFTPD_MODULES += mod_rewrite PROFTPD_MODULES += mod_rewrite
endif endif
@ -85,12 +92,6 @@ define PROFTPD_USE_LLU
endef endef
PROFTPD_PRE_CONFIGURE_HOOKS += PROFTPD_USE_LLU 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) PROFTPD_MAKE = $(MAKE1)
# install Perl based scripts in target # install Perl based scripts in target