diff options
Diffstat (limited to 'sysutils/mstflint/files')
5 files changed, 30 insertions, 31 deletions
diff --git a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am b/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am index 08abbc2bceac..bd94fd521d74 100644 --- a/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am +++ b/sysutils/mstflint/files/extrat-LITE-patch-mlxconfig_Makefile.am @@ -1,6 +1,6 @@ ---- mlxconfig/Makefile.am.orig 2020-01-10 20:19:15.456616000 +0100 -+++ mlxconfig/Makefile.am 2020-01-10 20:19:48.307817000 +0100 -@@ -55,13 +55,6 @@ AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(top_srcdir)/includ +--- mlxconfig/Makefile.am.orig 2022-12-16 18:41:14.183823000 +0100 ++++ mlxconfig/Makefile.am 2022-12-16 18:41:40.798788000 +0100 +@@ -55,13 +55,6 @@ AM_CXXFLAGS = -pthread -Wall -W -g -MP -MD -pipe -Wno-deprecated-declarations $(COMPILER_FPIC) -DDATA_PATH=\"$(pkgdatadir)\" bin_PROGRAMS = mstconfig @@ -10,7 +10,7 @@ - cp $(PYTHON_WRAPPER_SCRIPT) $@ - -mlxprivhostlibdir=$(libdir)/mstflint/python_tools/$(MLXPRIVHOST_PYTHON_WRAPPER) --mlxprivhostlib_SCRIPTS = $(MLXPRIVHOST_PYTHON_WRAPPER).py +-mlxprivhostlib_DATA = $(MLXPRIVHOST_PYTHON_WRAPPER).py noinst_LTLIBRARIES = libmlxcfg.a diff --git a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp b/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp index 858e33e7bdc3..7540c09ee44a 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp +++ b/sysutils/mstflint/files/extrat-patch-mlxarchive_mlxarchive_mfa2.cpp @@ -1,6 +1,6 @@ ---- mlxarchive/mlxarchive_mfa2.cpp.orig 2020-01-05 16:50:06.000000000 +0100 -+++ mlxarchive/mlxarchive_mfa2.cpp 2020-01-09 14:20:54.186228000 +0100 -@@ -39,7 +39,9 @@ +--- mlxarchive/mlxarchive_mfa2.cpp.orig 2022-12-16 18:15:27.440142000 +0100 ++++ mlxarchive/mlxarchive_mfa2.cpp 2022-12-16 18:16:25.933770000 +0100 +@@ -40,7 +40,9 @@ */ #include <xz_utils/xz_utils.h> @@ -10,19 +10,18 @@ #include "mlxarchive_mfa2.h" #include "mlxarchive_mfa2_utils.h" -@@ -120,6 +122,7 @@ void MFA2::pack(vector<u_int8_t>& buff) - xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(), - zippedComponentBlockBuff.data(), zippedSize); - +@@ -115,6 +117,7 @@ + printf("-E- zipped size not as expected\n"); + exit(1); + } +#ifndef NO_OPEN_SSL - //compute descriptors SHA256 + // compute descriptors SHA256 vector<u_int8_t> descriptorsBuff; packDescriptors(descriptorsBuff); -@@ -136,7 +139,7 @@ void MFA2::pack(vector<u_int8_t>& buff) +@@ -131,6 +134,7 @@ mlxSignSHA256 << zippedComponentBlockBuff; mlxSignSHA256.getDigest(digest); _packageDescriptor.setSHA256(digest); -- +#endif } diff --git a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp index 9b272356c8e0..6d8fda101e5a 100644 --- a/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp +++ b/sysutils/mstflint/files/extrat-patch-mlxfwupdate_server_request.cpp @@ -1,7 +1,7 @@ ---- mlxfwupdate/server_request.cpp.orig 2020-01-09 00:45:10.200149000 +0100 -+++ mlxfwupdate/server_request.cpp 2020-01-09 00:46:56.459627000 +0100 +--- mlxfwupdate/server_request.cpp.orig 2022-12-16 18:34:53.974210000 +0100 ++++ mlxfwupdate/server_request.cpp 2022-12-16 18:36:46.969103000 +0100 @@ -43,9 +43,7 @@ - + #include <string> using namespace std; -#ifndef USE_CURL @@ -11,13 +11,13 @@ extern int abort_request; -@@ -62,7 +60,9 @@ ServerRequest::ServerRequest(const char *url, const ch +@@ -65,7 +63,9 @@ _show_progress = show_progress; - _ceritifcate = certificate; + _ceritifcate = certificate; _numberOfRetrials = numberOfRetrials; +#ifdef USE_CURL - _headers = NULL; + _headers = NULL; +#endif - if (proxy != NULL) { - if (proxy[0] != 0) { - _UseProxy = 1; + if (proxy != NULL) + { + if (proxy[0] != 0) diff --git a/sysutils/mstflint/files/patch-configure.ac b/sysutils/mstflint/files/patch-configure.ac index cadb5d44529c..d00ebfb529b3 100644 --- a/sysutils/mstflint/files/patch-configure.ac +++ b/sysutils/mstflint/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2020-10-02 01:05:50.612135000 +0200 -+++ configure.ac 2020-10-02 01:06:26.890856000 +0200 -@@ -233,7 +233,7 @@ +--- configure.ac.orig 2022-10-31 08:38:13 UTC ++++ configure.ac +@@ -248,7 +248,7 @@ AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x AS_HELP_STRING([--enable-static-libstdcpp], [Enable link static to libstdc++])) AS_IF([test "x$enable_static_libstdcpp" = "xyes" -o "x$enable_all_static" = "xyes" ], [ diff --git a/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp b/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp index 863628c9fbaa..527e6676864e 100644 --- a/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp +++ b/sysutils/mstflint/files/patch-mlxfwupdate_cmd__line__params.cpp @@ -1,14 +1,14 @@ ---- mlxfwupdate/cmd_line_params.cpp.orig 2019-11-16 07:49:07 UTC +--- mlxfwupdate/cmd_line_params.cpp.orig 2022-12-16 14:59:44 UTC +++ mlxfwupdate/cmd_line_params.cpp -@@ -97,9 +97,9 @@ CmdLineParams::CmdLineParams() +@@ -92,9 +92,9 @@ CmdLineParams::CmdLineParams() #else - #ifdef MSTFLINT + #ifdef MSTFLINT - certificate = (string)ROOT_PATH + "etc/mstflint/ca-bundle.crt"; + certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem"; - #else + #else - certificate = (string)ROOT_PATH + "etc/mft/ca-bundle.crt"; + certificate = (string)ROOT_PATH + "/etc/ssl/cert.pem"; - #endif + #endif #endif } |