janus-gateway: bump version to v0.5.0

PATCH New aduskett at gmail.com 2 participants 5 messages Dec 26, 2018 – Dec 27, 2018

lore

Share & tools

lore

aduskett at gmail.com

author

2018-12-26 21:26 UTC #0 lore raw

PATCH v2 1/4 janus-gateway: bump version to v0.5.0

From: Adam Duskett <[email protected]>

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Added missing Signed off by line.

 package/janus-gateway/janus-gateway.hash | 2 +-
 package/janus-gateway/janus-gateway.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/janus-gateway/janus-gateway.hash +1 -1

index f84ed8b6db..9b13e0f0fc 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 35cbbd5e7b7067e3a0b5ba221ea845814e5b59c733302f88fea80bcf98ce416f janus-gateway-v0.2.6.tar.gz
+sha256 c9c3b741a5d9f956845d5094c211690178cc0d630a7b23b870437c88a7e4ed3b janus-gateway-v0.5.0.tar.gz
 sha256 0a884af515b4593503f6f0c9b424db3945bd77eaa2644d25f45eb93a412b3c19 COPYING

package/janus-gateway/janus-gateway.mk +1 -1

index 261fc25202..cea06b754e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = v0.2.6
+JANUS_GATEWAY_VERSION = v0.5.0
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
 JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING

Signature · 1 line

2.19.2

aduskett at gmail.com

author

2018-12-26 21:26 UTC #1 lore raw

PATCH v2 2/4 libcpprestsdk: bump version to v2.10.8

From: Adam Duskett <[email protected]>

In adition:
- Add -DCPPREST_EXCLUDE_WEBSOCKETS=ON as a default CONF_OPT as websocketspp is not checked as a dependency.

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Added missing Signed off by line.

 package/libcpprestsdk/libcpprestsdk.hash | 2 +-
 package/libcpprestsdk/libcpprestsdk.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

package/libcpprestsdk/libcpprestsdk.hash +1 -1

index b8c5d5430e..9a8155f354 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 cf4d57bdcc1ce53f1d228156620dd87af95cbff109d85c81e8be01d0bb58fd25	libcpprestsdk-v2.10.5.tar.gz
+sha256 fd79d34b3fad4622ff58480f57ecdf374061c5bdbd83e317019422575c820443	libcpprestsdk-v2.10.8.tar.gz
 sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97	license.txt

package/libcpprestsdk/libcpprestsdk.mk +2 -2

index 14526e7de4..e5500d8c7f 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBCPPRESTSDK_VERSION = v2.10.5
+LIBCPPRESTSDK_VERSION = v2.10.8
 LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
 LIBCPPRESTSDK_LICENSE = MIT
 LIBCPPRESTSDK_LICENSE_FILES = license.txt
 LIBCPPRESTSDK_SUBDIR = Release
 LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
-LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON
 
 $(eval $(cmake-package))

Signature · 1 line

2.19.2

aduskett at gmail.com

author

2018-12-26 21:26 UTC #2 lore raw

PATCH v2 3/4 libressl: bump to version 2.8.3

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Added missing Signed off by line.

 package/libressl/libressl.hash | 2 +-
 package/libressl/libressl.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/libressl/libressl.hash +1 -1

index b0d1928e10..a98f344677 100644
@@ -1,4 +1,4 @@
 # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
-sha256 b8cb31e59f1294557bfc80f2a662969bc064e83006ceef0574e2553a1c254fd5  libressl-2.8.2.tar.gz
+sha256 9b640b13047182761a99ce3e4f000be9687566e0828b4a72709e9e6a3ef98477  libressl-2.8.3.tar.gz
 # Locally computed
 sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1  COPYING

package/libressl/libressl.mk +1 -1

index f035f9044e..e02ab90269 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBRESSL_VERSION = 2.8.2
+LIBRESSL_VERSION = 2.8.3
 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code)
 LIBRESSL_LICENSE_FILES = COPYING

Signature · 1 line

2.19.2

aduskett at gmail.com

author

2018-12-26 21:26 UTC #3 lore raw

PATCH v2 4/4 sngrep: bump version to v1.4.6

In reply to aduskett at gmail.com

From: Adam Duskett <[email protected]>

Remove upstreamed patch.

Signed-off-by Adam Duskett <[email protected]>

---
Changes v1 -> v2:
- Added missing Signed off by line.

 .../0001-Fix-building-against-LibreSSL.patch  | 78 -------------------
 package/sngrep/sngrep.hash                    |  6 +-
 package/sngrep/sngrep.mk                      |  2 +-
 3 files changed, 4 insertions(+), 82 deletions(-)
 delete mode 100644 package/sngrep/0001-Fix-building-against-LibreSSL.patch

package/sngrep/0001-Fix-building-against-LibreSSL.patch deleted +0 ~~-78~~

