jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/libressl: bump version to 2.7.2

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

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2018-04-02 10:37:07 +02:00 committed by Thomas Petazzoni
parent 82aef67f2b
commit 9f1900ecaa
3 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch
View File

@ -1,38 +0,0 @@
From: Baruch Siach <baruch@tkos.co.il>
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 <baruch@tkos.co.il>
---
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)
{

4
package/libressl/libressl.hash
View File

@ -1,2 +1,4 @@
# From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 # 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

2
package/libressl/libressl.mk
View File

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