Rebuilt for Python 3.9

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1808355

.gitignore

@@ -1 +1,11 @@
 greenlet-0.3.1.tar.gz
+/greenlet-0.4.0.zip
+/greenlet-0.4.1.zip
+/greenlet-0.4.2.zip
+/greenlet-0.4.5.zip
+/greenlet-0.4.7.zip
+/greenlet-0.4.9.zip
+/0.4.11.tar.gz
+/greenlet-0.4.12.tar.gz
+/greenlet-0.4.13.tar.gz
+/greenlet-0.4.14.tar.gz

c644ca6823994b958e004b3e00b587723181b58e.patch

@@ -0,0 +1,48 @@
+From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
+From: Victor Stinner <vstinner@python.org>
+Date: Wed, 18 Mar 2020 15:09:33 +0100
+Subject: [PATCH] Port to Python 3.9
+
+On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
+https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
+
+Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
+since PyEval_CallObjectWithKeywords() has been deprecated in
+Python 3.9 and PyObject_Call() has the same behavior. The only
+difference is that PyEval_CallObjectWithKeywords() can be called with
+args=NULL, but g_initialstub() ensures that args is not NULL.
+---
+ greenlet.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/greenlet.c b/greenlet.c
+index ec738b9..d37fc97 100644
+--- a/greenlet.c
++++ b/greenlet.c
+@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
+ #define GREENLET_USE_TRACING 1
+ #endif
+ 
++#ifndef _Py_DEC_REFTOTAL
++  /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
++    https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
++#  ifdef Py_REF_DEBUG
++#    define _Py_DEC_REFTOTAL _Py_RefTotal--
++#  else
++#    define _Py_DEC_REFTOTAL
++#  endif
++#endif
++
+ /* Weak reference to the switching-to greenlet during the slp switch */
+ static PyGreenlet* volatile ts_target = NULL;
+ /* Strong reference to the switching from greenlet after the switch */
+@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
+ 			result = NULL;
+ 		} else {
+ 			/* call g.run(*args, **kwargs) */
+-			result = PyEval_CallObjectWithKeywords(
+-				run, args, kwargs);
++			result = PyObject_Call(run, args, kwargs);
+ 			Py_DECREF(args);
+ 			Py_XDECREF(kwargs);
+ 		}

get-rid-of-ts_origin.patch

