From: Samuel Martin <s.martin49@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 19/33] python2: bump to 2.7.3
Date: Thu, 22 Nov 2012 01:18:09 +0100 [thread overview]
Message-ID: <1353543503-8952-20-git-send-email-s.martin49@gmail.com> (raw)
In-Reply-To: <1353543503-8952-1-git-send-email-s.martin49@gmail.com>
Pyhton 2.7.3 includes several security fixes.
See: http://www.python.org/download/releases/2.7.3/
Also fixes the patch making sqlite optional.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
package/python/python-2.7-009-python-symlink.patch | 25 -----------------
.../python-2.7-100-optional-test-modules.patch | 3 ++-
package/python/python-2.7-101-optional-pydoc.patch | 3 ++-
package/python/python-2.7-102-optional-2to3.patch | 12 +++------
.../python/python-2.7-103-optional-sqlite.patch | 31 +++++++++++++++++++++-
package/python/python-2.7-104-optional-tk.patch | 3 ++-
.../python/python-2.7-105-optional-curses.patch | 3 ++-
package/python/python-2.7-106-optional-expat.patch | 3 ++-
package/python/python-2.7-110-optional-db.patch | 7 ++---
package/python/python.mk | 2 +-
10 files changed, 48 insertions(+), 44 deletions(-)
delete mode 100644 package/python/python-2.7-009-python-symlink.patch
diff --git a/package/python/python-2.7-009-python-symlink.patch b/package/python/python-2.7-009-python-symlink.patch
deleted file mode 100644
index 1b1d0c8..0000000
--- a/package/python/python-2.7-009-python-symlink.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Use a symlink between python and pythonVERSION
-
-By default, a hard link is used between /usr/bin/python and
-/usr/bin/pythonVERSION. Using hard links for such things is fairly
-uncommon, so let's make a symbolic link instead.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- Makefile.pre.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: Python-2.7.2/Makefile.pre.in
-===================================================================
---- Python-2.7.2.orig/Makefile.pre.in
-+++ Python-2.7.2/Makefile.pre.in
-@@ -796,7 +796,7 @@
- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
- else true; \
- fi
-- (cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
-+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
- -rm -f $(DESTDIR)$(BINDIR)/python-config
- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
- -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
diff --git a/package/python/python-2.7-100-optional-test-modules.patch b/package/python/python-2.7-100-optional-test-modules.patch
index fc49d52..a988717 100644
--- a/package/python/python-2.7-100-optional-test-modules.patch
+++ b/package/python/python-2.7-100-optional-test-modules.patch
@@ -4,6 +4,7 @@ The Python standard distribution comes with many test modules, that
are not necessarly useful on embedded targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 40 +++++++++++++++++++++++++++-------------
@@ -55,7 +56,7 @@ Index: Python-2.7.2/Makefile.pre.in
+ ctypes/test distutils/tests unittest/test
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-101-optional-pydoc.patch b/package/python/python-2.7-101-optional-pydoc.patch
index 195abcc..ccc937b 100644
--- a/package/python/python-2.7-101-optional-pydoc.patch
+++ b/package/python/python-2.7-101-optional-pydoc.patch
@@ -4,6 +4,7 @@ It removes 0.5 MB of data from the target plus the pydoc script
itself.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -32,7 +33,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += pydoc_data
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-102-optional-2to3.patch b/package/python/python-2.7-102-optional-2to3.patch
index 1e04540..0321619 100644
--- a/package/python/python-2.7-102-optional-2to3.patch
+++ b/package/python/python-2.7-102-optional-2to3.patch
@@ -4,6 +4,7 @@ lib2to3 is a library to convert Python 2.x code to Python 3.x. As
such, it is probably not very useful on embedded system targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 24 +++++++++++++++++-------
@@ -33,7 +34,7 @@ Index: Python-2.7.2/Makefile.pre.in
ctypes/test distutils/tests unittest/test
endif
-@@ -884,6 +882,23 @@
+@@ -884,6 +882,16 @@
LIBSUBDIRS += pydoc_data
endif
@@ -47,14 +48,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += sqlite3/test
-+endif
-+endif
-+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-103-optional-sqlite.patch b/package/python/python-2.7-103-optional-sqlite.patch
index 4172bae..a915c55 100644
--- a/package/python/python-2.7-103-optional-sqlite.patch
+++ b/package/python/python-2.7-103-optional-sqlite.patch
@@ -1,10 +1,12 @@
Add option to disable the sqlite3 module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
+ Makefile.pre.in | 24 +++++++++++++++++-------
configure.in | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ 2 file changed, 9 insertions(+)
Index: Python-2.7.2/configure.in
===================================================================
@@ -26,3 +28,30 @@ Index: Python-2.7.2/configure.in
AC_SUBST(PYDOC)
AC_ARG_ENABLE(pydoc,
+Index: Python-2.7.2/Makefile.pre.in
+===================================================================
+--- Python-2.7.2.orig/Makefile.pre.in
++++ Python-2.7.2/Makefile.pre.in
+@@ -875,7 +874,7 @@
+ lib-tk/test/test_ttk test test/data \
+ test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
+ test/tracedmodules email/test email/test/data \
+- json/tests sqlite3/test bsddb/test \
++ json/tests bsddb/test \
+ ctypes/test distutils/tests unittest/test
+ endif
+
+@@ -884,6 +882,13 @@
+ LIBSUBDIRS += pydoc_data
+ endif
+
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += sqlite3/test
++endif
++endif
++
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ @for i in $(SCRIPTDIR) $(LIBDEST); \
+ do \
diff --git a/package/python/python-2.7-104-optional-tk.patch b/package/python/python-2.7-104-optional-tk.patch
index 12f1236..9333e33 100644
--- a/package/python/python-2.7-104-optional-tk.patch
+++ b/package/python/python-2.7-104-optional-tk.patch
@@ -1,6 +1,7 @@
Add an option to disable the tk module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 14 ++++++++++----
@@ -42,7 +43,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-105-optional-curses.patch b/package/python/python-2.7-105-optional-curses.patch
index e3705cb..7f8da7c 100644
--- a/package/python/python-2.7-105-optional-curses.patch
+++ b/package/python/python-2.7-105-optional-curses.patch
@@ -1,6 +1,7 @@
Add an option to disable the curses module
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -28,7 +29,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += curses
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-106-optional-expat.patch b/package/python/python-2.7-106-optional-expat.patch
index be1b4a3..2d8ae74 100644
--- a/package/python/python-2.7-106-optional-expat.patch
+++ b/package/python/python-2.7-106-optional-expat.patch
@@ -7,6 +7,7 @@ builtin the Python sources, or no expat at all (which disables the
installation of XML modules).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 6 +++++-
@@ -35,7 +36,7 @@ Index: Python-2.7.2/Makefile.pre.in
+LIBSUBDIRS += $(XMLLIBSUBDIRS)
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python-2.7-110-optional-db.patch b/package/python/python-2.7-110-optional-db.patch
index 0d5ee0c..b32eea9 100644
--- a/package/python/python-2.7-110-optional-db.patch
+++ b/package/python/python-2.7-110-optional-db.patch
@@ -5,6 +5,7 @@ able to build Python without it, this patch adds an option to disable
the build/installation of this Python module.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Makefile.pre.in | 10 ++++++++--
@@ -28,8 +29,8 @@ Index: Python-2.7.2/Makefile.pre.in
LIBSUBDIRS += test test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \
test/tracedmodules email/test email/test/data \
-- json/tests sqlite3/test bsddb/test \
-+ json/tests sqlite3/test \
+- json/tests bsddb/test \
++ json/tests \
ctypes/test distutils/tests unittest/test
endif
@@ -44,7 +45,7 @@ Index: Python-2.7.2/Makefile.pre.in
+endif
+endif
+
- libinstall: build_all $(srcdir)/Lib/$(PLATDIR)
+ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
@for i in $(SCRIPTDIR) $(LIBDEST); \
do \
Index: Python-2.7.2/configure.in
diff --git a/package/python/python.mk b/package/python/python.mk
index e0ec9bb..6e960cd 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -4,7 +4,7 @@
#
#############################################################
PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).2
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).3
PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.bz2
PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
PYTHON_LICENSE = Python software foundation license v2, others
--
1.8.0
next prev parent reply other threads:[~2012-11-22 0:18 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-22 0:17 [Buildroot] [PATCH 00/33] Pull request for 2012.11/bug-fixes Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 01/33] libecore: fix build with glibc >=2.16 Samuel Martin
2012-11-23 9:00 ` Peter Korsgaard
2012-11-22 0:17 ` [Buildroot] [PATCH 02/33] libpcap: add pcap.pc file Samuel Martin
2012-11-22 10:09 ` Thomas Petazzoni
2012-11-22 10:39 ` Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 03/33] tcpdump: use 'pkg-config pcap' instead of pcap-config Samuel Martin
2012-11-22 10:10 ` Thomas Petazzoni
2012-11-22 10:46 ` Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 04/33] igh-ethercat: disable drivers build with kernel 3.6 Samuel Martin
2012-11-22 10:12 ` Thomas Petazzoni
2012-11-22 11:07 ` Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 05/33] imagemagick: explicitly disable c++ support if no c++ compiler available Samuel Martin
2012-11-23 9:09 ` Peter Korsgaard
2012-11-22 0:17 ` [Buildroot] [PATCH 06/33] sylpheed: fix build disabling gpgme support Samuel Martin
2012-11-23 9:10 ` Peter Korsgaard
2013-05-06 8:01 ` Peter Korsgaard
2013-05-06 10:02 ` Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 07/33] fluxbox: fix build against imlib2 Samuel Martin
2012-11-23 9:14 ` Peter Korsgaard
2012-12-09 18:14 ` Samuel Martin
2012-11-22 0:17 ` [Buildroot] [PATCH 08/33] owl-linux: update help text about linux kernel dependencies Samuel Martin
2012-11-30 15:45 ` Peter Korsgaard
2012-11-22 0:17 ` [Buildroot] [PATCH 09/33] linux-fusion: fix build Samuel Martin
2012-11-29 12:38 ` Simon Dawson
2012-11-30 0:34 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 10/33] ltp-testsuite: add warning about bessel function support if uclibc toolchain Samuel Martin
2013-03-04 9:30 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 11/33] ltp-testsuite: fix build on uClibc exp10 Samuel Martin
2013-03-04 9:29 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 12/33] sconeserver: fix configure.in Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 13/33] sconeserver: fix imagemagick dependency Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 14/33] dependencies: build a host python2 if no suitable one can be found Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 15/33] scons: force to use python2 on the host Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 16/33] libmad: do not install mad.pc on the target Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 17/33] matchbox packages: fix broken urls Samuel Martin
2012-11-30 15:43 ` Peter Korsgaard
2012-11-30 19:57 ` Samuel Martin
2012-11-30 20:16 ` Peter Korsgaard
2012-11-30 20:38 ` [Buildroot] [PATCH] " Samuel Martin
2012-11-30 21:09 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 18/33] linux-fusion: bump to version 8.10.4 Samuel Martin
2012-11-29 12:38 ` Simon Dawson
2012-11-30 15:24 ` Peter Korsgaard
2012-11-22 0:18 ` Samuel Martin [this message]
2012-11-22 10:16 ` [Buildroot] [PATCH 19/33] python2: bump to 2.7.3 Thomas Petazzoni
2012-11-22 10:47 ` Samuel Martin
2012-11-22 10:52 ` Thomas Petazzoni
2012-11-22 0:18 ` [Buildroot] [PATCH 20/33] pkg-download.mk: add tarball check in the wget method Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 21/33] rrdtool: add python binding support Samuel Martin
2013-01-15 21:57 ` Peter Korsgaard
2013-01-15 22:17 ` Samuel Martin
2012-11-22 0:18 ` [Buildroot] [PATCH 22/33] libmad: add license info Samuel Martin
2012-11-24 23:08 ` Arnout Vandecappelle
2012-11-30 15:29 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 23/33] scons: " Samuel Martin
2012-11-24 23:06 ` Arnout Vandecappelle
2012-11-30 15:32 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 24/33] efl packages: " Samuel Martin
2012-11-24 23:04 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 25/33] fluxbox: " Samuel Martin
2012-11-24 20:48 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 26/33] igh-ethercat: " Samuel Martin
2012-11-24 20:46 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 27/33] imagemagick: " Samuel Martin
2012-11-24 20:42 ` Arnout Vandecappelle
2012-11-30 15:34 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 28/33] imlib2: " Samuel Martin
2012-11-24 20:29 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 29/33] ltp-testsuite: " Samuel Martin
2012-11-24 20:41 ` Arnout Vandecappelle
2013-01-15 22:18 ` Peter Korsgaard
2012-11-22 0:18 ` [Buildroot] [PATCH 30/33] matchbox packages: " Samuel Martin
2012-11-24 20:37 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 31/33] owl-linux: " Samuel Martin
2012-11-24 20:20 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 32/33] rrdtool: " Samuel Martin
2012-11-22 5:17 ` Baruch Siach
2012-11-22 10:07 ` Samuel Martin
2012-11-24 20:09 ` Arnout Vandecappelle
2012-11-22 0:18 ` [Buildroot] [PATCH 33/33] sylpheed: " Samuel Martin
2012-11-24 23:15 ` Arnout Vandecappelle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353543503-8952-20-git-send-email-s.martin49@gmail.com \
--to=s.martin49@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox