* [Buildroot] [PATCH v3 1/3] ustream-ssl: new package
@ 2016-10-10 10:45 Rahul Jain
2016-10-10 10:45 ` [Buildroot] [PATCH v3 2/3] uhttpd: " Rahul Jain
2016-10-10 10:45 ` [Buildroot] [PATCH v3 3/3] DEVELOPERS: add entry for uhttpd and ustream-ssl Rahul Jain
0 siblings, 2 replies; 5+ messages in thread
From: Rahul Jain @ 2016-10-10 10:45 UTC (permalink / raw)
To: buildroot
ustream-ssl has support for polarssl and cyassl
but since polarssl is made obsolete by mbedtls and cyassl
is not present in buildroot, we have not added support for it.
Signed-off-by: Rahul Bedarkar <Rahul.Bedarkar@imgtec.com>
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
Changes v2 -> v3:
- Remove entry from DEVELOPERS file
Changes v1 -> v2:
- No changes
package/Config.in | 1 +
package/ustream-ssl/Config.in | 12 ++++++++++++
package/ustream-ssl/ustream-ssl.mk | 20 ++++++++++++++++++++
3 files changed, 33 insertions(+)
create mode 100644 package/ustream-ssl/Config.in
create mode 100644 package/ustream-ssl/ustream-ssl.mk
diff --git a/package/Config.in b/package/Config.in
index 60184ce..352ef42 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -910,6 +910,7 @@ menu "Crypto"
source "package/polarssl/Config.in"
source "package/tinydtls/Config.in"
source "package/trousers/Config.in"
+ source "package/ustream-ssl/Config.in"
endmenu
menu "Database"
diff --git a/package/ustream-ssl/Config.in b/package/ustream-ssl/Config.in
new file mode 100644
index 0000000..540e436
--- /dev/null
+++ b/package/ustream-ssl/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_USTREAM_SSL
+ bool "ustream-ssl"
+ depends on !BR2_STATIC_LIBS #libubox
+ select BR2_PACKAGE_LIBUBOX
+ select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
+ help
+ ustream SSL wrapper
+
+ https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary
+
+comment "ustream-ssl needs a toolchain w/ dynamic library"
+ depends on BR2_STATIC_LIBS
diff --git a/package/ustream-ssl/ustream-ssl.mk b/package/ustream-ssl/ustream-ssl.mk
new file mode 100644
index 0000000..d8f8aed
--- /dev/null
+++ b/package/ustream-ssl/ustream-ssl.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# ustream-ssl
+#
+################################################################################
+
+USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6
+USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git
+USTREAM_SSL_LICENSE = ISC
+USTREAM_SSL_INSTALL_STAGING = YES
+USTREAM_SSL_DEPENDENCIES = libubox
+
+ifeq ($(BR2_PACKAGE_MBEDTLS),y)
+USTREAM_SSL_DEPENDENCIES += mbedtls
+USTREAM_SSL_CONF_OPTS += -DMBEDTLS=ON
+else
+USTREAM_SSL_DEPENDENCIES += openssl
+endif
+
+$(eval $(cmake-package))
--
2.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 2/3] uhttpd: new package
2016-10-10 10:45 [Buildroot] [PATCH v3 1/3] ustream-ssl: new package Rahul Jain
@ 2016-10-10 10:45 ` Rahul Jain
2016-10-14 14:50 ` Vicente Olivert Riera
2016-10-10 10:45 ` [Buildroot] [PATCH v3 3/3] DEVELOPERS: add entry for uhttpd and ustream-ssl Rahul Jain
1 sibling, 1 reply; 5+ messages in thread
From: Rahul Jain @ 2016-10-10 10:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Bedarkar <Rahul.Bedarkar@imgtec.com>
Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>
Signed-off-by: Abhishek Singh <Abhishek.Singh@imgtec.com>
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
Changes v2 -> v3:
- Remove entry from DEVELOPERS file
Changes v1 -> v2:
- Updated the url in help (Suggested by Arnout)
- Use http url (Suggested by Arnout)
- Add hash file (Suggested by Arnout)
- Improve handling of optional dependency on lua (Suggested by Arnout)
- Remove unrequired config options (Suggested by Arnout)
- Explicitly specify the config option when enabling lua, ssl and ubus support (Suggested by Arnout)
package/Config.in | 1 +
package/uhttpd/Config.in | 18 ++++++++++++++++++
package/uhttpd/uhttpd.hash | 2 ++
package/uhttpd/uhttpd.mk | 38 ++++++++++++++++++++++++++++++++++++++
4 files changed, 59 insertions(+)
create mode 100644 package/uhttpd/Config.in
create mode 100644 package/uhttpd/uhttpd.hash
create mode 100644 package/uhttpd/uhttpd.mk
diff --git a/package/Config.in b/package/Config.in
index 352ef42..426a1be 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1613,6 +1613,7 @@ endif
source "package/tunctl/Config.in"
source "package/tvheadend/Config.in"
source "package/udpcast/Config.in"
+ source "package/uhttpd/Config.in"
source "package/ulogd/Config.in"
source "package/ushare/Config.in"
source "package/ussp-push/Config.in"
diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
new file mode 100644
index 0000000..e463b93
--- /dev/null
+++ b/package/uhttpd/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_UHTTPD
+ bool "uhttpd"
+ depends on !BR2_STATIC_LIBS # dlopen()
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+ depends on BR2_USE_MMU # fork()
+ select BR2_PACKAGE_LIBUBOX
+ select BR2_PACKAGE_JSON_C
+ help
+ uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
+ support. It is intended as a drop-in replacement for the Busybox
+ HTTP daemon.
+
+ https://wiki.openwrt.org/doc/howto/http.uhttpd
+
+comment "uhttpd needs a toolchain w/ dynamic library"
+ depends on BR2_TOOLCHAIN_HAS_SYNC_4
+ depends on BR2_USE_MMU
+ depends on BR2_STATIC_LIBS
diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash
new file mode 100644
index 0000000..59e54ad
--- /dev/null
+++ b/package/uhttpd/uhttpd.hash
@@ -0,0 +1,2 @@
+# No hash for this git snapshot
+none xxx uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz
diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
new file mode 100644
index 0000000..b4ef291
--- /dev/null
+++ b/package/uhttpd/uhttpd.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# uhttpd
+#
+################################################################################
+
+UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
+UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git
+UHTTPD_SITE_METHOD = git
+UHTTPD_LICENSE = ISC
+UHTTPD_DEPENDENCIES = libubox json-c
+
+ifeq ($(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION),"5.1")
+ifeq ($(BR2_PACKAGE_LUA),y)
+UHTTPD_DEPENDENCIES += lua
+else ifeq ($(BR2_PACKAGE_LUAJIT),y)
+UHTTPD_DEPENDENCIES += luajit
+endif
+UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON
+else
+UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_USTREAM_SSL),y)
+UHTTPD_DEPENDENCIES += ustream-ssl
+UHTTPD_CONF_OPTS += -DTLS_SUPPORT=ON
+else
+UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_UBUS),y)
+UHTTPD_DEPENDENCIES += ubus
+UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=ON
+else
+UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF
+endif
+
+$(eval $(cmake-package))
--
2.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 3/3] DEVELOPERS: add entry for uhttpd and ustream-ssl
2016-10-10 10:45 [Buildroot] [PATCH v3 1/3] ustream-ssl: new package Rahul Jain
2016-10-10 10:45 ` [Buildroot] [PATCH v3 2/3] uhttpd: " Rahul Jain
@ 2016-10-10 10:45 ` Rahul Jain
1 sibling, 0 replies; 5+ messages in thread
From: Rahul Jain @ 2016-10-10 10:45 UTC (permalink / raw)
To: buildroot
Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
---
DEVELOPERS | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/DEVELOPERS b/DEVELOPERS
index 240fb2c..5e6e6d1 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1200,6 +1200,10 @@ F: package/gssdp/
F: package/gupnp/
F: package/gupnp-av/
+N: Rahul Jain <rahul.jain@imgtec.com>
+F: package/uhttpd
+F: package/ustream-ssl
+
N: Renaud Aubin <root@renaud.io>
F: package/libhttpparser/
--
2.6.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 2/3] uhttpd: new package
2016-10-10 10:45 ` [Buildroot] [PATCH v3 2/3] uhttpd: " Rahul Jain
@ 2016-10-14 14:50 ` Vicente Olivert Riera
2016-10-17 10:25 ` Rahul Jain
0 siblings, 1 reply; 5+ messages in thread
From: Vicente Olivert Riera @ 2016-10-14 14:50 UTC (permalink / raw)
To: buildroot
Hello Rahul,
On 10/10/16 12:45, Rahul Jain wrote:
> Signed-off-by: Rahul Bedarkar <Rahul.Bedarkar@imgtec.com>
> Signed-off-by: Neha Bairathi <Neha.Bairathi@imgtec.com>
> Signed-off-by: Abhishek Singh <Abhishek.Singh@imgtec.com>
> Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
> ---
> Changes v2 -> v3:
> - Remove entry from DEVELOPERS file
> Changes v1 -> v2:
> - Updated the url in help (Suggested by Arnout)
> - Use http url (Suggested by Arnout)
> - Add hash file (Suggested by Arnout)
> - Improve handling of optional dependency on lua (Suggested by Arnout)
> - Remove unrequired config options (Suggested by Arnout)
> - Explicitly specify the config option when enabling lua, ssl and ubus support (Suggested by Arnout)
>
> package/Config.in | 1 +
> package/uhttpd/Config.in | 18 ++++++++++++++++++
> package/uhttpd/uhttpd.hash | 2 ++
> package/uhttpd/uhttpd.mk | 38 ++++++++++++++++++++++++++++++++++++++
> 4 files changed, 59 insertions(+)
> create mode 100644 package/uhttpd/Config.in
> create mode 100644 package/uhttpd/uhttpd.hash
> create mode 100644 package/uhttpd/uhttpd.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index 352ef42..426a1be 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1613,6 +1613,7 @@ endif
> source "package/tunctl/Config.in"
> source "package/tvheadend/Config.in"
> source "package/udpcast/Config.in"
> + source "package/uhttpd/Config.in"
> source "package/ulogd/Config.in"
> source "package/ushare/Config.in"
> source "package/ussp-push/Config.in"
> diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
> new file mode 100644
> index 0000000..e463b93
> --- /dev/null
> +++ b/package/uhttpd/Config.in
> @@ -0,0 +1,18 @@
> +config BR2_PACKAGE_UHTTPD
> + bool "uhttpd"
> + depends on !BR2_STATIC_LIBS # dlopen()
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
> + depends on BR2_USE_MMU # fork()
> + select BR2_PACKAGE_LIBUBOX
> + select BR2_PACKAGE_JSON_C
> + help
> + uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
> + support. It is intended as a drop-in replacement for the Busybox
> + HTTP daemon.
> +
> + https://wiki.openwrt.org/doc/howto/http.uhttpd
> +
> +comment "uhttpd needs a toolchain w/ dynamic library"
> + depends on BR2_TOOLCHAIN_HAS_SYNC_4
> + depends on BR2_USE_MMU
> + depends on BR2_STATIC_LIBS
> diff --git a/package/uhttpd/uhttpd.hash b/package/uhttpd/uhttpd.hash
> new file mode 100644
> index 0000000..59e54ad
> --- /dev/null
> +++ b/package/uhttpd/uhttpd.hash
> @@ -0,0 +1,2 @@
> +# No hash for this git snapshot
> +none xxx uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz
> diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
> new file mode 100644
> index 0000000..b4ef291
> --- /dev/null
> +++ b/package/uhttpd/uhttpd.mk
> @@ -0,0 +1,38 @@
> +################################################################################
> +#
> +# uhttpd
> +#
> +################################################################################
> +
> +UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
> +UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git
> +UHTTPD_SITE_METHOD = git
> +UHTTPD_LICENSE = ISC
Same thing here, UHTTPD_LICENSE_FILES is missing. You are saying that
the license is ISC, but, how can you check it? You need some file to
look at in order to check it.
Regards,
Vincent.
> +UHTTPD_DEPENDENCIES = libubox json-c
> +
> +ifeq ($(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION),"5.1")
> +ifeq ($(BR2_PACKAGE_LUA),y)
> +UHTTPD_DEPENDENCIES += lua
> +else ifeq ($(BR2_PACKAGE_LUAJIT),y)
> +UHTTPD_DEPENDENCIES += luajit
> +endif
> +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON
> +else
> +UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_USTREAM_SSL),y)
> +UHTTPD_DEPENDENCIES += ustream-ssl
> +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=ON
> +else
> +UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF
> +endif
> +
> +ifeq ($(BR2_PACKAGE_UBUS),y)
> +UHTTPD_DEPENDENCIES += ubus
> +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=ON
> +else
> +UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF
> +endif
> +
> +$(eval $(cmake-package))
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v3 2/3] uhttpd: new package
2016-10-14 14:50 ` Vicente Olivert Riera
@ 2016-10-17 10:25 ` Rahul Jain
0 siblings, 0 replies; 5+ messages in thread
From: Rahul Jain @ 2016-10-17 10:25 UTC (permalink / raw)
To: buildroot
Hi Vicente,
Thanks for your comments.
On Friday 14 October 2016 08:20 PM, Vicente Olivert Riera wrote:
>> diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
>> new file mode 100644
>> index 0000000..b4ef291
>> --- /dev/null
>> +++ b/package/uhttpd/uhttpd.mk
>> @@ -0,0 +1,38 @@
>> +################################################################################
>>
>> +#
>> +# uhttpd
>> +#
>> +################################################################################
>>
>> +
>> +UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
>> +UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git
>> +UHTTPD_SITE_METHOD = git
>> +UHTTPD_LICENSE = ISC
>
> Same thing here, UHTTPD_LICENSE_FILES is missing. You are saying that
> the license is ISC, but, how can you check it? You need some file to
> look at in order to check it.
>
The package does not provide any license file, but all the source files
have the ISC license header. I will add one of the source file as the
license file.
Thanks,
Rahul Jain
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-10-17 10:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-10 10:45 [Buildroot] [PATCH v3 1/3] ustream-ssl: new package Rahul Jain
2016-10-10 10:45 ` [Buildroot] [PATCH v3 2/3] uhttpd: " Rahul Jain
2016-10-14 14:50 ` Vicente Olivert Riera
2016-10-17 10:25 ` Rahul Jain
2016-10-10 10:45 ` [Buildroot] [PATCH v3 3/3] DEVELOPERS: add entry for uhttpd and ustream-ssl Rahul Jain
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox