mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-27 04:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/ibrcommon: update patches

Browse Source 
Replaced patch 0001 with an upstream commit.

Added Upstream: tags to patches 0002 & 0003.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls
2026-09-19 17:57:43 +02:00
committed by Thomas Petazzoni
parent 03776c154e
commit e4d9ab154e
5 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.checkpackageignore
View File

@@ -402,9 +402,6 @@ package/hplip/0001-build-use-pkg-config-to-discover-libusb.patch lib_patch.Upstr
package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch lib_patch.Upstream
package/i2pd/S99i2pd Shellcheck lib_sysv.Indent lib_sysv.Variables
package/i7z/0001-fix-build-with-gcc-10.patch lib_patch.Upstream
package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch lib_patch.Upstream
package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch lib_patch.Upstream
package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch lib_patch.Upstream
package/icu/0001-dont-build-static-dynamic-twice.patch lib_patch.Upstream
package/icu/0002-link-icudata-as-data-only.patch lib_patch.Upstream
package/icu/0003-fix-static-linking-with-icu-uc.patch lib_patch.Upstream

46
package/ibrcommon/0001-ibrcommon-Use-simplyfied-POSIX-method-to-get-the-bas.patch Normal file
View File

@@ -0,0 +1,46 @@
From fcea9d27f5153c8da77ebab956f75eaa1fd48836 Mon Sep 17 00:00:00 2001
From: Johannes Morgenroth <jm@m-network.de>
Date: Sun, 20 Dec 2015 12:51:53 +0100
Subject: [PATCH] ibrcommon: Use simplyfied POSIX method to get the basename
Upstream: https://github.com/ibrdtn/ibrdtn/commit/fcea9d27f5153c8da77ebab956f75eaa1fd48836
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
ibrcommon/data/File.cpp | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp
index 31af4ae7..5f8e24e3 100644
--- a/ibrcommon/data/File.cpp
+++ b/ibrcommon/data/File.cpp
@@ -34,10 +34,7 @@
#include <cstring>
#include <cerrno>
#include <fstream>
-
-#if !defined(HAVE_FEATURES_H) || defined(ANDROID)
#include <libgen.h>
-#endif
#ifdef __WIN32__
#include <io.h>
@@ -225,14 +222,7 @@ namespace ibrcommon
std::string File::getBasename() const
{
-#if !defined(ANDROID) && defined(HAVE_FEATURES_H)
- return std::string(basename(_path.c_str()));
-#else
- char path[_path.length()+1];
- ::memcpy(&path, _path.c_str(), _path.length()+1);
-
- return std::string(basename(path));
-#endif
+ return std::string(basename((char*)_path.c_str()));
}
File File::get(const std::string &filename) const
--
2.47.3

55
package/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch
View File

@@ -1,55 +0,0 @@
From d667b13a87cf3207599a19eb981a893a1d7a67ee Mon Sep 17 00:00:00 2001
From: Brendan Heading <brendanheading@gmail.com>
Date: Mon, 14 Sep 2015 23:25:52 +0100
Subject: [PATCH] ibrcommon/data/File.cpp: support POSIX basename call
Firstly, and somewhat strangely, musl chooses not to provide a basename(3)
prototype within <string.h> whenever __cplusplus is defined. This can be
solved by including the <libgen.h> header defined by POSIX 1003.1 whenever
__GLIBC__ is not defined.
However, this leads to a second problem. POSIX defines the function as
char* basename(char*) and this is the only version supported by musl.
However, the std::string.cstr() method returns a const char*.
POSIX says that the string parameter can be modified. However the GNU
implementation never modifies it. glibc therefore supports an extension
when compiling under C++ by also supplying
const char* basename(const char*). This extension is not present on musl
which is the cause of the failure.
The solution is reasonably straightforward; test if __GLIBC__ is defined
before calling basename. If not, use the fallback already provided for
other platforms whereby basename() is called on a temporary copy.
Signed-off-by: Brendan Heading <brendanheading@gmail.com>
Upstream-status: pending
---
ibrcommon/data/File.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp
index 31af4ae..68e9b4f 100644
--- a/ibrcommon/data/File.cpp
+++ b/ibrcommon/data/File.cpp
@@ -35,7 +35,7 @@
#include <cerrno>
#include <fstream>
-#if !defined(HAVE_FEATURES_H) || defined(ANDROID)
+#if !defined(HAVE_FEATURES_H) || !defined(__GLIBC__) || defined(ANDROID)
#include <libgen.h>
#endif
@@ -225,7 +225,7 @@ namespace ibrcommon
std::string File::getBasename() const
{
-#if !defined(ANDROID) && defined(HAVE_FEATURES_H)
+#if !defined(ANDROID) && defined(HAVE_FEATURES_H) && defined(__GLIBC__)
return std::string(basename(_path.c_str()));
#else
char path[_path.length()+1];
--
2.4.3

3
package/ibrcommon/0002-ibrcommon-added-openssl-1.1-compatibility-264.patch
View File

@@ -5,8 +5,7 @@ Subject: [PATCH] ibrcommon: added openssl 1.1 compatibility (#264)
This patch adds compatibility to openssl 1.1.0.
Backported from master branch:
https://github.com/ibrdtn/ibrdtn/commit/a801d10a081e3130e24042256a43190c9eb6c112
Upstream: https://github.com/ibrdtn/ibrdtn/commit/a801d10a081e3130e24042256a43190c9eb6c112
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

3
package/ibrcommon/0003-ibrcommon-ssl-gcm-fix-static-build-with-openssl.patch
View File

@@ -15,8 +15,9 @@ Makefile:560: recipe for target 'dtnd' failed
Fixes:
- http://autobuild.buildroot.org/results/1d3b4b6cf043a3e185ce758b617a0a18c3d36cdb
Upstream: https://github.com/ibrdtn/ibrdtn/commit/103bab3d4759e56b7e46cb9848e64037cd666911
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/ibrdtn/ibrdtn/pull/269]
---
ibrcommon/ibrcommon/ssl/gcm/gcm.cpp | 10 +++++-----
ibrcommon/ibrcommon/ssl/gcm/gf128mul.cpp | 2 +-