Attachment #232746 for bug #262840

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

Lines 1-5 Link Here

(-)b/shells/xonsh/Makefile (-2 / +2 lines)
1	PORTNAME= xonsh	1	PORTNAME= xonsh
2	PORTVERSION= 0.7.9	2	PORTVERSION= 0.11.0
3	CATEGORIES= shells python	3	CATEGORIES= shells python
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 14-20 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLA Link Here
14		14
15	NO_ARCH= yes	15	NO_ARCH= yes
16		16
17	USES= python:3.4+	17	USES= python:3.6+
18	USE_PYTHON= distutils autoplist concurrent	18	USE_PYTHON= distutils autoplist concurrent
19		19
20	.include <bsd.port.mk>	20	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/shells/xonsh/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1537440457	1	TIMESTAMP = 1648316889
2	SHA256 (xonsh-0.7.9.tar.gz) = a90785419da7346927c51135ed4871e17862acad8be7adc557bac15e2cda4825	2	SHA256 (xonsh-0.11.0.tar.gz) = 0d9c3d9a4e8b8199ae697fbc9d1e0ae55085cdbdd4306d04813350996f9c15dc
3	SIZE (xonsh-0.7.9.tar.gz) = 833920	3	SIZE (xonsh-0.11.0.tar.gz) = 1027609




--- xonsh/xoreutils/uptime.py.orig	2018-09-05 14:16:47 UTC
+++ xonsh/xoreutils/uptime.py
@@ -100,13 +100,13 @@ def _uptime_bsd():
         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 262840

Removed Link Here

(-)a/shells/xonsh/files/patch-xonsh_xoreutils_uptime.py (-19 lines)
1	--- xonsh/xoreutils/uptime.py.orig 2018-09-05 14:16:47 UTC
2	+++ xonsh/xoreutils/uptime.py
3	@@ -100,13 +100,13 @@ def _uptime_bsd():
4	return None
5	# Determine how much space we need for the response.
6	sz = ctypes.c_uint(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)
9	if sz.value != struct.calcsize("@LL"):
10	# Unexpected, let's give up.
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:
19	-