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

Thanks to Igor Poboiko for providing a patch.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index ee8b16e1ecdeaa630ef7e06a610bf63bab419c1f..d008076005ab11bd9672fdb56623cd744c7ec529 100644 (file)
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -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
 }
 

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
new file mode 100644 (file)
index 0000000..f8fea48
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch
@@ -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)) {