subject:"\[arch\-commits\] Commit in python2\/trunk \(PKGBUILD\)"

[arch-commits] Commit in python2/trunk (PKGBUILD)

2020-09-05 Thread Felix Yan via arch-commits

Date: Saturday, September 5, 2020 @ 11:55:26
  Author: felixonmars
Revision: 395472

upgpkg: python2 2.7.18-2: rebuild with gcc 10.2 and libxcrypt

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-05 11:55:08 UTC (rev 395471)
+++ PKGBUILD2020-09-05 11:55:26 UTC (rev 395472)
@@ -5,13 +5,13 @@
 
 pkgname=python2
 pkgver=2.7.18
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
 license=('PSF')
 url="https://www.python.org/;
-depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'openssl' 'sqlite' 'zlib')
+depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 
'sqlite' 'zlib')
 makedepends=('tk' 'bluez-libs')
 checkdepends=('gdb' 'file' 'xorg-server-xvfb')
 optdepends=('tk: for IDLE'

[arch-commits] Commit in python2/trunk (PKGBUILD)

2020-04-23 Thread Felix Yan via arch-commits

Date: Thursday, April 23, 2020 @ 22:56:44
  Author: felixonmars
Revision: 381455

upgpkg: python2 2.7.18-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-23 22:52:39 UTC (rev 381454)
+++ PKGBUILD2020-04-23 22:56:44 UTC (rev 381455)
@@ -4,8 +4,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.17
-pkgrel=3
+pkgver=2.7.18
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -20,7 +20,7 @@
 conflicts=('python<3')
 
source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
 mtime-workaround.patch)
-sha512sums=('2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a'
+sha512sums=('a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c'
 'SKIP'
 
'4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson

[arch-commits] Commit in python2/trunk (PKGBUILD)

2020-04-08 Thread Felix Yan via arch-commits

Date: Wednesday, April 8, 2020 @ 17:25:39
  Author: felixonmars
Revision: 379855

libffi 3.3 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-08 17:07:14 UTC (rev 379854)
+++ PKGBUILD2020-04-08 17:25:39 UTC (rev 379855)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.17
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD mtime-workaround.patch)

2020-03-21 Thread Felix Yan via arch-commits

Date: Saturday, March 21, 2020 @ 06:21:23
  Author: felixonmars
Revision: 378021

upgpkg: python2 2.7.17-2

unbreak pyc files

Added:
  python2/trunk/mtime-workaround.patch
Modified:
  python2/trunk/PKGBUILD

+
 PKGBUILD   |   15 +++
 mtime-workaround.patch |   10 ++
 2 files changed, 21 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-03-21 00:30:37 UTC (rev 378020)
+++ PKGBUILD2020-03-21 06:21:23 UTC (rev 378021)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.17
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -18,14 +18,20 @@
 'python2-setuptools'
 'python2-pip')
 conflicts=('python<3')
-source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc})
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
+mtime-workaround.patch)
 
sha512sums=('2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a'
-'SKIP')
+'SKIP'
+
'4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
 
 prepare() {
   cd Python-${pkgver}
 
+  # makepkg will touch all files to $SOURCE_DATE_EPOCH which will break pyc 
file's mtime check.
+  # workaround this by touching them to $SOURCE_DATE_EPOCH before running 
compileall.
+  patch -p0 -i ../mtime-workaround.patch
+
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
@@ -76,10 +82,11 @@
   # Since 2.7.14 with latest xvfb
   # test_idle, test_tk, test_ttk_guionly: segfaults
   # Since 2.7.15: test_ctypes
+  # test_ftplib test_imaplib test_urllib2_localnet: krb5 errors
 
   cd Python-${pkgver}
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly test_ctypes test_ssl
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly test_ctypes test_ssl test_ftplib 
test_imaplib test_urllib2_localnet
 }
 
 package() {

Added: mtime-workaround.patch
===
--- mtime-workaround.patch  (rev 0)
+++ mtime-workaround.patch  2020-03-21 06:21:23 UTC (rev 378021)
@@ -0,0 +1,10 @@
+--- Makefile.pre.in.orig   2020-03-21 08:40:27.031543502 +0800
 Makefile.pre.in2020-03-21 08:47:27.277107917 +0800
+@@ -1137,6 +1137,7 @@
+   $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+   $(DESTDIR)$(LIBDEST)/distutils/tests ; \
+   fi
++  find $(DESTDIR)$(LIBDEST) -exec touch -h -d @$(SOURCE_DATE_EPOCH) {} +
+   PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+   $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+   -d $(LIBDEST) -f \

[arch-commits] Commit in python2/trunk (PKGBUILD)

2019-10-22 Thread Felix Yan via arch-commits

Date: Tuesday, October 22, 2019 @ 09:41:45
  Author: felixonmars
Revision: 365306

upgpkg: python2 2.7.17-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-22 09:28:43 UTC (rev 365305)
+++ PKGBUILD2019-10-22 09:41:45 UTC (rev 365306)
@@ -4,7 +4,7 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.16
+pkgver=2.7.17
 pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
@@ -19,7 +19,7 @@
 'python2-pip')
 conflicts=('python<3')
 
source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc})
-sha512sums=('16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0'
+sha512sums=('2dc19a0b0d818c71429dae94783e58b2aac0fa31f5faa1e840cac06245a59932ecc4658d913515736601bcf70a78c9ec60367aed75f4567d1e41ff3bb104da9a'
 'SKIP')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson

[arch-commits] Commit in python2/trunk (PKGBUILD)

2019-05-20 Thread Antonio Rojas via arch-commits

Date: Monday, May 20, 2019 @ 20:35:58
  Author: arojas
Revision: 353661

https

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-20 20:32:17 UTC (rev 353660)
+++ PKGBUILD2019-05-20 20:35:58 UTC (rev 353661)
@@ -10,7 +10,7 @@
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
 license=('PSF')
-url="http://www.python.org/;
+url="https://www.python.org/;
 depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'openssl' 'sqlite' 'zlib')
 makedepends=('tk' 'bluez-libs')
 checkdepends=('gdb' 'file' 'xorg-server-xvfb')

[arch-commits] Commit in python2/trunk (PKGBUILD descr_ref.patch)

2019-03-11 Thread Felix Yan via arch-commits

Date: Monday, March 11, 2019 @ 19:56:32
  Author: felixonmars
Revision: 347711

upgpkg: python2 2.7.16-1

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/descr_ref.patch

-+
 PKGBUILD|   16 --
 descr_ref.patch |   58 --
 2 files changed, 5 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-11 18:03:48 UTC (rev 347710)
+++ PKGBUILD2019-03-11 19:56:32 UTC (rev 347711)
@@ -4,8 +4,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.15
-pkgrel=4
+pkgver=2.7.16
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -18,11 +18,9 @@
 'python2-setuptools'
 'python2-pip')
 conflicts=('python<3')
