net-fs/cifs-utils: fix build

Package-Manager: portage-2.2.26

5 files changed, 38 insertions, 58 deletions

diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 1bc5b8c8..1a8fe77c 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -1,5 +1,4 @@
-AUX cifs-utils-6.1-hardcoded-path.patch 1513 SHA256 2a0415b1452f3033c8322ed102b9acafbab9640f936254002d1bc493a0e6d7d5 SHA512 3ad0fbea11cd6a4bf6072e1131ccf87b0b81a9c869e2ee199f655ebc974c5e79f87694aa162ce2911767b6689f3b7530895b835d920575b5c37ac8fcd8cf4aad WHIRLPOOL 8684a3a3de491f9bc17070c8ad9d53bad14f5af62692e805bdd548bd4ad731096c01ce580b9800b053fcf583ee7af4166cfe00761f207934fa75b0223b22da76
-AUX cifs-utils-6.1-paths.h.patch 200 SHA256 3998b247b3a2658a637755db8ebf800eee75b3650ca0e114513e5a68fe71939f SHA512 8728a3a7ccc5837faac7e0380c32f8855e71013b6175117f22b1acfdd321363ab7529141e5f3d3e75a60fd0366adc3e23b8b59672fada77e201261d8bcb45ee3 WHIRLPOOL 4a99f745e65632cbbbc4d4c28028bf81fcb5f57076f46a93f1a53143c640007b08f59addbbb062807b2992350137ee54914b75f9e045596fcb0da1f879ca87ad
+AUX cifs-utils-6.4-fix-headers.patch 1361 SHA256 bbb2512b1b5be4c98599d314d4863f799c4ea47092f5c994b41b2ccdd2d60f19 SHA512 a8eef78220b9ddfd0649742df26e607fe05011b1f7171436dabd744d2b0088d921005a2088968f27c1b7e9e95562d5c2c050497df43ba70fbf5c8123f3113afd WHIRLPOOL 97fcdb869bc2cd2e03a78e9a0e7bf64bd9cb5eb96e6dc72feb6c898663cdd3835fa3d5075f179287eb20697225451528428802111ecc088d4a1e1f3c08e828e0
 DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
-EBUILD cifs-utils-6.4-r99.ebuild 2875 SHA256 89025d12d7b39f788da5b493f88b52d7a74c794ff444e71b5959f832d5434b1d SHA512 1bbb19a0267e4fb25c9a1f31ae167a3197c1887bd479f8936aff147337cb62249f25bf1f6b534ed6e7b92fb17edafb5d14db0eac69c2698b811674958699aafe WHIRLPOOL 3982865f9c20fe496ee8a635f34093ea8b2bf19b7dd7b7638e6805c90f3b7ab2a6cee5a527f93e20a6db775d64c77511dac28eaf000eba70595fe758d0fc8c5f
+EBUILD cifs-utils-6.4-r99.ebuild 2879 SHA256 6b98cdd3c24f6071d4810817003c18b92e00eadc1a40ff5cc1fd6327b287a2eb SHA512 c3e3ad9b308e7ccd6d468c2202ace2a0490c92c86d1e8937c2eba1d9457153e65202e9327aa50fd1e88a4970f6075ad420c97a8921894ea24332c97112102873 WHIRLPOOL 27a3579b60d82b307dbbabccab716b2f4cd83417bbb7ea045df1745a3d4cb5c783c8e17d5be705144af0bb2208993ea3738ec3ecf55ecedde6c399506df56604
 MISC metadata.xml 889 SHA256 89bba935346607875e91cba58f764b546785ddfd0959a1da29332a8413285576 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66 WHIRLPOOL 6d0c66bb0c9349a25c87b051f91ee70dd489ffa89bc343922cc90f9961c343d56a8c596b08565576530a297a5f36e1cc65f8500b8af1570e7975ff0176e4db34
