Patchwork [1/2] ProFTPD: Add config option to enable mod_rewrite

login
register
mail settings
Submitter Stephan Hoffmann
Date Feb. 5, 2013, 10:54 a.m.
Message ID <1360061657-2329-1-git-send-email-sho@relinux.de>
Download mbox | patch
Permalink /patch/218227/
State Accepted
Headers show

Comments

Stephan Hoffmann - Feb. 5, 2013, 10:54 a.m.
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
---
 package/proftpd/Config.in  |    6 ++++++
 package/proftpd/proftpd.mk |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)
Stephan Hoffmann - March 4, 2013, 10:22 a.m.
Ping?
I'd really like to get this committed since I am using it in a customer
system.

Am 05.02.2013 11:54, schrieb Stephan Hoffmann:
> Signed-off-by: Stephan Hoffmann <sho@relinux.de>
> ---
>  package/proftpd/Config.in  |    6 ++++++
>  package/proftpd/proftpd.mk |    4 ++++
>  2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
> index abdedc9..7866e0a 100644
> --- a/package/proftpd/Config.in
> +++ b/package/proftpd/Config.in
> @@ -4,3 +4,9 @@ config BR2_PACKAGE_PROFTPD
>  	  ProFTPD, a highly configurable FTP server.
>  
>  	  http://www.proftpd.org/
> +
> +config BR2_PACKAGE_PROFTPD_MOD_REWRITE
> +	bool "proftpd mod_rewrite"
> +	depends on BR2_PACKAGE_PROFTPD
> +	help
> +	  Compile ProFTPD with mod_rewrite
> diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
> index 1d02194..92644a8 100644
> --- a/package/proftpd/proftpd.mk
> +++ b/package/proftpd/proftpd.mk
> @@ -20,6 +20,10 @@ PROFTPD_CONF_OPT = --localstatedir=/var/run \
>  		--enable-shadow \
>  		--with-gnu-ld
>  
> +ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
> +PROFTPD_CONF_OPT += --with-modules=mod_rewrite
> +endif
> +
>  define PROFTPD_MAKENAMES
>  	$(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames
>  endef
Peter Korsgaard - March 4, 2013, 12:39 p.m.
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:

 Stephan> Ping?
 Stephan> I'd really like to get this committed since I am using it in a customer
 Stephan> system.

 Stephan> Am 05.02.2013 11:54, schrieb Stephan Hoffmann:
 >> Signed-off-by: Stephan Hoffmann <sho@relinux.de>
 >> ---
 >> package/proftpd/Config.in  |    6 ++++++
 >> package/proftpd/proftpd.mk |    4 ++++
 >> 2 files changed, 10 insertions(+), 0 deletions(-)
 >> 
 >> diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
 >> index abdedc9..7866e0a 100644
 >> --- a/package/proftpd/Config.in
 >> +++ b/package/proftpd/Config.in
 >> @@ -4,3 +4,9 @@ config BR2_PACKAGE_PROFTPD
 >> ProFTPD, a highly configurable FTP server.
 >> 
 >> http://www.proftpd.org/
 >> +
 >> +config BR2_PACKAGE_PROFTPD_MOD_REWRITE
 >> +	bool "proftpd mod_rewrite"

Committed with the option text changed to "mod_rewrite support", thanks.

Patch

diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index abdedc9..7866e0a 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -4,3 +4,9 @@  config BR2_PACKAGE_PROFTPD
 	  ProFTPD, a highly configurable FTP server.
 
 	  http://www.proftpd.org/
+
+config BR2_PACKAGE_PROFTPD_MOD_REWRITE
+	bool "proftpd mod_rewrite"
+	depends on BR2_PACKAGE_PROFTPD
+	help
+	  Compile ProFTPD with mod_rewrite
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 1d02194..92644a8 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -20,6 +20,10 @@  PROFTPD_CONF_OPT = --localstatedir=/var/run \
 		--enable-shadow \
 		--with-gnu-ld
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
+PROFTPD_CONF_OPT += --with-modules=mod_rewrite
+endif
+
 define PROFTPD_MAKENAMES
 	$(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames
 endef