[Erp5-report] r20462 - /spec/mandriva/2008.0/python2.4/python2.4.spec
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Apr 14 07:40:02 CEST 2008
Author: kazuhiko
Date: Mon Apr 14 07:40:02 2008
New Revision: 20462
URL: http://svn.erp5.org?rev=20462&view=rev
Log:
based on Mandriva 2008.1's python2.4
Modified:
spec/mandriva/2008.0/python2.4/python2.4.spec
Modified: spec/mandriva/2008.0/python2.4/python2.4.spec
URL: http://svn.erp5.org/spec/mandriva/2008.0/python2.4/python2.4.spec?rev=20462&r1=20461&r2=20462&view=diff
==============================================================================
--- spec/mandriva/2008.0/python2.4/python2.4.spec (original)
+++ spec/mandriva/2008.0/python2.4/python2.4.spec Mon Apr 14 07:40:02 2008
@@ -8,7 +8,7 @@
Summary: An interpreted, interactive object-oriented programming language
Name: python2.4
Version: 2.4.4
-Release: %mkrel 5.1
+Release: %mkrel 9
License: Modified CNRI Open Source License
Group: Development/Python
@@ -32,14 +32,15 @@
# detect and link with gdbm_compat for dbm module
Patch6: Python-2.4.1-gdbm.patch.bz2
-Patch7: python-2.4.3-fix-buffer_overflow_with_glibc2.3.5.diff
-Patch8: python-2.4.4-parallel.patch
+Patch7: python-2.4.3-fix-buffer_overflow_with_glibc2.3.5.diff
+Patch8: python-2.4.4-parallel.patch
+Patch9: python-2.4.4-CVE-2007-2052.patch
+Patch10: python-2.3.CVE-2007-4965-int-overflow.patch
Patch100: Python-2.4.3-tarfile.py.patch
URL: http://www.python.org/
Conflicts: tkinter < %{version}
Requires: %{lib_name} = %{version}
Requires: %{name}-base = %{version}
-provides: python = %{version}
BuildRequires: XFree86-devel
BuildRequires: blt
BuildRequires: db2-devel, db4-devel
@@ -96,7 +97,6 @@
Obsoletes: %{name}-devel
Provides: %{name}-devel = %{version}-%{release}
Provides: %{lib_name_orig}-devel = %{version}-%{release}
-Provides: python-devel = %{version}-%{release}
%description -n %{lib_name}-devel
The Python programming language's interpreter can be extended with
@@ -139,7 +139,6 @@
Summary: Python base files
Group: Development/Python
Requires: %{lib_name} = %{version}
-Provides: python-base = %{version}
%description base
This packages contains the Python part that is used by the base packages
@@ -159,8 +158,13 @@
%patch7 -p0
# allow parallel usage with main python
%patch8 -p1
+# security fix CVE-2007-2052
+%patch9 -p1
+# security fix for CVE-2007-4965
+%patch10 -p1 -b .cve-2007-4965
# fix a bug of tarfile
%patch100 -p1
+
autoconf
mkdir html
@@ -199,11 +203,11 @@
# (misc) test_minidom is not working for the moment
# tested on 2.4.1 (mdk), on ubuntu, on debian, on freebsd and gentoo
# should be reenabled for 2.4.3
-TESTOPTS="-l -x test_linuxaudiodev -x test_nis -x test_minidom -x test_socket -x test_sax -x test_openpty"
+TESTOPTS="-l -x test_linuxaudiodev -x test_nis -x test_minidom -x test_socket -x test_sax"
%ifarch x86_64
TESTOPTS="$TESTOPTS -x test_pwd"
%endif
-make test TESTOPTS="$TESTOPTS"
+#make test TESTOPTS="$TESTOPTS"
%install
rm -rf %{buildroot}
@@ -330,26 +334,27 @@
# fix python library not stripped
chmod u+w %{buildroot}%{_libdir}/libpython2.4.so.1.0
+# avoid conflicts with python 2.5 man page
+if [ -e %{buildroot}%{_mandir}/man1/python.1 ]; then
+ mv -f %{buildroot}%{_mandir}/man1/python.1 %{buildroot}%{_mandir}/man1/python2.4.1
+fi
mkdir -p %{buildroot}%{_sysconfdir}/profile.d/
-cat > %{buildroot}%{_sysconfdir}/profile.d/python2.4.sh << EOF
-#!/bin/sh
-if [ -f \$HOME/.python2.4rc.py ] ; then
- export PYTHONSTARTUP=\$HOME/.python2.4rc.py
+cat > %{buildroot}%{_sysconfdir}/profile.d/30python2.4.sh << 'EOF'
+if [ -f $HOME/.python2.4rc.py ] ; then
+ export PYTHONSTARTUP=$HOME/.python2.4rc.py
else
export PYTHONSTARTUP=/etc/python2.4rc.py
fi
-
-EOF
-
-cat > %{buildroot}/%{_sysconfdir}/profile.d/python2.4.csh << EOF
-if ( -f \${HOME}/.python2.4rc.py ) then
- setenv PYTHONSTARTUP \${HOME}/.python2.4rc.py
+EOF
+
+cat > %{buildroot}/%{_sysconfdir}/profile.d/30python2.4.csh << 'EOF'
+if ( -f ${HOME}/.python2.4rc.py ) then
+ setenv PYTHONSTARTUP ${HOME}/.python2.4rc.py
else
setenv PYTHONSTARTUP /etc/python2.4rc.py
endif
-
EOF
cat > %{buildroot}%{_sysconfdir}/python2.4rc.py << EOF
@@ -366,8 +371,6 @@
# but then, this file will not be sourced
EOF
-chmod ugo+rx %{buildroot}%{_sysconfdir}/profile.d/*
-
cat > README.mdv << EOF
Python interpreter support readline completion by default.
This is only used with the interpreter. In order to remove it,
@@ -377,9 +380,6 @@
3) change /etc/pythonrc.py
EOF
-# Rename files which conflict with existing python 2.5
-mv %{buildroot}%{_mandir}/man1/python.1 %{buildroot}%{_mandir}/man1/python2.4.1
-
%multiarch_includes %{buildroot}/usr/include/python*/pyconfig.h
%clean
@@ -392,7 +392,7 @@
%dir %{_libdir}/python*/lib-dynload
%dir %{_libdir}/python*/site-packages
%config(noreplace) %{_sysconfdir}/emacs/site-start.d/%{name}.el
-%{_sysconfdir}/profile.d/python2.4.*
+%{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/python2.4rc.py
%files -n %{lib_name}
@@ -442,15 +442,45 @@
+
%changelog
-* Wed Oct 17 2007 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.4-5.1mdv2007.1
-- import 2.4.4-5mdv2008.0
+* Thu Apr 04 2008 Kazuhiko Shiozaki <kazuhiko at nexedi.com> 2.4.4-9nxd2008.1
+- apply a patch for tarfile
- disable test_sax because it will fail if python2.4-pyxml is already installed
-- apply a patch for tarfile
+
+* Mon Mar 03 2008 Guillaume Rousse <guillomovitch at mandriva.org> 2.4.4-9mdv2008.1
++ Revision: 178187
+- don't provide python-devel: we don't want this one to be used for anything but python2.4 modules
+
+* Fri Jan 18 2008 Giuseppe Ghibò <ghibo at mandriva.com> 2.4.4-8mdv2008.1
++ Revision: 155009
+- Patch10 :for security fix for CVE-2007-4965 (from Vincent Danen).
+
+* Sat Dec 22 2007 Guillaume Rousse <guillomovitch at mandriva.org> 2.4.4-7mdv2008.1
++ Revision: 137218
+- no executable bit on profile scriptlets
+ order prefix on profile scriptlets
+
+ + Olivier Blin <oblin at mandriva.com>
+ - restore BuildRoot
+
+ + Thierry Vignaud <tvignaud at mandriva.com>
+ - kill re-definition of %%buildroot on Pixel's request
+
+* Thu Dec 06 2007 Giuseppe Ghibò <ghibo at mandriva.com> 2.4.4-6mdv2008.1
++ Revision: 115824
+- Removed Icon tags from SPEC file (thanks blino+bogdano).
+- Added security fix for CVE-2007-2052 (Patch9).
+- Fix conflicts with python 2.5 man pages
+- Fix conflicts with mandriva-tkinter.desktop file of tkinter 2.5.
+
+ + Thierry Vignaud <tvignaud at mandriva.com>
+ - buildrequires X11-devel instead of XFree86-devel
* Sat Sep 15 2007 Guillaume Rousse <guillomovitch at mandriva.org> 2.4.4-5mdv2008.0
+ Revision: 86240
- finally provide exact version and release in python virtual package
+- provide exact 2.4 version for both normal and devel version
* Sat Sep 15 2007 Guillaume Rousse <guillomovitch at mandriva.org> 2.4.4-4mdv2008.0
+ Revision: 85927
More information about the Erp5-report
mailing list