* [Buildroot] [PATCH v2] nginx-upload-module: new package
@ 2016-07-15 3:10 Matt Weber
2016-07-15 20:25 ` Thomas Petazzoni
2016-07-16 13:17 ` Thomas Petazzoni
0 siblings, 2 replies; 6+ messages in thread
From: Matt Weber @ 2016-07-15 3:10 UTC (permalink / raw)
To: buildroot
From: Bimal Jacob <Bimal.Jacob@rockwellcollins.com>
A module for nginx web server for handling file uploads using
multipart/form-data encoding (RFC 1867).
Signed-off-by: Bimal Jacob <bimal.jacob@rockwellcollins.com>
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
v1 -> v2
[Matt W.
- Removed select of nginx in module Config.in
and instead added external module section
in nginx Config.in (copied nginx-naxsi patch)
- Renamed to use dash instead of underscore
- Moved conditional enable in nginx .mk up
with other module enables
- Added openssl dependency
---
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
package/nginx-upload-module/Config.in | 8 ++++++++
package/nginx-upload-module/nginx-upload-module.hash | 2 ++
package/nginx-upload-module/nginx-upload-module.mk | 13 +++++++++++++
package/nginx/Config.in | 3 +++
package/nginx/nginx.mk | 6 ++++++
5 files changed, 32 insertions(+)
create mode 100644 package/nginx-upload-module/Config.in
create mode 100644 package/nginx-upload-module/nginx-upload-module.hash
create mode 100644 package/nginx-upload-module/nginx-upload-module.mk
diff --git a/package/nginx-upload-module/Config.in b/package/nginx-upload-module/Config.in
new file mode 100644
index 0000000..348d522
--- /dev/null
+++ b/package/nginx-upload-module/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_NGINX_UPLOAD_MODULE
+ bool "nginx-upload-module"
+ select BR2_PACKAGE_OPENSSL
+ help
+ A module for nginx web server for handling file uploads using
+ multipart/form-data encoding (RFC 1867).
+
+ https://github.com/vkholodkov/nginx-upload-module
diff --git a/package/nginx-upload-module/nginx-upload-module.hash b/package/nginx-upload-module/nginx-upload-module.hash
new file mode 100644
index 0000000..5c3b908
--- /dev/null
+++ b/package/nginx-upload-module/nginx-upload-module.hash
@@ -0,0 +1,2 @@
+#Locally Computed:
+sha256 8cd1d9d968ffba807de2e546ea9cad5e1ae294ec60b4927b2d60a98bdb4a1144 nginx-upload-module-aba1e3f34c754551f4f49e572bc86863d535609d.tar.gz
diff --git a/package/nginx-upload-module/nginx-upload-module.mk b/package/nginx-upload-module/nginx-upload-module.mk
new file mode 100644
index 0000000..127e442
--- /dev/null
+++ b/package/nginx-upload-module/nginx-upload-module.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# nginx-upload-module
+#
+################################################################################
+
+NGINX_UPLOAD_MODULE_VERSION = aba1e3f34c754551f4f49e572bc86863d535609d
+NGINX_UPLOAD_MODULE_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_MODULE_VERSION))
+NGINX_UPLOAD_MODULE_LICENSE = BSD-3c
+NGINX_UPLOAD_MODULE_LICENSE_FILES = LICENCE
+NGINX_UPLOAD_MODULE_DEPENDENCIES = openssl
+
+$(eval $(generic-package))
diff --git a/package/nginx/Config.in b/package/nginx/Config.in
index e6f2d96..9f2ba21 100644
--- a/package/nginx/Config.in
+++ b/package/nginx/Config.in
@@ -380,4 +380,7 @@ config BR2_PACKAGE_NGINX_ADD_MODULES
help
Space separated list of urls of the additional modules
+comment "external modules"
+ source "package/nginx-upload-module/Config.in"
+
endif
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 5eb5488..97f6a7c 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -234,6 +234,12 @@ NGINX_CONF_OPTS += \
endif # BR2_PACKAGE_NGINX_STREAM
+# external modules
+ifeq ($(BR2_PACKAGE_NGINX_UPLOAD_MODULE),y)
+NGINX_CONF_OPTS += $(addprefix --add-module=,$(NGINX_UPLOAD_MODULE_DIR))
+NGINX_DEPENDENCIES += nginx-upload-module
+endif
+
# Debug logging
NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug)
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] nginx-upload-module: new package
2016-07-15 3:10 [Buildroot] [PATCH v2] nginx-upload-module: new package Matt Weber
@ 2016-07-15 20:25 ` Thomas Petazzoni
2016-07-16 13:17 ` Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-07-15 20:25 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 14 Jul 2016 22:10:17 -0500, Matt Weber wrote:
> From: Bimal Jacob <Bimal.Jacob@rockwellcollins.com>
>
> A module for nginx web server for handling file uploads using
> multipart/form-data encoding (RFC 1867).
>
> Signed-off-by: Bimal Jacob <bimal.jacob@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
Applied with the following changes:
[Thomas:
- rename from nginx-upload-module to nginx-upload. Indeed, we don't
want all nginx modules to be suffixed with "-module"
- include the module Config.in file directly from package/Config.in,
like we do for Python, Perl, Lua or TCL modules.]
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] nginx-upload-module: new package
2016-07-15 3:10 [Buildroot] [PATCH v2] nginx-upload-module: new package Matt Weber
2016-07-15 20:25 ` Thomas Petazzoni
@ 2016-07-16 13:17 ` Thomas Petazzoni
2016-07-16 16:49 ` Matthew Weber
1 sibling, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2016-07-16 13:17 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 14 Jul 2016 22:10:17 -0500, Matt Weber wrote:
> From: Bimal Jacob <Bimal.Jacob@rockwellcollins.com>
>
> A module for nginx web server for handling file uploads using
> multipart/form-data encoding (RFC 1867).
>
> Signed-off-by: Bimal Jacob <bimal.jacob@rockwellcollins.com>
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
This seems to break the build in certain conditions:
http://autobuild.buildroot.net/results/64b/64b1bde02346ca67b670f0b095bd3acad707e8cd/build-end.log
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] nginx-upload-module: new package
2016-07-16 13:17 ` Thomas Petazzoni
@ 2016-07-16 16:49 ` Matthew Weber
2016-07-19 7:16 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Matthew Weber @ 2016-07-16 16:49 UTC (permalink / raw)
To: buildroot
On Saturday, July 16, 2016, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Thu, 14 Jul 2016 22:10:17 -0500, Matt Weber wrote:
>> From: Bimal Jacob <Bimal.Jacob@rockwellcollins.com>
>>
>> A module for nginx web server for handling file uploads using
>> multipart/form-data encoding (RFC 1867).
>>
>> Signed-off-by: Bimal Jacob <bimal.jacob@rockwellcollins.com>
>> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
>
> This seems to break the build in certain conditions:
>
>
http://autobuild.buildroot.net/results/64b/64b1bde02346ca67b670f0b095bd3acad707e8cd/build-end.log
Will take a look.
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
--
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure
Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com
Note: Any Export License Required Information and License Restricted Third
Party Intellectual Property (TPIP) content must be encrypted and sent to
matthew.weber at corp.rockwellcollins.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160716/791fb6f8/attachment.html>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] nginx-upload-module: new package
2016-07-16 16:49 ` Matthew Weber
@ 2016-07-19 7:16 ` Thomas Petazzoni
2016-07-19 13:18 ` Matthew Weber
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2016-07-19 7:16 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 16 Jul 2016 11:49:05 -0500, Matthew Weber wrote:
> http://autobuild.buildroot.net/results/64b/64b1bde02346ca67b670f0b095bd3acad707e8cd/build-end.log
>
> Will take a look.
Have you had the change to take a look?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v2] nginx-upload-module: new package
2016-07-19 7:16 ` Thomas Petazzoni
@ 2016-07-19 13:18 ` Matthew Weber
0 siblings, 0 replies; 6+ messages in thread
From: Matthew Weber @ 2016-07-19 13:18 UTC (permalink / raw)
To: buildroot
All,
On Tue, Jul 19, 2016 at 2:16 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
>
> Hello,
>
> On Sat, 16 Jul 2016 11:49:05 -0500, Matthew Weber wrote:
>
> > http://autobuild.buildroot.net/results/64b/64b1bde02346ca67b670f0b095bd3acad707e8cd/build-end.log
> >
> > Will take a look.
>
> Have you had the change to take a look?
Yes, (sorry on vacation Fri/Mon). There was a missing http module
dependency, we plan to submit a patch later today.
Thanks!
>
>
> Thanks,
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
--
Matthew L Weber / Pr Software Engineer
Airborne Information Systems / Security Systems and Software / Secure Platforms
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
www.rockwellcollins.com
Note: Any Export License Required Information and License Restricted
Third Party Intellectual Property (TPIP) content must be encrypted and
sent to matthew.weber at corp.rockwellcollins.com.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-07-19 13:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-15 3:10 [Buildroot] [PATCH v2] nginx-upload-module: new package Matt Weber
2016-07-15 20:25 ` Thomas Petazzoni
2016-07-16 13:17 ` Thomas Petazzoni
2016-07-16 16:49 ` Matthew Weber
2016-07-19 7:16 ` Thomas Petazzoni
2016-07-19 13:18 ` Matthew Weber
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.