-source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
-descr_ref.patch)
-sha512sums=('27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6'
-'SKIP'
-
'2e16eb23eb402dbe921c09bce99b400c10939114b4a1ded0e94a744d8cb66427947bc8d07c4fb054f9fe0906d10d1da509fc2273fd136225c0f019cc43dd045d')
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc})
+sha512sums=('16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0'
+'SKIP')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
 
 prepare() {
@@ -53,10 +51,6 @@
 
   # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
   touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
-
-  # FS#48761
-  # http://bugs.python.org/issue25750
-  patch -Np1 -i ../descr_ref.patch
 }
 
 build() {

Deleted: descr_ref.patch
===
--- descr_ref.patch 2019-03-11 18:03:48 UTC (rev 347710)
+++ descr_ref.patch 2019-03-11 19:56:32 UTC (rev 347711)
@@ -1,58 +0,0 @@
-When calling tp_descr_get(self, obj, type), make sure that we own a reference 
to "self"
-
-diff -ru Python-2.7.9/Objects/typeobject.c 
Python-2.7.9-fixed//Objects/typeobject.c
 Python-2.7.9/Objects/typeobject.c  2014-12-10 16:59:57.0 +0100
-+++ Python-2.7.9-fixed//Objects/typeobject.c   2015-11-27 20:39:58.276156800 
+0100
-@@ -2542,6 +2542,7 @@
- PyTypeObject *metatype = Py_TYPE(type);
- PyObject *meta_attribute, *attribute;
- descrgetfunc meta_get;
-+PyObject* res;
- 
- if (!PyString_Check(name)) {
- PyErr_Format(PyExc_TypeError,
-@@ -2563,6 +2564,7 @@
- meta_attribute = _PyType_Lookup(metatype, name);
- 
- if (meta_attribute != NULL) {
-+Py_INCREF(meta_attribute);
- meta_get = Py_TYPE(meta_attribute)->tp_descr_get;
- 
- if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
-@@ -2570,10 +2572,11 @@
-  * writes. Assume the attribute is not overridden in
-  * type's tp_dict (and bases): call the descriptor now.
-  */
--return meta_get(meta_attribute, (PyObject *)type,
-+res = meta_get(meta_attribute, (PyObject *)type,
- (PyObject *)metatype);
-+Py_DECREF(meta_attribute);
-+return res;
- }
--Py_INCREF(meta_attribute);
- }
- 
- /* No data descriptor found on metatype. Look in tp_dict of this
-@@ -2581,6 +2584,7 @@
- attribute = _PyType_Lookup(type, name);
- if (attribute != NULL) {
- /* Implement descriptor functionality, if any */
-+Py_INCREF(attribute);
- descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
- 
- Py_XDECREF(meta_attribute);
-@@ -2588,11 +2592,12 @@
- if (local_get != NULL) {
- /* NULL 2nd argument indicates the descriptor was
-  * found on the target object itself (or a base)  */
--return local_get(attribute, (PyObject *)NULL,
-+res = local_get(attribute, (PyObject *)NULL,
-  (PyObject *)type);
-+Py_DECREF(attribute);
-+return res;
- }
- 
--Py_INCREF(attribute);
- return attribute;
- }
-

[arch-commits] Commit in python2/trunk (PKGBUILD)

2019-01-10 Thread Felix Yan via arch-commits

Date: Thursday, January 10, 2019 @ 23:45:00
  Author: felixonmars
Revision: 343529

Readline 8.0 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 22:45:57 UTC (rev 343528)
+++ PKGBUILD2019-01-10 23:45:00 UTC (rev 343529)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.15
-pkgrel=3
+pkgrel=4
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2019-01-10 Thread Felix Yan via arch-commits

Date: Thursday, January 10, 2019 @ 22:45:41
  Author: felixonmars
Revision: 343527

upgpkg: python2 2.7.15-3

Readline 8.0 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 21:55:48 UTC (rev 343526)
+++ PKGBUILD2019-01-10 22:45:41 UTC (rev 343527)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.15
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -85,7 +85,7 @@
 
   cd Python-${pkgver}
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly test_ctypes
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly test_ctypes test_ssl
 }
 
 package() {

[arch-commits] Commit in python2/trunk (PKGBUILD)

2018-06-27 Thread Bartłomiej Piotrowski via arch-commits

Date: Wednesday, June 27, 2018 @ 13:26:25
  Author: bpiotrowski
Revision: 327691

2.7.15-2: rebuild against gdbm 1.15

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-06-27 13:10:24 UTC (rev 327690)
+++ PKGBUILD2018-06-27 13:26:25 UTC (rev 327691)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.15
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD fix-profile-task.patch)

2018-05-01 Thread Felix Yan via arch-commits

Date: Tuesday, May 1, 2018 @ 12:23:58
  Author: felixonmars
Revision: 323210

upgpkg: python2 2.7.15-1

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/fix-profile-task.patch

+
 PKGBUILD   |   17 +++--
 fix-profile-task.patch |   13 -
 2 files changed, 7 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-01 09:23:18 UTC (rev 323209)
+++ PKGBUILD2018-05-01 12:23:58 UTC (rev 323210)
@@ -5,8 +5,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.14
-pkgrel=3
+pkgver=2.7.15
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
@@ -20,11 +20,10 @@
 'python2-pip')
 conflicts=('python<3')
 
source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
-descr_ref.patch fix-profile-task.patch)
-sha512sums=('78310b0be6388ffa15f29a80afb9ab3c03a572cb094e9da00cfe391afadb51696e41f592eb658d6a31a2f422fdac8a55214a382cbb8cfb43d4a127d5b35ea7f9'
+descr_ref.patch)
+sha512sums=('27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6'
 'SKIP'
-
'2e16eb23eb402dbe921c09bce99b400c10939114b4a1ded0e94a744d8cb66427947bc8d07c4fb054f9fe0906d10d1da509fc2273fd136225c0f019cc43dd045d'
-
'5d7b47bfa9f13cf5fb827546189d823033278f96866366fca5257aaf819c92ffb26e2116426c84ab78d9ae3178eebb591fa4b2f22cfc2725e3e3e795fdb5c2b6')
+
'2e16eb23eb402dbe921c09bce99b400c10939114b4a1ded0e94a744d8cb66427947bc8d07c4fb054f9fe0906d10d1da509fc2273fd136225c0f019cc43dd045d')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
 
 prepare() {
@@ -59,9 +58,6 @@
   # FS#48761
   # http://bugs.python.org/issue25750
   patch -Np1 -i ../descr_ref.patch
-
-  # Backport from Python 3.x
-  patch -Np2 -i ../fix-profile-task.patch
 }
 
 build() {
@@ -86,10 +82,11 @@
 check() {
   # Since 2.7.14 with latest xvfb
   # test_idle, test_tk, test_ttk_guionly: segfaults
+  # Since 2.7.15: test_ctypes
 
   cd Python-${pkgver}
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly test_ctypes
 }
 
 package() {

Deleted: fix-profile-task.patch
===
--- fix-profile-task.patch  2018-05-01 09:23:18 UTC (rev 323209)
+++ fix-profile-task.patch  2018-05-01 12:23:58 UTC (rev 323210)
@@ -1,13 +0,0 @@
-diff --git a/Python-2.7.13/Makefile.pre.in b/Python-2.7.13/Makefile.pre.in
-index e288964..22edc27 100644
 a/Python-2.7.13/Makefile.pre.in
-+++ b/Python-2.7.13/Makefile.pre.in
-@@ -456,7 +456,7 @@ build_all_generate_profile:
- 
- run_profile_task:
-   : # FIXME: can't run for a cross build
--  $(LLVM_PROF_FILE) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
-+  $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
- 
- build_all_merge_profile:
-   $(LLVM_PROF_MERGER)

[arch-commits] Commit in python2/trunk (PKGBUILD)

2018-04-16 Thread Felix Yan via arch-commits

Date: Monday, April 16, 2018 @ 12:10:14
  Author: felixonmars
Revision: 321904

upgpkg: python2 2.7.14-3

libnsl rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-16 07:34:09 UTC (rev 321903)
+++ PKGBUILD2018-04-16 12:10:14 UTC (rev 321904)
@@ -6,13 +6,13 @@
 
 pkgname=python2
 pkgver=2.7.14
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')
 license=('PSF')
 url="http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
+depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'openssl' 'sqlite' 'zlib')
 makedepends=('tk' 'bluez-libs')
 checkdepends=('gdb' 'file' 'xorg-server-xvfb')
 optdepends=('tk: for IDLE'
@@ -84,13 +84,12 @@
 }
 
 check() {
-  # Since 2.7.13,
-  # test_replace_overflow (present in test_bytes, test_str, test_string, 
test_unicode, test_userstring) segfault on i686
-  # test_bigrepeat (present in test_tuple) segfault on i686
+  # Since 2.7.14 with latest xvfb
+  # test_idle, test_tk, test_ttk_guionly: segfaults
 
   cd Python-${pkgver}
   LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_bytes test_str test_string test_tuple test_unicode test_userstring
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_idle test_tk test_ttk_guionly
 }
 
 package() {

[arch-commits] Commit in python2/trunk (PKGBUILD)

2018-01-04 Thread Felix Yan via arch-commits

Date: Friday, January 5, 2018 @ 02:43:54
  Author: felixonmars
Revision: 314060

upgpkg: python2 2.7.14-2

rebuild with gdbm 1.14.1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-01-05 02:39:20 UTC (rev 314059)
+++ PKGBUILD2018-01-05 02:43:54 UTC (rev 314060)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.14
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD fix-profile-task.patch)

2017-07-20 Thread Felix Yan

Date: Thursday, July 20, 2017 @ 19:45:10
  Author: felixonmars
Revision: 300874

upgpkg: python2 2.7.13-4

- enable PGO
- remove hardening-wrapper

Added:
  python2/trunk/fix-profile-task.patch
Modified:
  python2/trunk/PKGBUILD

+
 PKGBUILD   |   26 ++
 fix-profile-task.patch |   13 +
 2 files changed, 31 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-20 19:36:05 UTC (rev 300873)
+++ PKGBUILD2017-07-20 19:45:10 UTC (rev 300874)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.13
-pkgrel=3
+pkgrel=4
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 license=('PSF')
 url="http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
