Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Added	python.changes
@@ -0,0 +1,64 @@ +* Wed Jul 24 2013 Carsten Munk <carsten.munk@jollamobile.com> - 2.7.5 +- Don't package dl and imageop on x86_64, doesn't get built for it. + +* Fri May 16 2013 D Wadsworth <letters.random13@gmail.com> - 2.7.5 +- Fixes MER#721: update python to 2.7.5 (quick bugfix release for 2.7.4) + +* Thu May 09 2013 D Wadsworth <letters.random13@gmail.com> - 2.7.4 +- Fixes MER#721: update python to 2.7.4 + +* Sun Mar 03 2013 Carsten Munk <carsten.munk@jollamobile.com> - 2.7.3 +- Remove some more timestamps + +* Mon Jan 28 2013 Oleg Girko <ol+mer@infoserver.ru> - 2.7.3 +- Exclude 2 more tests for x86_64 architecture. + +* Tue Jan 22 2013 Oleg Girko <ol+mer@infoserver.ru> - 2.7.3 +- Add support for building on x86_64 architecture. + +* Sat Apr 14 2012 D Wadsworth <letters.random13@gmail.com> - 2.7.3 +- Fixes MER#98: Upgrade Python to 2.7 +- skip tests for sb2/qemu builds (many unexpected test crashes); but retain + arch-dependent (EXCLUDED_TESTS) logic (including new mipsel arch) for future native testing +- Clean up yaml/spec files + +* Mon Jan 23 2012 Martin Brook <martin.brook100@googlemail.com> - 2.6.4 +- added python-2.6-fix-parallel-make.patch to fix https://bugs.merproject.org/show_bug.cgi?id=34 + +* Mon Jun 27 2011 Chris Ferron <chris.e.ferron@linux.intel.com> - 2.6.4 +- PACKAGE CLEANUP - Removed unnecessary Obsoletes and Provides of Distutils as there is no longer a package in MeeGo with that name or a package other then this package that provides the name. Since there is no package Distutils, the obsolete is no loger needed or the provides. + +* Thu Jan 27 2011 Huaxu Wan <huaxu.wan@intel.com> - 2.6.4 +- Add patch python-2.6-multiple_race_conditions.patch +- Fix BMC#8839, BMC8842, CVE-2010-3493 and CVE-2010-3492 + Multiple race conditions in smtpd.py in the smtpd module in Python 2.6, 2.7, + 3.1, and 3.2 alpha allow remote attackers to cause a denial of service (daemon + outage) by establishing and then immediately closing a TCP connection. + The upstream patches r87123, r86084 fix the above issues for 2.6-maint and 2.7 + respectively. This patch merge both of them. + +* Fri Jul 30 2010 Huaxu Wan <huaxu.wan@linux.intel.com> - 2.6.4 +- Fix bug BMC#2616 in Trunk + +* Tue Jun 08 2010 Huaxu Wan <huaxu.wan@intel.com> - 2.6.4 +- Fix bug http://bugs.python.org/issue7673 + or http://bugs.meego.com/show_bug.cgi?id=2614 + +* Sat Mar 06 2010 Anas Nashif <anas.nashif@intel.com> - 2.6.4 +- Disable tkinter, we use it nowhere + +* Thu Jan 07 2010 Anas Nashif <anas.nashif@intel.com> - 2.6.4 +- Update to 2.6.4 + +* Fri Oct 02 2009 Anas Nashif <anas.nashif@intel.com> - 2.6.2 +- Update to 2.6.2 + +* Mon Sep 21 2009 Anas Nashif <anas.nashif@intel.com> - 2.6.2 +- Update to 2.6.2 + +* Sat Dec 20 2008 Anas Nashif <anas.nashif@intel.com> 2.6 +- Do not require tkinter + +* Thu Dec 18 2008 Anas Nashif <anas.nashif@intel.com> 2.6 +- Disable tkinter build +
[-] [+]	Added	python.spec ^
@@ -0,0 +1,491 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.26 +# + +Name: python + +# >> macros +%global _default_patch_fuzz 2 +%global pybasever 2.7 +%global pylibdir %{_libdir}/python%{pybasever} +%global dynload_dir %{pylibdir}/lib-dynload +# << macros + +Summary: An interpreted, interactive, object-oriented programming language +Version: 2.7.5 +Release: 1 +Group: Development/Languages +License: Python +URL: http://www.python.org/ +Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 +Source100: python.yaml +Patch0: cgi-py-shebang.patch +Patch1: Python-2.2.1-pydocnogui.patch +Patch2: notimestamp.patch +Patch3: skip-sem-test.patch +BuildRequires: pkgconfig(libffi) +BuildRequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: bzip2 +BuildRequires: bzip2-devel +BuildRequires: db4-devel >= 4.8 +BuildRequires: gcc +BuildRequires: gdbm-devel +BuildRequires: make +BuildRequires: pkgconfig +BuildRequires: readline-devel +BuildRequires: tar +Provides: python-abi = %{pybasever} + +%description +Python is an interpreted, interactive, object-oriented programming +language often compared to Tcl, Perl, Scheme or Java. Python includes +modules, classes, exceptions, very high level dynamic data types and +dynamic typing. Python supports interfaces to many system calls and +libraries, as well as to various windowing systems (X11, Motif, Tk, +Mac and MFC). + +Programmers can write new built-in modules for Python in C or C++. +Python can be used as an extension language for applications that need +a programmable interface. This package contains most of the standard +Python modules. + +This package provides the "python" executable; most of the actual +implementation is within the "python-libs" package. + + +%package libs +Summary: Runtime libraries for Python +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description libs +This package contains runtime libraries for use by Python: +- the libpython dynamic library, for use by applications that embed Python as +a scripting language, and by the main "python" executable +- the Python standard library + + +%package test +Summary: The test modules from the main python package +Group: Development/Languages +Requires: %{name} = %{version}-%{release} + +%description test +The test modules from the main python package: %{name} +These have been removed to save space, as they are never or almost +never used in production. + +You might want to install the python-test package if you're developing python +code that uses more than just unittest and/or test_support.py. + + +%package tools +Summary: A collection of development tools included with Python +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Provides: python2-tools = %{version} +Obsoletes: python2-tools < %{version} + +%description tools +This package includes several tools to help with the development of Python +programs, including IDLE (an IDE with editing and debugging facilities), a +color editor (pynche), and a python gettext program (pygettext.py). + + +%package devel +Summary: The libraries and header files needed for Python development +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Provides: python2-devel = %{version}-%{release} +Obsoletes: python2-devel < %{version}-%{release} + +%description devel +The Python programming language's interpreter can be extended with +dynamically loaded extensions and can be embedded in other programs. +This package contains the header files and libraries needed to do +these types of tasks. + +Install python-devel if you want to develop Python extensions. The +python package will also need to be installed. You'll probably also +want to install the python-docs package, which contains Python +documentation. + + +%prep +%setup -q -n Python-%{version} + +# cgi-py-shebang.patch +%patch0 -p1 +# Python-2.2.1-pydocnogui.patch +%patch1 -p1 +# notimestamp.patch +%patch2 -p1 +# >> setup +# << setup + +%build +# >> build pre +export CC=gcc +# << build pre + +%configure --disable-static \ + --enable-ipv6 \ + --enable-unicode=ucs4 \ + --enable-shared \ + --with-system-ffi + +make %{?jobs:-j%jobs} + +# >> build post +#have to test pre-installed here (or can we move yaml's check up here)? + +echo STARTING: CHECKING OF PYTHON +echo NOTE: the test suite is run two times +echo arch is "%{_arch}" +echo buildarch is "%{_build_arch}" + +#skip failing tests (FAIL or crash (seg fault, etc)). +#otherwise rpmbuild will bomb (make test exits w/ non-zero status). +# +#always excluded are due to no tkinter module: +#test_tcl skipped -- No module named _tkinter +#they would show up as skips unexpected on linux2 otherwise +ALWAYS_EXCLUDED_TESTS=" \ +test_tcl \ +test_tk \ +test_ttk_guionly \ +test_ttk_textonly \ +%{nil}" + +#scratchbox2 builds (arm or mipsel) cause several unexpected failures +#see, e.g., mer#309 (gdb) +#test_ftplib, test_posix fail on at least sb2/armv7 (but ok on osc) +SB2_EXCLUDED=" \ +test_capi \ +test_epoll \ +test_ftplib \ +test_gdb \ +test_hashlib \ +test_httpservers \ +test_mmap \ +test_multiprocessing \ +test_posix \ +test_threading \ +%{nil}" + +%ifarch %{arm} + +echo "testing: ifarch is arm" +#2.7.3 is much worse (seg faults, crashes) in tests under qemu than 2.7.2 was +#and definite armv7el / armv8el differences + + +ARCH_EXCLUDED="\ +$SB2_EXCLUDED \ +test_bz2 \ +test_cmath \ +test_file \ +test_file2k \ +test_float \ +test_io \ +test_locale \ +test_math \ +test_openpty \ +test_pty \
[-] [+]	Added	Python-2.2.1-pydocnogui.patch ^
@@ -0,0 +1,37 @@ +--- Python-2.2.1/Lib/pydoc.py.nogui 2002-07-08 18:32:47.000000000 -0400 ++++ Python-2.2.1/Lib/pydoc.py 2002-07-08 18:33:37.000000000 -0400 +@@ -18,9 +18,6 @@ + Run "pydoc -p <port>" to start an HTTP server on a given port on the + local machine to generate documentation web pages. + +-For platforms without a command line, "pydoc -g" starts the HTTP server +-and also pops up a little window for controlling it. +- + Run "pydoc -w <name>" to write out the HTML documentation for a module + to a file named "<name>.html". + """ +@@ -2043,9 +2040,6 @@ + writing = 0 + + for opt, val in opts: +- if opt == '-g': +- gui() +- return + if opt == '-k': + apropos(val) + return +@@ -2099,13 +2093,10 @@ + %s -p <port> + Start an HTTP server on the given port on the local machine. + +-%s -g +- Pop up a graphical interface for finding and serving documentation. +- + %s -w <name> ... + Write out the HTML documentation for a module to a file in the current + directory. If <name> contains a '%s', it is treated as a filename; if + it names a directory, documentation is written for all the contents. +-""" % (cmd, os.sep, cmd, cmd, cmd, cmd, os.sep) ++""" % (cmd, os.sep, cmd, cmd, cmd, os.sep) + + if __name__ == '__main__': cli()
[-] [+]	Added	cgi-py-shebang.patch ^
@@ -0,0 +1,15 @@ +--- Python-2.7.2/Lib/cgi.py-local 2012-01-16 21:05:45.851988493 -0800 ++++ Python-2.7.2/Lib/cgi.py 2012-01-16 21:06:38.803316979 -0800 +@@ -1,10 +1,6 @@ +-#! /usr/local/bin/python ++#! /usr/bin/env python + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, ++# .... Granted, + # binary installations by Linux vendors often install Python in + # /usr/bin. So let those vendors patch cgi.py to match their choice + # of installation.
[-] [+]	Added	notimestamp.patch ^
@@ -0,0 +1,26 @@ +--- Python-2.7.4/Modules/getbuildinfo.c 2013-04-06 07:02:37.000000000 -0700 ++++ Python-2.7.4-notimestamp/Modules/getbuildinfo.c 2013-05-09 11:04:08.960671214 -0700 +@@ -4,21 +4,9 @@ + #include <stdio.h> + #endif + +-#ifndef DATE +-#ifdef __DATE__ +-#define DATE __DATE__ +-#else +-#define DATE "xx/xx/xx" +-#endif +-#endif ++#define DATE "May 09 2013" + +-#ifndef TIME +-#ifdef __TIME__ +-#define TIME __TIME__ +-#else +-#define TIME "xx:xx:xx" +-#endif +-#endif ++#define TIME "12:34:56" + + /* on unix, SVNVERSION is passed on the command line. + * on Windows, the string is interpolated using
[-] [+]	Added	skip-sem-test.patch ^
@@ -0,0 +1,23 @@ +diff -Naur -x '*~' Python-2.7.1/configure.in Python-2.7.1-skip-shm-test/configure.in +--- Python-2.7.1/configure.ac 2010-11-01 02:47:19.000000000 +0100 ++++ Python-2.7.1-skip-shm-test/configure.ac 2011-02-02 22:28:42.000000000 +0100 +@@ -3609,7 +3609,7 @@ + } + ]])], + [ac_cv_posix_semaphores_enabled=yes], +-[ac_cv_posix_semaphores_enabled=no], ++[ac_cv_posix_semaphores_enabled=yes], + [ac_cv_posix_semaphores_enabled=yes]) + ) + AC_MSG_RESULT($ac_cv_posix_semaphores_enabled) +@@ -3645,8 +3645,8 @@ + } + ]])], + [ac_cv_broken_sem_getvalue=no], +-[ac_cv_broken_sem_getvalue=yes], +-[ac_cv_broken_sem_getvalue=yes]) ++[ac_cv_broken_sem_getvalue=no], ++[ac_cv_broken_sem_getvalue=no]) + ) + AC_MSG_RESULT($ac_cv_broken_sem_getvalue) + if test $ac_cv_broken_sem_getvalue = yes
	Added	Python-2.7.5.tar.bz2 ^
[-] [+]	Deleted	_service ^
@@ -1,8 +0,0 @@ -<services> - <service name="tar_git"> - <param name="url">git://git.merproject.org/mer-core/python</param> - <param name="branch">master</param> - <param name="revision">28c73a264eb0638472a2c00157ae0bcd8bc75776</param> - <param name="dumb">Y</param> - </service> -</services> \ No newline at end of file
[-] [+]	Added	python-rpmlintrc ^
@@ -0,0 +1 @@ +addFilter("E: wrong-script-interpreter .*")
[-] [+]	Added	python.yaml ^
@@ -0,0 +1,272 @@ +Name: python +Summary: An interpreted, interactive, object-oriented programming language +Version: 2.7.5 +Release: 1 +Group: Development/Languages +License: Python +URL: http://www.python.org/ +Sources: + - http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.bz2 +Patches: + - cgi-py-shebang.patch + - Python-2.2.1-pydocnogui.patch + - notimestamp.patch +Description: \| + Python is an interpreted, interactive, object-oriented programming + language often compared to Tcl, Perl, Scheme or Java. Python includes + modules, classes, exceptions, very high level dynamic data types and + dynamic typing. Python supports interfaces to many system calls and + libraries, as well as to various windowing systems (X11, Motif, Tk, + Mac and MFC). + + Programmers can write new built-in modules for Python in C or C++. + Python can be used as an extension language for applications that need + a programmable interface. This package contains most of the standard + Python modules. + + This package provides the "python" executable; most of the actual + implementation is within the "python-libs" package. + +PkgConfigBR: + - libffi + - ncursesw + - openssl + - sqlite3 +PkgBR: + - bzip2 + - bzip2-devel + - db4-devel >= 4.8 + - gcc + - gdbm-devel + - make + - pkgconfig + - readline-devel + - tar +Provides: + - python-abi = %{pybasever} +Configure: configure +ConfigOptions: + - --enable-ipv6 + - --enable-unicode=ucs4 + - --enable-shared + - --with-system-ffi +Builder: make +Files: + - "%defattr(-, root, root, -)" + - "%doc LICENSE README" + - "%{_bindir}/pydoc" + - "%{_bindir}/python" + - "%{_bindir}/python2" + - "%{_bindir}/python%{pybasever}" + - "%{_mandir}//" +Check: no +SubPackages: + - Name: libs + Summary: Runtime libraries for Python + Group: Applications/System + Description: \| + This package contains runtime libraries for use by Python: + - the libpython dynamic library, for use by applications that embed Python as + a scripting language, and by the main "python" executable + - the Python standard library + Files: + - "%defattr(-, root, root, -)" + - "%dir %{pylibdir}" + - "%dir %{dynload_dir}" + - "%{dynload_dir}/Python-%{version}-py%{pybasever}.egg-info" + - "#warning, hardwired SOVERSION 1.0" + - "%{_libdir}/libpython%{pybasever}.so.1.0" + - + - "#this list is from the stdout of rpmbuild -bl ('provides...' section)." + - "#note the 'module' disappeared from some names 2.7.1 to 2.7.2(?)." + - "%{dynload_dir}/_bisect.so" + - "%{dynload_dir}/_bsddb.so" + - "%{dynload_dir}/_codecs_cn.so" + - "%{dynload_dir}/_codecs_hk.so" + - "%{dynload_dir}/_codecs_iso2022.so" + - "%{dynload_dir}/_codecs_jp.so" + - "%{dynload_dir}/_codecs_kr.so" + - "%{dynload_dir}/_codecs_tw.so" + - "%{dynload_dir}/_collections.so" + - "%{dynload_dir}/_csv.so" + - "%{dynload_dir}/_ctypes.so" + - "%{dynload_dir}/_curses.so" + - "%{dynload_dir}/_curses_panel.so" + - "%{dynload_dir}/_elementtree.so" + - "%{dynload_dir}/_functools.so" + - "%{dynload_dir}/_hashlib.so" + - "%{dynload_dir}/_heapq.so" + - "%{dynload_dir}/_hotshot.so" + - "%{dynload_dir}/_io.so" + - "%{dynload_dir}/_json.so" + - "%{dynload_dir}/_locale.so" + - "%{dynload_dir}/_lsprof.so" + - "%{dynload_dir}/_multibytecodec.so" + - "%{dynload_dir}/_multiprocessing.so" + - "%{dynload_dir}/_random.so" + - "%{dynload_dir}/_socket.so" + - "%{dynload_dir}/_sqlite3.so" + - "%{dynload_dir}/_ssl.so" + - "%{dynload_dir}/_struct.so" + - "%{dynload_dir}/array.so" + - "%{dynload_dir}/audioop.so" + - "%{dynload_dir}/binascii.so" + - "%{dynload_dir}/bz2.so" + - "%{dynload_dir}/cPickle.so" + - "%{dynload_dir}/cStringIO.so" + - "%{dynload_dir}/cmath.so" + - "%{dynload_dir}/crypt.so" + - "%{dynload_dir}/datetime.so" + - "%{dynload_dir}/dbm.so" + - "%{dynload_dir}/dl.so" + - "%{dynload_dir}/fcntl.so" + - "%{dynload_dir}/future_builtins.so" + - "%{dynload_dir}/gdbm.so" + - "%{dynload_dir}/grp.so" + - "%{dynload_dir}/imageop.so" + - "%{dynload_dir}/itertools.so" + - "%{dynload_dir}/linuxaudiodev.so" + - "%{dynload_dir}/math.so" + - "%{dynload_dir}/mmap.so" + - "%{dynload_dir}/nis.so" + - "%{dynload_dir}/operator.so" + - "%{dynload_dir}/ossaudiodev.so" + - "%{dynload_dir}/parser.so" + - "%{dynload_dir}/pyexpat.so" + - "%{dynload_dir}/readline.so" + - "%{dynload_dir}/resource.so" + - "%{dynload_dir}/select.so" + - "%{dynload_dir}/spwd.so" + - "%{dynload_dir}/strop.so" + - "%{dynload_dir}/syslog.so" + - "%{dynload_dir}/termios.so" + - "%{dynload_dir}/time.so" + - "%{dynload_dir}/unicodedata.so" + - "%{dynload_dir}/zlib.so" + - + - "%dir %{pylibdir}/site-packages" + - "%{pylibdir}/site-packages/README" + - "%{pylibdir}/.py" + - + - "%dir %{pylibdir}/bsddb" + - "%{pylibdir}/bsddb/.py" + - "%{pylibdir}/pdb.doc" + - "%{pylibdir}/compiler" + - "%dir %{pylibdir}/ctypes" + - "%{pylibdir}/ctypes/.py" + - "%{pylibdir}/ctypes/macholib" + - "%{pylibdir}/curses" + - "%dir %{pylibdir}/distutils" + - "%{pylibdir}/distutils/.py" + - "%{pylibdir}/distutils/README" + - "%{pylibdir}/distutils/command" + - "%exclude %{pylibdir}/distutils/command/wininst-.exe" + - "%dir %{pylibdir}/email" + - "%{pylibdir}/email/.py" + - "%{pylibdir}/email/mime" + - "%{pylibdir}/encodings" + - "%{pylibdir}/hotshot" + - "%{pylibdir}/idlelib" + - "%exclude %{pylibdir}/idlelib/idle.bat" + - "%{pylibdir}/importlib" + - "%dir %{pylibdir}/json" + - "%{pylibdir}/json/.py" + - "%{pylibdir}/lib2to3" + - "%{pylibdir}/logging" + - "%{pylibdir}/multiprocessing" + - "%{pylibdir}/plat-linux2" + - "%{pylibdir}/pydoc_data" + - "%dir %{pylibdir}/sqlite3" + - "%{pylibdir}/sqlite3/.py" + - + - "#see -tests pkg for others" + - "%dir %{pylibdir}/test" + - "%{pylibdir}/test/test_support.py" + - "%{pylibdir}/test/__init__.py*" + - "%{pylibdir}/unittest" + - "%{pylibdir}/wsgiref" + - "%{pylibdir}/xml" + - + - "%dir %{pylibdir}/config" + - "%{pylibdir}/config/Makefile" + - "%dir %{_includedir}/python%{pybasever}" + - "#note: this config.h might only support 32 bit arch?" + - "%{_includedir}/python%{pybasever}/pyconfig.h" + + - Name: test + Summary: The test modules from the main python package + Group: Development/Languages + Description: \|