Skip to contentSkip to conversation

package/proftpd: add mod_cap option

PATCH New Fabrice Fontaine 3 participants 3 messages Mar 7, 2020 – Mar 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/proftpd: add mod_cap option

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:
https://github.com/proftpd/proftpd/commit/8c845703fcf2c7978614784126bd074ffc4477f9

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

---
 package/proftpd/Config.in  |  6 ++++++
 package/proftpd/proftpd.mk | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)
package/proftpd/Config.in +6 -0
index edec37c8dd..4a544f0c50 100644
@@ -8,6 +8,12 @@ config 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
 	bool "mod_rewrite support"
 	help
package/proftpd/proftpd.mk +7 -6
index 02dd0e825e..946a37d69e 100644
@@ -25,6 +25,13 @@ PROFTPD_CONF_OPTS = \
 	--with-gnu-ld \
 	--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)
 PROFTPD_MODULES += mod_rewrite
 endif
@@ -85,12 +92,6 @@ define PROFTPD_USE_LLU
 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)
 
 # install Perl based scripts in target
Signature · 1 line
2.25.0
#1 lore raw

PATCH 1/1 package/proftpd: add mod_cap option

Quoted 5 lines · On Sun, 8 Mar 2020 00:27:35 +0100 Fabrice Fontaine…

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:
https://github.com/proftpd/proftpd/commit/8c845703fcf2c7978614784126bd074ffc4477f9

Quoted 8 lines

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

---
 package/proftpd/Config.in  |  6 ++++++
 package/proftpd/proftpd.mk | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/proftpd: add mod_cap option

In reply to Fabrice Fontaine
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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:
https://github.com/proftpd/proftpd/commit/8c845703fcf2c7978614784126bd074ffc4477f9

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

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard