python3 update for blender

python3/PKGBUILD

@@ -1,64 +1,73 @@
 pkgname=python3
-pkgver=3.1.3
+pkgver=3.2
 pkgrel=1
-_pybasever=3.1
+_pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite3')
+makedepends=('tk' 'sqlite3' 'valgrind')
 optdepends=('tk: for tkinter')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-        python-internal-expat.patch)
-md5sums=('ad5e5f1c07e829321e0a015f8cafe245'
-         '57fa26dd3353a697e8262d926aa035ad')
+        CVE-2011-1521.patch)
+sha1sums=('c3ecfa6528d536d5298635227081c36484e034a7'
+          '561161ce5ae3a91254352c09a33e3e4434444e14')  
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
-  patch -Np0 -i ../python-internal-expat.patch
+  
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
-  export OPT="${CFLAGS}"
-  export CPPFLAGS+="`pkg-config --cflags-only-I libffi`"
+# urllib Security Vulnerability
+  # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html
+  patch -Np1 -i ../CVE-2011-1521.patch
+
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
+              --with-valgrind \
               --with-wide-unicode \
+              --with-system-expat \
               --with-system-ffi
 
   make
+}
 
-  # Run the upstream test suite
-  LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:${LD_LIBRARY_PATH} PYTHON=./python \
-     ./runtests.sh -x test_distutils
-  for testname in $(cat BAD); do
-     echo "== ${testname} =="
-     cat OUT/${testname}.out
-  done
+check() {
+  cd "${srcdir}/Python-${pkgver}"
+  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site
 }
 
 package() {
   cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install maninstall
 
-  # clean-up reference to build directory
-  sed -i "s#$srcdir/Python-${pkgver}:##" $pkgdir/usr/lib/python3.1/config/Makefile
+  # Why are these not done by default...
+  ln -sf python3               "${pkgdir}/usr/bin/python"
+  ln -sf python3-config        "${pkgdir}/usr/bin/python-config"
+  ln -sf idle3                 "${pkgdir}/usr/bin/idle"
+  ln -sf pydoc3                "${pkgdir}/usr/bin/pydoc"
+  ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
 
-  # Fix conflicts with python2 - python2 version is newer...
-  rm ${pkgdir}/usr/bin/2to3
+  # Fix FS#22552
+  ln -sf ../../libpython${_pybasever}mu.so \
+    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
 
-  # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  # Clean-up reference to build directory
+  sed -i "s#$srcdir/Python-${pkgver}:##" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
+
+  # License
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-