mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
bump version to 2022.02.9
add miyoo_defconfig
This commit is contained in:
tiopex
@@ -0,0 +1,43 @@
|
||||
From 58ddc137021a938f37c3794305a839f8df449d3f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 5 Apr 2022 23:59:15 +0200
|
||||
Subject: [PATCH] etc/uams/openssl_compat.h: fix build with libressl >= 2.7.0
|
||||
|
||||
Fix the following build failure with libressl >= 2.7.0 which added
|
||||
DH_set0_pqg with
|
||||
https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf:
|
||||
|
||||
In file included from uams_dhx_passwd.c:35:
|
||||
openssl_compat.h:15:19: error: static declaration of 'DH_set0_pqg' follows non-static declaration
|
||||
15 | inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
|
||||
| ^~~~~~~~~~~
|
||||
In file included from uams_dhx_passwd.c:33:
|
||||
/home/autobuild/autobuild/instance-2/output-1/host/mips64-buildroot-linux-uclibc/sysroot/usr/include/openssl/dh.h:195:5: note: previous declaration of 'DH_set0_pqg' was here
|
||||
195 | int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
|
||||
| ^~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/fc6e308f346570f8198542602bc8c1bdd0a4869e
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not sent yet]
|
||||
---
|
||||
etc/uams/openssl_compat.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/uams/openssl_compat.h b/etc/uams/openssl_compat.h
|
||||
index ded377bc..5cc8de34 100644
|
||||
--- a/etc/uams/openssl_compat.h
|
||||
+++ b/etc/uams/openssl_compat.h
|
||||
@@ -11,7 +11,7 @@ http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
||||
#ifndef OPENSSL_COMPAT_H
|
||||
#define OPENSSL_COMPAT_H
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000L)
|
||||
inline static int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
|
||||
{
|
||||
/* If the fields p and g in d are NULL, the corresponding input
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Bauer <zonexpertconsulting@outlook.com>
|
||||
Date: Wed, 22 Jan 2020 09:59:47 -0600
|
||||
Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/Netatalk/Netatalk/pull/125/commits/32df6e155ccfc83216321925273c3e75e631ebe6]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
etc/afpd/directory.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
|
||||
index eb89c606..81bfa9cb 100644
|
||||
--- a/etc/afpd/directory.h
|
||||
+++ b/etc/afpd/directory.h
|
||||
@@ -91,7 +91,7 @@ struct maccess {
|
||||
#define AR_UWRITE (1<<2)
|
||||
#define AR_UOWN (1<<7)
|
||||
|
||||
-q_t *invalid_dircache_entries;
|
||||
+extern q_t *invalid_dircache_entries;
|
||||
|
||||
typedef int (*dir_loop)(struct dirent *, char *, void *);
|
||||
|
||||
@@ -6,6 +6,8 @@ config BR2_PACKAGE_NETATALK
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_BERKELEYDB
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_LIBOPENSSL_ENABLE_CAST if BR2_PACKAGE_LIBOPENSSL
|
||||
select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
|
||||
select BR2_PACKAGE_LIBEVENT
|
||||
select BR2_PACKAGE_LIBGCRYPT
|
||||
select BR2_PACKAGE_LIBGPG_ERROR
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.12/
|
||||
md5 021d2330cb7f7cd2977aec46299dcc1b netatalk-3.1.12.tar.bz2
|
||||
sha1 cc1fe1ebdbdb4da9cf82835c440e82ba28a832c5 netatalk-3.1.12.tar.bz2
|
||||
# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.13/
|
||||
md5 697421623c32ee0ab9c8076191766e5f netatalk-3.1.13.tar.bz2
|
||||
sha1 16dd7fa84962a44b36b795b8c44393e728785947 netatalk-3.1.13.tar.bz2
|
||||
# Locally computed
|
||||
sha256 89ada6bcfe1b39ad94f58c236654d1d944f2645c3e7de98b3374e0bd37d5e05d netatalk-3.1.13.tar.bz2
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 7599ae145e53be03a08f8b558b2f2e0c828e1630f1843cc04f41981b8cefcd65 COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NETATALK_VERSION = 3.1.12
|
||||
NETATALK_VERSION = 3.1.13
|
||||
NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
|
||||
NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
|
||||
# For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
|
||||
@@ -14,6 +14,7 @@ NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
|
||||
libevent
|
||||
NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like
|
||||
NETATALK_LICENSE_FILES = COPYING COPYRIGHT
|
||||
NETATALK_CPE_ID_VENDOR = netatalk_project
|
||||
|
||||
# Don't run ldconfig!
|
||||
NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \
|
||||
|
||||
Reference in New Issue
Block a user