Trivial update to 3.3.2. OK? f.-
Index: Makefile =================================================================== RCS file: /cvs/ports/lang/python/3.3/Makefile,v retrieving revision 1.4 diff -p -u -r1.4 Makefile --- Makefile 18 May 2013 04:13:16 -0000 1.4 +++ Makefile 18 May 2013 04:50:11 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.4 2013/05/18 04:13:16 fgsch Exp $ VERSION = 3.3 -REVISION = 1 -PATCHLEVEL = .1 +PATCHLEVEL = .2 SHARED_LIBS = python3.3m 0.0 VERSION_SPEC = >=3.3,<3.4 Index: distinfo =================================================================== RCS file: /cvs/ports/lang/python/3.3/distinfo,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 distinfo --- distinfo 28 Apr 2013 01:29:57 -0000 1.1.1.1 +++ distinfo 18 May 2013 04:50:11 -0000 @@ -1,2 +1,2 @@ -SHA256 (Python-3.3.1.tgz) = Zx3DYy8xHmPGczcDqgoa2QyZJ33cgpnTnkh3GKUDGb0= -SIZE (Python-3.3.1.tgz) = 16521332 +SHA256 (Python-3.3.2.tgz) = 3mZPyjuOCrIPtCv+0aNuJvEW8YU+iK2hLbyTh2EDYXI= +SIZE (Python-3.3.2.tgz) = 16530940 Index: files/CHANGES.OpenBSD =================================================================== RCS file: /cvs/ports/lang/python/3.3/files/CHANGES.OpenBSD,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 CHANGES.OpenBSD --- files/CHANGES.OpenBSD 28 Apr 2013 01:29:57 -0000 1.1.1.1 +++ files/CHANGES.OpenBSD 18 May 2013 04:50:12 -0000 @@ -7,7 +7,5 @@ of changes made to this version of Pytho 2. INSTSONAME could be incorrect, configure.ac was patched to fix it. -3. select.kevent has been modified to work with OpenBSD. - These changes are available in the OpenBSD CVS repository <http://www.openbsd.org/anoncvs.html> in ports/lang/python/3.3. Index: patches/patch-Lib_test_test_kqueue_py =================================================================== RCS file: patches/patch-Lib_test_test_kqueue_py diff -N patches/patch-Lib_test_test_kqueue_py --- patches/patch-Lib_test_test_kqueue_py 28 Apr 2013 01:29:57 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-Lib_test_test_kqueue_py,v 1.1.1.1 2013/04/28 01:29:57 fgsch Exp $ ---- Lib/test/test_kqueue.py.orig Wed Apr 17 17:41:28 2013 -+++ Lib/test/test_kqueue.py Wed Apr 17 17:41:40 2013 -@@ -101,7 +101,8 @@ class TestKQueue(unittest.TestCase): - pass # FreeBSD doesn't raise an exception here - server, addr = serverSocket.accept() - -- if sys.platform.startswith("darwin"): -+ if sys.platform.startswith("darwin") or \ -+ sys.platform.startswith("openbsd"): - flags = select.KQ_EV_ADD | select.KQ_EV_ENABLE - else: - flags = 0 Index: patches/patch-Modules_selectmodule_c =================================================================== RCS file: /cvs/ports/lang/python/3.3/patches/patch-Modules_selectmodule_c,v retrieving revision 1.2 diff -p -u -r1.2 patch-Modules_selectmodule_c --- patches/patch-Modules_selectmodule_c 18 May 2013 04:13:16 -0000 1.2 +++ patches/patch-Modules_selectmodule_c 18 May 2013 04:50:12 -0000 @@ -1,7 +1,4 @@ $OpenBSD: patch-Modules_selectmodule_c,v 1.2 2013/05/18 04:13:16 fgsch Exp $ - -See http://bugs.python.org/issue12181 for details. - --- Modules/selectmodule.c.orig Sat Apr 6 08:41:54 2013 +++ Modules/selectmodule.c Mon May 13 04:45:07 2013 @@ -235,11 +235,13 @@ select_select(PyObject *self, PyObject *args) @@ -19,78 +16,3 @@ See http://bugs.python.org/issue12181 fo tv.tv_usec = tv_usec; #endif if (tv.tv_sec < 0) { -@@ -1571,6 +1573,23 @@ static PyTypeObject kqueue_queue_Type; - # error uintptr_t does not match int, long, or long long! - #endif - -+/* -+ * kevent is not standard and its members vary across BSDs. -+ */ -+#if !defined(__OpenBSD__) -+# define IDENT_TYPE T_UINTPTRT -+# define IDENT_CAST Py_intptr_t -+# define DATA_TYPE T_INTPTRT -+# define DATA_FMT_UNIT INTPTRT_FMT_UNIT -+# define IDENT_AsType PyLong_AsUintptr_t -+#else -+# define IDENT_TYPE T_UINT -+# define IDENT_CAST int -+# define DATA_TYPE T_INT -+# define DATA_FMT_UNIT "i" -+# define IDENT_AsType PyLong_AsUnsignedLong -+#endif -+ - /* Unfortunately, we can't store python objects in udata, because - * kevents in the kernel can be removed without warning, which would - * forever lose the refcount on the object stored with it. -@@ -1578,11 +1597,11 @@ static PyTypeObject kqueue_queue_Type; - - #define KQ_OFF(x) offsetof(kqueue_event_Object, x) - static struct PyMemberDef kqueue_event_members[] = { -- {"ident", T_UINTPTRT, KQ_OFF(e.ident)}, -+ {"ident", IDENT_TYPE, KQ_OFF(e.ident)}, - {"filter", T_SHORT, KQ_OFF(e.filter)}, - {"flags", T_USHORT, KQ_OFF(e.flags)}, - {"fflags", T_UINT, KQ_OFF(e.fflags)}, -- {"data", T_INTPTRT, KQ_OFF(e.data)}, -+ {"data", DATA_TYPE, KQ_OFF(e.data)}, - {"udata", T_UINTPTRT, KQ_OFF(e.udata)}, - {NULL} /* Sentinel */ - }; -@@ -1608,7 +1627,7 @@ kqueue_event_init(kqueue_event_Object *self, PyObject - PyObject *pfd; - static char *kwlist[] = {"ident", "filter", "flags", "fflags", - "data", "udata", NULL}; -- static char *fmt = "O|hhi" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent"; -+ static char *fmt = "O|hhi" DATA_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent"; - - EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */ - -@@ -1618,8 +1637,12 @@ kqueue_event_init(kqueue_event_Object *self, PyObject - return -1; - } - -- if (PyLong_Check(pfd)) { -- self->e.ident = PyLong_AsUintptr_t(pfd); -+ if (PyLong_Check(pfd) -+#if IDENT_TYPE == T_UINT -+ && PyLong_AsUnsignedLong(pfd) < UINT_MAX -+#endif -+ ) { -+ self->e.ident = IDENT_AsType(pfd); - } - else { - self->e.ident = PyObject_AsFileDescriptor(pfd); -@@ -1647,10 +1670,10 @@ kqueue_event_richcompare(kqueue_event_Object *s, kqueu - Py_TYPE(s)->tp_name, Py_TYPE(o)->tp_name); - return NULL; - } -- if (((result = s->e.ident - o->e.ident) == 0) && -+ if (((result = (IDENT_CAST)(s->e.ident - o->e.ident)) == 0) && - ((result = s->e.filter - o->e.filter) == 0) && - ((result = s->e.flags - o->e.flags) == 0) && -- ((result = s->e.fflags - o->e.fflags) == 0) && -+ ((result = (int)(s->e.fflags - o->e.fflags)) == 0) && - ((result = s->e.data - o->e.data) == 0) && - ((result = s->e.udata - o->e.udata) == 0) - ) { Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/lang/python/3.3/pkg/PLIST-main,v retrieving revision 1.2 diff -p -u -r1.2 PLIST-main --- pkg/PLIST-main 18 May 2013 04:13:16 -0000 1.2 +++ pkg/PLIST-main 18 May 2013 04:50:12 -0000 @@ -651,6 +651,8 @@ lib/python3.3/ctypes/test/__pycache__/te lib/python3.3/ctypes/test/__pycache__/test_varsize_struct.cpython-33.pyo lib/python3.3/ctypes/test/__pycache__/test_win32.cpython-33.pyc lib/python3.3/ctypes/test/__pycache__/test_win32.cpython-33.pyo +lib/python3.3/ctypes/test/__pycache__/test_wintypes.cpython-33.pyc +lib/python3.3/ctypes/test/__pycache__/test_wintypes.cpython-33.pyo lib/python3.3/ctypes/test/runtests.py lib/python3.3/ctypes/test/test_anon.py lib/python3.3/ctypes/test/test_array_in_pointer.py @@ -704,6 +706,7 @@ lib/python3.3/ctypes/test/test_unicode.p lib/python3.3/ctypes/test/test_values.py lib/python3.3/ctypes/test/test_varsize_struct.py lib/python3.3/ctypes/test/test_win32.py +lib/python3.3/ctypes/test/test_wintypes.py lib/python3.3/ctypes/util.py lib/python3.3/ctypes/wintypes.py lib/python3.3/curses/ @@ -1640,9 +1643,9 @@ lib/python3.3/lib-dynload/xxlimited.so lib/python3.3/lib-dynload/zlib.so lib/python3.3/lib2to3/ lib/python3.3/lib2to3/Grammar.txt -lib/python3.3/lib2to3/Grammar3.3.1.final.0.pickle +lib/python3.3/lib2to3/Grammar3.3.2.final.0.pickle lib/python3.3/lib2to3/PatternGrammar.txt -lib/python3.3/lib2to3/PatternGrammar3.3.1.final.0.pickle +lib/python3.3/lib2to3/PatternGrammar3.3.2.final.0.pickle lib/python3.3/lib2to3/__init__.py lib/python3.3/lib2to3/__main__.py lib/python3.3/lib2to3/__pycache__/ Index: pkg/PLIST-tests =================================================================== RCS file: /cvs/ports/lang/python/3.3/pkg/PLIST-tests,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 PLIST-tests --- pkg/PLIST-tests 28 Apr 2013 01:29:59 -0000 1.1.1.1 +++ pkg/PLIST-tests 18 May 2013 04:50:13 -0000 @@ -814,6 +814,8 @@ lib/python3.3/test/__pycache__/test_wsgi lib/python3.3/test/__pycache__/test_wsgiref.cpython-33.pyo lib/python3.3/test/__pycache__/test_xdrlib.cpython-33.pyc lib/python3.3/test/__pycache__/test_xdrlib.cpython-33.pyo +lib/python3.3/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyc +lib/python3.3/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyo lib/python3.3/test/__pycache__/test_xml_etree.cpython-33.pyc lib/python3.3/test/__pycache__/test_xml_etree.cpython-33.pyo lib/python3.3/test/__pycache__/test_xml_etree_c.cpython-33.pyc @@ -1862,6 +1864,7 @@ lib/python3.3/test/test_winsound.py lib/python3.3/test/test_with.py lib/python3.3/test/test_wsgiref.py lib/python3.3/test/test_xdrlib.py +lib/python3.3/test/test_xml_dom_minicompat.py lib/python3.3/test/test_xml_etree.py lib/python3.3/test/test_xml_etree_c.py lib/python3.3/test/test_xmlrpc.py