diff --git a/net-fs/cifs-utils/cifs-utils-6.4-r99.ebuild b/net-fs/cifs-utils/cifs-utils-6.4-r99.ebuild
index 7058013a..ee2b07e6 100644
--- a/net-fs/cifs-utils/cifs-utils-6.4-r99.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.4-r99.ebuild
@@ -52,7 +52,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-6.1-paths.h.patch" #for musl
+	epatch "${FILESDIR}/${PN}-6.4-fix-headers.patch" #for musl
 }
 
 src_configure() {
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
deleted file mode 100644
index c2e2ea21..00000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-hardcoded-path.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4e315f6a02a4edb259b33bcf0665eba259fee2f2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 30 Jul 2013 10:00:26 +0200
-Subject: [PATCH] Do not rely on hardcoded path to systemd-ask-password.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Relying on hardcoded /bin/systemd-ask-password path breaks systemd that
-install systemd-ask-password in /usr/bin. Since both paths are supposed
-to be in ${PATH} and popen() passes the command to shell, just pass
-'systemd-ask-password' and let the shell find it.
-
-Fixes: https://bugzilla.samba.org/show_bug.cgi?id=10054
-Signed-off-by: Michał Górny <mgorny@gentoo.org>
----
- mount.cifs.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mount.cifs.c b/mount.cifs.c
-index e76beee..7206dcb 100644
---- a/mount.cifs.c
-+++ b/mount.cifs.c
-@@ -1626,7 +1626,7 @@ drop_child_privs(void)
- }
- 
- /*
-- * If systemd is running and /bin/systemd-ask-password --
-+ * If systemd is running and systemd-ask-password --
-  * is available, then use that else fallback on getpass(..)
-  *
-  * Returns: @input or NULL on error
-@@ -1649,7 +1649,7 @@ get_password(const char *prompt, char *input, int capacity)
- 		FILE *ask_pass_fp = NULL;
- 
- 		cmd = ret = NULL;
--		if (asprintf(&cmd, "/bin/systemd-ask-password \"%s\"", prompt) >= 0) {
-+		if (asprintf(&cmd, "systemd-ask-password \"%s\"", prompt) >= 0) {
- 			ask_pass_fp = popen (cmd, "re");
- 			free (cmd);
- 		}
--- 
-1.7.0.4
-
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch b/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch
deleted file mode 100644
index 5e2434d7..00000000
--- a/net-fs/cifs-utils/files/cifs-utils-6.1-paths.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cifs-utils-6.1/mtab.c
-+++ b/cifs-utils-6.1/mtab.c
-@@ -38,6 +38,7 @@
- #include <mntent.h>
- #include <stdlib.h>
- #include <signal.h>
-+#include <paths.h>
- #include "mount.h"
- #include "config.h"
- 
diff --git a/net-fs/cifs-utils/files/cifs-utils-6.4-fix-headers.patch b/net-fs/cifs-utils/files/cifs-utils-6.4-fix-headers.patch
new file mode 100644
index 00000000..f4798dbe
--- /dev/null
+++ b/net-fs/cifs-utils/files/cifs-utils-6.4-fix-headers.patch
@@ -0,0 +1,35 @@
+diff -Naur /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/getcifsacl.c cifs-utils-6.4/getcifsacl.c
+--- /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/getcifsacl.c	2014-07-11 15:14:06.000000000 +0000
++++ cifs-utils-6.4/getcifsacl.c	2016-04-05 10:43:29.952000000 +0000
+@@ -33,6 +33,8 @@
+ #include <stddef.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <linux/limits.h>
++#include <endian.h>
+ #include <ctype.h>
+ #include <sys/xattr.h>
+ #include "cifsacl.h"
+diff -Naur /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/mtab.c cifs-utils-6.4/mtab.c
+--- /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/mtab.c	2014-07-11 15:14:06.000000000 +0000
++++ cifs-utils-6.4/mtab.c	2016-04-05 10:02:35.872000000 +0000
+@@ -38,6 +38,7 @@
+ #include <mntent.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <paths.h>
+ #include "mount.h"
+ #include "config.h"
+ 
+diff -Naur /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/setcifsacl.c cifs-utils-6.4/setcifsacl.c
+--- /var/tmp/portage/net-fs/cifs-utils-6.4/work/cifs-utils-6.4/setcifsacl.c	2014-07-11 15:14:06.000000000 +0000
++++ cifs-utils-6.4/setcifsacl.c	2016-04-05 10:43:45.696000000 +0000
+@@ -33,6 +33,8 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <linux/limits.h>
++#include <endian.h>
+ #include <ctype.h>
+ #include <sys/xattr.h>
+