| 1 |
commit: af61a8bd9c0484d04fafc560236c8eacc890c2fa |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 27 07:57:57 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 27 07:58:11 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af61a8bd |
| 7 |
|
| 8 |
net-fs/cifs-utils: Fixed compilation with app-crypt/heimdal (# 612584). |
| 9 |
|
| 10 |
Thanks to Igor Poboiko for providing a patch. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 13 |
|
| 14 |
net-fs/cifs-utils/cifs-utils-6.7.ebuild | 6 +++++ |
| 15 |
.../cifs-utils/files/cifs-utils-6.7-heimdal.patch | 27 ++++++++++++++++++++++ |
| 16 |
2 files changed, 33 insertions(+) |
| 17 |
|
| 18 |
diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild |
| 19 |
index ee8b16e1ecd..d008076005a 100644 |
| 20 |
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild |
| 21 |
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild |
| 22 |
@@ -52,6 +52,12 @@ pkg_setup() { |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
default |
| 26 |
+ |
| 27 |
+ if has app-crypt/heimdal ; then |
| 28 |
+ # https://bugs.gentoo.org/612584 |
| 29 |
+ eapply "${FILESDIR}/${PN}-6.7-heimdal.patch" |
| 30 |
+ fi |
| 31 |
+ |
| 32 |
eautoreconf |
| 33 |
} |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch b/net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..f8fea48fb4b |
| 39 |
--- /dev/null |
| 40 |
+++ b/net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch |
| 41 |
@@ -0,0 +1,27 @@ |
| 42 |
+https://bugs.gentoo.org/612584 |
| 43 |
+ |
| 44 |
+--- cifs-utils-6.7/cifs.upcall.c |
| 45 |
++++ cifs-utils-6.7/cifs.upcall.c |
| 46 |
+@@ -75,11 +75,13 @@ |
| 47 |
+ #define KRB5_KEY_LENGTH(k) ((k)->keyvalue.length) |
| 48 |
+ #define KRB5_KEY_DATA(k) ((k)->keyvalue.data) |
| 49 |
+ #define KRB5_KEY_DATA_CAST void |
| 50 |
++#define KRB5_FREE_STRING(c,k) krb5_xfree(k) |
| 51 |
+ #else /* MIT */ |
| 52 |
+ #define KRB5_KEY_TYPE(k) ((k)->enctype) |
| 53 |
+ #define KRB5_KEY_LENGTH(k) ((k)->length) |
| 54 |
+ #define KRB5_KEY_DATA(k) ((k)->contents) |
| 55 |
+ #define KRB5_KEY_DATA_CAST krb5_octet |
| 56 |
++#define KRB5_FREE_STRING(c,k) krb5_free_string(c,k) |
| 57 |
+ #endif |
| 58 |
+ |
| 59 |
+ #ifdef HAVE_LIBCAP_NG |
| 60 |
+@@ -358,7 +360,7 @@ |
| 61 |
+ syslog(LOG_DEBUG, "%s: krb5_cc_get_full_name failed: %d\n", __func__, ret); |
| 62 |
+ } else { |
| 63 |
+ syslog(LOG_DEBUG, "%s: default ccache is %s\n", __func__, cachename); |
| 64 |
+- krb5_free_string(context, cachename); |
| 65 |
++ KRB5_FREE_STRING(context, cachename); |
| 66 |
+ } |
| 67 |
+ |
| 68 |
+ if (!get_tgt_time(cc)) { |
Archives