commit: e6f859a4f86cf5006827a1422240387de76262f3 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> AuthorDate: Mon Mar 24 13:12:46 2014 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Mon Mar 24 13:55:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=e6f859a4
dev-lang/python: remove ptmx/ptc checks Package-Manager: portage-2.2.8-r1 --- .../Python-2.7.5-remove-ptmx-ptc-checks.patch | 76 ++++++++++++++++++++++ .../Python-3.3.4-remove-ptmx-ptc-checks.patch | 76 ++++++++++++++++++++++ dev-lang/python/python-2.7.5-r99.ebuild | 1 + dev-lang/python/python-3.3.3-r99.ebuild | 1 + ...on-3.3.3-r99.ebuild => python-3.3.4-r99.ebuild} | 15 ++--- 5 files changed, 161 insertions(+), 8 deletions(-) diff --git a/dev-lang/python/files/Python-2.7.5-remove-ptmx-ptc-checks.patch b/dev-lang/python/files/Python-2.7.5-remove-ptmx-ptc-checks.patch new file mode 100644 index 0000000..1d7d9da --- /dev/null +++ b/dev-lang/python/files/Python-2.7.5-remove-ptmx-ptc-checks.patch @@ -0,0 +1,76 @@ +diff -Naur Python-2.7.5.orig/configure Python-2.7.5/configure +--- Python-2.7.5.orig/configure 2014-03-01 13:57:22.604047699 +0000 ++++ Python-2.7.5/configure 2014-03-01 14:01:12.096060532 +0000 +@@ -14247,72 +14247,6 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 + $as_echo "$as_me: checking for device files" >&6;} + +-if test "x$cross_compiling" = xyes; then +- if test "${ac_cv_file__dev_ptmx+set}" != set; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-$as_echo_n "checking for /dev/ptmx... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-$as_echo "not set" >&6; } +- as_fn_error $? "set ac_cv_file__dev_ptmx to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 +- fi +- if test "${ac_cv_file__dev_ptc+set}" != set; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-$as_echo_n "checking for /dev/ptc... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-$as_echo "not set" >&6; } +- as_fn_error $? "set ac_cv_file__dev_ptc to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 +- fi +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-$as_echo_n "checking for /dev/ptmx... " >&6; } +-if ${ac_cv_file__dev_ptmx+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "/dev/ptmx"; then +- ac_cv_file__dev_ptmx=yes +-else +- ac_cv_file__dev_ptmx=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5 +-$as_echo "$ac_cv_file__dev_ptmx" >&6; } +-if test "x$ac_cv_file__dev_ptmx" = xyes; then : +- +-fi +- +-if test "x$ac_cv_file__dev_ptmx" = xyes; then +- +-$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-$as_echo_n "checking for /dev/ptc... " >&6; } +-if ${ac_cv_file__dev_ptc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "/dev/ptc"; then +- ac_cv_file__dev_ptc=yes +-else +- ac_cv_file__dev_ptc=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5 +-$as_echo "$ac_cv_file__dev_ptc" >&6; } +-if test "x$ac_cv_file__dev_ptc" = xyes; then : +- +-fi +- +-if test "x$ac_cv_file__dev_ptc" = xyes; then +- +-$as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h +- +-fi +- + if test "$have_long_long" = yes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %lld and %llu printf() format support" >&5 diff --git a/dev-lang/python/files/Python-3.3.4-remove-ptmx-ptc-checks.patch b/dev-lang/python/files/Python-3.3.4-remove-ptmx-ptc-checks.patch new file mode 100644 index 0000000..5d392ca --- /dev/null +++ b/dev-lang/python/files/Python-3.3.4-remove-ptmx-ptc-checks.patch @@ -0,0 +1,76 @@ +diff -Naur Python-3.3.4.org/configure Python-3.3.4/configure +--- Python-3.3.4.org/configure 2014-03-01 14:04:59.596073253 +0000 ++++ Python-3.3.4/configure 2014-03-01 14:06:48.095079319 +0000 +@@ -14660,72 +14660,6 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for device files" >&5 + $as_echo "$as_me: checking for device files" >&6;} + +-if test "x$cross_compiling" = xyes; then +- if test "${ac_cv_file__dev_ptmx+set}" != set; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-$as_echo_n "checking for /dev/ptmx... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-$as_echo "not set" >&6; } +- as_fn_error $? "set ac_cv_file__dev_ptmx to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 +- fi +- if test "${ac_cv_file__dev_ptc+set}" != set; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-$as_echo_n "checking for /dev/ptc... " >&6; } +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +-$as_echo "not set" >&6; } +- as_fn_error $? "set ac_cv_file__dev_ptc to yes/no in your CONFIG_SITE file when cross compiling" "$LINENO" 5 +- fi +-fi +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptmx" >&5 +-$as_echo_n "checking for /dev/ptmx... " >&6; } +-if ${ac_cv_file__dev_ptmx+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "/dev/ptmx"; then +- ac_cv_file__dev_ptmx=yes +-else +- ac_cv_file__dev_ptmx=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptmx" >&5 +-$as_echo "$ac_cv_file__dev_ptmx" >&6; } +-if test "x$ac_cv_file__dev_ptmx" = xyes; then : +- +-fi +- +-if test "x$ac_cv_file__dev_ptmx" = xyes; then +- +-$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +-$as_echo_n "checking for /dev/ptc... " >&6; } +-if ${ac_cv_file__dev_ptc+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +-if test -r "/dev/ptc"; then +- ac_cv_file__dev_ptc=yes +-else +- ac_cv_file__dev_ptc=no +-fi +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__dev_ptc" >&5 +-$as_echo "$ac_cv_file__dev_ptc" >&6; } +-if test "x$ac_cv_file__dev_ptc" = xyes; then : +- +-fi +- +-if test "x$ac_cv_file__dev_ptc" = xyes; then +- +-$as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h +- +-fi +- + if test "$have_long_long" = yes + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for %lld and %llu printf() format support" >&5 diff --git a/dev-lang/python/python-2.7.5-r99.ebuild b/dev-lang/python/python-2.7.5-r99.ebuild index f743a8f..f237d49 100644 --- a/dev-lang/python/python-2.7.5-r99.ebuild +++ b/dev-lang/python/python-2.7.5-r99.ebuild @@ -119,6 +119,7 @@ src_prepare() { setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@" epatch_user + epatch "${FILESDIR}/Python-2.7.5-remove-ptmx-ptc-checks.patch" eautoconf eautoheader diff --git a/dev-lang/python/python-3.3.3-r99.ebuild b/dev-lang/python/python-3.3.3-r99.ebuild index 503f775..068daf4 100644 --- a/dev-lang/python/python-3.3.3-r99.ebuild +++ b/dev-lang/python/python-3.3.3-r99.ebuild @@ -90,6 +90,7 @@ src_prepare() { sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" epatch_user + epatch "${FILESDIR}/Python-3.3.4-remove-ptmx-ptc-checks.patch" eautoconf eautoheader diff --git a/dev-lang/python/python-3.3.3-r99.ebuild b/dev-lang/python/python-3.3.4-r99.ebuild similarity index 95% copy from dev-lang/python/python-3.3.3-r99.ebuild copy to dev-lang/python/python-3.3.4-r99.ebuild index 503f775..a4c590b 100644 --- a/dev-lang/python/python-3.3.3-r99.ebuild +++ b/dev-lang/python/python-3.3.4-r99.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.3.ebuild,v 1.12 2014/01/19 12:34:50 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.3.4.ebuild,v 1.1 2014/02/17 17:21:02 floppym Exp $ EAPI="4" WANT_AUTOMAKE="none" @@ -9,17 +9,17 @@ WANT_LIBTOOL="none" inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 toolchain-funcs multiprocessing MY_P="Python-${PV}" -PATCHSET_REVISION="0" +PATCHSET_VERSION="${PV}-0" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE="http://www.python.org/" SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz - http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz - mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.xz" + http://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz + mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz" LICENSE="PSF-2" SLOT="3.3" -KEYWORDS="amd64 arm ~mips x86" +KEYWORDS="~amd64 ~arm ~mips ~x86" IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 +ncurses +readline sqlite +ssl +threads tk wininst +xml" # Do not add a dependency on dev-lang/python to this ebuild. @@ -72,8 +72,6 @@ src_prepare() { EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" epatch "${FILESDIR}/python-3.3-fix-posix-close-clash.patch" - epatch "${FILESDIR}/python-3.3-xattr.patch" - epatch "${FILESDIR}/python-3.3-lchmod.patch" sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ @@ -90,6 +88,7 @@ src_prepare() { sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.ac || die "sed failed" epatch_user + epatch "${FILESDIR}/Python-3.3.4-remove-ptmx-ptc-checks.patch" eautoconf eautoheader @@ -183,7 +182,7 @@ src_compile() { touch Include/graminit.h Python/graminit.c || die cd "${BUILD_DIR}" || die - emake CPPFLAGS="" CFLAGS="" LDFLAGS="" + emake CPPFLAGS="" CFLAGS="" LDFLAGS="-lpython3.3" # Work around bug 329499. See also bug 413751 and 457194. if has_version dev-libs/libffi[pax_kernel]; then