| 1 |
commit: 9bdff0e5ea288b745e38ef08914fe141a127902c |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 14:21:46 2020 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 14:22:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdff0e5 |
| 7 |
|
| 8 |
net-libs/mbedtls: fix wrong headers, bug #705038 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/705038 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 13 |
|
| 14 |
.../mbedtls-un-pebcak-705038-wrong-file.patch | 50 ++++++++++++++++++++++ |
| 15 |
net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild | 1 + |
| 16 |
net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild | 1 + |
| 17 |
3 files changed, 52 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..73e870fa1e4 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-libs/mbedtls/files/mbedtls-un-pebcak-705038-wrong-file.patch |
| 24 |
@@ -0,0 +1,50 @@ |
| 25 |
+Fix https://bugs.gentoo.org/705038 |
| 26 |
+ |
| 27 |
+Thanks Greg Turner <gmt@×××××××.net> |
| 28 |
+ |
| 29 |
+diff -urpN mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt |
| 30 |
+--- mbedtls-mbedtls-2.19.1.orig/crypto/include/CMakeLists.txt 2020-01-26 09:01:50.324231295 -0800 |
| 31 |
++++ mbedtls-mbedtls-2.19.1/crypto/include/CMakeLists.txt 2020-01-26 09:04:26.498880873 -0800 |
| 32 |
+@@ -5,6 +5,19 @@ if(INSTALL_MBEDTLS_HEADERS) |
| 33 |
+ file(GLOB headers "mbedtls/*.h") |
| 34 |
+ file(GLOB psa_headers "psa/*.h") |
| 35 |
+ |
| 36 |
++ if(USE_CRYPTO_SUBMODULE) |
| 37 |
++ # Don't overwrite mbedtls's header files! |
| 38 |
++ # config.h is supposed to be automatically checked for compatibility |
| 39 |
++ # in automatic builds, while the other files should not just be |
| 40 |
++ # compatible, but also identical in theory. |
| 41 |
++ # Practically, we don't check that in crypto but just assume that the |
| 42 |
++ # submodule configuration is sane and trust tls's headers. |
| 43 |
++ list(REMOVE_ITEM headers "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h" |
| 44 |
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h" |
| 45 |
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h" |
| 46 |
++ "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h") |
| 47 |
++ endif(USE_CRYPTO_SUBMODULE) |
| 48 |
++ |
| 49 |
+ install(FILES ${headers} |
| 50 |
+ DESTINATION include/mbedtls |
| 51 |
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) |
| 52 |
+diff -urpN mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt mbedtls-mbedtls-2.19.1/include/CMakeLists.txt |
| 53 |
+--- mbedtls-mbedtls-2.19.1.orig/include/CMakeLists.txt 2020-01-26 09:01:50.320231227 -0800 |
| 54 |
++++ mbedtls-mbedtls-2.19.1/include/CMakeLists.txt 2020-01-26 09:03:45.761189288 -0800 |
| 55 |
+@@ -4,19 +4,6 @@ if(INSTALL_MBEDTLS_HEADERS) |
| 56 |
+ |
| 57 |
+ file(GLOB headers "mbedtls/*.h") |
| 58 |
+ |
| 59 |
+- if(USE_CRYPTO_SUBMODULE) |
| 60 |
+- # Don't overwrite mbedtls's header files! |
| 61 |
+- # config.h is supposed to be automatically checked for compatibility |
| 62 |
+- # in automatic builds, while the other files should not just be |
| 63 |
+- # compatible, but also identical in theory. |
| 64 |
+- # Practically, we don't check that in crypto but just assume that the |
| 65 |
+- # submodule configuration is sane and trust tls's headers. |
| 66 |
+- list(REMOVE_ITEM headers "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/compat-1.3.h" |
| 67 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/config.h" |
| 68 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/error.h" |
| 69 |
+- "${CMAKE_CURRENT_SOURCE_DIR}/mbedtls/version.h") |
| 70 |
+- endif(USE_CRYPTO_SUBMODULE) |
| 71 |
+- |
| 72 |
+ install(FILES ${headers} |
| 73 |
+ DESTINATION include/mbedtls |
| 74 |
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) |
| 75 |
|
| 76 |
diff --git a/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild |
| 77 |
index b11f2794a35..dfb900ea4c6 100644 |
| 78 |
--- a/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild |
| 79 |
+++ b/net-libs/mbedtls/mbedtls-2.18.1-r1.ebuild |
| 80 |
@@ -38,6 +38,7 @@ enable_mbedtls_option() { |
| 81 |
|
| 82 |
PATCHES=( |
| 83 |
"${FILESDIR}"/${PN}-dont-overwrite-headers.patch |
| 84 |
+ "${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch |
| 85 |
) |
| 86 |
|
| 87 |
src_prepare() { |
| 88 |
|
| 89 |
diff --git a/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild b/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild |
| 90 |
index 1a73d20f220..a18fc891988 100644 |
| 91 |
--- a/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild |
| 92 |
+++ b/net-libs/mbedtls/mbedtls-2.19.1-r1.ebuild |
| 93 |
@@ -38,6 +38,7 @@ enable_mbedtls_option() { |
| 94 |
|
| 95 |
PATCHES=( |
| 96 |
"${FILESDIR}"/${PN}-dont-overwrite-headers.patch |
| 97 |
+ "${FILESDIR}"/${PN}-un-pebcak-705038-wrong-file.patch |
| 98 |
) |
| 99 |
|
| 100 |
src_prepare() { |
Archives