Attachment #197066 for bug #230369

Lines 1-7 Link Here

(-)shells/xonsh/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xonsh	3	PORTNAME= xonsh
4	PORTVERSION= 0.6.0	4	PORTVERSION= 0.7.8
5	CATEGORIES= shells python	5	CATEGORIES= shells python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 9-15 Link Here
9	MAINTAINER= roberfern@gmail.com	9	MAINTAINER= roberfern@gmail.com
10	COMMENT= Python-ish BASH-wards shell	10	COMMENT= Python-ish BASH-wards shell
11		11
12	LICENSE= BSD2CLAUSE	12	LICENSE_FILE= ${WRCDIR}/license
13		13
14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}	14	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}
15		15

Lines 1-3 Link Here

(-)shells/xonsh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1511473787	1	TIMESTAMP = 1536835442
2	SHA256 (xonsh-0.6.0.tar.gz) = 19aa4c075378aef8476b8b2cdb0bea6fa5e10933163de443b958fa485e0f6dc6	2	SHA256 (xonsh-0.7.8.tar.gz) = 956c7fbf19968afaade11fa5cb627a7f2c177a9e05f8cb03f7efa86b5fe4cb08
3	SIZE (xonsh-0.6.0.tar.gz) = 652164	3	SIZE (xonsh-0.7.8.tar.gz) = 827000

Lines 1-11 Link Here

(-)shells/xonsh/files/patch-xonsh_platform.py (-6 / +6 lines)
1	--- xonsh/platform.py.orig 2017-03-12 02:36:40 UTC	1	--- xonsh/platform.py.orig 2018-09-13 12:49:50.901559000 +0200
2	+++ xonsh/platform.py	2	+++ xonsh/platform.py 2018-09-13 12:51:16.043551000 +0200
3	@@ -491,7 +491,7 @@ def LIBC():	3	@@ -571,7 +571,7 @@
4	libc = ctypes.CDLL('cygwin1.dll')	4	libc = ctypes.CDLL("msys-2.0.dll")
5	elif ON_BSD:	5	elif ON_BSD:
6	try:	6	try:
7	- libc = ctypes.CDLL('libc.so')	7	- libc = ctypes.CDLL("libc.so")
8	+ libc = ctypes.CDLL(ctypes.util.find_library("c"))	8	+ libc = ctypes.CDLL(ctypes.util.find_library("c"))
9	except AttributeError:	9	except AttributeError:
10	libc = None	10	libc = None
11	except OSError:	11	except OSError:




--- xonsh/xoreutils/uptime.py.orig	2018-09-13 12:52:13.885001000 +0200
+++ xonsh/xoreutils/uptime.py	2018-09-13 12:53:15.599470000 +0200
@@ -100,13 +100,13 @@
         return None
     # Determine how much space we need for the response.
     sz = ctypes.c_uint(0)
-    xp.LIBC.sysctlbyname("kern.boottime", None, ctypes.byref(sz), None, 0)
+    xp.LIBC.sysctlbyname(b"kern.boottime", None, ctypes.byref(sz), None, 0)
     if sz.value != struct.calcsize("@LL"):
         # Unexpected, let's give up.
         return None
     # For real now.
     buf = ctypes.create_string_buffer(sz.value)
-    xp.LIBC.sysctlbyname("kern.boottime", buf, ctypes.byref(sz), None, 0)
+    xp.LIBC.sysctlbyname(b"kern.boottime", buf, ctypes.byref(sz), None, 0)
     sec, usec = struct.unpack_from("@LL", buf.raw)
     # OS X disagrees what that second value is.
     if usec > 1000000:

Return to bug 230369

Lines 1-11 Link Here

(-)shells/xonsh/files/patch-xonsh_xoreutils_uptime.py (-6 / +13 lines)
1	--- xonsh/xoreutils/uptime.py.orig 2017-02-11 16:24:07 UTC	1	--- xonsh/xoreutils/uptime.py.orig 2018-09-13 12:52:13.885001000 +0200
2	+++ xonsh/xoreutils/uptime.py	2	+++ xonsh/xoreutils/uptime.py 2018-09-13 12:53:15.599470000 +0200
3	@@ -100,7 +100,7 @@ def _uptime_bsd():	3	@@ -100,13 +100,13 @@
4	return None	4	return None
5	# Determine how much space we need for the response.	5	# Determine how much space we need for the response.
6	sz = ctypes.c_uint(0)	6	sz = ctypes.c_uint(0)
7	- xp.LIBC.sysctlbyname('kern.boottime', None, ctypes.byref(sz), None, 0)	7	- xp.LIBC.sysctlbyname("kern.boottime", None, ctypes.byref(sz), None, 0)
8	+ xp.LIBC.sysctlbyname(b'kern.boottime', None, ctypes.byref(sz), None, 0)	8	+ xp.LIBC.sysctlbyname(b"kern.boottime", None, ctypes.byref(sz), None, 0)
9	if sz.value != struct.calcsize('@LL'):	9	if sz.value != struct.calcsize("@LL"):
10	# Unexpected, let's give up.	10	# Unexpected, let's give up.
11	return None	11	return None
		12	# For real now.
		13	buf = ctypes.create_string_buffer(sz.value)
		14	- xp.LIBC.sysctlbyname("kern.boottime", buf, ctypes.byref(sz), None, 0)
		15	+ xp.LIBC.sysctlbyname(b"kern.boottime", buf, ctypes.byref(sz), None, 0)
		16	sec, usec = struct.unpack_from("@LL", buf.raw)
		17	# OS X disagrees what that second value is.
		18	if usec > 1000000: