From 7e989460dec6afc658fee1ebfcb93118976bf8ce Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Jun 26 2012 18:53:28 +0000 Subject: 2.7.3-10: fix missing include in uid/gid handling patch (patch 157; rhbz#830405) --- diff --git a/00157-uid-gid-overflows.patch b/00157-uid-gid-overflows.patch index dc533fd..0d6abb5 100644 --- a/00157-uid-gid-overflows.patch +++ b/00157-uid-gid-overflows.patch @@ -1,7 +1,15 @@ diff -up Python-2.7.3/Include/modsupport.h.uid-gid-overflows Python-2.7.3/Include/modsupport.h --- Python-2.7.3/Include/modsupport.h.uid-gid-overflows 2012-04-09 19:07:29.000000000 -0400 -+++ Python-2.7.3/Include/modsupport.h 2012-05-15 18:57:52.215433846 -0400 -@@ -128,6 +128,17 @@ PyAPI_FUNC(PyObject *) Py_InitModule4(co ++++ Python-2.7.3/Include/modsupport.h 2012-06-26 14:52:03.739471150 -0400 +@@ -8,6 +8,7 @@ extern "C" { + /* Module support interface */ + + #include ++#include + + /* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier + to mean Py_ssize_t */ +@@ -128,6 +129,17 @@ PyAPI_FUNC(PyObject *) Py_InitModule4(co PyAPI_DATA(char *) _Py_PackageContext; @@ -21,7 +29,7 @@ diff -up Python-2.7.3/Include/modsupport.h.uid-gid-overflows Python-2.7.3/Includ #endif diff -up Python-2.7.3/Lib/test/test_grp.py.uid-gid-overflows Python-2.7.3/Lib/test/test_grp.py --- Python-2.7.3/Lib/test/test_grp.py.uid-gid-overflows 2012-04-09 19:07:31.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_grp.py 2012-05-15 18:57:52.216433855 -0400 ++++ Python-2.7.3/Lib/test/test_grp.py 2012-06-26 14:51:36.000817929 -0400 @@ -16,7 +16,7 @@ class GroupDatabaseTestCase(unittest.Tes self.assertEqual(value[1], value.gr_passwd) self.assertIsInstance(value.gr_passwd, basestring) @@ -33,7 +41,7 @@ diff -up Python-2.7.3/Lib/test/test_grp.py.uid-gid-overflows Python-2.7.3/Lib/te diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/test/test_os.py --- Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_os.py 2012-05-15 18:57:52.217433864 -0400 ++++ Python-2.7.3/Lib/test/test_os.py 2012-06-26 14:51:36.000817929 -0400 @@ -677,30 +677,36 @@ if sys.platform != 'win32': def test_setuid(self): if os.getuid() != 0: @@ -82,7 +90,7 @@ diff -up Python-2.7.3/Lib/test/test_os.py.uid-gid-overflows Python-2.7.3/Lib/tes diff -up Python-2.7.3/Lib/test/test_posix.py.uid-gid-overflows Python-2.7.3/Lib/test/test_posix.py --- Python-2.7.3/Lib/test/test_posix.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_posix.py 2012-05-15 18:57:52.218433873 -0400 ++++ Python-2.7.3/Lib/test/test_posix.py 2012-06-26 14:51:36.001817916 -0400 @@ -217,7 +217,7 @@ class PosixTester(unittest.TestCase): if hasattr(posix, 'stat'): self.assertTrue(posix.stat(test_support.TESTFN)) @@ -135,7 +143,7 @@ diff -up Python-2.7.3/Lib/test/test_posix.py.uid-gid-overflows Python-2.7.3/Lib/ if hasattr(posix, 'chdir'): diff -up Python-2.7.3/Lib/test/test_pwd.py.uid-gid-overflows Python-2.7.3/Lib/test/test_pwd.py --- Python-2.7.3/Lib/test/test_pwd.py.uid-gid-overflows 2012-04-09 19:07:32.000000000 -0400 -+++ Python-2.7.3/Lib/test/test_pwd.py 2012-05-17 14:53:04.353015373 -0400 ++++ Python-2.7.3/Lib/test/test_pwd.py 2012-06-26 14:51:36.001817916 -0400 @@ -18,9 +18,9 @@ class PwdTest(unittest.TestCase): self.assertEqual(e[1], e.pw_passwd) self.assertIsInstance(e.pw_passwd, basestring) @@ -162,7 +170,7 @@ diff -up Python-2.7.3/Lib/test/test_pwd.py.uid-gid-overflows Python-2.7.3/Lib/te diff -up Python-2.7.3/Modules/grpmodule.c.uid-gid-overflows Python-2.7.3/Modules/grpmodule.c --- Python-2.7.3/Modules/grpmodule.c.uid-gid-overflows 2012-04-09 19:07:34.000000000 -0400 -+++ Python-2.7.3/Modules/grpmodule.c 2012-05-15 18:57:52.220433893 -0400 ++++ Python-2.7.3/Modules/grpmodule.c 2012-06-26 14:51:36.002817904 -0400 @@ -70,7 +70,7 @@ mkgrent(struct group *p) Py_INCREF(Py_None); } @@ -197,8 +205,8 @@ diff -up Python-2.7.3/Modules/grpmodule.c.uid-gid-overflows Python-2.7.3/Modules } return mkgrent(p); diff -up Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows Python-2.7.3/Modules/posixmodule.c ---- Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows 2012-05-15 18:57:50.823420672 -0400 -+++ Python-2.7.3/Modules/posixmodule.c 2012-05-16 11:40:54.975642353 -0400 +--- Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows 2012-06-26 14:51:35.864819629 -0400 ++++ Python-2.7.3/Modules/posixmodule.c 2012-06-26 14:51:36.005817868 -0400 @@ -1305,8 +1305,8 @@ _pystat_fromstructstat(STRUCT_STAT *st) PyStructSequence_SET_ITEM(v, 2, PyInt_FromLong((long)st->st_dev)); #endif @@ -574,7 +582,7 @@ diff -up Python-2.7.3/Modules/posixmodule.c.uid-gid-overflows Python-2.7.3/Modul diff -up Python-2.7.3/Modules/pwdmodule.c.uid-gid-overflows Python-2.7.3/Modules/pwdmodule.c --- Python-2.7.3/Modules/pwdmodule.c.uid-gid-overflows 2012-04-09 19:07:34.000000000 -0400 -+++ Python-2.7.3/Modules/pwdmodule.c 2012-05-17 14:47:20.263191561 -0400 ++++ Python-2.7.3/Modules/pwdmodule.c 2012-06-26 14:51:36.006817855 -0400 @@ -73,8 +73,8 @@ mkpwent(struct passwd *p) #else SETS(setIndex++, p->pw_passwd); @@ -606,7 +614,7 @@ diff -up Python-2.7.3/Modules/pwdmodule.c.uid-gid-overflows Python-2.7.3/Modules return mkpwent(p); diff -up Python-2.7.3/Python/getargs.c.uid-gid-overflows Python-2.7.3/Python/getargs.c --- Python-2.7.3/Python/getargs.c.uid-gid-overflows 2012-04-09 19:07:35.000000000 -0400 -+++ Python-2.7.3/Python/getargs.c 2012-05-15 18:57:52.229433979 -0400 ++++ Python-2.7.3/Python/getargs.c 2012-06-26 14:51:36.007817842 -0400 @@ -4,6 +4,7 @@ #include "Python.h" @@ -615,7 +623,7 @@ diff -up Python-2.7.3/Python/getargs.c.uid-gid-overflows Python-2.7.3/Python/get #ifdef __cplusplus -@@ -1902,6 +1903,110 @@ _PyArg_NoKeywords(const char *funcname, +@@ -1902,6 +1903,110 @@ _PyArg_NoKeywords(const char *funcname, funcname); return 0; } diff --git a/python.spec b/python.spec index 46bf3c8..6a37977 100644 --- a/python.spec +++ b/python.spec @@ -108,7 +108,7 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: Version: 2.7.3 -Release: 9%{?dist} +Release: 10%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -1836,6 +1836,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Tue Jun 26 2012 David Malcolm - 2.7.3-10 +- fix missing include in uid/gid handling patch (patch 157; rhbz#830405) + * Fri Jun 22 2012 David Malcolm - 2.7.3-9 - use rpm macro for power64 (rhbz#834653)