Skip to contentSkip to conversation

python: fix SSL for 2.6

PATCH Applied Jesse Gilles 3 participants 5 messages Feb 15, 2010 – May 5, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python: fix SSL for 2.6

Hi all,

I am new to the mailing list and I have a couple of patches to contribute.

This fixes SSL support for python 2.6. Looks like the python module for SSL was missing from the package.

Thanks,
Jesse

* Add SSL module to build -- fixes "import ssl"

contrib/python/generate-manifest-2.6.py +1 -1
index fe0e385..890d1c0 100755
@@ -248,7 +248,7 @@ if __name__ == "__main__":
 
     m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
     "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
-    "pipes.* socket.* tempfile.* StringIO.* " )
+    "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
 
     m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
     "json" ) # package
recipes/python/python-2.6-manifest.inc +1 -1
index cee12c8..188ee31 100644
@@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 RDEPENDS_python-compiler="python-core"
recipes/python/python.inc +1 -1
index 7e61f79..aff18db 100644
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
 
 DEFAULT_PREFERENCE = "-26"
 	
#1 lore raw

Re: [PATCH 2/2] ruby: fix 1.8.7-p248 compile

* Update ruby library path so extensions needing mkmf can build and find the right ruby headers. Fixes building of ext/dl.

recipes/ruby/files/extmk.patch new file +13 -0
new file mode 100644
index 0000000..8b68450
@@ -0,0 +1,13 @@
+diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb
+--- ruby-1.8.7-p248.orig/ext/extmk.rb	2009-12-24 03:01:58.000000000 -0600
++++ ruby-1.8.7-p248/ext/extmk.rb	2010-02-12 15:55:27.370061558 -0600
+@@ -354,8 +354,8 @@
+   $ruby = '$(topdir)/miniruby' + EXEEXT
+ end
+ $ruby << " -I'$(topdir)'"
++$ruby << " -I'$(top_srcdir)/lib'"
+ unless CROSS_COMPILING
+-  $ruby << " -I'$(top_srcdir)/lib'"
+   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+   $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
+   ENV["RUBYLIB"] = "-"
recipes/ruby/ruby_1.8.7-p248.bb +1 -0
index 8d95373..827327b 100644
@@ -2,6 +2,7 @@ require ruby.inc
 DEPENDS = "ruby-native zlib openssl"
 SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
            file://extmk_run.patch;patch=1 \
+           file://extmk.patch;patch=1 \
 "
 FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
                     ${libdir}/ruby/1.8/*/*/.debug"
Quoted 58 lines · Jesse Gilles

Hi all,

I am new to the mailing list and I have a couple of patches to contribute.

This fixes SSL support for python 2.6. Looks like the python module for SSL was missing from the package.

Thanks,
Jesse

* Add SSL module to build -- fixes "import ssl"

contrib/python/generate-manifest-2.6.py +1 -1
index fe0e385..890d1c0 100755
@@ -248,7 +248,7 @@ if __name__ == "__main__":
 
     m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
     "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
-    "pipes.* socket.* tempfile.* StringIO.* " )
+    "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
 
     m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
     "json" ) # package
recipes/python/python-2.6-manifest.inc +1 -1
index cee12c8..188ee31 100644
@@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 RDEPENDS_python-compiler="python-core"
recipes/python/python.inc +1 -1
index 7e61f79..aff18db 100644
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
 
 DEFAULT_PREFERENCE = "-26"
 

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#3 lore raw
In reply to Jesse Gilles

Hallo.

Quoted 3 lines · Jesse Gilles

This fixes SSL support for python 2.6. Looks like the python module for SSL was missing from the package.

Mickey, can you have a look at this? Thanks.

Quoted 33 lines

* Add SSL module to build -- fixes "import ssl"

contrib/python/generate-manifest-2.6.py +1 -1
index fe0e385..890d1c0 100755
@@ -248,7 +248,7 @@ if __name__ == "__main__":
 
     m.addPackage( "python-io", "Python Low-Level I/O", "python-core python-math",
     "lib-dynload/_socket.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " +
-    "pipes.* socket.* tempfile.* StringIO.* " )
+    "pipes.* socket.* ssl.* tempfile.* StringIO.* " )
 
     m.addPackage( "python-json", "Python JSON Support", "python-core python-math python-re",
     "json" ) # package
recipes/python/python-2.6-manifest.inc +1 -1
index cee12c8..188ee31 100644
@@ -51,7 +51,7 @@ FILES_python-core="${libdir}/python2.6/__future__.* ${libdir}/python2.6/_abcoll.
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
+FILES_python-io="${libdir}/python2.6/lib-dynload/_socket.so ${libdir}/python2.6/lib-dynload/_ssl.so ${libdir}/python2.6/lib-dynload/select.so ${libdir}/python2.6/lib-dynload/termios.so ${libdir}/python2.6/lib-dynload/cStringIO.so ${libdir}/python2.6/pipes.* ${libdir}/python2.6/socket.* ${libdir}/python2.6/ssl.* ${libdir}/python2.6/tempfile.* ${libdir}/python2.6/StringIO.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 RDEPENDS_python-compiler="python-core"
recipes/python/python.inc +0 -0
index 7e61f79..aff18db 100644

recipes/python/python.inc LICENSE = "PSF" · line 9

Quoted 7 lines
recipes/python/python.inc +1 -1
@@ -4,7 +4,7 @@ LICENSE = "PSF"
 SECTION = "devel/python"
 PRIORITY = "optional"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "ml8"
+INC_PR = "ml9"
 
 DEFAULT_PREFERENCE = "-26"

regards
Stefan Schmidt