Attachment #209878 for bug #242587

View | Details | Raw Unified | Return to bug 242587
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	llfuse
PORTVERSION=	1.3.6
PORTREVISION=	4
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}


LICENSE=	LGPL20+

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}

USES=		compiler:c++11-lang fuse pkgconfig python tar:bz2
USE_PYTHON=	autoplist distutils


Lines 1-3 Link Here

(-)devel/py-llfuse/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1491213962	1	TIMESTAMP = 1576102973
2	SHA256 (llfuse-1.2.tar.bz2) = 24d3ff1dd793db0c03cbbfb298df94a369ecdce5831f8f175ec12d647ad01586	2	SHA256 (llfuse-1.3.6.tar.bz2) = 31a267f7ec542b0cd62e0f1268e1880fdabf3f418ec9447def99acfa6eff2ec9
3	SIZE (llfuse-1.2.tar.bz2) = 327967	3	SIZE (llfuse-1.3.6.tar.bz2) = 361750




--- setup.py.orig	2017-01-22 22:24:10 UTC
+++ setup.py
@@ -80,24 +80,24 @@ def main():
     # We may have unused functions if we compile for older FUSE versions
     compile_args.append('-Wno-unused-function')
 
-    # Value-changing conversions should always be explicit.
-    compile_args.append('-Werror=conversion')
-
-    # Note that (i > -1) is false if i is unsigned (-1 will be converted to
-    # a large positive value). We certainly don't want to do this by
-    # accident.
-    compile_args.append('-Werror=sign-compare')
-
     # Enable all fatal warnings only when compiling from Mercurial tip.
     # (otherwise we break forward compatibility because compilation with newer
     # compiler may fail if additional warnings are added)
-    if DEVELOPER_MODE:
+    if 0:
         compile_args.append('-Werror')
         compile_args.append('-Wfatal-errors')
 
         # Unreachable code is expected because we need to support multiple
         # platforms and architectures.
         compile_args.append('-Wno-error=unreachable-code')
+
+        # Value-changing conversions should always be explicit.
+        compile_args.append('-Werror=conversion')
+
+        # Note that (i > -1) is false if i is unsigned (-1 will be converted to
+        # a large positive value). We certainly don't want to do this by
+        # accident.
+        compile_args.append('-Werror=sign-compare')
 
     # http://bugs.python.org/issue7576
     if sys.version_info[0] == 3 and sys.version_info[1] < 2:




--- setup.py.orig	2017-01-22 22:24:10 UTC
+++ setup.py
@@ -80,24 +80,24 @@ def main():
     # We may have unused functions if we compile for older FUSE versions
     compile_args.append('-Wno-unused-function')
 
-    # Value-changing conversions should always be explicit.
-    compile_args.append('-Werror=conversion')
-
-    # Note that (i > -1) is false if i is unsigned (-1 will be converted to
-    # a large positive value). We certainly don't want to do this by
-    # accident.
-    compile_args.append('-Werror=sign-compare')
-
     # Enable all fatal warnings only when compiling from Mercurial tip.
     # (otherwise we break forward compatibility because compilation with newer
     # compiler may fail if additional warnings are added)
-    if DEVELOPER_MODE:
+    if 0:
         compile_args.append('-Werror')
         compile_args.append('-Wfatal-errors')
 
         # Unreachable code is expected because we need to support multiple
         # platforms and architectures.
         compile_args.append('-Wno-error=unreachable-code')
+
+        # Value-changing conversions should always be explicit.
+        compile_args.append('-Werror=conversion')
+
+        # Note that (i > -1) is false if i is unsigned (-1 will be converted to
+        # a large positive value). We certainly don't want to do this by
+        # accident.
+        compile_args.append('-Werror=sign-compare')
 
     # http://bugs.python.org/issue7576
     if sys.version_info[0] == 3 and sys.version_info[1] < 2:

Lines 1-11 Link Here

