| 1 |
commit: bd6af1944ccbf81a3d43df39ecc45e874493b87f |
| 2 |
Author: Salah Coronya <salah.coronya <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 24 18:40:32 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 8 06:46:44 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd6af194 |
| 7 |
|
| 8 |
app-crypt/tpm2-pkcs11: Remove -WError, fix clang compile |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/744439 |
| 11 |
Closes: https://bugs.gentoo.org/744457 |
| 12 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 13 |
Signed-off-by: Salah Coronya <salah.coronya <AT> gmail.com> |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/17653 |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
.../tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch | 12 ++++++++++++ |
| 18 |
app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild | 13 ++++++++++++- |
| 19 |
app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild | 11 ++++++++++- |
| 20 |
3 files changed, 34 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..7aae19c7c71 |
| 25 |
--- /dev/null |
| 26 |
+++ b/app-crypt/tpm2-pkcs11/files/tpm2-pkcs11-1.3.2-Remove-WError.patch |
| 27 |
@@ -0,0 +1,12 @@ |
| 28 |
+diff --git a/configure.ac b/configure.ac |
| 29 |
+index 3088817..d789ce9 100644 |
| 30 |
+--- a/configure.ac |
| 31 |
++++ b/configure.ac |
| 32 |
+@@ -460,7 +460,6 @@ AS_IF([test x"$enable_hardening" != xno], [ |
| 33 |
+ |
| 34 |
+ add_hardened_c_flag([-Wall]) |
| 35 |
+ add_hardened_c_flag([-Wextra]) |
| 36 |
+- add_hardened_c_flag([-Werror]) |
| 37 |
+ |
| 38 |
+ add_hardened_c_flag([-Wformat]) |
| 39 |
+ add_hardened_c_flag([-Wformat-security]) |
| 40 |
|
| 41 |
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild |
| 42 |
index eacca8899f5..6e609d4e5f4 100644 |
| 43 |
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild |
| 44 |
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.3.2.ebuild |
| 45 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} ) |
| 46 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
| 47 |
PYTHON_REQ_USE="sqlite" |
| 48 |
|
| 49 |
-inherit distutils-r1 |
| 50 |
+inherit autotools distutils-r1 |
| 51 |
|
| 52 |
DESCRIPTION="A PKCS#11 interface for TPM2 hardware" |
| 53 |
HOMEPAGE="https://tpm2-software.github.io/" |
| 54 |
@@ -35,7 +35,18 @@ DEPEND="${RDEPEND}" |
| 55 |
BDEPEND="sys-devel/autoconf-archive |
| 56 |
virtual/pkgconfig" |
| 57 |
|
| 58 |
+PATCHES=( |
| 59 |
+ "$FILESDIR/${PN}-1.3.2-Remove-WError.patch" |
| 60 |
+ ) |
| 61 |
+ |
| 62 |
+src_prepare() { |
| 63 |
+ default |
| 64 |
+ eautoreconf |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_configure() { |
| 68 |
+# we need the default version of src_configure, not the one exported |
| 69 |
+# by distutils-r1 |
| 70 |
default |
| 71 |
} |
| 72 |
|
| 73 |
|
| 74 |
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild |
| 75 |
index be28c64da7e..b413d95cb6a 100644 |
| 76 |
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild |
| 77 |
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.4.0.ebuild |
| 78 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} ) |
| 79 |
DISTUTILS_USE_SETUPTOOLS=rdepend |
| 80 |
PYTHON_REQ_USE="sqlite" |
| 81 |
|
| 82 |
-inherit distutils-r1 |
| 83 |
+inherit autotools distutils-r1 |
| 84 |
|
| 85 |
DESCRIPTION="A PKCS#11 interface for TPM2 hardware" |
| 86 |
HOMEPAGE="https://tpm2-software.github.io/" |
| 87 |
@@ -38,6 +38,15 @@ DEPEND="${RDEPEND}" |
| 88 |
BDEPEND="sys-devel/autoconf-archive |
| 89 |
virtual/pkgconfig" |
| 90 |
|
| 91 |
+PATCHES=( |
| 92 |
+ "$FILESDIR/${PN}-1.3.2-Remove-WError.patch" |
| 93 |
+ ) |
| 94 |
+ |
| 95 |
+src_prepare() { |
| 96 |
+ default |
| 97 |
+ eautoreconf |
| 98 |
+} |
| 99 |
+ |
| 100 |
src_configure() { |
| 101 |
econf \ |
| 102 |
$(use_enable fapi) |
Archives