diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-fs/cifs-utils/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-fs/cifs-utils/files')
-rw-r--r-- | net-fs/cifs-utils/files/cifs-utils-6.7-heimdal.patch | 27 | ||||
-rw-r--r-- | net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch | 29 |
2 files changed, 56 insertions, 0 deletions
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 index 000000000000..f8fea48fb4b4 --- /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)) { diff --git a/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch b/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch new file mode 100644 index 000000000000..7e3418631bd4 --- /dev/null +++ b/net-fs/cifs-utils/files/cifs-utils-6.7-talloc.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/show_bug.cgi?id=612018 + +From: Thomas Witt <pyromaniac@exherbo.org> +Date: Wed, 15 Mar 2017 20:20:44 +0000 (+0000) +Subject: mount.cifs: Remove data_blob.h include +X-Git-Url: https://git.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=272d523a57a4e8791d625a479128613be5e401f5 + +mount.cifs: Remove data_blob.h include + +data_blob.h includes talloc.h from libtalloc, but that is only marked as +a dependency for cifs.upcall. No symbols from that header are used by +cifs.mount, so remove it to avoid the libtalloc dependency + +Signed-off-by: Thomas Witt <pyromaniac@exherbo.org> +--- + +diff --git a/mount.cifs.c b/mount.cifs.c +index 13b71ef..2612feb 100644 +--- a/mount.cifs.c ++++ b/mount.cifs.c +@@ -61,7 +61,6 @@ + #include "mount.h" + #include "util.h" + #include "resolve_host.h" +-#include "data_blob.h" + + #ifndef MS_MOVE + #define MS_MOVE 8192 + |