[Buildroot] [PATCH v2 1/2] package/proftpd: add enable buffer size

[Buildroot] [PATCH v2 1/2] package/proftpd: add enable buffer size

[Jared Bents]

Enable buffer size as a compile time option to change internal
buffer size.

Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>

--
[v1->v2]:
- Update to enable-buffer-size instead of previous
  enable-tunable-buffer-size.
- Update to the help information for added option to Config.in
  and included units.
---
 package/proftpd/Config.in  | 13 +++++++++++++
 package/proftpd/proftpd.mk |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/package/proftpd/Config.in b/package/proftpd/Config.in
index b615a5ff4c..478a7e80e1 100644
--- a/package/proftpd/Config.in
+++ b/package/proftpd/Config.in
@@ -65,4 +65,17 @@ config BR2_PACKAGE_PROFTPD_MOD_QUOTATAB_SQL
 	  Compile mod_quotatab with mod_quotatab_sql table.
 
 endif
+
+config BR2_PACKAGE_PROFTPD_BUFFER_SIZE
+	int "buffer size in bytes (0 for default)"
+	default "0"
+	help
+	  By increasing the buffer size above the default of 1K,
+	  proftpd reads and writes data in larger chunks, and makes
+	  fewer expensive system calls. Use of this option to set buffer
+	  sizes of 8K or more has been reported to drastically increase
+	  transfer speeds (depending on network configurations).
+
+	  0 uses the default size of 1024.
+
 endif
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 8f3ff5088e..324a602761 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -121,4 +121,8 @@ define PROFTPD_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service
 endef
 
+ifneq ($(BR2_PACKAGE_PROFTPD_BUFFER_SIZE),0)
+PROFTPD_CONF_OPTS += --enable-buffer-size=$(BR2_PACKAGE_PROFTPD_BUFFER_SIZE)
+endif
+
 $(eval $(autotools-package))
-- 
2.18.0

[Buildroot] [PATCH v2 2/2] package/proftpd: add sendfile

[Jared Bents]

Enables sendfile to ProFTPD for zero-copy transfers.

Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>

--
[v1->v2]:
- Removed option and made sendfile always enabled.
---
 package/proftpd/proftpd.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 324a602761..a228d58e03 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -20,6 +20,7 @@ PROFTPD_CONF_OPTS = \
 	--disable-ncurses \
 	--disable-facl \
 	--disable-dso \
+	--enable-sendfile \
 	--enable-shadow \
 	--with-gnu-ld
 
-- 
2.18.0

[Buildroot] [PATCH v2 1/2] package/proftpd: add enable buffer size

[Arnout Vandecappelle]

On 12/11/2018 17:45, Jared Bents wrote:
> Enable buffer size as a compile time option to change internal
> buffer size.
> 
> Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>

 Both applied to next, thanks!

 Regards,
 Arnout

[Buildroot] [PATCH v2 1/2] package/proftpd: add enable buffer size

[Baruch Siach]

Hi Arnout,

On Tue, Nov 13, 2018 at 12:56:34AM +0100, Arnout Vandecappelle wrote:
> On 12/11/2018 17:45, Jared Bents wrote:
> > Enable buffer size as a compile time option to change internal
> > buffer size.
> > 
> > Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
> 
>  Both applied to next, thanks!

Not in next as of commit 3db2ed427138f (python-cchardet: new package).

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH v2 1/2] package/proftpd: add enable buffer size

[Arnout Vandecappelle]

On 14/11/2018 06:04, Baruch Siach wrote:
> Hi Arnout,
> 
> On Tue, Nov 13, 2018 at 12:56:34AM +0100, Arnout Vandecappelle wrote:
>> On 12/11/2018 17:45, Jared Bents wrote:
>>> Enable buffer size as a compile time option to change internal
>>> buffer size.
>>>
>>> Signed-off-by: Jared Bents <jared.bents@rockwellcollins.com>
>>
>>  Both applied to next, thanks!
> 
> Not in next as of commit 3db2ed427138f (python-cchardet: new package).

 Oops, I pushed to a local clone instead of to git.buildroot.org...

 Done now.

 Regards,
 Arnout