Revision: 25619
http://sourceforge.net/p/gar/code/25619
Author: dmichelsen
Date: 2016-03-18 22:18:16 +0000 (Fri, 18 Mar 2016)
Log Message:
-----------
lang-python/python/branches/python-3.3: Update to 3.3.6 and rebuild to to
removal of SSL v2 symbols from OpenSSL
Modified Paths:
--------------
csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums
Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
2016-03-18 16:14:39 UTC (rev 25618)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/Makefile
2016-03-18 22:18:16 UTC (rev 25619)
@@ -1,7 +1,7 @@
# $Id$
NAME = Python
-VERSION = 3.3.2
+VERSION = 3.3.6
VER = 3.3
DVER = 3-3
UVER = 3_3
@@ -17,7 +17,7 @@
# - http://bugs.python.org/issue4902
# - Python-2.6.1/Modules/_ctypes/libffi/src/x86/sysv.S
-SPKG_SOURCEURL = http://python.org/download/releases/$(VERSION)
+VENDOR_URL = http://python.org/download/releases/$(VERSION)
DESCRIPTION = A high-level scripting language.
define BLURB
@@ -30,16 +30,16 @@
an extension language for applications that need a programmable interface.
endef
-MASTER_SITES = http://python.org/ftp/python/$(VERSION)/
+MASTER_SITES = https://www.python.org/ftp/python/$(VERSION)/
+DISTFILES += $(DISTNAME).tar.xz
+
UPSTREAM_MASTER_SITES = http://python.org/ftp/python/
UFILES_REGEX = $(VER)\.\d+
-DISTFILES = $(DISTNAME).tar.bz2
-
# Patches
PATCHFILES += makesetup.diff
PATCHFILES += modules.diff
-PATCHFILES += multiprocess.diff
+#PATCHFILES += multiprocess.diff
PATCHFILES += 0004-Use-PY_CPPFLAGS-in-Modules-makesetup.patch
PATCHFILES += 0005-Use-opt-csw-lib-for-module-search.patch
PATCHFILES += 0007-Settings-for-Solaris.patch
@@ -52,6 +52,7 @@
# There are problems with platform-dependent data in $(prefix)/lib/python3.3
# Installation paths are defined in:
# http://hg.python.org/cpython/file/26588b6a39d9/Makefile.pre.in#l114
+
# http://wiki.debian.org/Python/MultiArch
# GARFLAVOR = DBG
# BUILD64 = 1
@@ -86,7 +87,14 @@
# cswpycompile can how handle Python 3 files.
PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print
}'
+BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWggettext-dev
+BUILD_DEP_PKGS += CSWlibncurses-dev
+BUILD_DEP_PKGS += CSWlibgcrypt-dev
+# Because of /opt/csw/lib/libxtermcap.a
+BUILD_DEP_PKGS += CSWschilybase
+
PACKAGES = CSWidle$(CVER)
SPKG_DESC_CSWidle$(CVER) = Python IDE
CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython
@@ -108,7 +116,7 @@
SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER)
series
INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibbz2-1-0
-RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi6
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibgdbm4
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWliblzma5
@@ -119,6 +127,7 @@
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0
RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1
+RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibintl8
CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython
CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy-
@@ -189,12 +198,7 @@
CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_
-BUILD_DEP_PKGS += CSWlibffi-dev
-BUILD_DEP_PKGS += CSWggettext-dev
-BUILD_DEP_PKGS += CSWlibncurses-dev
-BUILD_DEP_PKGS += CSWlibgcrypt-dev
-# Because of /opt/csw/lib/libxtermcap.a
-BUILD_DEP_PKGS += CSWschilybase
+GARCOMPILER = GNU
LICENSE = LICENSE
@@ -202,25 +206,7 @@
CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy-
CHECKPKG_OVERRIDES_CSWpython$(CVER)-test +=
catalogname-does-not-start-with-py_
-# To avoid file collisions with CSWpython:
-EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),'
-EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),'
-EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),'
-EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),'
-EXTRA_PAX_ARGS += -s
',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),'
-
EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python
-GARCOMPILER = GNU
-
include gar/category.mk
-# There is a file name conflict over libffi.so symlink between libffi package
-# and a gcc-java package. While it will ultimately belong to libffi_dev, the
-# symlink is currently under a subdirectory.
-# pkgchk -L CSWlibffi-dev
-# (...)
-# /opt/csw/lib/ffi/libffi.so=../libffi.so.5.0.10 s none CSWlibffi-dev
-# EXTRA_LINKER_FLAGS += $(libdir)/ffi
-# LDFLAGS += -L$(libdir)/ffi
-
Modified: csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums
===================================================================
--- csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums
2016-03-18 16:14:39 UTC (rev 25618)
+++ csw/mgar/pkg/lang-python/python/branches/python-3.3/checksums
2016-03-18 22:18:16 UTC (rev 25619)
@@ -1 +1 @@
-7dffe775f3bea68a44f762a3490e5e28 Python-3.3.2.tar.bz2
+67b8ddd9ee600d636423ada321b8da86 Python-3.3.6.tar.xz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