+makedepends=('tk' 'bluez-libs')
 checkdepends=('gdb' 'file' 'xorg-server-xvfb')
 optdepends=('tk: for IDLE'
 'python2-setuptools'
@@ -22,12 +22,13 @@
 
source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
 bpo-29697-don-t-use-openssl-1.0-fallback-on-1.1.patch
 bpo-30714-alpn-changes-for-openssl-1.1.0f.patch
-descr_ref.patch)
-sha1sums=('18a8f30a0356c751b8d0ea6f76e764cab13ee046'
-  'SKIP'
-  'cb503cdbee806382db1ddad4de5ae1390ff6bb9f'
-  'fb888fc23761976616da0b735c702c23f8707771'
-  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+descr_ref.patch fix-profile-task.patch)
+sha512sums=('f37c9a28ce129d01e63c84d7db627a06402854578f62d17927334ea21ede318e04bbf66e890e3f47c85333e6b19f6e5581fb3f3e27efd24be27017d1b6529c4b'
+'SKIP'
+
'115c40c36f2f18474244c758472c6b670a576d8f0289d9add005af1ed23d368738eed09fe2123df38ed5111c37ce31d998ae3db2eeff29fc5ac3065f8ea25211'
+
'b32c2a0f17b3d19720187b68606024886c6b8008b7c61feaf4fe7b26b4547fddc71a2f191f87557d5fe613d06a8bc79ce5f724681a3090559fc34a032ccbf61a'
+
'2e16eb23eb402dbe921c09bce99b400c10939114b4a1ded0e94a744d8cb66427947bc8d07c4fb054f9fe0906d10d1da509fc2273fd136225c0f019cc43dd045d'
+
'5d7b47bfa9f13cf5fb827546189d823033278f96866366fca5257aaf819c92ffb26e2116426c84ab78d9ae3178eebb591fa4b2f22cfc2725e3e3e795fdb5c2b6')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
 
 prepare() {
@@ -68,6 +69,9 @@
   # FS#48761
   # http://bugs.python.org/issue25750
   patch -Np1 -i ../descr_ref.patch
+
+  # Backport from Python 3.x
+  patch -Np2 -i ../fix-profile-task.patch
 }
 
 build() {
@@ -77,6 +81,8 @@
   ./configure --prefix=/usr \
   --enable-shared \
   --with-threads \
+  --enable-optimizations \
+  --with-lto \
   --enable-ipv6 \
   --enable-unicode=ucs4 \
   --with-system-expat \
@@ -99,6 +105,10 @@
 
 package() {
   cd Python-${pkgver}
+
+  # Hack to avoid building again
+  sed -i 's/^all:.*$/all: build_all/' Makefile
+
   make DESTDIR="${pkgdir}" altinstall maninstall
 
   rm "${pkgdir}"/usr/share/man/man1/python.1

Added: fix-profile-task.patch
===
--- fix-profile-task.patch  (rev 0)
+++ fix-profile-task.patch  2017-07-20 19:45:10 UTC (rev 300874)
@@ -0,0 +1,13 @@
+diff --git a/Python-2.7.13/Makefile.pre.in b/Python-2.7.13/Makefile.pre.in
+index e288964..22edc27 100644
+--- a/Python-2.7.13/Makefile.pre.in
 b/Python-2.7.13/Makefile.pre.in
+@@ -456,7 +456,7 @@ build_all_generate_profile:
+ 
+ run_profile_task:
+   : # FIXME: can't run for a cross build
+-  $(LLVM_PROF_FILE) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
++  $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true
+ 
+ build_all_merge_profile:
+   $(LLVM_PROF_MERGER)

[arch-commits] Commit in python2/trunk (PKGBUILD)

2017-02-11 Thread Pierre Schmitz

Date: Saturday, February 11, 2017 @ 11:46:49
  Author: pierre
Revision: 288655

upgpkg: python2 2.7.13-2

OpenSSL 1,1 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-11 11:18:18 UTC (rev 288654)
+++ PKGBUILD2017-02-11 11:46:49 UTC (rev 288655)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.13
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2016-12-20 Thread Felix Yan

Date: Wednesday, December 21, 2016 @ 07:32:36
  Author: felixonmars
Revision: 284366

upgpkg: python2 2.7.13-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 9 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-12-21 07:30:51 UTC (rev 284365)
+++ PKGBUILD2016-12-21 07:32:36 UTC (rev 284366)
@@ -5,8 +5,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.12
-pkgrel=2
+pkgver=2.7.13
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 url="http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
 makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
-checkdepends=('gdb' 'file')
+checkdepends=('gdb' 'file' 'xorg-server-xvfb')
 optdepends=('tk: for IDLE'
 'python2-setuptools'
 'python2-pip')
@@ -21,7 +21,7 @@
 conflicts=('python<3')
 
source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
 descr_ref.patch)
-sha1sums=('05360b8ade117b35e266b2004a7f1f11250c6dcd'
+sha1sums=('18a8f30a0356c751b8d0ea6f76e764cab13ee046'
   'SKIP'
   '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
 validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
@@ -42,11 +42,6 @@
   sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
 Lib/distutils/tests/test_install_scripts.py
 
-  # TODO: Still not passed
-  # Silent test_gdb failures on 'no symbol table loaded'.
-  #sed -i '/ignore_patterns = (/a "No symbol table is loaded.  Use the 
\\"file\\" command.",' \
-  #  Lib/test/test_gdb.py
-
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -83,15 +78,13 @@
 }
 
 check() {
-  # As of 2.7.12, 1 test failed:
-  # test_gdb
-  # Besides, test_thread disabled as it will stuck
-  
-  # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)
+  # Since 2.7.13,
+  # test_replace_overflow (present in test_bytes, test_str, test_string, 
test_unicode, test_userstring) segfault on i686
+  # test_bigrepeat (present in test_tuple) segfault on i686
 
   cd Python-${pkgver}
-  SHELL=/bin/sh 
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_thread || warning "Tests failed"
+  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_bytes test_str test_string test_tuple test_unicode test_userstring
 }
 
 package() {

[arch-commits] Commit in python2/trunk (PKGBUILD)

2016-11-07 Thread Bartłomiej Piotrowski

Date: Monday, November 7, 2016 @ 11:04:40
  Author: bpiotrowski
Revision: 280026

readline 7.0 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-07 10:50:20 UTC (rev 280025)
+++ PKGBUILD2016-11-07 11:04:40 UTC (rev 280026)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.12
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2016-07-03 Thread Felix Yan

Date: Monday, July 4, 2016 @ 02:14:49
  Author: felixonmars
Revision: 270924

use https source and enable pgp check (FS#49929)

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-04 02:10:36 UTC (rev 270923)
+++ PKGBUILD2016-07-04 02:14:49 UTC (rev 270924)
@@ -19,10 +19,12 @@
 'python2-setuptools'
 'python2-pip')
 conflicts=('python<3')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
 descr_ref.patch)
 sha1sums=('05360b8ade117b35e266b2004a7f1f11250c6dcd'
+  'SKIP'
   '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
+validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF')  # Benjamin Peterson
 
 prepare() {
   cd Python-${pkgver}

[arch-commits] Commit in python2/trunk (PKGBUILD)

2016-06-28 Thread Felix Yan

Date: Tuesday, June 28, 2016 @ 08:44:51
  Author: felixonmars
Revision: 270752

upgpkg: python2 2.7.12-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-28 07:21:32 UTC (rev 270751)
+++ PKGBUILD2016-06-28 08:44:51 UTC (rev 270752)
@@ -5,8 +5,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.11
-pkgrel=3
+pkgver=2.7.12
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@
 conflicts=('python<3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
 descr_ref.patch)
-sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff'
+sha1sums=('05360b8ade117b35e266b2004a7f1f11250c6dcd'
   '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
 
 prepare() {
@@ -81,8 +81,8 @@
 }
 
 check() {
-  # As of 2.7.11, 2 tests failed:
-  # test_doctest test_gdb
+  # As of 2.7.12, 1 test failed:
+  # test_gdb
   # Besides, test_thread disabled as it will stuck
   
   # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)

[arch-commits] Commit in python2/trunk (PKGBUILD descr_ref.patch)

2016-03-31 Thread Felix Yan

Date: Thursday, March 31, 2016 @ 08:43:03
  Author: fyan
Revision: 263481

upgpkg: python2 2.7.11-3

add a patch for FS#48761

Added:
  python2/trunk/descr_ref.patch
Modified:
  python2/trunk/PKGBUILD

-+
 PKGBUILD|   12 ---
 descr_ref.patch |   58 ++
 2 files changed, 67 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-31 05:20:41 UTC (rev 263480)
+++ PKGBUILD2016-03-31 06:43:03 UTC (rev 263481)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.11
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -19,8 +19,10 @@
 'python2-setuptools'
 'python2-pip')
 conflicts=('python<3')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+descr_ref.patch)
+sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff'
+  '8cc6ac63e909063eb16bbdabc0f0eac7d24ff0c1')
 
 prepare() {
   cd Python-${pkgver}
@@ -55,6 +57,10 @@
 
   # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
   touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+
+  # FS#48761
+  # http://bugs.python.org/issue25750
+  patch -p1 -i ../descr_ref.patch
 }
 
 build() {

Added: descr_ref.patch
===
--- descr_ref.patch (rev 0)
+++ descr_ref.patch 2016-03-31 06:43:03 UTC (rev 263481)
@@ -0,0 +1,58 @@
+When calling tp_descr_get(self, obj, type), make sure that we own a reference 
to "self"
+
+diff -ru Python-2.7.9/Objects/typeobject.c 
Python-2.7.9-fixed//Objects/typeobject.c
+--- Python-2.7.9/Objects/typeobject.c  2014-12-10 16:59:57.0 +0100
 Python-2.7.9-fixed//Objects/typeobject.c   2015-11-27 20:39:58.276156800 
+0100
+@@ -2542,6 +2542,7 @@
+ PyTypeObject *metatype = Py_TYPE(type);
+ PyObject *meta_attribute, *attribute;
+ descrgetfunc meta_get;
++PyObject* res;
+ 
+ if (!PyString_Check(name)) {
+ PyErr_Format(PyExc_TypeError,
+@@ -2563,6 +2564,7 @@
+ meta_attribute = _PyType_Lookup(metatype, name);
+ 
+ if (meta_attribute != NULL) {
++Py_INCREF(meta_attribute);
+ meta_get = Py_TYPE(meta_attribute)->tp_descr_get;
+ 
+ if (meta_get != NULL && PyDescr_IsData(meta_attribute)) {
+@@ -2570,10 +2572,11 @@
+  * writes. Assume the attribute is not overridden in
+  * type's tp_dict (and bases): call the descriptor now.
+  */
+-return meta_get(meta_attribute, (PyObject *)type,
++res = meta_get(meta_attribute, (PyObject *)type,
+ (PyObject *)metatype);
++Py_DECREF(meta_attribute);
++return res;
+ }
+-Py_INCREF(meta_attribute);
+ }
+ 
+ /* No data descriptor found on metatype. Look in tp_dict of this
+@@ -2581,6 +2584,7 @@
+ attribute = _PyType_Lookup(type, name);
+ if (attribute != NULL) {
+ /* Implement descriptor functionality, if any */
++Py_INCREF(attribute);
+ descrgetfunc local_get = Py_TYPE(attribute)->tp_descr_get;
+ 
+ Py_XDECREF(meta_attribute);
+@@ -2588,11 +2592,12 @@
+ if (local_get != NULL) {
+ /* NULL 2nd argument indicates the descriptor was
+  * found on the target object itself (or a base)  */
+-return local_get(attribute, (PyObject *)NULL,
++res = local_get(attribute, (PyObject *)NULL,
+  (PyObject *)type);
++Py_DECREF(attribute);
++return res;
+ }
+ 
+-Py_INCREF(attribute);
+ return attribute;
+ }
+

[arch-commits] Commit in python2/trunk (PKGBUILD)

2016-03-03 Thread Evangelos Foutras

Date: Thursday, March 3, 2016 @ 12:07:34
  Author: foutrelis
Revision: 260615

OpenSSL 1.0.2g rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-03 11:04:18 UTC (rev 260614)
+++ PKGBUILD2016-03-03 11:07:34 UTC (rev 260615)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.11
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2015-12-06 Thread Felix Yan

Date: Sunday, December 6, 2015 @ 17:02:36
  Author: fyan
Revision: 252836

upgpkg: python2 2.7.11-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 15:27:39 UTC (rev 252835)
+++ PKGBUILD2015-12-06 16:02:36 UTC (rev 252836)
@@ -5,8 +5,8 @@
 # Contributor: Jason Chu 
 
 pkgname=python2
-pkgver=2.7.10
-pkgrel=2
+pkgver=2.7.11
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@
 url="http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
 makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
-checkdepends=('gdb')
+checkdepends=('gdb' 'file')
 optdepends=('tk: for IDLE'
 'python2-setuptools'
 'python2-pip')
 conflicts=('python<3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('ee5a50c5562e7448f037d35fdedc18d95c748b9e')
+sha1sums=('c3b8bbe3f084c4d4ea13ffb03d75a5e22f9756ff')
 
 prepare() {
   cd Python-${pkgver}
@@ -53,8 +53,8 @@
   find . -name '*.py' | \
 xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
 
-  # Workaround asdl_c.py error after we touched the shebangs
-  touch Include/Python-ast.h Python/Python-ast.c
+  # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the 
shebangs
+  touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
 }
 
 build() {
@@ -75,12 +75,14 @@
 }
 
 check() {
-  # As of 2.7.10, 3 tests failed:
-  # test_doctest test_gdb test_mhlib
+  # As of 2.7.11, 2 tests failed:
+  # test_doctest test_gdb
   # Besides, test_thread disabled as it will stuck
+  
+  # $SHELL was set to avoid a test failure in test_gdb (it still fails due to 
other reasons, though)
 
   cd Python-${pkgver}
-  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+  SHELL=/bin/sh 
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
 "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x 
test_thread || warning "Tests failed"
 }

[arch-commits] Commit in python2/trunk (PKGBUILD)

2015-09-07 Thread Evangelos Foutras

Date: Monday, September 7, 2015 @ 16:00:56
  Author: foutrelis
Revision: 245456

ncurses 6.0 rebuild.

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-07 13:39:54 UTC (rev 245455)
+++ PKGBUILD2015-09-07 14:00:56 UTC (rev 245456)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.10
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2015-05-25 Thread Felix Yan

Date: Tuesday, May 26, 2015 @ 07:24:45
  Author: fyan
Revision: 239755

upgpkg: python2 2.7.10-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-26 04:32:41 UTC (rev 239754)
+++ PKGBUILD2015-05-26 05:24:45 UTC (rev 239755)
@@ -5,7 +5,7 @@
 # Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.9
+pkgver=2.7.10
 pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
@@ -13,7 +13,7 @@
 license=('PSF')
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk' 'bluez-libs')
+makedepends=('tk' 'bluez-libs' 'hardening-wrapper')
 checkdepends=('gdb')
 optdepends=('tk: for IDLE'
 'python2-setuptools'
@@ -20,7 +20,7 @@
 'python2-pip')
 conflicts=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3')
+sha1sums=('ee5a50c5562e7448f037d35fdedc18d95c748b9e')
 
 prepare() {
   cd Python-${pkgver}
@@ -75,8 +75,8 @@
 }
 
 check() {
-  # As of 2.7.9, 2 tests failed:
-  # test_gdb test_mhlib
+  # As of 2.7.10, 3 tests failed:
+  # test_doctest test_gdb test_mhlib
   # Besides, test_thread disabled as it will stuck
 
   cd Python-${pkgver}

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-12-10 Thread Felix Yan

Date: Thursday, December 11, 2014 @ 06:55:04
  Author: fyan
Revision: 227422

upgpkg: python2 2.7.9-1

upstream new release

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   29 +++--
 1 file changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-11 04:56:31 UTC (rev 227421)
+++ PKGBUILD2014-12-11 05:55:04 UTC (rev 227422)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer: Felix Yan felixonm...@gmail.com
+# Maintainer: Felix Yan felixonm...@archlinux.org
 # Contributor: Stéphane Gaudreault steph...@archlinux.org
 # Contributor: Allan McRae al...@archlinux.org
 # Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.8
-pkgrel=2
+pkgver=2.7.9
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -14,10 +14,13 @@
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
 makedepends=('tk' 'bluez-libs')
-optdepends=('tk: for IDLE')
+checkdepends=('gdb')
+optdepends=('tk: for IDLE'
+'python2-setuptools'
+'python2-pip')
 conflicts=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4')
+sha1sums=('3172f6e957713c2d9fca462cc16068222fd1b9d3')
 
 prepare() {
   cd Python-${pkgver}
@@ -33,8 +36,13 @@
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
   sed -i s/python2.3/python2/g Lib/distutils/tests/test_build_scripts.py \
- Lib/distutils/tests/test_install_scripts.py
+Lib/distutils/tests/test_install_scripts.py
 
+  # TODO: Still not passed
+  # Silent test_gdb failures on 'no symbol table loaded'.
+  #sed -i '/ignore_patterns = (/a No symbol table is loaded.  Use the 
\\file\\ command.,' \
+  #  Lib/test/test_gdb.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -60,19 +68,20 @@
   --enable-unicode=ucs4 \
   --with-system-expat \
   --with-system-ffi \
-  --with-dbmliborder=gdbm:ndbm
+  --with-dbmliborder=gdbm:ndbm \
+  --without-ensurepip
 
   make
 }
 
 check() {
-  # As of 2.7.7, 1 test failed:
-  # test_uuid
+  # As of 2.7.9, 2 tests failed:
+  # test_gdb test_mhlib
   # Besides, test_thread disabled as it will stuck
 
   cd Python-${pkgver}
   LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:${LD_LIBRARY_PATH} \
-${srcdir}/Python-${pkgver}/python -m test.regrtest -uall -x test_thread 
|| warning Tests failed
+${srcdir}/Python-${pkgver}/python -m test.regrtest -v -uall -x 
test_thread || warning Tests failed
 }
 
 package() {

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-09-24 Thread Felix Yan

Date: Wednesday, September 24, 2014 @ 13:16:51
  Author: fyan
Revision: 222923

upgpkg: python2 2.7.8-2

rebuild to fix the pyc files with bad mtime

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-24 11:04:31 UTC (rev 222922)
+++ PKGBUILD2014-09-24 11:16:51 UTC (rev 222923)
@@ -6,7 +6,7 @@
 
 pkgname=python2
 pkgver=2.7.8
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-07-02 Thread Felix Yan

Date: Wednesday, July 2, 2014 @ 09:39:22
  Author: fyan
Revision: 216192

upgpkg: python2 2.7.8-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-02 07:35:51 UTC (rev 216191)
+++ PKGBUILD2014-07-02 07:39:22 UTC (rev 216192)
@@ -5,7 +5,7 @@
 # Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.7
+pkgver=2.7.8
 pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
@@ -17,7 +17,7 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('5f82557cac5abf18d1df6f8bb2029aa335b321f4')
+sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4')
 
 prepare() {
   cd Python-${pkgver}

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-06-22 Thread Felix Yan

Date: Sunday, June 22, 2014 @ 11:16:43
  Author: fyan
Revision: 215339

remove uneeded file from sed line

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-21 20:13:07 UTC (rev 215338)
+++ PKGBUILD2014-06-22 09:16:43 UTC (rev 215339)
@@ -13,7 +13,7 @@
 license=('PSF')
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk=8.6.0' 'bluez-libs')
+makedepends=('tk' 'bluez-libs')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
@@ -33,7 +33,7 @@
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
   sed -i s/python2.3/python2/g Lib/distutils/tests/test_build_scripts.py \
- Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
+ Lib/distutils/tests/test_install_scripts.py
 
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
@@ -45,7 +45,7 @@
   find . -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
-  # Workaround asdl_c.py error
+  # Workaround asdl_c.py error after we touched the shebangs
   touch Include/Python-ast.h Python/Python-ast.c
 }

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-06-02 Thread Felix Yan

Date: Monday, June 2, 2014 @ 20:10:15
  Author: fyan
Revision: 214041

upgpkg: python2 2.7.7-1

- new upstream release
- enabled tests

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   46 +++---
 1 file changed, 27 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-02 15:23:24 UTC (rev 214040)
+++ PKGBUILD2014-06-02 18:10:15 UTC (rev 214041)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
+# Maintainer: Felix Yan felixonm...@gmail.com
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.6
-pkgrel=3
+pkgver=2.7.7
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -15,20 +16,12 @@
 makedepends=('tk=8.6.0' 'bluez-libs')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-CVE-2014-1912.patch::http://hg.python.org/cpython/raw-rev/87673659d8f7)
-sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80'
-  '1d0527f7b8483e1e0e12867675fdff86f22cd297')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('5f82557cac5abf18d1df6f8bb2029aa335b321f4')
 
 prepare() {
-  cd ${srcdir}/Python-${pkgver}
+  cd Python-${pkgver}
 
-  # FS#39040 / CVE-2014-1912, upstream report: 
http://bugs.python.org/issue20246
-  # Remove the NEWS file update from upstream patch which will cause a conflict
-  sed -i 40,51d $srcdir/CVE-2014-1912.patch
-  patch -p1 -i $srcdir/CVE-2014-1912.patch
-
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
@@ -60,15 +53,30 @@
   cd ${srcdir}/Python-${pkgver}
 
   export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
+  ./configure --prefix=/usr \
+  --enable-shared \
+  --with-threads \
+  --enable-ipv6 \
+  --enable-unicode=ucs4 \
+  --with-system-expat \
+  --with-system-ffi \
   --with-dbmliborder=gdbm:ndbm
 
   make
 }
 
+check() {
+  # As of 2.7.7, 1 test failed:
+  # test_uuid
+  # Besides, test_thread disabled as it will stuck
+
+  cd Python-${pkgver}
+  LD_LIBRARY_PATH=${srcdir}/Python-${pkgver}:${LD_LIBRARY_PATH} \
+${srcdir}/Python-${pkgver}/python -m test.regrtest -uall -x test_thread 
|| warning Tests failed
+}
+
 package() {
-  cd ${srcdir}/Python-${pkgver}
+  cd Python-${pkgver}
   make DESTDIR=${pkgdir} altinstall maninstall
 
   rm ${pkgdir}/usr/share/man/man1/python.1

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-02-25 Thread Felix Yan

Date: Wednesday, February 26, 2014 @ 05:11:10
  Author: fyan
Revision: 206424

upgpkg: python2 2.7.6-3

- fix FS#39040: applied upstream patch for CVE-2014-1912

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-25 22:23:19 UTC (rev 206423)
+++ PKGBUILD2014-02-26 04:11:10 UTC (rev 206424)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.6
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,12 +16,19 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+CVE-2014-1912.patch::http://hg.python.org/cpython/raw-rev/87673659d8f7)
+sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80'
+  '1d0527f7b8483e1e0e12867675fdff86f22cd297')
 
 prepare() {
   cd ${srcdir}/Python-${pkgver}
 
+  # FS#39040 / CVE-2014-1912, upstream report: 
http://bugs.python.org/issue20246
+  # Remove the NEWS file update from upstream patch which will cause a conflict
+  sed -i 40,51d $srcdir/CVE-2014-1912.patch
+  patch -p1 -i $srcdir/CVE-2014-1912.patch
+
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c

[arch-commits] Commit in python2/trunk (PKGBUILD)

2014-02-15 Thread Felix Yan

Date: Saturday, February 15, 2014 @ 16:09:56
  Author: fyan
Revision: 206007

upgpkg: python2 2.7.6-2

- fix FS#38915

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-02-15 15:06:53 UTC (rev 206006)
+++ PKGBUILD2014-02-15 15:09:56 UTC (rev 206007)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.6
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -40,6 +40,13 @@
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
+
+  # clean up #!s
+  find . -name '*.py' | \
+xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
+
+  # Workaround asdl_c.py error
+  touch Include/Python-ast.h Python/Python-ast.c
 }
 
 build() {
@@ -80,13 +87,6 @@
   mv ${pkgdir}/usr/bin/pydoc{,2}
   mv ${pkgdir}/usr/bin/2to3{,-2.7}
 
-  # clean up #!s
-  find . -name '*.py' | \
-xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
-
-  # Workaround asdl_c.py error
-  touch Include/Python-ast.h Python/Python-ast.c
-
   # clean-up reference to build directory
   sed -i s#${srcdir}/Python-${pkgver}:## 
${pkgdir}/usr/lib/python${_pybasever}/config/Makefile

[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7.5-CVE-2013-4238.patch)

2013-11-26 Thread Ángel Velásquez

Date: Tuesday, November 26, 2013 @ 17:09:28
  Author: angvp
Revision: 200338

upgpkg: python2 2.7.6-1

Version bump to 2.7.6 and FS#37006 reviewed

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/python-2.7.5-CVE-2013-4238.patch

--+
 PKGBUILD |   18 +-
 python-2.7.5-CVE-2013-4238.patch |  267 -
 2 files changed, 8 insertions(+), 277 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-26 15:53:06 UTC (rev 200337)
+++ PKGBUILD2013-11-26 16:09:28 UTC (rev 200338)
@@ -4,8 +4,8 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.5
-pkgrel=2
+pkgver=2.7.6
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,17 +16,12 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-python-2.7.5-CVE-2013-4238.patch)
-sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
-  'fb1f95ca21d9c00eaaea5a58236d1d97300482d7')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80')
 
 prepare() {
   cd ${srcdir}/Python-${pkgver}
 
-  # http://bugs.python.org/issue18709
-  patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch
-
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
@@ -86,9 +81,12 @@
   mv ${pkgdir}/usr/bin/2to3{,-2.7}
 
   # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
+  find . -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
+  # Workaround asdl_c.py error
+  touch Include/Python-ast.h Python/Python-ast.c
+
   # clean-up reference to build directory
   sed -i s#${srcdir}/Python-${pkgver}:## 
${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
 

Deleted: python-2.7.5-CVE-2013-4238.patch
===
--- python-2.7.5-CVE-2013-4238.patch2013-11-26 15:53:06 UTC (rev 200337)
+++ python-2.7.5-CVE-2013-4238.patch2013-11-26 16:09:28 UTC (rev 200338)
@@ -1,267 +0,0 @@
-
-# HG changeset patch
-# User Christian Heimes christ...@cheimes.de
-# Date 1376693687 -7200
-# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b
-# Parent  87fcc13ade91874971ad577efaa2254c744a2b07
-Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
-inside subjectAltName correctly. Formerly the module has used OpenSSL's
-GENERAL_NAME_print() function to get the string represention of ASN.1
-strings for rfc822Name (email), dNSName (DNS) and
-uniformResourceIdentifier (URI).
-
-diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
-new file mode 100644
 /dev/null
-+++ b/Lib/test/nullbytecert.pem
-@@ -0,0 +1,90 @@
-+Certificate:
-+Data:
-+Version: 3 (0x2)
-+Serial Number: 0 (0x0)
-+Signature Algorithm: sha1WithRSAEncryption
-+Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, 
OU=Python Core Development, 
CN=null.python.org\x00example.org/emailAddress=python-...@python.org
-+Validity
-+Not Before: Aug  7 13:11:52 2013 GMT
-+Not After : Aug  7 13:12:52 2013 GMT
-+Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, 
OU=Python Core Development, 
CN=null.python.org\x00example.org/emailAddress=python-...@python.org
-+Subject Public Key Info:
-+Public Key Algorithm: rsaEncryption
-+Public-Key: (2048 bit)
-+Modulus:
-+00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+

[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7.5-CVE-2013-4238.patch)

2013-09-06 Thread Bartłomiej Piotrowski

Date: Friday, September 6, 2013 @ 10:06:06
  Author: bpiotrowski
Revision: 193928

upgpkg: python2 2.7.5-2

- fix CVE-2013-4238 (FS#36758)

Added:
  python2/trunk/python-2.7.5-CVE-2013-4238.patch
Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   17 +-
 python-2.7.5-CVE-2013-4238.patch |  267 +
 2 files changed, 280 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-06 07:53:42 UTC (rev 193927)
+++ PKGBUILD2013-09-06 08:06:06 UTC (rev 193928)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.5
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,12 +16,17 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+python-2.7.5-CVE-2013-4238.patch)
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
+  'fb1f95ca21d9c00eaaea5a58236d1d97300482d7')
 
-build() {
+prepare() {
   cd ${srcdir}/Python-${pkgver}
 
+  # http://bugs.python.org/issue18709
+  patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch
+
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
@@ -40,7 +45,11 @@
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
+}
 
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
   export OPT=${CFLAGS}
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi \

Added: python-2.7.5-CVE-2013-4238.patch
===
--- python-2.7.5-CVE-2013-4238.patch(rev 0)
+++ python-2.7.5-CVE-2013-4238.patch2013-09-06 08:06:06 UTC (rev 193928)
@@ -0,0 +1,267 @@
+
+# HG changeset patch
+# User Christian Heimes christ...@cheimes.de
+# Date 1376693687 -7200
+# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b
+# Parent  87fcc13ade91874971ad577efaa2254c744a2b07
+Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
+inside subjectAltName correctly. Formerly the module has used OpenSSL's
+GENERAL_NAME_print() function to get the string represention of ASN.1
+strings for rfc822Name (email), dNSName (DNS) and
+uniformResourceIdentifier (URI).
+
+diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
+new file mode 100644
+--- /dev/null
 b/Lib/test/nullbytecert.pem
+@@ -0,0 +1,90 @@
++Certificate:
++Data:
++Version: 3 (0x2)
++Serial Number: 0 (0x0)
++Signature Algorithm: sha1WithRSAEncryption
++Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, 
OU=Python Core Development, 
CN=null.python.org\x00example.org/emailAddress=python-...@python.org
++Validity
++Not Before: Aug  7 13:11:52 2013 GMT
++Not After : Aug  7 13:12:52 2013 GMT
++Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, 
OU=Python Core Development, 
CN=null.python.org\x00example.org/emailAddress=python-...@python.org
++Subject Public Key Info:
++Public Key Algorithm: rsaEncryption
++Public-Key: (2048 bit)
++Modulus:
++00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
++03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
++16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
++88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
++32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
++56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
++a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
++45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
++ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
++90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
++7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
++68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
++f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
++f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
++ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
++d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
++9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
++2f:85
++Exponent: 65537 (0x10001)
++X509v3 extensions:
++X509v3 Basic Constraints: critical
++CA:FALSE
++X509v3 Subject Key Identifier:
++

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-08-10 Thread Ángel Velásquez

Date: Saturday, August 10, 2013 @ 16:19:42
  Author: angvp
Revision: 192386

Reverting db bump

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-10 14:11:23 UTC (rev 192385)
+++ PKGBUILD2013-08-10 14:19:42 UTC (rev 192386)
@@ -1,12 +1,11 @@
 # $Id$
-# Maintainer: Angel Velasquez an...@archlinux.org 
-# Contributor: Stéphane Gaudreault steph...@archlinux.org
-# Contributor: Allan McRae al...@archlinux.org
-# Contributor: Jason Chu ja...@archlinux.org
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
+# Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
 pkgver=2.7.5
-pkgrel=2
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -20,7 +19,7 @@
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
 sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
 
-prepare() {
+build() {
   cd ${srcdir}/Python-${pkgver}
 
   # Temporary workaround for FS#22322
@@ -42,11 +41,6 @@
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
-}
-
-build() {
-  cd ${srcdir}/Python-${pkgver}
-
   export OPT=${CFLAGS}
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi \

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-08-04 Thread Ángel Velásquez

Date: Monday, August 5, 2013 @ 02:21:40
  Author: angvp
Revision: 192038

upgpkg: python2 2.7.5-2

Rebuilt against db 6.0.20 and some clean up of the PKGBUILD

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-04 20:38:17 UTC (rev 192037)
+++ PKGBUILD2013-08-05 00:21:40 UTC (rev 192038)
@@ -1,11 +1,12 @@
 # $Id$
-# Maintainer: Stéphane Gaudreault steph...@archlinux.org
-# Contributer: Allan McRae al...@archlinux.org
-# Contributer: Jason Chu ja...@archlinux.org
+# Maintainer: Angel Velasquez an...@archlinux.org 
+# Contributor: Stéphane Gaudreault steph...@archlinux.org
+# Contributor: Allan McRae al...@archlinux.org
+# Contributor: Jason Chu ja...@archlinux.org
 
 pkgname=python2
 pkgver=2.7.5
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -19,7 +20,7 @@
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
 sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
 
-build() {
+prepare() {
   cd ${srcdir}/Python-${pkgver}
 
   # Temporary workaround for FS#22322
@@ -41,6 +42,11 @@
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
+}
+
+build() {
+  cd ${srcdir}/Python-${pkgver}
+
   export OPT=${CFLAGS}
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi \

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-06-02 Thread Tom Gundersen

Date: Sunday, June 2, 2013 @ 10:08:45
  Author: tomegun
Revision: 186976

change bluez dep

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-02 08:08:21 UTC (rev 186975)
+++ PKGBUILD2013-06-02 08:08:45 UTC (rev 186976)
@@ -12,7 +12,7 @@
 license=('PSF')
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk=8.6.0' 'bluez')
+makedepends=('tk=8.6.0' 'bluez-libs')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-05-12 Thread Stéphane Gaudreault

Date: Sunday, May 12, 2013 @ 18:29:10
  Author: stephane
Revision: 185264

upgpkg: python2 2.7.5-1

upstream update

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-12 16:29:01 UTC (rev 185263)
+++ PKGBUILD2013-05-12 16:29:10 UTC (rev 185264)
@@ -4,7 +4,7 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.4
+pkgver=2.7.5
 pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
@@ -17,7 +17,7 @@
 conflicts=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
+sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf')
 
 build() {
   cd ${srcdir}/Python-${pkgver}

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-04-06 Thread Stéphane Gaudreault

Date: Sunday, April 7, 2013 @ 01:26:26
  Author: stephane
Revision: 182103

upgpkg: python2 2.7.4-1

upstream update

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-06 23:26:20 UTC (rev 182102)
+++ PKGBUILD2013-04-06 23:26:26 UTC (rev 182103)
@@ -4,7 +4,7 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.4rc1
+pkgver=2.7.4
 pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
@@ -17,7 +17,7 @@
 conflicts=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('e6bad3df94c13de68bec450a6a91eabee80a43f9')
+sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e')
 
 build() {
   cd ${srcdir}/Python-${pkgver}

[arch-commits] Commit in python2/trunk (PKGBUILD)

2013-03-24 Thread Stéphane Gaudreault

Date: Monday, March 25, 2013 @ 01:02:26
  Author: stephane
Revision: 180618

testing 2.7.4 rc1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   38 +-
 1 file changed, 21 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-24 22:09:11 UTC (rev 180617)
+++ PKGBUILD2013-03-25 00:02:26 UTC (rev 180618)
@@ -4,8 +4,8 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.3
-pkgrel=4
+pkgver=2.7.4rc1
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 conflicts=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
+sha1sums=('e6bad3df94c13de68bec450a6a91eabee80a43f9')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
@@ -32,6 +32,9 @@
   # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
+  sed -i s/python2.3/python2/g Lib/distutils/tests/test_build_scripts.py \
+ Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -50,21 +53,23 @@
   cd ${srcdir}/Python-${pkgver}
   make DESTDIR=${pkgdir} altinstall maninstall
 
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
+  rm ${pkgdir}/usr/share/man/man1/python.1
 
-  ln -sf ../../libpython${_pybasever}.so \
-${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
 
-  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
+  # FS#33954
+  ln -sf python-${_pybasever}.pc${pkgdir}/usr/lib/pkgconfig/python2.pc
 
+  ln -sf ../../libpython${_pybasever}.so 
${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
+
   # some useful stuff
   install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
-  install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
-  install -m755 Tools/scripts/{README,*py} \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+  install -m755 Tools/i18n/{msgfmt,pygettext}.py 
${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
+  install -m755 Tools/scripts/{README,*py} 
${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
 
   # fix conflicts with python
   mv ${pkgdir}/usr/bin/idle{,2}
@@ -72,13 +77,12 @@
   mv ${pkgdir}/usr/bin/2to3{,-2.7}
 
   # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
+  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
   # clean-up reference to build directory
-  sed -i s#${srcdir}/Python-${pkgver}:## \
-${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
+  sed -i s#${srcdir}/Python-${pkgver}:## 
${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
 
   # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in python2/trunk (PKGBUILD)

2012-12-22 Thread andyrtr

Date: Saturday, December 22, 2012 @ 15:32:58
  Author: andyrtr
Revision: 173777

upgpkg: python2 2.7.3-4

rebuild for tcl/tk 8.6.0

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-22 20:27:03 UTC (rev 173776)
+++ PKGBUILD2012-12-22 20:32:58 UTC (rev 173777)
@@ -5,14 +5,14 @@
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=3
+pkgrel=4
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk' 'bluez')
+makedepends=('tk=8.6.0' 'bluez')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2012-12-12 Thread Stéphane Gaudreault

Date: Wednesday, December 12, 2012 @ 07:19:49
  Author: stephane
Revision: 173188

upgpkg: python2 2.7.3-3

Add support for Bluetooth

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-12 11:55:32 UTC (rev 173187)
+++ PKGBUILD2012-12-12 12:19:49 UTC (rev 173188)
@@ -5,14 +5,14 @@
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
 url=http://www.python.org/;
 depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
-makedepends=('tk')
+makedepends=('tk' 'bluez')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2012-04-23 Thread Stéphane Gaudreault

Date: Monday, April 23, 2012 @ 20:17:20
  Author: stephane
Revision: 157114

upgpkg: python2 2.7.3-2

rebuild for libffi-3.0.11

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-23 23:56:16 UTC (rev 157113)
+++ PKGBUILD2012-04-24 00:17:20 UTC (rev 157114)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2012-04-14 Thread Stéphane Gaudreault

Date: Saturday, April 14, 2012 @ 19:21:49
  Author: stephane
Revision: 156163

upgpkg: python2 2.7.3-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   27 +--
 1 file changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 22:02:29 UTC (rev 156162)
+++ PKGBUILD2012-04-14 23:21:49 UTC (rev 156163)
@@ -4,8 +4,8 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.2
-pkgrel=6
+pkgver=2.7.3
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,14 +16,8 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-linux2.patch
-gdbm-magic-values.patch
-13156-revert-tls-changeset-subinterpreter.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-  '937c06190899a491d662c7918658313e7640070e'
-  'ede2c991b1a91eec5a01cc2d3a11231f17d750ae'
-  'd61fa2b8efd1d08a2ee8a9aed434dc94b8297d6b')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
@@ -38,17 +32,6 @@
   # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
-  # Make sure sys.platform is set to linux2, even on kernel 3.X
-  # cf http://bugs.python.org/issue12326
-  patch -Np1 -i ../linux2.patch
-
-  # gdbm has new magic that whichdb does not recognize
-  # http://bugs.python.org/issue13007
-  patch -Np1 -i ../gdbm-magic-values.patch
-
-  # http://bugs.python.org/issue13156
-  patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch
-
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -60,7 +43,7 @@
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
   --with-dbmliborder=gdbm:ndbm
 
-  make MACHDEP=linux2
+  make
 }
 
 package() {

[arch-commits] Commit in python2/trunk (PKGBUILD)

2012-04-07 Thread Stéphane Gaudreault

Date: Saturday, April 7, 2012 @ 12:18:43
  Author: stephane
Revision: 155846

upgpkg: python2 2.7.2-6

sqlite3 - sqlite pkgname change

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-07 15:45:08 UTC (rev 155845)
+++ PKGBUILD2012-04-07 16:18:43 UTC (rev 155846)
@@ -5,13 +5,13 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=5
+pkgrel=6
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
 url=http://www.python.org/;
-depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
@@ -32,7 +32,7 @@
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
 
-  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
+  # Enable built-in SQLite module to load extensions (fix FS#22122)
   sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
 
   # FS#23997

[arch-commits] Commit in python2/trunk (PKGBUILD gdbm-magic-values.patch linux2.patch)

2011-11-21 Thread Stéphane Gaudreault

Date: Monday, November 21, 2011 @ 12:35:56
  Author: stephane
Revision: 143038

upgpkg: python2 2.7.2-4

revert last changes, re-enable gdbm

Added:
  python2/trunk/gdbm-magic-values.patch
  python2/trunk/linux2.patch
Modified:
  python2/trunk/PKGBUILD

-+
 PKGBUILD|   24 +---
 gdbm-magic-values.patch |   13 +
 linux2.patch|   23 +++
 3 files changed, 53 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 17:31:39 UTC (rev 143037)
+++ PKGBUILD2011-11-21 17:35:56 UTC (rev 143038)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=3
+pkgrel=4
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,8 +16,12 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+linux2.patch
+gdbm-magic-values.patch)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
+  '937c06190899a491d662c7918658313e7640070e'
+  '0f4cd9508c9ace620a829a688a9285e0480b5fb5')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
@@ -32,6 +36,14 @@
   # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  patch -Np1 -i ../linux2.patch
+
+  # gdbm has new magic that whichdb does not recognize
+  # http://bugs.python.org/issue13007
+  patch -Np1 -i ../gdbm-magic-values.patch
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -40,11 +52,9 @@
 
   export OPT=${CFLAGS}
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
-  --enable-unicode=ucs4 --with-system-expat --with-system-ffi
+  --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
+  --with-dbmliborder=gdbm:ndbm
 
-  # Make sure sys.platform is set to linux2, even on kernel 3.X
-  # cf http://bugs.python.org/issue12326
-  # Here we simply run make with a different MACHDEP variable. It requires no 
patching.
   make MACHDEP=linux2
 }
 

Added: gdbm-magic-values.patch
===
--- gdbm-magic-values.patch (rev 0)
+++ gdbm-magic-values.patch 2011-11-21 17:35:56 UTC (rev 143038)
@@ -0,0 +1,13 @@
+diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py
+--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.0 
-0400
 Python-2.7.2/Lib/whichdb.py2011-09-30 15:45:21.778872290 -0400
+@@ -91,7 +91,7 @@ def whichdb(filename):
+ return 
+ 
+ # Check for GNU dbm
+-if magic == 0x13579ace:
++if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+ return gdbm
+ 
+ # Check for old Berkeley db hash file format v2
+diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS

Added: linux2.patch
===
--- linux2.patch(rev 0)
+++ linux2.patch2011-11-21 17:35:56 UTC (rev 143038)
@@ -0,0 +1,23 @@
+http://hg.python.org/cpython/rev/c816479f6aaf/
+diff --git a/configure b/configure
+--- a/configure
 b/configure
+@@ -2995,6 +2995,7 @@ then
+   MACHDEP=$ac_md_system$ac_md_release
+
+   case $MACHDEP in
++  linux*) MACHDEP=linux2;;
+   cygwin*) MACHDEP=cygwin;;
+   darwin*) MACHDEP=darwin;;
+   atheos*) MACHDEP=atheos;;
+diff --git a/configure.in b/configure.in
+--- a/configure.in
 b/configure.in
+@@ -293,6 +293,7 @@ then
+   MACHDEP=$ac_md_system$ac_md_release
+
+   case $MACHDEP in
++  linux*) MACHDEP=linux2;;
+   cygwin*) MACHDEP=cygwin;;
+   darwin*) MACHDEP=darwin;;
+   atheos*) MACHDEP=atheos;;

[arch-commits] Commit in python2/trunk (PKGBUILD linux2.patch)

2011-11-20 Thread Stéphane Gaudreault

Date: Sunday, November 20, 2011 @ 21:26:31
  Author: stephane
Revision: 143021

upgpkg: python2 2.7.2-3

gdbm 1.10 rebuild

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/linux2.patch

--+
 PKGBUILD |   17 +++--
 linux2.patch |   24 
 2 files changed, 7 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-21 02:06:36 UTC (rev 143020)
+++ PKGBUILD2011-11-21 02:26:31 UTC (rev 143021)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -16,10 +16,8 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-linux2.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-  '8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
@@ -34,10 +32,6 @@
   # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
-  # Make sure sys.platform is set to linux2, even on kernel 3.X
-  # cf http://bugs.python.org/issue12326
-  patch -Np1 -i ../linux2.patch
-
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -48,7 +42,10 @@
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi
 
-  make
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  # Here we simply run make with a different MACHDEP variable. It requires no 
patching.
+  make MACHDEP=linux2
 }
 
 package() {

Deleted: linux2.patch
===
--- linux2.patch2011-11-21 02:06:36 UTC (rev 143020)
+++ linux2.patch2011-11-21 02:26:31 UTC (rev 143021)
@@ -1,24 +0,0 @@
-http://hg.python.org/cpython/rev/c816479f6aaf/
-diff --git a/configure b/configure
 a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
-   MACHDEP=$ac_md_system$ac_md_release
- 
-   case $MACHDEP in
-+  linux*) MACHDEP=linux2;;
-   cygwin*) MACHDEP=cygwin;;
-   darwin*) MACHDEP=darwin;;
-   atheos*) MACHDEP=atheos;;
-diff --git a/configure.in b/configure.in
 a/configure.in
-+++ b/configure.in
-@@ -293,6 +293,7 @@ then
-   MACHDEP=$ac_md_system$ac_md_release
- 
-   case $MACHDEP in
-+  linux*) MACHDEP=linux2;;
-   cygwin*) MACHDEP=cygwin;;
-   darwin*) MACHDEP=darwin;;
-   atheos*) MACHDEP=atheos;;
-

[arch-commits] Commit in python2/trunk (PKGBUILD linux2.patch)

2011-09-16 Thread Stéphane Gaudreault

Date: Friday, September 16, 2011 @ 12:35:58
  Author: stephane
Revision: 138106

Make sure sys.platform is set to linux2, even on kernel 3.X

Added:
  python2/trunk/linux2.patch
Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 linux2.patch |   24 
 2 files changed, 32 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-16 14:11:53 UTC (rev 138105)
+++ PKGBUILD2011-09-16 16:35:58 UTC (rev 138106)
@@ -16,8 +16,10 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
+linux2.patch)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
+  '8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
@@ -32,6 +34,10 @@
   # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
+  # Make sure sys.platform is set to linux2, even on kernel 3.X
+  # cf http://bugs.python.org/issue12326
+  patch -Np1 -i ../linux2.patch
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat

Added: linux2.patch
===
--- linux2.patch(rev 0)
+++ linux2.patch2011-09-16 16:35:58 UTC (rev 138106)
@@ -0,0 +1,24 @@
+http://hg.python.org/cpython/rev/c816479f6aaf/
+diff --git a/configure b/configure
+--- a/configure
 b/configure
+@@ -2995,6 +2995,7 @@ then
+   MACHDEP=$ac_md_system$ac_md_release
+ 
+   case $MACHDEP in
++  linux*) MACHDEP=linux2;;
+   cygwin*) MACHDEP=cygwin;;
+   darwin*) MACHDEP=darwin;;
+   atheos*) MACHDEP=atheos;;
+diff --git a/configure.in b/configure.in
+--- a/configure.in
 b/configure.in
+@@ -293,6 +293,7 @@ then
+   MACHDEP=$ac_md_system$ac_md_release
+ 
+   case $MACHDEP in
++  linux*) MACHDEP=linux2;;
+   cygwin*) MACHDEP=cygwin;;
+   darwin*) MACHDEP=darwin;;
+   atheos*) MACHDEP=atheos;;
+

[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7-db51.patch)

2011-06-29 Thread Stéphane Gaudreault

Date: Wednesday, June 29, 2011 @ 11:22:59
  Author: stephane
Revision: 129895

upgpkg: python2 2.7.2-2
drop db support

Modified:
  python2/trunk/PKGBUILD
Deleted:
  python2/trunk/python-2.7-db51.patch

---+
 PKGBUILD  |   14 +-
 python-2.7-db51.patch |   42 --
 2 files changed, 5 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-29 13:43:11 UTC (rev 129894)
+++ PKGBUILD2011-06-29 15:22:59 UTC (rev 129895)
@@ -5,27 +5,23 @@
 
 pkgname=python2
 pkgver=2.7.2
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
 url=http://www.python.org/;
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
+depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-python-2.7-db51.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
- '9667a2a2f8594902b352793e649f78696a77bd13')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
 
-  patch -Np1 -i ../python-2.7-db51.patch
-
   # Temporary workaround for FS#22322
   # See http://bugs.python.org/issue10835 for upstream report
   sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
