gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

net-fs/cifs-utils: Fixed compilation with app-crypt/heimdal (# 612584).

Browse Source 
Thanks to Igor Poboiko for providing a patch.

Package-Manager: Portage-2.3.5, Repoman-2.3.2
This commit is contained in:
Lars Wendler
2017-03-27 09:57:57 +02:00
parent 816ee9da5f
commit af61a8bd9c
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net-fs/cifs-utils/cifs-utils-6.7.ebuild
View File

@@ -52,6 +52,12 @@ pkg_setup() {
src_prepare() {
default
if has app-crypt/heimdal ; then
# https://bugs.gentoo.org/612584
eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
fi
eautoreconf
}

27
net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch Normal file
View File

@@ -0,0 +1,27 @@
https://bugs.gentoo.org/612584
--- cifs-utils-6.7/cifs.upcall.c
+++ cifs-utils-6.7/cifs.upcall.c
@@ -75,11 +75,13 @@
#define KRB5_KEY_LENGTH(k) ((k)->keyvalue.length)
#define KRB5_KEY_DATA(k) ((k)->keyvalue.data)
#define KRB5_KEY_DATA_CAST void
+#define KRB5_FREE_STRING(c,k) krb5_xfree(k)
#else /* MIT */
#define KRB5_KEY_TYPE(k) ((k)->enctype)
#define KRB5_KEY_LENGTH(k) ((k)->length)
#define KRB5_KEY_DATA(k) ((k)->contents)
#define KRB5_KEY_DATA_CAST krb5_octet
+#define KRB5_FREE_STRING(c,k) krb5_free_string(c,k)
#endif
#ifdef HAVE_LIBCAP_NG
@@ -358,7 +360,7 @@
syslog(LOG_DEBUG, "%s: krb5_cc_get_full_name failed: %d\n", __func__, ret);
} else {
syslog(LOG_DEBUG, "%s: default ccache is %s\n", __func__, cachename);
- krb5_free_string(context, cachename);
+ KRB5_FREE_STRING(context, cachename);
}
if (!get_tgt_time(cc)) {