diff mbox series

[1/1] package/mariadb: requires DES in openssl

Message ID 20240317140505.803596-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/mariadb: requires DES in openssl | expand

Commit Message

Fabrice Fontaine March 17, 2024, 2:05 p.m. UTC
Enable DES in openssl to avoid the following build failure raised since
commit a83d41867c8d69a77d5cd0a665aa216af5340359:

In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50,
                 from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34:
/home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type
   26 |   DES_cblock key1, key2, key3;
      |   ^~~~~~~~~~
/home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3: error: 'DES_key_schedule' does not name a type; did you mean 'st_des_keyschedule'?
   31 |   DES_key_schedule ks1, ks2, ks3;
      |   ^~~~~~~~~~~~~~~~
      |   st_des_keyschedule

Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359
 - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/mariadb/Config.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Peter Korsgaard March 23, 2024, 12:51 p.m. UTC | #1
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Enable DES in openssl to avoid the following build failure raised since
 > commit a83d41867c8d69a77d5cd0a665aa216af5340359:

 > In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50,
 >                  from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34:
 > /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type
 >    26 |   DES_cblock key1, key2, key3;
 >       |   ^~~~~~~~~~
 > /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3:
 > error: 'DES_key_schedule' does not name a type; did you mean
 > 'st_des_keyschedule'?
 >    31 |   DES_key_schedule ks1, ks2, ks3;
 >       |   ^~~~~~~~~~~~~~~~
 >       |   st_des_keyschedule

 > Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359
 >  - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
Peter Korsgaard March 25, 2024, 7:31 a.m. UTC | #2
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Enable DES in openssl to avoid the following build failure raised since
 > commit a83d41867c8d69a77d5cd0a665aa216af5340359:

 > In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50,
 >                  from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34:
 > /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type
 >    26 |   DES_cblock key1, key2, key3;
 >       |   ^~~~~~~~~~
 > /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3:
 > error: 'DES_key_schedule' does not name a type; did you mean
 > 'st_des_keyschedule'?
 >    31 |   DES_key_schedule ks1, ks2, ks3;
 >       |   ^~~~~~~~~~~~~~~~
 >       |   st_des_keyschedule

 > Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359
 >  - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2024.02.x, thanks.
diff mbox series

Patch

diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in
index d88dda3cda..acedd1da9d 100644
--- a/package/mariadb/Config.in
+++ b/package/mariadb/Config.in
@@ -11,6 +11,7 @@  config BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_FMT
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL
 	select BR2_PACKAGE_PCRE2
 	help
 	  MariaDB is one of the most popular database servers in the