Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Dec 2013 09:36:49 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335371 - in head/lang/python32: . files
Message-ID:  <201312010936.rB19an0n069473@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Sun Dec  1 09:36:49 2013
New Revision: 335371
URL: http://svnweb.freebsd.org/changeset/ports/335371

Log:
  lang/python32: Backport upstream kevent fix
  
  Backport a change fixing use of kevent flags that was merged to Python
  default, 3.3 and 2.7 branches, but not 3.2 and 3.1 that were in
  security-only mode at the time of commit. [1]
  
  - Add patch: patch-Modules__selectmodule.c
  
  References:
  
  [1] Issue #11973: Fix a problem in kevent. The flags and fflags fields
      are now properly handled as unsigned. [#11973]
  
      http://bugs.python.org/issue11973
      http://hg.python.org/cpython/rev/8345fb616cbd
  
  While I'm here:
  
  - Add LICENSE (PSFL)
  - Clean up, reorganise, sort & whitespace align sections
  
  PR:		ports/156759
  Submitted by:	David Naylor <naylor.b.david@gmail.com>
  Reviewed by:	mva

Added:
  head/lang/python32/files/patch-Modules__selectmodule.c   (contents, props changed)
Modified:
  head/lang/python32/Makefile

Modified: head/lang/python32/Makefile
==============================================================================
--- head/lang/python32/Makefile	Sun Dec  1 09:34:20 2013	(r335370)
+++ head/lang/python32/Makefile	Sun Dec  1 09:36:49 2013	(r335371)
@@ -1,35 +1,40 @@
 # $FreeBSD$
 
-PORTNAME=	python32
-PORTVERSION=	3.2.5
-PORTREVISION=	3
-CATEGORIES=	lang python ipv6
-MASTER_SITES=	PYTHON
+PORTNAME=		python32
+PORTVERSION=		3.2.5
+PORTREVISION=		4
+CATEGORIES=		lang python ipv6
+MASTER_SITES=		PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
-DISTFILES=	${PYTHON_DISTFILE}
+DISTFILES=		${PYTHON_DISTFILE}
+DIST_SUBDIR=		python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Interpreted object-oriented programming language
 
-DIST_SUBDIR=	python
-WRKSRC=		${PYTHON_WRKSRC}/portbld.static
-PATCH_WRKSRC=	${PYTHON_WRKSRC}
-GNU_CONFIGURE=	yes
+LICENSE=	PSFL
+
+GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure # must be relative
-CONFIGURE_ENV=	OPT="" SVNVERSION="echo freebsd"
-MAKE_ENV=	VPATH="${PYTHON_WRKSRC}"
-USE_LDCONFIG=	yes
+CONFIGURE_ENV=		OPT="" SVNVERSION="echo freebsd"
+MAKE_ENV=		VPATH="${PYTHON_WRKSRC}"
+
 INSTALL_TARGET=	altinstall
 MAN1=		${PYTHON_VERSION}.1
 
+USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_XZ=		yes
-PYTHON_VERSION=	python3.2
+
+PYTHON_VERSION=		python3.2
 PYTHON_NO_DEPENDS=	yes
 
+WRKSRC=		${PYTHON_WRKSRC}/portbld.static
+SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
+PATCH_WRKSRC=	${PYTHON_WRKSRC}
+
 PYABIVER=	# default empty, for after appending
 
-SHARED_WRKSRC=	${PYTHON_WRKSRC}/portbld.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//} \
 		PYMAJOR=${PYTHON_MAJOR_VER} \
 		PYVER_WITHPAT=${PORTVERSION:S/.rc/rc/} \

Added: head/lang/python32/files/patch-Modules__selectmodule.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/python32/files/patch-Modules__selectmodule.c	Sun Dec  1 09:36:49 2013	(r335371)
@@ -0,0 +1,11 @@
+--- ./Modules/selectmodule.c.orig	2013-11-30 23:03:20.030929248 +1100
++++ ./Modules/selectmodule.c	2013-11-30 23:03:56.111022639 +1100
+@@ -1246,7 +1246,7 @@
+     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" INTPTRT_FMT_UNIT UINTPTRT_FMT_UNIT ":kevent";
+ 
+     EV_SET(&(self->e), 0, EVFILT_READ, EV_ADD, 0, 0, 0); /* defaults */
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312010936.rB19an0n069473>