@@ -33,7 +29,7 @@
   # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
 
-  # FS#2399
+  # FS#23997
   sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
 
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),

Deleted: python-2.7-db51.patch
===
--- python-2.7-db51.patch   2011-06-29 13:43:11 UTC (rev 129894)
+++ python-2.7-db51.patch   2011-06-29 15:22:59 UTC (rev 129895)
@@ -1,42 +0,0 @@
-diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
 Python-2.7-orig//Modules/_bsddb.c  2010-05-10 00:46:46.0 +1000
-+++ Python-2.7/Modules/_bsddb.c2010-10-20 13:19:26.436669911 +1000
-@@ -9765,8 +9765,11 @@
- 
- ADD_INT(d, DB_REP_PERMANENT);
- 
--#if (DBVER = 44)
-+#if (DBVER = 44)  (DBVER = 48)
- ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
-+#endif
-+
-+#if (DBVER = 44)
- ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
- ADD_INT(d, DB_REP_CONF_BULK);
- ADD_INT(d, DB_REP_CONF_NOWAIT);
-diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
 Python-2.7-orig//setup.py  2010-06-27 22:36:16.0 +1000
-+++ Python-2.7/setup.py2010-10-20 13:10:48.256670026 +1000
-@@ -765,7 +765,7 @@
- # a release.  Most open source OSes come with one or more
- # versions of BerkeleyDB already installed.
- 
--max_db_ver = (4, 8)
-+max_db_ver = (5, 1)
- min_db_ver = (4, 1)
- db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -787,8 +787,12 @@
- return True
- 
- def gen_db_minor_ver_nums(major):
--if major == 4:
-+if major == 5:
- for x in range(max_db_ver[1]+1):
-+if allow_db_ver((5, x)):
-+yield x
-+if major == 4:
-+for x in range(9):
- if allow_db_ver((4, x)):
- yield x
- elif major == 3:

