Re: ports/156759: commit references a PR

2013-12-01 Thread dfilter service
The following reply was made to PR ports/156759; it has been noted by GNATS.

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:  
Subject: Re: ports/156759: commit references a PR
Date: Sun,  1 Dec 2013 09:34:28 + (UTC)

 Author: koobs
 Date: Sun Dec  1 09:34:20 2013
 New Revision: 335370
 URL: http://svnweb.freebsd.org/changeset/ports/335370
 
 Log:
   lang/python31: Backport upstream kevent fix and use libffi from ports
   
   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
   
   Based on patch by: David Naylor 
   
   Unconditionally use libffi from ports because the Python 3.1 branch was
   closed for maintenance when the import of libffi 3.0.13 took place. This
   fixes _ctypes module build failure on i386. [2]
   
   - Add global CONFIGURE_ARGS and LIB_DEPENDS
   
   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
   
   [2] Fixes Issue #17192: Update the ctypes module's libffi to v3.0.13.
   This specifically addresses a stack misalignment issue on x86 and
   issues on some more recent platforms. [#17192]
   
   http://bugs.python.org/issue17192
   http://hg.python.org/cpython/rev/a94b3b4599f1
   http://hg.python.org/cpython/rev/688bc0b44d96
   
   While I'm here:
   
   - Add LICENSE (PSFL)
   - Clean up & whitespace alignment
   
   PR:  ports/156759 [1]
   Reviewed by: mva
 
 Added:
   head/lang/python31/files/patch-Modules__selectmodule.c   (contents, props 
changed)
 Modified:
   head/lang/python31/Makefile
 
 Modified: head/lang/python31/Makefile
 ==
 --- head/lang/python31/MakefileSun Dec  1 09:16:16 2013
(r335369)
 +++ head/lang/python31/MakefileSun Dec  1 09:34:20 2013
(r335370)
 @@ -1,24 +1,30 @@
  # $FreeBSD$
  
 -PORTNAME= python31
 -PORTVERSION=  3.1.5
 -PORTREVISION= 5
 -CATEGORIES=   lang python ipv6
 -MASTER_SITES= PYTHON
 +PORTNAME= python31
 +PORTVERSION=  3.1.5
 +PORTREVISION= 6
 +CATEGORIES=   lang python ipv6
 +MASTER_SITES= PYTHON
  MASTER_SITE_SUBDIR=   ${PYTHON_MASTER_SITE_SUBDIR}
 -DISTFILES=${PYTHON_DISTFILE}
 +DISTFILES=${PYTHON_DISTFILE}
 +DIST_SUBDIR=  python
  
  MAINTAINER=   pyt...@freebsd.org
  COMMENT=  Interpreted object-oriented programming language
  
 -DEPRECATED=   Python 3.1 will be end-of-life soon, please migrate to 
lang/python33
 -EXPIRATION_DATE=2014-06-01
 +LICENSE=  PSFL
  
 -DIST_SUBDIR=  python
 -GNU_CONFIGURE=yes
 +LIB_DEPENDS=  libffi.so:${PORTSDIR}/devel/libffi
 +
 +DEPRECATED=   Python 3.1 will be end-of-life soon, please migrate to 
lang/python33
 +EXPIRATION_DATE=  2014-06-01
 +
 +GNU_CONFIGURE=yes
  CONFIGURE_SCRIPT= ../configure # must be relative
 -CONFIGURE_ENV=OPT="" SVNVERSION="echo freebsd" ac_cv_opt_olimit_ok=no
 -MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
 +CONFIGURE_ARGS=   --with-system-ffi
 +CONFIGURE_ENV=OPT="" SVNVERSION="echo freebsd" 
ac_cv_opt_olimit_ok=no
 +MAKE_ENV= VPATH="${PYTHON_WRKSRC}"
 +
  INSTALL_TARGET=   altinstall
  MAN1= ${PYTHON_VERSION}.1
  
 @@ -26,7 +32,7 @@ USE_LDCONFIG=yes
  USE_PYTHON=   yes
  USE_XZ=   yes
  
 -PYTHON_VERSION=   python3.1
 +PYTHON_VERSION=   python3.1
  PYTHON_NO_DEPENDS=yes
  
  WRKSRC=   ${PYTHON_WRKSRC}/portbld.static
 @@ -73,14 +79,14 @@ CONFIGURE_ENV+=ac_cv_lib_intl_textdomai
  .include 
  
  .if ${PORT_OPTIONS:MTHREADS}
 -PLIST_SUB+=   THREADS=""
 +PLIST_SUB+=   THREADS=""
  CONFIGURE_ARGS+=  --with-threads
  CFLAGS+=  ${PTHREAD_CFLAGS}
  LDFLAGS+= ${PTHREAD_LIBS}
 -.else # defined(WITHOUT_THREADS)
 -PLIST_SUB+=   THREADS="@comment "
 +.else
 +PLIST_SUB+=   THREADS="@comment "
  CONFIGURE_ARGS+=  --without-threads
 -.endif # !defined(WITHOUT_THREADS)
 +.endif
  
  .if ${PORT_OPTIONS:MUCS4}
  CONFIGURE_ARGS+=  --with-wide-unicode
 
 Added: head/lang/python31/files/patch-Modules__selectmodule.c
 ==
 --- /dev/null  00:00:00 1970   (empty, because file is newly added)
 +++ head/lang/python31/files/patch-Modules__selectmodule.c Sun Dec  1 
09:34:20 2013(r335370)
 @@ -0,0 +1,11 @@
 +--- ./Modules/selectmodule.c.orig 2013-11-30 23:09:48.211062086 +1100
  ./Modules/selectmodule.c  2013-11-30 23:53:51.740895007 +1100
 +@@ -1229,7 +1229,7 @@
 + 
 + EV_SET(&(self->e), 0, EVFILT_R

Re: ports/156759: commit references a PR

2013-12-01 Thread dfilter service
The following reply was made to PR ports/156759; it has been noted by GNATS.

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:  
Subject: Re: ports/156759: commit references a PR
Date: Sun,  1 Dec 2013 09:36:56 + (UTC)

 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 
   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/MakefileSun Dec  1 09:34:20 2013
(r335370)
 +++ head/lang/python32/MakefileSun 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=   pyt...@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 */
 + 
 ___
 svn-ports-...@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org"
 
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"


Re: ports/156759: [patch] lang/python: kevent does not accept KQ_NOTE_EXIT (and other (f)flags)

2013-12-01 Thread Kubilay Kocak
The following reply was made to PR ports/156759; it has been noted by GNATS.

From: Kubilay Kocak 
To: bug-follo...@freebsd.org, naylor.b.da...@gmail.com
Cc:  
Subject: Re: ports/156759: [patch] lang/python: kevent does not accept 
KQ_NOTE_EXIT
 (and other (f)flags)
Date: Sun, 01 Dec 2013 21:18:56 +1100

 The last two commits now bring this 1.5 year old PR and journey to a close.
 
 David, a specific thank you for originally submitting this upstream and
 then into a PR with a patch. Apologies it took so long to get resolved.
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"


Re: ports/156759: [patch] lang/python: kevent does not accept KQ_NOTE_EXIT (and other (f)flags)

2013-12-01 Thread koobs
Synopsis: [patch] lang/python: kevent does not accept KQ_NOTE_EXIT (and other 
(f)flags)

State-Changed-From-To: open->closed
State-Changed-By: koobs
State-Changed-When: Sun Dec 1 12:28:41 UTC 2013
State-Changed-Why: 
All supported Python ports now carry this fix from upstream, or maintain
a backported patch. Thanks David!

http://www.freebsd.org/cgi/query-pr.cgi?pr=156759
___
freebsd-python@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-python
To unsubscribe, send any mail to "freebsd-python-unsubscr...@freebsd.org"