diff mbox series

[next,1/1] package/janus-gateway: bump to version 1.1.2

Message ID 20230308172533.773-1-nicolas.cavallari@green-communications.fr
State Accepted
Headers show
Series [next,1/1] package/janus-gateway: bump to version 1.1.2 | expand

Commit Message

Nicolas Cavallari March 8, 2023, 5:25 p.m. UTC 
Remove patch applied upstream.

Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
---
 ...se-parentheses-to-ensure-compilation.patch | 27 -------------------
 package/janus-gateway/janus-gateway.hash      |  2 +-
 package/janus-gateway/janus-gateway.mk        |  2 +-
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch

Comments

Thomas Petazzoni March 12, 2023, 11:20 a.m. UTC | #1 
On Wed,  8 Mar 2023 18:25:33 +0100
Nicolas Cavallari <nicolas.cavallari@green-communications.fr> wrote:

> Remove patch applied upstream.
> 
> Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
> ---
>  ...se-parentheses-to-ensure-compilation.patch | 27 -------------------
>  package/janus-gateway/janus-gateway.hash      |  2 +-
>  package/janus-gateway/janus-gateway.mk        |  2 +-
>  3 files changed, 2 insertions(+), 29 deletions(-)
>  delete mode 100644 package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch

Applied to next, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch b/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch
deleted file mode 100644
index f91c13d1f6..0000000000
--- a/package/janus-gateway/0003-Use-parentheses-to-ensure-compilation.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 51431c36cd5f2997c0f7723909195b9883ae0486 Mon Sep 17 00:00:00 2001
-From: Benson Muite <bkmgit@users.noreply.github.com>
-Date: Wed, 4 Jan 2023 13:33:36 +0300
-Subject: [PATCH] Use parentheses to ensure compilation (#3138)
-
-Compiler fails with latest Curl release. Use parenthesis to ensure compiler evaluates expression correctly.
-
-[Retrieved from:
-https://github.com/meetecho/janus-gateway/commit/51431c36cd5f2997c0f7723909195b9883ae0486]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- src/turnrest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/turnrest.c b/src/turnrest.c
-index b8560d22f2..42e6114de8 100644
---- a/src/turnrest.c
-+++ b/src/turnrest.c
-@@ -165,7 +165,7 @@ janus_turnrest_response *janus_turnrest_request(const char *user) {
- 	JANUS_LOG(LOG_VERB, "Sending request: %s\n", request_uri);
- 	janus_mutex_unlock(&api_mutex);
- 	curl_easy_setopt(curl, CURLOPT_URL, request_uri);
--	curl_easy_setopt(curl, api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST, 1);
-+	curl_easy_setopt(curl, (api_http_get ? CURLOPT_HTTPGET : CURLOPT_POST), 1);
- 	if(!api_http_get) {
- 		/* FIXME Some servers don't like a POST with no data */
- 		curl_easy_setopt(curl, CURLOPT_POSTFIELDS, query_string);
diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash
index 7a87ae737a..a147a8afff 100644
--- a/package/janus-gateway/janus-gateway.hash
+++ b/package/janus-gateway/janus-gateway.hash
@@ -1,3 +1,3 @@ 
 # Locally computed
-sha256  bb83c19d6137e39833e8eb2b1deeecb33b5d19d4f503d51703bdcc478c447940  janus-gateway-1.1.1.tar.gz
+sha256  f721d62a22b38ba3a341a5502f06b8b3a5a4f7bd0e9cc6c53de257fe99695e17  janus-gateway-1.1.2.tar.gz
 sha256  91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6  COPYING
diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk
index dd898563e5..786bc211d4 100644
--- a/package/janus-gateway/janus-gateway.mk
+++ b/package/janus-gateway/janus-gateway.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = 1.1.1
+JANUS_GATEWAY_VERSION = 1.1.2
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception
 JANUS_GATEWAY_LICENSE_FILES = COPYING