* [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl
@ 2022-04-23 15:33 Fabrice Fontaine
2022-04-25 20:21 ` Arnout Vandecappelle
2022-05-27 8:08 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-04-23 15:33 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fix the following build failure with libressl >= 2.7.0:
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>
---
..._compat.h-fix-build-with-libressl-2..patch | 43 +++++++++++++++++++
1 file changed, 43 insertions(+)
create mode 100644 package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
diff --git a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
new file mode 100644
index 0000000000..05913862f6
--- /dev/null
+++ b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
@@ -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
+
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl
2022-04-23 15:33 [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl Fabrice Fontaine
@ 2022-04-25 20:21 ` Arnout Vandecappelle
2022-05-27 8:08 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2022-04-25 20:21 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 23/04/2022 17:33, Fabrice Fontaine wrote:
> Fix the following build failure with libressl >= 2.7.0:
>
> 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>
Applied to master, thanks.
Regards,
Arnout
> ---
> ..._compat.h-fix-build-with-libressl-2..patch | 43 +++++++++++++++++++
> 1 file changed, 43 insertions(+)
> create mode 100644 package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
>
> diff --git a/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
> new file mode 100644
> index 0000000000..05913862f6
> --- /dev/null
> +++ b/package/netatalk/0002-etc-uams-openssl_compat.h-fix-build-with-libressl-2..patch
> @@ -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
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl
2022-04-23 15:33 [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl Fabrice Fontaine
2022-04-25 20:21 ` Arnout Vandecappelle
@ 2022-05-27 8:08 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2022-05-27 8:08 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Fix the following build failure with libressl >= 2.7.0:
> 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>
Committed to 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-27 8:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-23 15:33 [Buildroot] [PATCH 1/1] package/netatalk: fix build with libressl Fabrice Fontaine
2022-04-25 20:21 ` Arnout Vandecappelle
2022-05-27 8:08 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.