summaryrefslogtreecommitdiffstats
path: root/package/lua-flu/0001-use-system-xattr-h.patch
blob: 1cd44b46175882133e3a171c9d131a2e6b443241 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
Use system <sys/xattr.h>

The one from attr is no longer installed with latest version.

ENOATTR was in fact defined as ENODATA, so switch to using that instead.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

---
Upstream status: merged:
    https://bitbucket.org/doub/flu/pull-requests/1
    https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70


diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
@@ -327,7 +327,7 @@
 				name = "fs.getxattr";
 				parameters = {"path", "name"};
 				results = {"value"};
-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
+				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
 			},
 			{
 				name = "fs.listxattr";
@@ -338,7 +338,7 @@
 			{
 				name = "fs.removexattr";
 				parameters = {"path", "name"};
-				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
+				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
 			},
 			{
 				name = "fs.opendir";
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua	2018-05-06 09:22:28.495324054 +0200
@@ -222,8 +222,8 @@
 -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs
 
 function luafs.getxattr(path, name)
-	local attrs = assert(xattrs[path], errno.ENOATTR)
-	return assert(attrs[name], errno.ENOATTR)
+	local attrs = assert(xattrs[path], errno.ENODATA)
+	return assert(attrs[name], errno.ENODATA)
 end
 
 function luafs.setxattr(path, name, value, flags)
@@ -236,7 +236,7 @@
 end
 
 function luafs.removexattr(path, name)
-	local attrs = assert(xattrs[path], errno.ENOATTR)
+	local attrs = assert(xattrs[path], errno.ENODATA)
 	attrs[name] = nil
 	if next(attrs)==nil then
 		xattrs[path] = nil
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html	2018-05-06 09:22:28.499324049 +0200
@@ -347,7 +347,7 @@
 		<div class="function">
 		<h3><a name="fs.getxattr"><code>value = fs.getxattr (path, name)</code></a></h3>
 
-<p>Get an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
+<p>Get an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
 		</div>
 
 		<div class="function">
@@ -359,7 +359,7 @@
 		<div class="function">
 		<h3><a name="fs.removexattr"><code>fs.removexattr (path, name)</code></a></h3>
 
-<p>Remove an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
+<p>Remove an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
 		</div>
 
 		<div class="function">
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c	2018-05-06 09:23:06.323282527 +0200
@@ -3,7 +3,7 @@
 #include <lua.h>
 #include <lauxlib.h>
 #include <stdlib.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include "compat.h"
 
 /****************************************************************************/
@@ -103,7 +103,7 @@
 	REGISTER_ERROR(EDOM)
 	REGISTER_ERROR(ERANGE)
 	REGISTER_ERROR(ENOSYS)
-	REGISTER_ERROR(ENOATTR)
+	REGISTER_ERROR(ENODATA)
 	#undef REGISTER_ERROR
 }
 
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:22:04.123351349 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
@@ -14,7 +14,7 @@
 		library = 'fuse',
 	},
 	ATTR = {
-		header = 'attr/xattr.h',
+		header = 'sys/xattr.h',
 	},
 }
 dependencies = {
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c	2018-05-06 09:23:06.323282527 +0200
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <string.h>
 #include <fuse.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <lua.h>
 #include <lauxlib.h>
 
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in	2018-05-06 09:23:06.323282527 +0200
@@ -14,7 +14,7 @@
 		library = 'fuse',
 	},
 	ATTR = {
-		header = 'attr/xattr.h',
+		header = 'sys/xattr.h',
 	},
 }
 dependencies = {
diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md
--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md	2015-03-31 18:54:19.000000000 +0200
+++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md	2018-05-06 09:22:28.495324054 +0200
@@ -345,7 +345,7 @@
 
 ### `value = fs.getxattr (path, name)`
 
-Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
+Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
 
 ---
 
@@ -357,7 +357,7 @@
 
 ### `fs.removexattr (path, name)`
 
-Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
+Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
 
 ---
 
diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec
--- lua-flu-20150331-1.orig/flu-20150331-1.rockspec	2015-04-02 23:44:11.000000000 +0200
+++ lua-flu-20150331-1/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
@@ -14,7 +14,7 @@
 		library = 'fuse',
 	},
 	ATTR = {
-		header = 'attr/xattr.h',
+		header = 'sys/xattr.h',
 	},
 }
 dependencies = {
OpenPOWER on IntegriCloud