rpms/python-cherrypy/EL-5 python-cherrypy-2.3.0-EINTR.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 python-cherrypy-regression-test.patch, 1.4, 1.5 python-cherrypy-tutorial-doc.patch, 1.6, 1.7 python-cherrypy.spec, 1.16, 1.17 sources, 1.7, 1.8 python-cherrypy-2.2.1-EINTR.patch, 1.1, NONE
Toshio くらとみ (toshio)
fedora-extras-commits at redhat.com
Mon Feb 11 22:37:13 UTC 2008
Author: toshio
Update of /cvs/pkgs/rpms/python-cherrypy/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv738
Modified Files:
.cvsignore python-cherrypy-regression-test.patch
python-cherrypy-tutorial-doc.patch python-cherrypy.spec
sources
Added Files:
python-cherrypy-2.3.0-EINTR.patch
Removed Files:
python-cherrypy-2.2.1-EINTR.patch
Log Message:
Sync with the Fedora python-cherrypy-2.3.x. setuptools allows people to
define dependencies based on version and since 2.3.x has a security fix,
many projects have set their requirements to python-cherrypy >= 2.3.0 even
though we have the fix backported.
This should be a compatible update.
python-cherrypy-2.3.0-EINTR.patch:
--- NEW FILE python-cherrypy-2.3.0-EINTR.patch ---
diff -up CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak CherryPy-2.3.0/cherrypy/_cpwsgiserver.py
--- CherryPy-2.3.0/cherrypy/_cpwsgiserver.py.bak 2008-01-17 15:57:48.000000000 -0800
+++ CherryPy-2.3.0/cherrypy/_cpwsgiserver.py 2008-01-17 15:59:32.000000000 -0800
@@ -404,6 +404,13 @@ class CherryPyWSGIServer(object):
# accept() by default
return
except socket.error, x:
+ if hasattr(errno, "EINTR") and x.args[0] == errno.EINTR:
+ # I *think* this is right. EINTR should occur when a signal
+ # is received during the accept() call; all docs say retry
+ # the call, and I *think* I'm reading it right that Python
+ # will then go ahead and poll for and handle the signal
+ # elsewhere. See http://www.cherrypy.org/ticket/707.
+ return
msg = x.args[1]
if msg == "Bad file descriptor":
# Our socket was closed
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 13 Jul 2006 18:57:57 -0000 1.7
+++ .cvsignore 11 Feb 2008 22:36:20 -0000 1.8
@@ -1 +1 @@
-CherryPy-2.2.1.tar.gz
+CherryPy-2.3.0.tar.gz
python-cherrypy-regression-test.patch:
Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/python-cherrypy-regression-test.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy-regression-test.patch 13 Jul 2006 18:52:33 -0000 1.4
+++ python-cherrypy-regression-test.patch 11 Feb 2008 22:36:20 -0000 1.5
@@ -1,10 +1,12 @@
---- cherrypy/test/test.py.orig 2006-07-13 14:12:11.000000000 -0400
-+++ cherrypy/test/test.py 2006-07-13 14:12:19.000000000 -0400
-@@ -311,7 +311,6 @@
- CommandLineParser(testList).run()
-
- print
-- raw_input('hit enter')
+Index: CherryPy-2.3.0/cherrypy/test/test.py
+===================================================================
+--- CherryPy-2.3.0.orig/cherrypy/test/test.py
++++ CherryPy-2.3.0/cherrypy/test/test.py
+@@ -328,7 +328,6 @@ def run():
+ success = clp.run()
+ if clp.interactive:
+ print
+- raw_input('hit enter')
+ sys.exit(success)
- if __name__ == '__main__':
python-cherrypy-tutorial-doc.patch:
Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-cherrypy-tutorial-doc.patch 13 Jul 2006 18:52:33 -0000 1.6
+++ python-cherrypy-tutorial-doc.patch 11 Feb 2008 22:36:20 -0000 1.7
@@ -1,13 +1,14 @@
---- setup.py.orig 2006-07-13 14:15:25.000000000 -0400
-+++ setup.py 2006-07-13 14:16:00.000000000 -0400
-@@ -36,23 +36,11 @@
+diff -up CherryPy-2.3.0/setup.py.bak CherryPy-2.3.0/setup.py
+--- CherryPy-2.3.0/setup.py.bak 2008-01-17 14:37:31.000000000 -0800
++++ CherryPy-2.3.0/setup.py 2008-01-17 14:38:06.000000000 -0800
+@@ -36,23 +36,11 @@ url="http://www.cherrypy.org"
cp_license="BSD"
packages=[
"cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
- "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
+ "cherrypy.filters",
]
- download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
+ download_url="http://download.cherrypy.org/cherrypy/2.3.0/"
data_files=[
- ('cherrypy/tutorial',
- [
Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/python-cherrypy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- python-cherrypy.spec 29 Jan 2008 03:59:03 -0000 1.16
+++ python-cherrypy.spec 11 Feb 2008 22:36:20 -0000 1.17
@@ -1,8 +1,8 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: python-cherrypy
-Version: 2.2.1
-Release: 10%{?dist}
+Version: 2.3.0
+Release: 3%{?dist}
Summary: A pythonic, object-oriented web development framework
Group: Development/Libraries
License: BSD
@@ -11,8 +11,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: %{name}-tutorial-doc.patch
Patch1: %{name}-regression-test.patch
-Patch2: %{name}-%{version}-EINTR.patch
-Patch3: cherrypy-2.2.1-security-sessionfilter.patch
+Patch2: %{name}-2.3.0-EINTR.patch
BuildArch: noarch
@@ -30,10 +29,9 @@
%prep
%setup -q -n CherryPy-%{version}
-%patch0
-%patch1
-%patch2
-%patch3 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
@@ -42,11 +40,11 @@
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} -c 'import setuptools; execfile("setup.py")' install -O1 --skip-build --root %{buildroot}
+%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root %{buildroot}
-#%check
-#cd cherrypy/test
-#%{__python} test.py
+%check
+cd cherrypy/test
+%{__python} test.py
%clean
rm -rf $RPM_BUILD_ROOT
@@ -58,13 +56,20 @@
%{python_sitelib}/*
%changelog
-* Mon Jan 28 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-10
-- Patch was a backport from CP-3.x. Fix with the 2.x version.
-
-* Thu Jan 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-9
+* Thu Jan 22 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-3
- Add egg-info so that the new TurboGears can build against cherrypy on F-7
and F-8 as well as Rawhide.
+* Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-2
+- EINTR Patch needed to be forwarded ported as well as it is only applied to
+ CP trunk (3.x).
+
+* Thu Jan 17 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-1
+- Update to new upstream which rolls in the backported security fix.
+- Refresh other patches to apply against new version.
+- Change to new canonical source URL.
+- Reenable tests.
+
* Sun Jan 6 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.2.1-8
- Fix a security bug with a backport of http://www.cherrypy.org/changeset/1775
- Include the egginfo files as well as the python files.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 13 Jul 2006 18:57:57 -0000 1.7
+++ sources 11 Feb 2008 22:36:20 -0000 1.8
@@ -1 +1 @@
-14bf17b0706bc480342cb8fcfaed74cd CherryPy-2.2.1.tar.gz
+80ce0f666f2899d4e681432e4061db16 CherryPy-2.3.0.tar.gz
--- python-cherrypy-2.2.1-EINTR.patch DELETED ---
More information about the fedora-extras-commits
mailing list