@@ -1,106 +0,0 @@
-diff -up greenlet-0.3.1/greenlet.c.get-rid-of-ts_origin greenlet-0.3.1/greenlet.c
---- greenlet-0.3.1/greenlet.c.get-rid-of-ts_origin	2010-04-05 17:24:25.000000000 -0400
-+++ greenlet-0.3.1/greenlet.c	2011-10-19 13:59:30.485035920 -0400
-@@ -116,10 +116,8 @@ extern PyTypeObject PyGreenlet_Type;
- 
- /* The current greenlet in this thread state (holds a reference) */
- static PyGreenlet* ts_current = NULL;
--/* Holds a reference to the switching-from stack during the slp switch */
--static PyGreenlet* ts_origin = NULL;
- /* Holds a reference to the switching-to stack during the slp switch */
--static PyGreenlet* ts_target = NULL;
-+static PyGreenlet* volatile ts_target = NULL;
- /* NULL if error, otherwise args tuple to pass around during slp switch */
- static PyObject* ts_passaround_args = NULL;
- static PyObject* ts_passaround_kwargs = NULL;
-@@ -257,6 +255,7 @@ static int g_save(PyGreenlet* g, char* s
- static void slp_restore_state(void)
- {
- 	PyGreenlet* g = ts_target;
-+	PyGreenlet* owner = ts_current;
- 	
- 	/* Restore the heap copy back into the C stack */
- 	if (g->stack_saved != 0) {
-@@ -265,30 +264,32 @@ static void slp_restore_state(void)
- 		g->stack_copy = NULL;
- 		g->stack_saved = 0;
- 	}
--	if (ts_current->stack_stop == g->stack_stop)
--		g->stack_prev = ts_current->stack_prev;
--	else
--		g->stack_prev = ts_current;
-+	if (owner->stack_start == NULL)
-+		owner = owner->stack_prev; /* greenlet is dying, skip it */
-+	while (owner && owner->stack_stop <= g->stack_stop)
-+		owner = owner->stack_prev; /* find greenlet with more stack */
-+	g->stack_prev = owner;
- }
- 
- static int slp_save_state(char* stackref)
- {
- 	/* must free all the C stack up to target_stop */
- 	char* target_stop = ts_target->stack_stop;
--	assert(ts_current->stack_saved == 0);
--	if (ts_current->stack_start == NULL)
--		ts_current = ts_current->stack_prev;  /* not saved if dying */
-+	PyGreenlet* owner = ts_current;
-+	assert(owner->stack_saved == 0);
-+	if (owner->stack_start == NULL)
-+		owner = owner->stack_prev;  /* not saved if dying */
- 	else
--		ts_current->stack_start = stackref;
-+		owner->stack_start = stackref;
- 	
--	while (ts_current->stack_stop < target_stop) {
-+	while (owner->stack_stop < target_stop) {
- 		/* ts_current is entierely within the area to free */
--		if (g_save(ts_current, ts_current->stack_stop))
-+		if (g_save(owner, owner->stack_stop))
- 			return -1;  /* XXX */
--		ts_current = ts_current->stack_prev;
-+		owner = owner->stack_prev;
- 	}
--	if (ts_current != ts_target) {
--		if (g_save(ts_current, target_stop))
-+	if (owner != ts_target) {
-+		if (g_save(owner, target_stop))
- 			return -1;  /* XXX */
- 	}
- 	return 0;
-@@ -337,11 +338,11 @@ static int g_switchstack(void)
- 	*/
- 	int err;
- 	{   /* save state */
-+		PyGreenlet* current = ts_current;
- 		PyThreadState* tstate = PyThreadState_GET();
--		ts_current->recursion_depth = tstate->recursion_depth;
--		ts_current->top_frame = tstate->frame;
-+		current->recursion_depth = tstate->recursion_depth;
-+		current->top_frame = tstate->frame;
- 	}
--	ts_origin = ts_current;
- 	err = _PyGreenlet_slp_switch();
- 	if (err < 0) {   /* error */
- 		Py_XDECREF(ts_passaround_args);
-@@ -351,13 +352,15 @@ static int g_switchstack(void)
- 		ts_passaround_kwargs = NULL;
- 	}
- 	else {
-+		PyGreenlet* target = ts_target;
-+		PyGreenlet* origin = ts_current;
- 		PyThreadState* tstate = PyThreadState_GET();
--		tstate->recursion_depth = ts_target->recursion_depth;
--		tstate->frame = ts_target->top_frame;
--		ts_target->top_frame = NULL;
--		ts_current = ts_target;
--		Py_INCREF(ts_target);
--		Py_DECREF(ts_origin);
-+		tstate->recursion_depth = target->recursion_depth;
-+		tstate->frame = target->top_frame;
-+		target->top_frame = NULL;
-+		ts_current = target;
-+		Py_INCREF(target);
-+		Py_DECREF(origin);
- 	}
- 	return err;
- }

i686-register-fixes.patch

@@ -1,62 +0,0 @@
-# HG changeset patch
-# User Alexey Borzenkov <snaury@gmail.com>
-# Date 1313701525 -14400
-# Node ID 25bf29f4d3b79b026c1c05787bb741a8e7ef2229
-# Parent  c0bf397a723d4b61d7ef78cf575dea4c0fdb527e
-Fix compilation and register problems on some i386 configurations
-
-diff -r c0bf397a723d4b61d7ef78cf575dea4c0fdb527e -r 25bf29f4d3b79b026c1c05787bb741a8e7ef2229 platform/switch_x86_unix.h
---- a/platform/switch_x86_unix.h	Thu Aug 18 02:44:20 2011 +0400
-+++ b/platform/switch_x86_unix.h	Fri Aug 19 01:05:25 2011 +0400
-@@ -2,6 +2,8 @@
-  * this is the internal transfer function.
-  *
-  * HISTORY
-+ * 19-Aug-11  Alexey Borzenkov  <snaury@gmail.com>
-+ *      Correctly save ebp, ebx and cw
-  * 07-Sep-05 (py-dev mailing list discussion)
-  *      removed 'ebx' from the register-saved.  !!!! WARNING !!!!
-  *      It means that this file can no longer be compiled statically!
-@@ -34,18 +36,13 @@
- static int
- slp_switch(void)
- {
-+    void *ebp, *ebx;
-+    unsigned short cw;
-     register int *stackref, stsizediff;
--    /* !!!!WARNING!!!! need to add "ebx" in the next line, as well as in the
--     * last line of this function, if this header file is meant to be compiled
--     * non-dynamically!
--     */
--    __asm__ volatile ("" : : :
--      "esi",
--      "edi"
--#ifdef __MINGW32__
--    , "ebx"
--#endif
--    );
-+    __asm__ volatile ("" : : : "esi", "edi");
-+    __asm__ volatile ("fstcw %0" : "=m" (cw));
-+    __asm__ volatile ("movl %%ebp, %0" : "=m" (ebp));
-+    __asm__ volatile ("movl %%ebx, %0" : "=m" (ebx));
-     __asm__ ("movl %%esp, %0" : "=g" (stackref));
-     {
-         SLP_SAVE_STATE(stackref, stsizediff);
-@@ -57,13 +54,10 @@
-             );
-         SLP_RESTORE_STATE();
-     }
--    __asm__ volatile ("" : : :
--      "esi",
--      "edi"
--#ifdef __MINGW32__
--    , "ebx"
--#endif
--    );
-+    __asm__ volatile ("movl %0, %%ebx" : : "m" (ebx));
-+    __asm__ volatile ("movl %0, %%ebp" : : "m" (ebp));
-+    __asm__ volatile ("fldcw %0" : : "m" (cw));
-+    __asm__ volatile ("" : : : "esi", "edi");
-     return 0;
- }
- 

python-greenlet.spec

@@ -1,82 +1,182 @@
-# sitelib for noarch packages, sitearch for others (remove the unneeded one)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%global         modname greenlet
 
-Name:           python-greenlet
-Version:        0.3.1
+Name:           python-%{modname}
+Version:        0.4.14
 Release:        8%{?dist}
 Summary:        Lightweight in-process concurrent programming
-Group:          Development/Libraries
 License:        MIT
-URL:            http://pypi.python.org/pypi/greenlet
-Source0:        http://pypi.python.org/packages/source/g/greenlet/greenlet-%{version}.tar.gz
+URL:            https://github.com/python-greenlet/greenlet
+Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
+BuildRequires:  gcc-c++
+Patch1:         %{url}/commit/c644ca6823994b958e004b3e00b587723181b58e.patch
 
-# Based on https://bitbucket.org/ambroff/greenlet/changeset/2d5b17472757
-# slightly fixed up to apply cleanly. Avoid rhbz#746771
-Patch1:         get-rid-of-ts_origin.patch
-# Apply https://bitbucket.org/ambroff/greenlet/changeset/25bf29f4d3b7
-# to fix the i686 crash in rhbz#746771
-Patch2:         i686-register-fixes.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
-
-%description
-The greenlet package is a spin-off of Stackless, a version of CPython
-that supports micro-threads called "tasklets". Tasklets run
-pseudo-concurrently (typically in a single or a few OS-level threads)
+%global _description \
+The greenlet package is a spin-off of Stackless, a version of CPython\
+that supports micro-threads called "tasklets". Tasklets run\
+pseudo-concurrently (typically in a single or a few OS-level threads)\
 and are synchronized with data exchanges on "channels".
 
-%package devel
-Summary:        C development headers for python-greenlet
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%description %{_description}
 
-%description devel
-This package contains header files required for C modules development.
+%package -n     python3-%{modname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{modname}}
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+
+%description -n python3-%{modname} %{_description}
+
+Python 3 version.
+
+%package -n     python3-%{modname}-devel
+Summary:        C development headers for python3-%{modname}
+%{?python_provide:%python_provide python3-%{modname}-devel}
+Requires:       python3-%{modname}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description -n python3-%{modname}-devel
+%{summary}.
+
+Python 3 version.
 
 %prep
-%setup -q -n greenlet-%{version}
-%patch1 -p1 -b .get-rid-of-ts_origin
-%patch2 -p1 -b .i686_register_fixes
+%autosetup -n %{modname}-%{version} -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-chmod 644 benchmarks/*.py
+%py3_build
 
 %install
-rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%py3_install
  
-%clean
-rm -rf %{buildroot}
-
-# FIXME!!
-# The checks segfault on ppc64. So this arch
-# is essentially not supported until this is fixed
-%ifnarch ppc ppc64 s390 s390x
 %check
-# Run the upstream test suite:
-%{__python} setup.py test
+%{__python3} setup.py test
 
-# Run the upstream benchmarking suite to further exercise the code:
-PYTHONPATH=$(pwd) %{__python} benchmarks/chain.py
-PYTHONPATH=$(pwd) %{__python} benchmarks/switch.py
-%endif
+%files -n python3-%{modname}
+%license LICENSE LICENSE.PSF
+%doc AUTHORS NEWS README.rst
+%{python3_sitearch}/%{modname}-*.egg-info
+%{python3_sitearch}/%{modname}*.so
 
-%files
-%defattr(-,root,root,-)
-%doc doc/greenlet.txt README benchmarks AUTHORS NEWS
-%{python_sitearch}/greenlet.so
-%{python_sitearch}/greenlet*.egg-info
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/python*/greenlet
+%files -n python3-greenlet-devel
+%{_includedir}/python%{python3_version}*/%{modname}/
 
 %changelog
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-8
+- Rebuilt for Python 3.9
+
+* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-7
+- Fix Python 3.9 build
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Sep 26 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-5
+- Subpackages python2-greenlet, python2-greenlet-devel have been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-4
+- Rebuilt for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Jul 18 2018 Kevin Fenzi <kevin@scrye.com> - 0.4.14-1
+- Update to 0.4.14.
+- Drop upstreamed/no longer needed patches.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 03 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-4
+- Add fix for Python 3.7
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-3
+- Rebuilt for Python 3.7
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.13-1
+- Update to 0.4.13
+
+* Fri Jan 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.12-1
+- Update to 0.4.12
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Tue Dec 20 2016 Miro Hrončok <mhroncok@redhat.com> - 0.4.11-2
+- Rebuild for Python 3.6
+
+* Sun Dec 11 2016 Kevin Fenzi <kevin@scrye.com> - 0.4.11-1
+- Update to 0.4.11. Fixes bug #1403514
+
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
+* Sun Oct 25 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.9-1
+- Update to 0.4.9
+- Use %license macro
+- Follow new RPM Packaging guidelines
+- Cleanups in spec
+
+* Fri Aug 21 2015 Kevin Fenzi <kevin@scrye.com> 0.4.7-2
+- Re-enable tests on secondary arches. Fixes #1252899
+- Applied patch to build on ppc64le. Fixes #1252900
+
+* Fri Jun 26 2015 Kevin Fenzi <kevin@scrye.com> 0.4.7-1
+- Update to 0.4.7. Fixes bug #1235896
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sun Mar 29 2015 Terje Røsten <terje.rosten@ntnu.no> - 0.4.5-1
+- 0.4.5
+- Add python3 subpackage
+- Ship license files
+- Some spec clean ups
+- Update fixes FTBFS issue (bz#1106779)
+- Add comment about issues on ppc64, s390 & s390x
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jan 23 2014 Orion Poplawski <orion@cora.nwra.com> 0.4.2-1
+- Update to 0.4.2
+
+* Mon Aug 05 2013 Kevin Fenzi <kevin@scrye.com> 0.4.1-1
+- Update to 0.4.1
+- Fix FTBFS bug #993134
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jan 18 2013 Pádraig Brady <P@draigBrady.com> - 0.4.0-1
+- Update to 0.4.0
+
+* Thu Oct 11 2012 Pádraig Brady <P@draigBrady.com> - 0.3.1-11
+- Add support for ppc64
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Fri Nov 25 2011 Dan Horák <dan[at]danny.cz> - 0.3.1-8
 - disable tests also for s390(x)
 

sources

@@ -1 +1 @@
-8d75d7f3f659e915e286e1b0fa0e1c4d  greenlet-0.3.1.tar.gz
+SHA512 (greenlet-0.4.14.tar.gz) = c86802a0df56b78482b029a0eaf624ca8f14d0e704480b30a8a35e343b3e4a16e80b6f169a970a39935b39d56aafc25bada0738199818b5892ca398a809d54ef