1 |
commit: fdbc296110addf5d6f1ca909d8485158075933e5 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 24 10:08:12 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 24 10:08:31 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbc2961 |
7 |
|
8 |
net-fs/cifs-utils: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
net-fs/cifs-utils/Manifest | 2 - |
14 |
net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild | 85 ----------------- |
15 |
net-fs/cifs-utils/cifs-utils-6.3.ebuild | 105 --------------------- |
16 |
...cifs-utils-5.5-initialize_rc_var_properly.patch | 38 -------- |
17 |
...set-parsed_info-got_user-when-a-cred-file.patch | 31 ------ |
18 |
5 files changed, 261 deletions(-) |
19 |
|
20 |
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest |
21 |
index 4672f10..9777594 100644 |
22 |
--- a/net-fs/cifs-utils/Manifest |
23 |
+++ b/net-fs/cifs-utils/Manifest |
24 |
@@ -1,5 +1,3 @@ |
25 |
-DIST cifs-utils-5.9.tar.bz2 388403 SHA256 ee0d4ae25c54f47362ef4c97cda142224360a2c4a5a8fbf71d87003bf3eaaef2 SHA512 c4d789c6dce2c0927ccc9359147c12151ea9a688bc376c1df21deec66a98669dc4fb6dd8e26d549475d0bbe1e5449ce08fb86e45c765eee7013ec2040c23600e WHIRLPOOL ef4c9b23b2e12a53d936acd19ce10fbe347279ee3c2914a2cbe26d101898bad22606c622ca005af68e0c44605c4137b3633691171387e269caf06542919cec90 |
26 |
DIST cifs-utils-6.1.tar.bz2 390958 SHA256 381f1e9caccdafdcdb0efa32a4cceb77c1a96b0b58702394e4b86dac4825f3b5 SHA512 6427b74edbf56b865dee38a610c74ac5483cdc13096082cfc1e9d225a048c9b5ee0c7afb30e625a615a0e8e9f3767e33765220e27148e2c2a29d12d4129b01fd WHIRLPOOL a800a02a0729996035a331b460cb28ae5463ddecaf205d88173dc08efd7a2bee577995ebba97b36977858c8435ac3b7ec9c7ce5d193f8b30d0602f9546fed5b1 |
27 |
-DIST cifs-utils-6.3.tar.bz2 392465 SHA256 fff73b2a2547628acba05d324cf096e50f13fa8712f01bf0eb0dbabfe268375b SHA512 d1a16d56852d0b7570c795e04b6cee89a678e18401ec4a48bf734e5c941518c70d2cf82e795ce857c9aad07d9dfee68e96524e5d6e1392283cfee0a8b38e185e WHIRLPOOL e983ce227234cbc3141aac96d41a576b3bfb8a7cd0ea85191287d489b595e22e20bc9115a92b803da49931bcb7ac567cd3133b5729105ce99f6ea39c504535a8 |
28 |
DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72 |
29 |
DIST cifs-utils-6.5.tar.bz2 402158 SHA256 e2776578b8267c6dc0862897f5e10f87f10f8337fca9ca6a9118f5eb30cf49f7 SHA512 c5eea97d2be455ad676a3ff693641512d5c1d81d75eb1d7d08e4274b6844a1353b6791aa3ced4d8d656ed4a09b3c17ae80f289a90a3d429a8a94210e15f3e90e WHIRLPOOL 880b3c5762e791317140213fea008759b9d2599ddefb08319877ba6a5ced517fd6e0246050975ad01b74110b20f2233bb6cb505ecf3b2e05dca014ae378eaba5 |
30 |
|
31 |
diff --git a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 008bc47..0000000 |
34 |
--- a/net-fs/cifs-utils/cifs-utils-5.9-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,85 +0,0 @@ |
37 |
-# Copyright 1999-2013 Gentoo Foundation |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Id$ |
40 |
- |
41 |
-EAPI=4 |
42 |
- |
43 |
-inherit eutils confutils linux-info |
44 |
- |
45 |
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" |
46 |
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils" |
47 |
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" |
48 |
- |
49 |
-LICENSE="GPL-3" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~arm-linux ~x86-linux" |
52 |
-IUSE="ads +caps caps-ng creds" |
53 |
- |
54 |
-DEPEND="!net-fs/mount-cifs |
55 |
- !<net-fs/samba-3.6_rc1 |
56 |
- ads? ( sys-libs/talloc virtual/krb5 sys-apps/keyutils ) |
57 |
- caps? ( sys-libs/libcap ) |
58 |
- caps-ng? ( sys-libs/libcap-ng ) |
59 |
- creds? ( sys-apps/keyutils )" |
60 |
-RDEPEND="${DEPEND}" |
61 |
- |
62 |
-REQUIRED_USE="^^ ( caps caps-ng )" |
63 |
- |
64 |
-DOCS="doc/linux-cifs-client-guide.odt" |
65 |
- |
66 |
-pkg_setup() { |
67 |
- linux-info_pkg_setup |
68 |
- |
69 |
- confutils_use_conflict caps caps-ng |
70 |
- if ! linux_config_exists || ! linux_chkconfig_present CIFS; then |
71 |
- ewarn "You must enable CIFS support in your kernel config, " |
72 |
- ewarn "to be able to mount samba shares. You can find it at" |
73 |
- ewarn |
74 |
- ewarn " File systems" |
75 |
- ewarn " Network File Systems" |
76 |
- ewarn " CIFS support" |
77 |
- ewarn |
78 |
- ewarn "and recompile your kernel ..." |
79 |
- fi |
80 |
-} |
81 |
- |
82 |
-src_prepare() { |
83 |
- # bug #459040 |
84 |
- epatch "${FILESDIR}"/${P}-set-parsed_info-got_user-when-a-cred-file.patch |
85 |
-} |
86 |
- |
87 |
-src_configure() { |
88 |
- ROOTSBINDIR="${EPREFIX}"/sbin \ |
89 |
- econf \ |
90 |
- $(use_enable ads cifsupcall) \ |
91 |
- $(use_with caps libcap) \ |
92 |
- $(use_with caps-ng libcap-ng) \ |
93 |
- $(use_enable creds cifscreds) \ |
94 |
- --with-libcap-ng=$(use caps-ng && echo 'yes' || echo 'no') \ |
95 |
- --disable-cifsidmap \ |
96 |
- --disable-cifsacl |
97 |
-} |
98 |
- |
99 |
-src_install() { |
100 |
- default |
101 |
- |
102 |
- # remove empty directories |
103 |
- find "${ED}" -type d -print0 | xargs --null rmdir \ |
104 |
- --ignore-fail-on-non-empty &>/dev/null |
105 |
-} |
106 |
- |
107 |
-pkg_postinst() { |
108 |
- # Inform about set-user-ID bit of mount.cifs |
109 |
- ewarn "setuid use flag was dropped due to multiple security implications" |
110 |
- ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586" |
111 |
- ewarn "You are free to set setuid flags by yourself" |
112 |
- |
113 |
- # Inform about upcall usage |
114 |
- if use ads ; then |
115 |
- ewarn "Using mount.cifs in combination with keyutils" |
116 |
- ewarn "in order to mount DFS shares, you need to add" |
117 |
- ewarn "the following line to /etc/request-key.conf:" |
118 |
- ewarn " create dns_resolver * * /usr/sbin/cifs.upcall %k" |
119 |
- ewarn "Otherwise, your DFS shares will not work properly." |
120 |
- fi |
121 |
-} |
122 |
|
123 |
diff --git a/net-fs/cifs-utils/cifs-utils-6.3.ebuild b/net-fs/cifs-utils/cifs-utils-6.3.ebuild |
124 |
deleted file mode 100644 |
125 |
index 4b81eb6..0000000 |
126 |
--- a/net-fs/cifs-utils/cifs-utils-6.3.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,105 +0,0 @@ |
129 |
-# Copyright 1999-2014 Gentoo Foundation |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
-# $Id$ |
132 |
- |
133 |
-EAPI=5 |
134 |
- |
135 |
-inherit eutils linux-info multilib |
136 |
- |
137 |
-DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems" |
138 |
-HOMEPAGE="http://wiki.samba.org/index.php/LinuxCIFS_utils" |
139 |
-SRC_URI="ftp://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2" |
140 |
- |
141 |
-LICENSE="GPL-3" |
142 |
-SLOT="0" |
143 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~arm-linux ~x86-linux" |
144 |
-IUSE="+acl +ads +caps +caps-ng creds" |
145 |
- |
146 |
-DEPEND="!net-fs/mount-cifs |
147 |
- !<net-fs/samba-3.6_rc1 |
148 |
- ads? ( |
149 |
- sys-apps/keyutils |
150 |
- sys-libs/talloc |
151 |
- virtual/krb5 |
152 |
- ) |
153 |
- caps? ( !caps-ng? ( sys-libs/libcap ) ) |
154 |
- caps? ( caps-ng? ( sys-libs/libcap-ng ) ) |
155 |
- creds? ( sys-apps/keyutils )" |
156 |
-PDEPEND="${DEPEND} |
157 |
- acl? ( || ( |
158 |
- =net-fs/samba-3.6*[winbind] |
159 |
- >=net-fs/samba-4.0.0_alpha1 |
160 |
- ) ) |
161 |
-" |
162 |
- |
163 |
-REQUIRED_USE="acl? ( ads )" |
164 |
- |
165 |
-DOCS="doc/linux-cifs-client-guide.odt" |
166 |
- |
167 |
-pkg_setup() { |
168 |
- linux-info_pkg_setup |
169 |
- |
170 |
- if ! linux_config_exists || ! linux_chkconfig_present CIFS; then |
171 |
- ewarn "You must enable CIFS support in your kernel config, " |
172 |
- ewarn "to be able to mount samba shares. You can find it at" |
173 |
- ewarn |
174 |
- ewarn " File systems" |
175 |
- ewarn " Network File Systems" |
176 |
- ewarn " CIFS support" |
177 |
- ewarn |
178 |
- ewarn "and recompile your kernel ..." |
179 |
- fi |
180 |
-} |
181 |
- |
182 |
-src_configure() { |
183 |
- ROOTSBINDIR="${EPREFIX}"/sbin \ |
184 |
- econf \ |
185 |
- $(use_enable acl cifsacl cifsidmap) \ |
186 |
- $(use_enable ads cifsupcall) \ |
187 |
- $(use caps && use_with !caps-ng libcap || echo --without-libcap) \ |
188 |
- $(use caps && use_with caps-ng libcap-ng || echo --without-libcap-ng) \ |
189 |
- $(use_enable creds cifscreds) |
190 |
-} |
191 |
- |
192 |
-src_install() { |
193 |
- default |
194 |
- |
195 |
- # remove empty directories |
196 |
- find "${ED}" -type d -print0 | xargs --null rmdir \ |
197 |
- --ignore-fail-on-non-empty &>/dev/null |
198 |
- |
199 |
- if use acl ; then |
200 |
- dodir /etc/cifs-utils |
201 |
- dosym /usr/$(get_libdir)/cifs-utils/idmapwb.so \ |
202 |
- /etc/cifs-utils/idmap-plugin |
203 |
- dodir /etc/request-key.d |
204 |
- echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \ |
205 |
- > "${ED}/etc/request-key.d/cifs.idmap.conf" |
206 |
- fi |
207 |
- |
208 |
- if use ads ; then |
209 |
- dodir /etc/request-key.d |
210 |
- echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \ |
211 |
- > "${ED}/etc/request-key.d/cifs.upcall.conf" |
212 |
- fi |
213 |
-} |
214 |
- |
215 |
-pkg_postinst() { |
216 |
- # Inform about set-user-ID bit of mount.cifs |
217 |
- ewarn "setuid use flag was dropped due to multiple security implications" |
218 |
- ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586" |
219 |
- ewarn "You are free to set setuid flags by yourself" |
220 |
- |
221 |
- # Inform about upcall usage |
222 |
- if use acl ; then |
223 |
- einfo "The cifs.idmap utility has been enabled by creating the" |
224 |
- einfo "configuration file /etc/request-key.d/cifs.idmap.conf" |
225 |
- einfo "This enables you to get and set CIFS acls." |
226 |
- fi |
227 |
- |
228 |
- if use ads ; then |
229 |
- einfo "The cifs.upcall utility has been enabled by creating the" |
230 |
- einfo "configuration file /etc/request-key.d/cifs.upcall.conf" |
231 |
- einfo "This enables you to mount DFS shares." |
232 |
- fi |
233 |
-} |
234 |
|
235 |
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch b/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch |
236 |
deleted file mode 100644 |
237 |
index 2faa853..0000000 |
238 |
--- a/net-fs/cifs-utils/files/cifs-utils-5.5-initialize_rc_var_properly.patch |
239 |
+++ /dev/null |
240 |
@@ -1,38 +0,0 @@ |
241 |
-From 0eb3daa4b17ee64b464594f1a5d413ecb364957c Mon Sep 17 00:00:00 2001 |
242 |
-From: Jeff Layton <jlayton@×××××.org> |
243 |
-Date: Thu, 14 Jun 2012 10:59:18 -0400 |
244 |
-Subject: [PATCH 1/1] mount.cifs: set rc to 0 in libcap toggle_dac_capability |
245 |
- |
246 |
-Thus spake Jochen: |
247 |
- |
248 |
-The mount.cifs program from the cifs-utils package 5.5 did not work on |
249 |
-my Linux system. It just exited without an error message and did not |
250 |
-mount anything. |
251 |
- |
252 |
-[...] |
253 |
- |
254 |
-I think, when this variable rc is now used in this function, it has also |
255 |
-to be properly initialized there. |
256 |
- |
257 |
-Reported-by: Jochen Roderburg <roderburg@×××××××××.de> |
258 |
-Signed-off-by: Jeff Layton <jlayton@×××××.org> |
259 |
---- |
260 |
- mount.cifs.c | 2 +- |
261 |
- 1 files changed, 1 insertions(+), 1 deletions(-) |
262 |
- |
263 |
-diff --git a/mount.cifs.c b/mount.cifs.c |
264 |
-index a1b0454..6f3f382 100644 |
265 |
---- a/mount.cifs.c |
266 |
-+++ b/mount.cifs.c |
267 |
-@@ -495,7 +495,7 @@ free_caps: |
268 |
- static int |
269 |
- toggle_dac_capability(int writable, int enable) |
270 |
- { |
271 |
-- int rc; |
272 |
-+ int rc = 0; |
273 |
- cap_t caps; |
274 |
- cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH; |
275 |
- |
276 |
--- |
277 |
-1.7.0.4 |
278 |
- |
279 |
|
280 |
diff --git a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch b/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch |
281 |
deleted file mode 100644 |
282 |
index d06ae01..0000000 |
283 |
--- a/net-fs/cifs-utils/files/cifs-utils-5.9-set-parsed_info-got_user-when-a-cred-file.patch |
284 |
+++ /dev/null |
285 |
@@ -1,31 +0,0 @@ |
286 |
-From: Jeff Layton <jlayton@×××××.org> |
287 |
-Date: Sun, 13 Jan 2013 03:02:01 +0000 (-0500) |
288 |
-Subject: mount.cifs: set parsed_info->got_user when a cred file supplies a username |
289 |
-X-Git-Url: https://gitweb.samba.org/?p=cifs-utils.git;a=commitdiff_plain;h=1a01f7c4b90695211d12291d7a24bec05b1f2922 |
290 |
- |
291 |
-mount.cifs: set parsed_info->got_user when a cred file supplies a username |
292 |
- |
293 |
-commit 85d18a1ed introduced a regression when using a credentials file. |
294 |
-It set the username in the parsed mount info properly, but didn't set |
295 |
-the "got_user" flag in it. |
296 |
- |
297 |
-Also, fix an incorrect strlcpy length specifier in open_cred_file. |
298 |
- |
299 |
-Reported-by: "Mantas M." <grawity@×××××.com> |
300 |
-Signed-off-by: Jeff Layton <jlayton@×××××.org> |
301 |
---- |
302 |
- |
303 |
-diff --git a/mount.cifs.c b/mount.cifs.c |
304 |
-index c7c3055..40b77e9 100644 |
305 |
---- a/mount.cifs.c |
306 |
-+++ b/mount.cifs.c |
307 |
-@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name, |
308 |
- switch (parse_cred_line(line_buf + i, &temp_val)) { |
309 |
- case CRED_USER: |
310 |
- strlcpy(parsed_info->username, temp_val, |
311 |
-- sizeof(parsed_info->domain)); |
312 |
-+ sizeof(parsed_info->username)); |
313 |
-+ parsed_info->got_user = 1; |
314 |
- break; |
315 |
- case CRED_PASS: |
316 |
- i = set_password(parsed_info, temp_val); |