deleted file mode 100644
index 311f0b3d52..0000000000
@@ -1,78 +0,0 @@
-From 05d110ef57e9647b84c9656e746f72a76ea8c758 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <[email protected]>
-Date: Tue, 6 Feb 2018 12:47:43 -0500
-Subject: [PATCH] Fix building against LibreSSL
-
-LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-changes from OpenSSL >= 1.1.
-
-To work around this:
-
-- Check to see if LIBRESSL_VERSION_NUMBER is defined.
-- If so, define MODSSL_USE_OPENSSL_PRE_1_1_API.
-- Change all checks for OPENSSL_VERSION_NUMBER < 0x10100000L to
-  '#if MODSSL_USE_OPENSSL_PRE_1_1_API'
-
-Upstream-Status: Committed
-https://github.com/irontec/sngrep/commit/0ee014d497986c40de264f6392b01fdf4e337fd5
-
-Signed-off-by: Adam Duskett <[email protected]>
----
- src/capture_openssl.c | 6 +++---
- src/capture_openssl.h | 9 +++++++++
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/capture_openssl.c b/src/capture_openssl.c
-index 0a052c3..a4e1de0 100644
---- a/src/capture_openssl.c
-+++ b/src/capture_openssl.c
-@@ -94,7 +94,7 @@ P_hash(const char *digest, unsigned char *dest, int dlen, unsigned char *secret,
- 
-     // Calculate enough data to fill destination
-     while (pending > 0) {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-         HMAC_CTX hm;
-         HMAC_Init(&hm, secret, sslen, md);
-         HMAC_Update(&hm, tmpseed, tmpslen);
-@@ -495,7 +495,7 @@ tls_process_record(struct SSLConnection *conn, const uint8_t *payload,
-                 break;
-             case change_cipher_spec:
-                 // From now on, this connection will be encrypted using MasterSecret
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-                 if (conn->client_cipher_ctx->cipher && conn->server_cipher_ctx->cipher)
-                     conn->encrypted = 1;
- #else
-@@ -588,7 +588,7 @@ tls_process_record_handshake(struct SSLConnection *conn, const opaque *fragment,
-                 // Decrypt PreMasterKey
-                 clientkeyex = (struct ClientKeyExchange *) body;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if MODSSL_USE_OPENSSL_PRE_1_1_API
-                 RSA_private_decrypt(UINT16_INT(clientkeyex->length),
-                                     (const unsigned char *) &clientkeyex->exchange_keys,
-                                     (unsigned char *) &conn->pre_master_secret,
-diff --git a/src/capture_openssl.h b/src/capture_openssl.h
-index 31f48ce..b3e88fe 100644
---- a/src/capture_openssl.h
-+++ b/src/capture_openssl.h
-@@ -65,6 +65,15 @@
- #define OLD_OPENSSL_VERSION 1
- #endif
- 
-+/* LibreSSL declares OPENSSL_VERSION_NUMBER == 2.0 but does not include most
-+ * changes from OpenSSL >= 1.1 (new functions, macros, deprecations, ...)
-+ */
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+#define MODSSL_USE_OPENSSL_PRE_1_1_API (1)
-+#else
-+#define MODSSL_USE_OPENSSL_PRE_1_1_API (OPENSSL_VERSION_NUMBER < 0x10100000L)
-+#endif
-+
- //! Three bytes unsigned integer
- typedef struct uint16 {
-     unsigned char x[2];
--- 
-2.14.3
-

package/sngrep/sngrep.hash +3 -3

index 16552cf5cd..f751a14632 100644
@@ -1,6 +1,6 @@
-# From https://github.com/irontec/sngrep/releases/download/v1.4.5/sngrep-1.4.5.tar.gz.md5sum
-md5 11f1cdb8e8f3a3c9ef02ecd12268322e  sngrep-1.4.5.tar.gz
+# From https://github.com/irontec/sngrep/releases/download/v1.4.6/sngrep-1.4.6.tar.gz.md5sum
+md5 094e76786b118258bac69e1514aac826  sngrep-1.4.6.tar.gz
 
 # Locally computed
-sha256 16f1566f4507ba560c7461cc7ff1c1653beb14b8baf7846269bbb4880564e57f sngrep-v1.4.5.tar.gz
+sha256 638d6557dc68db401b07d73b2e7f8276800281f021fe0c942992566d6b59a48a sngrep-v1.4.6.tar.gz
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE

package/sngrep/sngrep.mk +1 -1

index 3f1fe989cf..c6d2a292b3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SNGREP_VERSION = v1.4.5
+SNGREP_VERSION = v1.4.6
 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
 SNGREP_LICENSE = GPL-3.0+
 SNGREP_LICENSE_FILES = LICENSE

Signature · 1 line

2.19.2

Thomas Petazzoni

2018-12-27 15:43 UTC #4 lore raw

PATCH v2 1/4 janus-gateway: bump version to v0.5.0

In reply to aduskett at gmail.com

Hello,

Quoted 6 lines · aduskett at gmail.com

From: Adam Duskett <[email protected]>
Signed-off-by Adam Duskett <[email protected]>
---
Changes v1 -> v2:
- Added missing Signed off by line.

Series applied to master. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com