Skip to contentSkip to conversation

package/libressl: bump version to 2.7.2

PATCH New Bernd Kuhls 3 participants 5 messages Apr 2, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libressl: bump version to 2.7.2

Removed patch 0001, a different version was applied upstream, please see upstream PR 82 for details. Added license hash.

---
 ...ix-build-with-musl-and-older-Linux-kernel.patch | 38 ----------------------
 package/libressl/libressl.hash                     |  4 ++-
 package/libressl/libressl.mk                       |  2 +-
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch
package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch deleted +0 -38
deleted file mode 100644
index ddb953402d..0000000000
@@ -1,38 +0,0 @@
-From: Baruch Siach <[email protected]>
-Date: Fri, 29 Sep 2017 10:06:52 +0300
-Subject: [PATCH] Fix build with musl and older Linux kernel
-
-The musl libc carries its own copy of Linux system calls. When building
-with Linux headers older than v3.17, musl provides SYS_getrandom
-definition, but not GRND_NONBLOCK. This causes build failure for
-libressl and openntpd:
-
-getentropy_linux.c: In function 'getentropy_getrandom':
-getentropy_linux.c:205:42: error: 'GRND_NONBLOCK' undeclared (first use in this function)
-   ret = syscall(SYS_getrandom, buf, len, GRND_NONBLOCK);
-                                          ^~~~~~~~~~~~~
-
-Define GRND_NONBLOCK locally when its definition is missing to fix the
-build. There should be no run-time effect. Older kernels return ENOSYS
-for unsupported syscall().
-
-[ from upstream pull request with file location changed ]
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://github.com/libressl-portable/openbsd/pull/82
-
-diff -Nuar libressl-2.5.5-orig/crypto/compat/getentropy_linux.c libressl-2.5.5/crypto/compat/getentropy_linux.c
---- libressl-2.5.5-orig/crypto/compat/getentropy_linux.c	2017-07-09 13:59:48.000000000 +0300
-+++ libressl-2.5.5/crypto/compat/getentropy_linux.c	2017-09-29 10:03:32.447958829 +0300
-@@ -194,6 +194,11 @@
- }
- 
- #ifdef SYS_getrandom
-+
-+#ifndef GRND_NONBLOCK
-+#define GRND_NONBLOCK   0x0001
-+#endif
-+
- static int
- getentropy_getrandom(void *buf, size_t len)
- {
package/libressl/libressl.hash +3 -1
index 9d926c677b..53b7e0af59 100644
@@ -1,2 +1,4 @@
 # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
-sha256	638a20c2f9e99ee283a841cd787ab4d846d1880e180c4e96904fc327d419d11f	libressl-2.6.4.tar.gz
+sha256 917a8779c342177ff3751a2bf955d0262d1d8916a4b408930c45cef326700995  libressl-2.7.2.tar.gz
+# Locally computed
+sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1  COPYING
package/libressl/libressl.mk +1 -1
index 2467086161..1a1dda1000 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBRESSL_VERSION = 2.6.4
+LIBRESSL_VERSION = 2.7.2
 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.14.2
#1 lore raw

PATCH v2 2/2 package/openvpn: bump version to 2.4.5

Changelog: https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24

This bump depends on libressl 2.7.2 to avoid a build error with this defconfig:

BR2_PACKAGE_LIBRESSL=y
BR2_PACKAGE_OPENVPN=y

Added license hash.

---
v2: Removed OpenSSL dependency as LibreSSL 2.7.2 fixes the build error

 package/openvpn/openvpn.hash | 3 ++-
 package/openvpn/openvpn.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/openvpn/openvpn.hash +2 -1
index 318f9edb88..079595d440 100644
@@ -1,2 +1,3 @@
 # Locally calculated after checking signature
-sha256 96cd1b8fe1e8cb2920f07c3fd3985faea756e16fdeebd11d3e146d5bd2b04a80  openvpn-2.4.4.tar.xz
+sha256 43c0a363a332350f620d1cd93bb431e082bedbc93d4fb872f758650d53c1d29e  openvpn-2.4.5.tar.xz
+sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043  COPYRIGHT.GPL
package/openvpn/openvpn.mk +1 -1
index 086f99bf4d..fbe65ad863 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENVPN_VERSION = 2.4.4
+OPENVPN_VERSION = 2.4.5
 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf openssl
Signature · 1 line
2.14.2
#2 lore raw

PATCH 1/2 package/libressl: bump version to 2.7.2

In reply to Bernd Kuhls

Hello,

Quoted 10 lines · Bernd Kuhls

Removed patch 0001, a different version was applied upstream, please see upstream PR 82 for details. Added license hash.

---
 ...ix-build-with-musl-and-older-Linux-kernel.patch | 38 ----------------------
 package/libressl/libressl.hash                     |  4 ++-
 package/libressl/libressl.mk                       |  2 +-
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/libressl: bump version to 2.7.2

In reply to Bernd Kuhls
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Removed patch 0001, a different version was applied upstream, please see upstream PR 82 for details. Added license hash.

According to the release notes:

https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.2-relnotes.txt

* Added support for many OpenSSL 1.0.2 and 1.1 APIs, based on observations of real-world usage in applications. These are implemented in parallel with existing OpenSSL 1.0.1 APIs - visibility changes have not been made to existing structs, allowing code written for older OpenSSL APIs to continue working.

So a number of packages earlier not compatible with libressl may now work.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 package/libressl: bump version to 2.7.2

Am Mon, 02 Apr 2018 12:07:55 +0200 schrieb Peter Korsgaard:

Quoted 2 lines

So a number of packages earlier not compatible with libressl may now work.

Hi Peter,

true, sent patches for ffmpeg, libevent, opusfile, openldap and ntp.

The following packages still do not build with libressl: mosquitto, libpjsip, softether, wpa_supplicant and hostapd.

Regards, Bernd