Commit 4b3425c0 authored by Samuel Martin's avatar Samuel Martin Committed by Peter Korsgaard
Browse files

python2: bump to 2.7.3 

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 and remove the symlink patch
(which has been fixed upstream).

Signed-off-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7364f0cb

package/python/python-2.7-009-python-symlink.patch

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
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)

package/python/python-2.7-100-optional-test-modules.patch

+2 −1
Original line number Diff line number Diff line
@@ -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

package/python/python-2.7-101-optional-pydoc.patch

+2 −1
Original line number Diff line number Diff line
@@ -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

package/python/python-2.7-102-optional-2to3.patch

+3 −9
Original line number Diff line number Diff line
@@ -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

package/python/python-2.7-103-optional-sqlite.patch

+30 −1
Original line number Diff line number Diff line 
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 \