(-)devel/py-llfuse/files/patch-src_llfuse.c (-11 lines)
1	--- src/llfuse.c.orig 2016-03-20 11:33:13 UTC
2	+++ src/llfuse.c
3	@@ -33573,7 +33573,7 @@ static PyObject *__pyx_pw_6llfuse_5setxa
4	}
5
6	static PyObject __pyx_pf_6llfuse_4setxattr(CYTHON_UNUSED PyObject __pyx_self, PyObject __pyx_v_path, PyObject __pyx_v_name, PyObject __pyx_v_value, PyObject __pyx_v_namespace) {
7	- int __pyx_v_ret;
8	+ ssize_t __pyx_v_ret;
9	Py_ssize_t __pyx_v_len_;
10	char *__pyx_v_cvalue;
11	char *__pyx_v_cpath;




--- src/xattr.h.orig	2016-02-23 17:14:08 UTC
+++ src/xattr.h
@@ -37,7 +37,7 @@ static ssize_t getxattr_p (char *path, c
                            UNUSED int namespace) {
     return getxattr(path, name, value, size);
 }
-static int setxattr_p (char *path, char *name, void *value, size_t size,
+static ssize_t setxattr_p (char *path, char *name, void *value, size_t size,
                        UNUSED int namespace) {
     return setxattr(path, name, value, size, 0);
 }
@@ -81,7 +81,7 @@ static ssize_t getxattr_p (char *path, c
     return ret;
 }
 
-static int setxattr_p (char *path, char *name, void *value, size_t size,
+static ssize_t setxattr_p (char *path, char *name, void *value, size_t size,
                        int namespace) {
     return extattr_set_file(path, namespace, name, value, size);
 }

Return to bug 242587

Lines 1-8 Link Here

(-)devel/py-llfuse/Makefile (-2 / +3 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= llfuse	3	PORTNAME= llfuse
4	PORTVERSION= 1.2	4	PORTVERSION= 1.3.6
5	PORTREVISION= 4
6	CATEGORIES= devel python	5	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 12-17 Link Here
12		11
13	LICENSE= LGPL20+	12	LICENSE= LGPL20+
14		13
		14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
		15
15	USES= compiler:c++11-lang fuse pkgconfig python tar:bz2	16	USES= compiler:c++11-lang fuse pkgconfig python tar:bz2
16	USE_PYTHON= autoplist distutils	17	USE_PYTHON= autoplist distutils
17		18

Lines 1-36 Link Here

(-)devel/py-llfuse/files/files/patch-setup.py (-36 lines)
1	--- setup.py.orig 2017-01-22 22:24:10 UTC
2	+++ setup.py
3	@@ -80,24 +80,24 @@ def main():
4	# We may have unused functions if we compile for older FUSE versions
5	compile_args.append('-Wno-unused-function')
6
7	- # Value-changing conversions should always be explicit.
8	- compile_args.append('-Werror=conversion')
9	-
10	- # Note that (i > -1) is false if i is unsigned (-1 will be converted to
11	- # a large positive value). We certainly don't want to do this by
12	- # accident.
13	- compile_args.append('-Werror=sign-compare')
14	-
15	# Enable all fatal warnings only when compiling from Mercurial tip.
16	# (otherwise we break forward compatibility because compilation with newer
17	# compiler may fail if additional warnings are added)
18	- if DEVELOPER_MODE:
19	+ if 0:
20	compile_args.append('-Werror')
21	compile_args.append('-Wfatal-errors')
22
23	# Unreachable code is expected because we need to support multiple
24	# platforms and architectures.
25	compile_args.append('-Wno-error=unreachable-code')
26	+
27	+ # Value-changing conversions should always be explicit.
28	+ compile_args.append('-Werror=conversion')
29	+
30	+ # Note that (i > -1) is false if i is unsigned (-1 will be converted to
31	+ # a large positive value). We certainly don't want to do this by
32	+ # accident.
33	+ compile_args.append('-Werror=sign-compare')
34
35	# http://bugs.python.org/issue7576
36	if sys.version_info[0] == 3 and sys.version_info[1] < 2:

Lines 1-36 Link Here

(-)devel/py-llfuse/files/patch-setup.py (-36 lines)
1	--- setup.py.orig 2017-01-22 22:24:10 UTC
2	+++ setup.py
3	@@ -80,24 +80,24 @@ def main():
4	# We may have unused functions if we compile for older FUSE versions
5	compile_args.append('-Wno-unused-function')
6
7	- # Value-changing conversions should always be explicit.
8	- compile_args.append('-Werror=conversion')
9	-
10	- # Note that (i > -1) is false if i is unsigned (-1 will be converted to
11	- # a large positive value). We certainly don't want to do this by
12	- # accident.
13	- compile_args.append('-Werror=sign-compare')
14	-
15	# Enable all fatal warnings only when compiling from Mercurial tip.
16	# (otherwise we break forward compatibility because compilation with newer
17	# compiler may fail if additional warnings are added)
18	- if DEVELOPER_MODE:
19	+ if 0:
20	compile_args.append('-Werror')
21	compile_args.append('-Wfatal-errors')
22
23	# Unreachable code is expected because we need to support multiple
24	# platforms and architectures.
25	compile_args.append('-Wno-error=unreachable-code')
26	+
27	+ # Value-changing conversions should always be explicit.
28	+ compile_args.append('-Werror=conversion')
29	+
30	+ # Note that (i > -1) is false if i is unsigned (-1 will be converted to
31	+ # a large positive value). We certainly don't want to do this by
32	+ # accident.
33	+ compile_args.append('-Werror=sign-compare')
34
35	# http://bugs.python.org/issue7576
36	if sys.version_info[0] == 3 and sys.version_info[1] < 2:

Lines 1-20 Link Here

(-)devel/py-llfuse/files/patch-src_xattr.h (-20 lines)
1	--- src/xattr.h.orig 2016-02-23 17:14:08 UTC
2	+++ src/xattr.h
3	@@ -37,7 +37,7 @@ static ssize_t getxattr_p (char *path, c
4	UNUSED int namespace) {
5	return getxattr(path, name, value, size);
6	}
7	-static int setxattr_p (char path, char name, void *value, size_t size,
8	+static ssize_t setxattr_p (char path, char name, void *value, size_t size,
9	UNUSED int namespace) {
10	return setxattr(path, name, value, size, 0);
11	}
12	@@ -81,7 +81,7 @@ static ssize_t getxattr_p (char *path, c
13	return ret;
14	}
15
16	-static int setxattr_p (char path, char name, void *value, size_t size,
17	+static ssize_t setxattr_p (char path, char name, void *value, size_t size,
18	int namespace) {
19	return extattr_set_file(path, namespace, name, value, size);
20	}