[arch-commits] Commit in python2/trunk (PKGBUILD)

2011-06-11 Thread Stéphane Gaudreault

Date: Saturday, June 11, 2011 @ 23:23:25
  Author: stephane
Revision: 127261

upgpkg: python2 2.7.2-1
version bump

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-11 21:35:23 UTC (rev 127260)
+++ PKGBUILD2011-06-12 03:23:25 UTC (rev 127261)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Allan McRae al...@archlinux.org
-# Contributer: Stéphane Gaudreault steph...@archlinux.org
+# Maintainer: Stéphane Gaudreault steph...@archlinux.org
+# Contributer: Allan McRae al...@archlinux.org
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7.2rc1
+pkgver=2.7.2
 pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
@@ -16,9 +16,9 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.bz2
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
 python-2.7-db51.patch)
-sha1sums=('656bfce75c7e674b2a05c16e1ab9225bf3023326'
+sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
  '9667a2a2f8594902b352793e649f78696a77bd13')
 
 build() {
@@ -33,6 +33,9 @@
   # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
 
+  # FS#2399
+  sed -i -e s|^#.* /usr/local/bin/python|#!/usr/bin/python2| Lib/cgi.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat

[arch-commits] Commit in python2/trunk (PKGBUILD)

2011-02-20 Thread Stéphane Gaudreault

Date: Sunday, February 20, 2011 @ 20:06:01
  Author: stephane
Revision: 110650

rename 2to3 - 2to3-2.7

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-20 21:41:26 UTC (rev 110649)
+++ PKGBUILD2011-02-21 01:06:01 UTC (rev 110650)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=6
+pkgrel=7
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -48,36 +48,37 @@
 
 package() {
   cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall maninstall
+  make DESTDIR=${pkgdir} altinstall maninstall
 
-  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
-  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
-  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
+  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
 
   ln -sf ../../libpython${_pybasever}.so \
-${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
-  mv ${pkgdir}/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
+  mv ${pkgdir}/usr/bin/smtpd.py ${pkgdir}/usr/lib/python${_pybasever}/
 
   # some useful stuff
-  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+  install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
   install -m755 Tools/i18n/{msgfmt,pygettext}.py \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
+${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/
   install -m755 Tools/scripts/{README,*py} \
-${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
+${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
 
   # fix conflicts with python
-  mv ${pkgdir}/usr/bin/idle{,2}
-  mv ${pkgdir}/usr/bin/pydoc{,2}
+  mv ${pkgdir}/usr/bin/idle{,2}
+  mv ${pkgdir}/usr/bin/pydoc{,2}
+  mv ${pkgdir}/usr/bin/2to3{,-2.7}
 
   # clean up #!s
-  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
+  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
   # clean-up reference to build directory
   sed -i s#${srcdir}/Python-${pkgver}:## \
-${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
+${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
 
   # license
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in python2/trunk (PKGBUILD)

2011-02-16 Thread Stéphane Gaudreault

Date: Wednesday, February 16, 2011 @ 16:05:53
  Author: stephane
Revision: 110155

upgpkg: python2 2.7.1-6
Add python{2,2.7} manpages in section 1 (fix FS#22900)

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-16 19:32:04 UTC (rev 110154)
+++ PKGBUILD2011-02-16 21:05:53 UTC (rev 110155)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=5
+pkgrel=6
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -48,10 +48,11 @@
 
 package() {
   cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} altinstall
+  make DESTDIR=${pkgdir} altinstall maninstall
 
-  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever}${pkgdir}/usr/bin/python2
   ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
+  ln -sf python${_pybasever}.1  ${pkgdir}/usr/share/man/man1/python2.1
 
   ln -sf ../../libpython${_pybasever}.so \
 ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
@@ -70,7 +71,7 @@
   mv ${pkgdir}/usr/bin/pydoc{,2}
 
   # clean up #!s
-  find ${pkgdir}/usr/lib/python2.7/ -name '*.py' | \
+  find ${pkgdir}/usr/lib/python${_pybasever}/ -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
   # clean-up reference to build directory

[arch-commits] Commit in python2/trunk (PKGBUILD)

2011-02-07 Thread Stéphane Gaudreault

Date: Monday, February 7, 2011 @ 15:33:18
  Author: stephane
Revision: 109310

upgpkg: python2 2.7.1-5
db-5.1.25-1 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-07 20:20:30 UTC (rev 109309)
+++ PKGBUILD2011-02-07 20:33:18 UTC (rev 109310)
@@ -5,7 +5,7 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=4
+pkgrel=5
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD)

2011-01-06 Thread Stéphane Gaudreault

Date: Thursday, January 6, 2011 @ 07:04:40
  Author: stephane
Revision: 105102

upgpkg: python2 2.7.1-4
workaround for FS#22322

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-06 11:44:50 UTC (rev 105101)
+++ PKGBUILD2011-01-06 12:04:40 UTC (rev 105102)
@@ -1,10 +1,11 @@
 # $Id$
 # Maintainer: Allan McRae al...@archlinux.org
+# Contributer: Stéphane Gaudreault steph...@archlinux.org
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=3
+pkgrel=4
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -25,6 +26,10 @@
 
   patch -Np1 -i ../python-2.7-db51.diff
 
+  # Temporary workaround for FS#22322
+  # See http://bugs.python.org/issue10835 for upstream report
+  sed -i /progname =/s/python/python${_pybasever}/ Python/pythonrun.c
+
   # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-12-20 Thread Stéphane Gaudreault

Date: Monday, December 20, 2010 @ 07:07:19
  Author: stephane
Revision: 103493

upgpkg: python2 2.7.1-3
Enable built-in SQLite3 module (fix FS#22122)

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-20 11:45:42 UTC (rev 103492)
+++ PKGBUILD2010-12-20 12:07:19 UTC (rev 103493)
@@ -4,12 +4,12 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
-url=http://www.python.org;
+url=http://www.python.org/;
 depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
@@ -25,6 +25,9 @@
 
   patch -Np1 -i ../python-2.7-db51.diff
 
+  # Enable built-in SQLite3 module (fix FS#22122)
+  sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-12-20 Thread Stéphane Gaudreault

Date: Monday, December 20, 2010 @ 07:28:27
  Author: stephane
Revision: 103498

better comment

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-20 12:11:17 UTC (rev 103497)
+++ PKGBUILD2010-12-20 12:28:27 UTC (rev 103498)
@@ -25,7 +25,7 @@
 
   patch -Np1 -i ../python-2.7-db51.diff
 
-  # Enable built-in SQLite3 module (fix FS#22122)
+  # Enable built-in SQLite3 module to load extensions (fix FS#22122)
   sed -i /SQLITE_OMIT_LOAD_EXTENSION/d setup.py
 
   # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-12-01 Thread Stéphane Gaudreault

Date: Wednesday, December 1, 2010 @ 08:48:46
  Author: stephane
Revision: 101746

upgpkg: python2 2.7.1-1
upstream update, use system libraries

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   40 
 1 file changed, 24 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-01 12:47:23 UTC (rev 101745)
+++ PKGBUILD2010-12-01 13:48:46 UTC (rev 101746)
@@ -3,8 +3,8 @@
 # Contributer: Jason Chu ja...@archlinux.org
 
 pkgname=python2
-pkgver=2.7
-pkgrel=3
+pkgver=2.7.1
+pkgrel=1
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -17,32 +17,40 @@
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
 python-2.7-db51.diff)
-md5sums=('0e8c9ec32abf5b732bea7d91b38c3339'
+md5sums=('aa27bc25725137ba155910bd8e5ddc4f'
  'd9b8161568ce17a305c1b71e61ccd4b5')
 
 build() {
-  cd ${srcdir}/Python-${pkgver}
+  cd ${srcdir}/Python-${pkgver}
 
-  patch -Np1 -i $srcdir/python-2.7-db51.diff
+  patch -Np1 -i ../python-2.7-db51.diff
 
+  # Ensure that we are using the system copy of various libraries (expat, zlib 
and libffi),
+  # rather than copies shipped in the tarball
+  rm -r Modules/expat
+  rm -r Modules/zlib
+  rm -r Modules/_ctypes/{darwin,libffi}*
+  sed -i s/self.use_system_libffi = False/self.use_system_libffi = True/g 
setup.py
+
   export OPT=${CFLAGS}
-  ./configure --prefix=/usr --enable-shared --with-threads \
-  --enable-unicode=ucs4 --with-system-expat
+  export CPPFLAGS+=`pkg-config --cflags-only-I libffi`
+  ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
+  --enable-unicode=ucs4 --with-system-expat --with-system-ffi
 
   make
 }
 
 package() {
-  cd ${srcdir}/Python-${pkgver}
+  cd ${srcdir}/Python-${pkgver}
   make DESTDIR=${pkgdir} altinstall
 
-  ln -sf python${_pybasever} $pkgdir/usr/bin/python2
-  ln -sf python${_pybasever}-config $pkgdir/usr/bin/python2-config
+  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever}-config ${pkgdir}/usr/bin/python2-config
 
   ln -sf ../../libpython${_pybasever}.so \
 ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
-  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
+  mv ${pkgdir}/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
 
   # some useful stuff
   install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
@@ -52,16 +60,16 @@
 ${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/
 
   # fix conflicts with python
-  mv $pkgdir/usr/bin/idle{,2}
-  mv $pkgdir/usr/bin/pydoc{,2}
+  mv ${pkgdir}/usr/bin/idle{,2}
+  mv ${pkgdir}/usr/bin/pydoc{,2}
 
   # clean up #!s
-  find $pkgdir/usr/lib/python2.7/ -name '*.py' | \
+  find ${pkgdir}/usr/lib/python2.7/ -name '*.py' | \
 xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
 
   # clean-up reference to build directory
-  sed -i s#$srcdir/Python-${pkgver}:## \
-$pkgdir/usr/lib/python${_pybasever}/config/Makefile
+  sed -i s#${srcdir}/Python-${pkgver}:## \
+${pkgdir}/usr/lib/python${_pybasever}/config/Makefile
 
   # license
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-12-01 Thread Stéphane Gaudreault

Date: Wednesday, December 1, 2010 @ 22:15:26
  Author: stephane
Revision: 101792

upgpkg: python2 2.7.1-2
fix missing dependecy on libffi

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-02 00:22:26 UTC (rev 101791)
+++ PKGBUILD2010-12-02 03:15:26 UTC (rev 101792)
@@ -4,13 +4,13 @@
 
 pkgname=python2
 pkgver=2.7.1
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
 license=('PSF')
 url=http://www.python.org;
-depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
+depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
 conflicts=('python3')
@@ -30,10 +30,8 @@
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
-  sed -i s/self.use_system_libffi = False/self.use_system_libffi = True/g 
setup.py
 
   export OPT=${CFLAGS}
-  export CPPFLAGS+=`pkg-config --cflags-only-I libffi`
   ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \
   --enable-unicode=ucs4 --with-system-expat --with-system-ffi

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-10-19 Thread Stéphane Gaudreault

Date: Tuesday, October 19, 2010 @ 22:42:07
  Author: stephane
Revision: 96367

db-5.1 rebuild

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-20 01:41:07 UTC (rev 96366)
+++ PKGBUILD2010-10-20 02:42:07 UTC (rev 96367)
@@ -4,7 +4,7 @@
 
 pkgname=python2
 pkgver=2.7
-pkgrel=2
+pkgrel=3
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')

[arch-commits] Commit in python2/trunk (PKGBUILD python-2.7-db51.diff)

2010-10-19 Thread Allan McRae

Date: Tuesday, October 19, 2010 @ 23:29:47
  Author: allan
Revision: 96373

upgpkg: python2 2.7-3
db-5.1 rebuild

Added:
  python2/trunk/python-2.7-db51.diff
Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 python-2.7-db51.diff |   42 ++
 2 files changed, 48 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-20 02:51:19 UTC (rev 96372)
+++ PKGBUILD2010-10-20 03:29:47 UTC (rev 96373)
@@ -15,12 +15,16 @@
 optdepends=('tk: for IDLE')
 conflicts=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2)
-md5sums=('0e8c9ec32abf5b732bea7d91b38c3339')
+source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
+python-2.7-db51.diff)
+md5sums=('0e8c9ec32abf5b732bea7d91b38c3339'
+ 'd9b8161568ce17a305c1b71e61ccd4b5')
 
 build() {
   cd ${srcdir}/Python-${pkgver}
 
+  patch -Np1 -i $srcdir/python-2.7-db51.diff
+
   export OPT=${CFLAGS}
   ./configure --prefix=/usr --enable-shared --with-threads \
   --enable-unicode=ucs4 --with-system-expat

Added: python-2.7-db51.diff
===
--- python-2.7-db51.diff(rev 0)
+++ python-2.7-db51.diff2010-10-20 03:29:47 UTC (rev 96373)
@@ -0,0 +1,42 @@
+diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c
+--- Python-2.7-orig//Modules/_bsddb.c  2010-05-10 00:46:46.0 +1000
 Python-2.7/Modules/_bsddb.c2010-10-20 13:19:26.436669911 +1000
+@@ -9765,8 +9765,11 @@
+ 
+ ADD_INT(d, DB_REP_PERMANENT);
+ 
+-#if (DBVER = 44)
++#if (DBVER = 44)  (DBVER = 48)
+ ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
++#endif
++
++#if (DBVER = 44)
+ ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
+ ADD_INT(d, DB_REP_CONF_BULK);
+ ADD_INT(d, DB_REP_CONF_NOWAIT);
+diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py
+--- Python-2.7-orig//setup.py  2010-06-27 22:36:16.0 +1000
 Python-2.7/setup.py2010-10-20 13:10:48.256670026 +1000
+@@ -765,7 +765,7 @@
+ # a release.  Most open source OSes come with one or more
+ # versions of BerkeleyDB already installed.
+ 
+-max_db_ver = (4, 8)
++max_db_ver = (5, 1)
+ min_db_ver = (4, 1)
+ db_setup_debug = False   # verbose debug prints from this script?
+ 
+@@ -787,8 +787,12 @@
+ return True
+ 
+ def gen_db_minor_ver_nums(major):
+-if major == 4:
++if major == 5:
+ for x in range(max_db_ver[1]+1):
++if allow_db_ver((5, x)):
++yield x
++if major == 4:
++for x in range(9):
+ if allow_db_ver((4, x)):
+ yield x
+ elif major == 3:

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-10-06 Thread Allan McRae

Date: Wednesday, October 6, 2010 @ 08:30:41
  Author: allan
Revision: 94279

upgpkg: python2 2.7-2
fix shebangs

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-06 12:30:34 UTC (rev 94278)
+++ PKGBUILD2010-10-06 12:30:41 UTC (rev 94279)
@@ -4,7 +4,7 @@
 
 pkgname=python2
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc=A high-level scripting language
 arch=('i686' 'x86_64')
@@ -40,10 +40,6 @@
 
   mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
 
-  # clean-up reference to build directory
-  sed -i s#$srcdir/Python-${pkgver}:## \
-$pkgdir/usr/lib/python${_pybasever}/config/Makefile
-
   # some useful stuff
   install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
   install -m755 Tools/i18n/{msgfmt,pygettext}.py \
@@ -55,6 +51,14 @@
   mv $pkgdir/usr/bin/idle{,2}
   mv $pkgdir/usr/bin/pydoc{,2}
 
+  # clean up #!s
+  find $pkgdir/usr/lib/python2.7/ -name '*.py' | \
+xargs sed -i s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|
+
+  # clean-up reference to build directory
+  sed -i s#$srcdir/Python-${pkgver}:## \
+$pkgdir/usr/lib/python${_pybasever}/config/Makefile
+
   # license
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-08-17 Thread Allan McRae

Date: Tuesday, August 17, 2010 @ 07:33:19
  Author: allan
Revision: 87609

upgpkg: python2 2.7-1
python2-2.7-1

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 11:09:16 UTC (rev 87608)
+++ PKGBUILD2010-08-17 11:33:19 UTC (rev 87609)
@@ -2,7 +2,7 @@
 # Maintainer: Allan McRae al...@archlinux.org
 # Contributer: Jason Chu ja...@archlinux.org
 
-pkgname=python
+pkgname=python2
 pkgver=2.7
 pkgrel=1
 _pybasever=2.7
@@ -13,6 +13,7 @@
 depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3')
 makedepends=('tk')
 optdepends=('tk: for IDLE')
+conflicts=('python3')
 options=('!makeflags')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2)
 md5sums=('0e8c9ec32abf5b732bea7d91b38c3339')
@@ -37,6 +38,11 @@
   ln -sf ../../libpython${_pybasever}.so \
 ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
+  # clean-up reference to build directory
+  sed -i s#$srcdir/Python-${pkgver}:## \
+$pkgdir/usr/lib/python${_pybasever}/config/Makefile
+
+  # some useful stuff
   install -dm755 ${pkgdir}/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
   install -m755 Tools/i18n/{msgfmt,pygettext}.py \
 ${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-08-17 Thread Allan McRae

Date: Tuesday, August 17, 2010 @ 08:14:27
  Author: allan
Revision: 87612

upgpkg: python2 2.7-1
improve split between python 2 and 3

Modified:
  python2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 11:37:43 UTC (rev 87611)
+++ PKGBUILD2010-08-17 12:14:27 UTC (rev 87612)
@@ -30,14 +30,16 @@
 
 package() {
   cd ${srcdir}/Python-${pkgver}
-  make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} altinstall
 
-  rm ${pkgdir}/usr/bin/python
-  ln -sf python${_pybasever} ${pkgdir}/usr/bin/python2
+  ln -sf python${_pybasever} $pkgdir/usr/bin/python2
+  ln -sf python${_pybasever}-config $pkgdir/usr/bin/python2-config
 
   ln -sf ../../libpython${_pybasever}.so \
 ${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
 
+  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
+
   # clean-up reference to build directory
   sed -i s#$srcdir/Python-${pkgver}:## \
 $pkgdir/usr/lib/python${_pybasever}/config/Makefile
@@ -52,8 +54,6 @@
   # fix conflicts with python
   mv $pkgdir/usr/bin/idle{,2}
   mv $pkgdir/usr/bin/pydoc{,2}
-  rm $pkgdir/usr/bin/python-config
-  mv $pkgdir/usr/bin/smtpd.py $pkgdir/usr/lib/python${_pybasever}/
 
   # license
   install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE

[arch-commits] Commit in python2/trunk (PKGBUILD)

2010-08-17 Thread Allan McRae

Date: Tuesday, August 17, 2010 @ 08:38:20
  Author: allan
Revision: 87620

propset Id

Modified:
  python2/trunk/PKGBUILD(contents, properties)

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-17 12:29:10 UTC (rev 87619)
+++ PKGBUILD2010-08-17 12:38:20 UTC (rev 87620)
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75257 2010-04-01 05:30:58Z allan $
+# $Id$
 # Maintainer: Allan McRae al...@archlinux.org
 # Contributer: Jason Chu ja...@archlinux.org
 


Property changes on: python2/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

63 matches

Mail list logo