commit 685eda8bf0d653e79bb2fa3b3781b630ebb44e42 Author: James Antill Date: Mon Aug 8 14:02:39 2022 -0400 Import rpm: e9f4c9756ebddcc6b2ebdc20050bc90a64a9f50f diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7b922cc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/psutil-5.6.4.tar.gz diff --git a/CVE-2019-18874.patch b/CVE-2019-18874.patch new file mode 100644 index 0000000..a6e9629 --- /dev/null +++ b/CVE-2019-18874.patch @@ -0,0 +1,617 @@ +diff --git a/psutil/_psutil_aix.c b/psutil/_psutil_aix.c +index 8c055a4..9f58f60 100644 +--- a/psutil/_psutil_aix.c ++++ b/psutil/_psutil_aix.c +@@ -265,8 +265,8 @@ psutil_proc_environ(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItem(py_retdict, py_key, py_val)) + goto error; +- Py_DECREF(py_key); +- Py_DECREF(py_val); ++ Py_CLEAR(py_key); ++ Py_CLEAR(py_val); + } + curvar = strchr(curvar, '\0') + 1; + } +@@ -510,10 +510,10 @@ psutil_users(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + endutxent(); + +@@ -570,9 +570,9 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_dev); +- Py_DECREF(py_mountp); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_dev); ++ Py_CLEAR(py_mountp); ++ Py_CLEAR(py_tuple); + mt = getmntent(file); + } + endmntent(file); +diff --git a/psutil/_psutil_bsd.c b/psutil/_psutil_bsd.c +index b4264ce..7f1c492 100644 +--- a/psutil/_psutil_bsd.c ++++ b/psutil/_psutil_bsd.c +@@ -154,7 +154,7 @@ psutil_pids(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_pid)) + goto error; +- Py_DECREF(py_pid); ++ Py_CLEAR(py_pid); + proclist++; + } + free(orig_address); +@@ -507,8 +507,8 @@ psutil_proc_open_files(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_path); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_path); ++ Py_CLEAR(py_tuple); + } + } + free(freep); +@@ -670,9 +670,9 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_dev); +- Py_DECREF(py_mountp); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_dev); ++ Py_CLEAR(py_mountp); ++ Py_CLEAR(py_tuple); + } + + free(fs); +@@ -765,7 +765,7 @@ psutil_net_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItemString(py_retdict, ifc_name, py_ifc_info)) + goto error; +- Py_DECREF(py_ifc_info); ++ Py_CLEAR(py_ifc_info); + } + else { + continue; +@@ -840,10 +840,10 @@ psutil_users(PyObject *self, PyObject *args) { + fclose(fp); + goto error; + } +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + + fclose(fp); +@@ -883,10 +883,10 @@ psutil_users(PyObject *self, PyObject *args) { + endutxent(); + goto error; + } +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + + endutxent(); +diff --git a/psutil/_psutil_linux.c b/psutil/_psutil_linux.c +index 717723d..0d16eb4 100644 +--- a/psutil/_psutil_linux.c ++++ b/psutil/_psutil_linux.c +@@ -241,9 +241,9 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_dev); +- Py_DECREF(py_mountp); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_dev); ++ Py_CLEAR(py_mountp); ++ Py_CLEAR(py_tuple); + } + endmntent(file); + return py_retlist; +@@ -454,10 +454,10 @@ psutil_users(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + endutent(); + return py_retlist; +diff --git a/psutil/_psutil_osx.c b/psutil/_psutil_osx.c +index d2ca94b..76ec0ee 100644 +--- a/psutil/_psutil_osx.c ++++ b/psutil/_psutil_osx.c +@@ -138,7 +138,7 @@ psutil_pids(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_pid)) + goto error; +- Py_DECREF(py_pid); ++ Py_CLEAR(py_pid); + proclist++; + } + free(orig_address); +@@ -653,7 +653,7 @@ psutil_per_cpu_times(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_cputime)) + goto error; +- Py_DECREF(py_cputime); ++ Py_CLEAR(py_cputime); + } + + ret = vm_deallocate(mach_task_self(), (vm_address_t)info_array, +@@ -841,9 +841,9 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_dev); +- Py_DECREF(py_mountp); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_dev); ++ Py_CLEAR(py_mountp); ++ Py_CLEAR(py_tuple); + } + + free(fs); +@@ -911,7 +911,6 @@ psutil_proc_threads(PyObject *self, PyObject *args) { + } + + for (j = 0; j < thread_count; j++) { +- py_tuple = NULL; + thread_info_count = THREAD_INFO_MAX; + kr = thread_info(thread_list[j], THREAD_BASIC_INFO, + (thread_info_t)thinfo_basic, &thread_info_count); +@@ -934,7 +933,7 @@ psutil_proc_threads(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + + ret = vm_deallocate(task, (vm_address_t)thread_list, +@@ -1043,10 +1042,8 @@ psutil_proc_open_files(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- py_tuple = NULL; +- Py_DECREF(py_path); +- py_path = NULL; ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_path); + // --- /construct python list + } + } +@@ -1226,7 +1223,7 @@ psutil_proc_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + else if (family == AF_UNIX) { + py_laddr = PyUnicode_DecodeFSDefault( +@@ -1248,9 +1245,9 @@ psutil_proc_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- Py_DECREF(py_laddr); +- Py_DECREF(py_raddr); ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_laddr); ++ Py_CLEAR(py_raddr); + } + } + } +@@ -1370,7 +1367,7 @@ psutil_net_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItemString(py_retdict, ifc_name, py_ifc_info)) + goto error; +- Py_DECREF(py_ifc_info); ++ Py_CLEAR(py_ifc_info); + } + else { + continue; +@@ -1543,7 +1540,7 @@ psutil_disk_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItemString(py_retdict, disk_name, py_disk_info)) + goto error; +- Py_DECREF(py_disk_info); ++ Py_CLEAR(py_disk_info); + + CFRelease(parent_dict); + IOObjectRelease(parent); +@@ -1605,10 +1602,10 @@ psutil_users(PyObject *self, PyObject *args) { + endutxent(); + goto error; + } +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + + endutxent(); +diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c +index 209e787..aa60084 100644 +--- a/psutil/_psutil_posix.c ++++ b/psutil/_psutil_posix.c +@@ -324,11 +324,11 @@ psutil_net_if_addrs(PyObject* self, PyObject* args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- Py_DECREF(py_address); +- Py_DECREF(py_netmask); +- Py_DECREF(py_broadcast); +- Py_DECREF(py_ptp); ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_address); ++ Py_CLEAR(py_netmask); ++ Py_CLEAR(py_broadcast); ++ Py_CLEAR(py_ptp); + } + + freeifaddrs(ifaddr); +diff --git a/psutil/_psutil_sunos.c b/psutil/_psutil_sunos.c +index 919e76d..31d6f36 100644 +--- a/psutil/_psutil_sunos.c ++++ b/psutil/_psutil_sunos.c +@@ -300,8 +300,8 @@ psutil_proc_environ(PyObject *self, PyObject *args) { + if (PyDict_SetItem(py_retdict, py_envname, py_envval) < 0) + goto error; + +- Py_DECREF(py_envname); +- Py_DECREF(py_envval); ++ Py_CLEAR(py_envname); ++ Py_CLEAR(py_envval); + } + + psutil_free_cstrings_array(env, env_count); +@@ -655,10 +655,10 @@ psutil_users(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_username); +- Py_DECREF(py_tty); +- Py_DECREF(py_hostname); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_tty); ++ Py_CLEAR(py_hostname); ++ Py_CLEAR(py_tuple); + } + endutxent(); + +@@ -714,9 +714,9 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_dev); +- Py_DECREF(py_mountp); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_dev); ++ Py_CLEAR(py_mountp); ++ Py_CLEAR(py_tuple); + } + fclose(file); + return py_retlist; +@@ -767,8 +767,7 @@ psutil_per_cpu_times(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_cputime)) + goto error; +- Py_DECREF(py_cputime); +- py_cputime = NULL; ++ Py_CLEAR(py_cputime); + } + } + +@@ -824,7 +823,7 @@ psutil_disk_io_counters(PyObject *self, PyObject *args) { + if (PyDict_SetItemString(py_retdict, ksp->ks_name, + py_disk_info)) + goto error; +- Py_DECREF(py_disk_info); ++ Py_CLEAR(py_disk_info); + } + } + ksp = ksp->ks_next; +@@ -959,8 +958,8 @@ psutil_proc_memory_maps(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_path); +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_path); ++ Py_CLEAR(py_tuple); + + // increment pointer + p += 1; +@@ -1075,7 +1074,7 @@ psutil_net_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItemString(py_retdict, ksp->ks_name, py_ifc_info)) + goto error; +- Py_DECREF(py_ifc_info); ++ Py_CLEAR(py_ifc_info); + goto next; + + next: +@@ -1273,7 +1272,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + } + #if defined(AF_INET6) +@@ -1287,7 +1286,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + #ifdef NEW_MIB_COMPLIANT + processed_pid = tp6.tcp6ConnCreationProcess; + #else +- processed_pid = 0; ++ processed_pid = 0; + #endif + if (pid != -1 && processed_pid != pid) + continue; +@@ -1316,14 +1315,14 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + } + #endif + // UDPv4 + else if (mibhdr.level == MIB2_UDP || mibhdr.level == MIB2_UDP_ENTRY) { + num_ent = mibhdr.len / sizeof(mib2_udpEntry_t); +- assert(num_ent * sizeof(mib2_udpEntry_t) == mibhdr.len); ++ assert(num_ent * sizeof(mib2_udpEntry_t) == mibhdr.len); + for (i = 0; i < num_ent; i++) { + memcpy(&ude, databuf.buf + i * sizeof ude, sizeof ude); + #ifdef NEW_MIB_COMPLIANT +@@ -1355,7 +1354,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + } + #if defined(AF_INET6) +@@ -1388,7 +1387,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + } + #endif +@@ -1561,7 +1560,7 @@ psutil_net_if_stats(PyObject* self, PyObject* args) { + goto error; + if (PyDict_SetItemString(py_retdict, ksp->ks_name, py_ifc_info)) + goto error; +- Py_DECREF(py_ifc_info); ++ Py_CLEAR(py_ifc_info); + } + } + +diff --git a/psutil/_psutil_windows.c b/psutil/_psutil_windows.c +index beaba18..08b208d 100644 +--- a/psutil/_psutil_windows.c ++++ b/psutil/_psutil_windows.c +@@ -221,7 +221,7 @@ psutil_pids(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_pid)) + goto error; +- Py_DECREF(py_pid); ++ Py_CLEAR(py_pid); + } + + // free C array allocated for PIDs +@@ -1003,7 +1003,7 @@ psutil_per_cpu_times(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + } + + free(sppi); +@@ -1156,7 +1156,7 @@ psutil_proc_threads(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + + CloseHandle(hThread); + } +@@ -1580,7 +1580,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_conn_tuple)) + goto error; +- Py_DECREF(py_conn_tuple); ++ Py_CLEAR(py_conn_tuple); + } + + free(table); +@@ -1667,7 +1667,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_conn_tuple)) + goto error; +- Py_DECREF(py_conn_tuple); ++ Py_CLEAR(py_conn_tuple); + } + + free(table); +@@ -1730,7 +1730,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_conn_tuple)) + goto error; +- Py_DECREF(py_conn_tuple); ++ Py_CLEAR(py_conn_tuple); + } + + free(table); +@@ -1793,7 +1793,7 @@ psutil_net_connections(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_conn_tuple)) + goto error; +- Py_DECREF(py_conn_tuple); ++ Py_CLEAR(py_conn_tuple); + } + + free(table); +@@ -2188,8 +2188,8 @@ psutil_net_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItem(py_retdict, py_nic_name, py_nic_info)) + goto error; +- Py_XDECREF(py_nic_name); +- Py_XDECREF(py_nic_info); ++ Py_CLEAR(py_nic_name); ++ Py_CLEAR(py_nic_info); + + free(pIfRow); + pCurrAddresses = pCurrAddresses->Next; +@@ -2304,7 +2304,7 @@ psutil_disk_io_counters(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItemString(py_retdict, szDeviceDisplay, py_tuple)) + goto error; +- Py_XDECREF(py_tuple); ++ Py_CLEAR(py_tuple); + + next: + CloseHandle(hDevice); +@@ -2461,7 +2461,7 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + } + +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + + // Continue looking for more mount points + mp_flag = FindNextVolumeMountPoint(mp_h, mp_buf, MAX_PATH); +@@ -2486,7 +2486,7 @@ psutil_disk_partitions(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); ++ Py_CLEAR(py_tuple); + goto next; + + next: +@@ -2610,9 +2610,9 @@ psutil_users(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_XDECREF(py_username); +- Py_XDECREF(py_address); +- Py_XDECREF(py_tuple); ++ Py_CLEAR(py_username); ++ Py_CLEAR(py_address); ++ Py_CLEAR(py_tuple); + } + + WTSFreeMemory(sessions); +@@ -2838,8 +2838,8 @@ psutil_proc_memory_maps(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- Py_DECREF(py_str); ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_str); + } + previousAllocationBase = (ULONGLONG)basicInfo.AllocationBase; + baseAddress = (PCHAR)baseAddress + basicInfo.RegionSize; +@@ -2889,8 +2889,8 @@ psutil_ppid_map(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItem(py_retdict, py_pid, py_ppid)) + goto error; +- Py_DECREF(py_pid); +- Py_DECREF(py_ppid); ++ Py_CLEAR(py_pid); ++ Py_CLEAR(py_ppid); + } while (Process32Next(handle, &pe)); + } + +@@ -2993,8 +2993,8 @@ psutil_net_if_addrs(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- Py_DECREF(py_mac_address); ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_mac_address); + } + + // find out the IP address associated with the NIC +@@ -3070,14 +3070,14 @@ psutil_net_if_addrs(PyObject *self, PyObject *args) { + goto error; + if (PyList_Append(py_retlist, py_tuple)) + goto error; +- Py_DECREF(py_tuple); +- Py_DECREF(py_address); +- Py_DECREF(py_netmask); ++ Py_CLEAR(py_tuple); ++ Py_CLEAR(py_address); ++ Py_CLEAR(py_netmask); + + pUnicast = pUnicast->Next; + } + } +- Py_DECREF(py_nic_name); ++ Py_CLEAR(py_nic_name); + pCurrAddresses = pCurrAddresses->Next; + } + +@@ -3197,8 +3197,8 @@ psutil_net_if_stats(PyObject *self, PyObject *args) { + goto error; + if (PyDict_SetItem(py_retdict, py_nic_name, py_ifc_info)) + goto error; +- Py_DECREF(py_nic_name); +- Py_DECREF(py_ifc_info); ++ Py_CLEAR(py_nic_name); ++ Py_CLEAR(py_ifc_info); + } + + free(pIfTable); diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..648918d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..e6427de --- /dev/null +++ b/plan.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt diff --git a/python-psutil-add-tolerance.patch b/python-psutil-add-tolerance.patch new file mode 100644 index 0000000..8c41db4 --- /dev/null +++ b/python-psutil-add-tolerance.patch @@ -0,0 +1,25 @@ +From 4ffbcb458ff0b838f2bfe387b6305c4817e363ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Thu, 15 Apr 2021 17:07:38 +0200 +Subject: [PATCH] Add tolerance to + test_linux.TestSystemVirtualMemory.test_total + +We see this test as very flaky without tolerance in Fedora and CentOS +--- + psutil/tests/test_linux.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py +index 0c6d498c8..f5243c2cd 100755 +--- a/psutil/tests/test_linux.py ++++ b/psutil/tests/test_linux.py +@@ -243,7 +243,8 @@ def test_total(self): + # self.assertEqual(free_value, psutil_value) + vmstat_value = vmstat('total memory') * 1024 + psutil_value = psutil.virtual_memory().total +- self.assertAlmostEqual(vmstat_value, psutil_value) ++ self.assertAlmostEqual( ++ vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM) + + @retry_on_failure() + def test_used(self): diff --git a/python-psutil-skip-tests-in-brew.patch b/python-psutil-skip-tests-in-brew.patch new file mode 100644 index 0000000..b63a842 --- /dev/null +++ b/python-psutil-skip-tests-in-brew.patch @@ -0,0 +1,24 @@ +diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py +index c1d0a94..e9914a9 100755 +--- a/psutil/tests/test_linux.py ++++ b/psutil/tests/test_linux.py +@@ -924,6 +924,7 @@ class TestLoadAvg(PsutilTestCase): + @unittest.skipIf(not LINUX, "LINUX only") + class TestSystemNetIfAddrs(PsutilTestCase): + ++ @unittest.skip("Broken in brew") + def test_ips(self): + for name, addrs in psutil.net_if_addrs().items(): + for addr in addrs: +diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py +index a55164c..21a04bb 100755 +--- a/psutil/tests/test_system.py ++++ b/psutil/tests/test_system.py +@@ -724,6 +724,7 @@ class TestNetAPIs(PsutilTestCase): + self.assertEqual(psutil.net_io_counters(pernic=True), {}) + assert m.called + ++ @unittest.skip("Broken in brew") + def test_net_if_addrs(self): + nics = psutil.net_if_addrs() + assert nics, nics diff --git a/python-psutil-skip-tests-in-mock.patch b/python-psutil-skip-tests-in-mock.patch new file mode 100644 index 0000000..93a2e1c --- /dev/null +++ b/python-psutil-skip-tests-in-mock.patch @@ -0,0 +1,134 @@ +diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-release-5.8.0/psutil/tests/test_linux.py +--- psutil-release-5.8.0.orig/psutil/tests/test_linux.py 2020-12-18 16:45:00.000000000 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_linux.py 2021-01-10 15:38:31.104890945 -0800 +@@ -661,14 +661,13 @@ + value = int(value.split('-')[1]) + 1 + self.assertEqual(psutil.cpu_count(), value) + +- @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"), +- "/sys/devices/system/cpu does not exist") ++ @unittest.skip("Unreliable on mock") + def test_against_sysdev_cpu_num(self): + ls = os.listdir("/sys/devices/system/cpu") + count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None]) + self.assertEqual(psutil.cpu_count(), count) + +- @unittest.skipIf(not which("nproc"), "nproc utility not available") ++ @unittest.skip("Unreliable on mock") + def test_against_nproc(self): + num = int(sh("nproc --all")) + self.assertEqual(psutil.cpu_count(logical=True), num) +@@ -713,7 +712,7 @@ + m.called + + +-@unittest.skipIf(not LINUX, "LINUX only") ++@unittest.skip("Unreliable in mock") + class TestSystemCPUCountPhysical(PsutilTestCase): + + @unittest.skipIf(not which("lscpu"), "lscpu utility not available") +@@ -745,7 +744,7 @@ + @unittest.skipIf(not LINUX, "LINUX only") + class TestSystemCPUFrequency(PsutilTestCase): + +- @unittest.skipIf(not HAS_CPU_FREQ, "not supported") ++ @unittest.skip("Unreliable in mock") + def test_emulate_use_second_file(self): + # https://github.com/giampaolo/psutil/issues/981 + def path_exists_mock(path): +@@ -759,7 +758,7 @@ + create=True): + assert psutil.cpu_freq() + +- @unittest.skipIf(not HAS_CPU_FREQ, "not supported") ++ @unittest.skip("Unreliable in mock") + def test_emulate_use_cpuinfo(self): + # Emulate a case where /sys/devices/system/cpu/cpufreq* does not + # exist and /proc/cpuinfo is used instead. +@@ -888,7 +887,7 @@ + self.assertEqual(freq.current, 200) + + +-@unittest.skipIf(not LINUX, "LINUX only") ++@unittest.skip("Unreliable in mock") + class TestSystemCPUStats(PsutilTestCase): + + def test_ctx_switches(self): +@@ -2126,13 +2125,14 @@ + value = tuple(map(int, value.split()[1:4])) + self.assertEqual(self.proc.gids(), value) + +- @retry_on_failure() ++ @unittest.skip("Unreliable in mock") + def test_num_ctx_switches(self): + value = self.read_status_file("voluntary_ctxt_switches:") + self.assertEqual(self.proc.num_ctx_switches().voluntary, value) + value = self.read_status_file("nonvoluntary_ctxt_switches:") + self.assertEqual(self.proc.num_ctx_switches().involuntary, value) + ++ @unittest.skip("Unreliable in mock") + def test_cpu_affinity(self): + value = self.read_status_file("Cpus_allowed_list:") + if '-' in str(value): +diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_misc.py psutil-release-5.8.0/psutil/tests/test_misc.py +--- psutil-release-5.8.0.orig/psutil/tests/test_misc.py 2020-12-18 16:45:00.000000000 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_misc.py 2021-01-10 15:38:31.104890945 -0800 +@@ -355,7 +355,7 @@ + + def test_setup_script(self): + setup_py = os.path.join(ROOT_DIR, 'setup.py') +- if CI_TESTING and not os.path.exists(setup_py): ++ if not os.path.exists(setup_py): + return self.skipTest("can't find setup.py") + module = import_module_by_path(setup_py) + self.assertRaises(SystemExit, module.setup) +diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-release-5.8.0/psutil/tests/test_system.py +--- psutil-release-5.8.0.orig/psutil/tests/test_system.py 2020-12-18 16:45:00.000000000 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_system.py 2021-01-10 15:38:31.105890946 -0800 +@@ -198,7 +198,7 @@ + self.assertGreater(bt, 0) + self.assertLess(bt, time.time()) + +- @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI") ++ @unittest.skipIf(not psutil.users(), "unreliable on CI") + def test_users(self): + users = psutil.users() + self.assertNotEqual(users, []) +@@ -510,7 +510,7 @@ + if not AIX and name in ('ctx_switches', 'interrupts'): + self.assertGreater(value, 0) + +- @unittest.skipIf(not HAS_CPU_FREQ, "not suported") ++ @unittest.skip("Unreliable in mock") + def test_cpu_freq(self): + def check_ls(ls): + for nt in ls: +@@ -579,6 +579,7 @@ + def test_disk_usage_bytes(self): + psutil.disk_usage(b'.') + ++ @unittest.skip("unreliable on CI") + def test_disk_partitions(self): + def check_ntuple(nt): + self.assertIsInstance(nt.device, str) +@@ -828,7 +829,7 @@ + + class TestSensorsAPIs(PsutilTestCase): + +- @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported") ++ @unittest.skip("Unreliable in mock") + def test_sensors_temperatures(self): + temps = psutil.sensors_temperatures() + for name, entries in temps.items(): +diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_testutils.py psutil-release-5.8.0/psutil/tests/test_testutils.py +--- psutil-release-5.8.0.orig/psutil/tests/test_testutils.py 2020-12-18 16:45:00.000000000 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_testutils.py 2021-01-10 15:48:14.240695423 -0800 +@@ -364,7 +364,7 @@ + self.assertRaises(ValueError, self.execute, lambda: 0, retries=-1) + + @retry_on_failure() +- @unittest.skipIf(CI_TESTING, "skipped on CI") ++ @unittest.skip("Unreliable in mock") + def test_leak_mem(self): + ls = [] + diff --git a/python-psutil.spec b/python-psutil.spec new file mode 100644 index 0000000..b1e76c0 --- /dev/null +++ b/python-psutil.spec @@ -0,0 +1,359 @@ +%global srcname psutil +%global sum A process and system utilities module for Python + +# Filter Python modules from Provides +%global __provides_exclude_from ^(%{python2_sitearch}|%{python3_sitearch})/.*\\.so$ + +# Prepared for Python 2 removal +%bcond_with python2 + +# Possibility to disable tests +%bcond_with tests + +Name: python-%{srcname} +Version: 5.6.4 +Release: 4%{?dist} +Summary: %{sum} + +License: BSD +URL: https://github.com/giampaolo/psutil +Source0: https://github.com/giampaolo/psutil/archive/release-%{version}.tar.gz#/%{srcname}-%{version}.tar.gz + +# Fix CVE-2019-18874: double free because of refcount mishandling +# Resolved upstream: https://github.com/giampaolo/psutil/commit/7d512c8e4442a896d56505be3e78f1156f443465 +# and https://github.com/giampaolo/psutil/commit/3a9bccfd2c6d2e6538298cd3892058b1204056e0 +Patch0: CVE-2019-18874.patch + +# Exclude i686 arch. Due to a modularity issue it's being added to the +# x86_64 compose of CRB, but we don't want to ship it at all. +# See: https://projects.engineering.redhat.com/browse/RCM-72605 +ExcludeArch: i686 + +BuildRequires: gcc +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-rpm-macros +# Test dependencies +%if %{with tests} +BuildRequires: procps-ng +BuildRequires: python%{python3_pkgversion}-mock +%endif + +%if %{with python2} +%if 0%{?fedora} < 32 +BuildRequires: python2-mock +BuildRequires: python2-devel +BuildRequires: python2-ipaddress +%else +# This package has an exception to use Python 2 in Fedora 32+ +# The exception is for chromium (chrome-remote-desktop) +# https://pagure.io/fesco/issue/2214 +BuildRequires: python27 +BuildRequires: python2-setuptools +%endif +%endif + +%description +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. + + +%if %{with python2} +%package -n python2-%{srcname} +Summary: %{sum} +%{?python_provide:%python_provide python2-%{srcname}} +Obsoletes: python-%{srcname} < 3.1.1-3 + +%description -n python2-psutil +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python 3, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. +%endif + +%package -n python%{python3_pkgversion}-psutil +Summary: %{sum} +%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}} + +%description -n python%{python3_pkgversion}-psutil +psutil is a module providing an interface for retrieving information on all +running processes and system utilization (CPU, memory, disks, network, users) in +a portable way by using Python 3, implementing many functionalities offered by +command line tools such as: ps, top, df, kill, free, lsof, free, netstat, +ifconfig, nice, ionice, iostat, iotop, uptime, pidof, tty, who, taskset, pmap. + + +%prep +%autosetup -p1 -n %{srcname}-release-%{version} + +# Remove shebangs +find psutil -name \*.py | while read file; do + sed -i.orig -e '1{/^#!/d}' $file && \ + touch -r $file.orig $file && \ + rm $file.orig +done + + +%build +%if %{with python2} +%py2_build +%endif +%py3_build + + +%install +%if %{with python2} +%py2_install +%endif +%py3_install + + +%check +%if %{with tests} +%if %{with python2} && 0%{?fedora} < 32 +make test-memleaks PYTHON=%{__python2} +%endif +make test-memleaks PYTHON=%{__python3} +%endif + + +%if %{with python2} +%files -n python2-%{srcname} +%license LICENSE +%doc CREDITS HISTORY.rst README.rst +%{python2_sitearch}/%{srcname}/ +%{python2_sitearch}/*.egg-info +%endif + + +%files -n python%{python3_pkgversion}-%{srcname} +%license LICENSE +%doc CREDITS HISTORY.rst README.rst +%{python3_sitearch}/%{srcname}/ +%{python3_sitearch}/*.egg-info + + +%changelog +* Mon Jul 26 2021 Charalampos Stratakis - 5.6.4-4 +- Security fix for CVE-2019-18874: double free because of refcount mishandling +Resolves: rhbz#1772014 + +* Thu Dec 12 2019 Tomas Orsava - 5.6.4-3 +- Exclude unsupported i686 arch + +* Wed Nov 20 2019 Lumír Balhar - 5.6.4-2 +- Adjusted for Python 3.8 module in RHEL 8 + +* Wed Nov 06 2019 Lumír Balhar - 5.6.4-1 +- New upstream release 5.6.4 +- bcond for Python 2 subpackage and tests +- Enabled tests + +* Sun Oct 06 2019 Kevin Fenzi - 5.6.3-5 +- Add python2-setuptools to BuildRequires to fix egg info. Fixes bug #1750362 + +* Tue Sep 03 2019 Miro Hrončok - 5.6.3-4 +- Reduce unused build dependencies + +* Fri Aug 16 2019 Miro Hrončok - 5.6.3-3 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 5.6.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 30 2019 Kevin Fenzi - 5.6.3-1 +- Update to 5.6.3 Fixes bug #1567102 + +* Thu Feb 28 2019 Yatin Karel - 5.5.1-1 +- Update to 5.5.1 (Resolves #1567102) + +* Sat Feb 02 2019 Fedora Release Engineering - 5.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 5.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Jun 17 2018 Miro Hrončok - 5.4.3-5 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 5.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Iryna Shcherbina - 5.4.3-3 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Mon Jan 22 2018 Gwyn Ciesla - 5.4.3-2 +- Disable tests entirely. + +* Mon Jan 22 2018 Gwyn Ciesla - 5.4.3-1 +- 5.4.3 + +* Thu Aug 03 2017 Fedora Release Engineering - 5.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 5.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Apr 23 2017 Kevin Fenzi - 5.2.2-1 +- Update to 5.2.2. Fixes bug #1441010 + +* Sat Mar 25 2017 Kevin Fenzi - 5.2.1-1 +- Update to 5.2.1. Fixes bug #1418489 + +* Sat Feb 25 2017 Kevin Fenzi - 5.1.3-1 +- Update to 5.1.3. Fixes bug #1418489 + +* Sat Feb 11 2017 Fedora Release Engineering - 5.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Kevin Fenzi - 5.0.1-1 +- Update to 5.0.1. Fixes bug #1389579 +- Disable failing test while upstream looks at it. + +* Wed Nov 09 2016 Kevin Fenzi - 5.0.0-1 +- Update to 5.0.0. Fixes bug #1389579 + +* Tue Oct 25 2016 Kevin Fenzi - 4.4.0-1 +- Update to 4.4.0. Fixes bug #1387942 + +* Sat Sep 03 2016 Kevin Fenzi - 4.3.1-1 +- Update to 4.3.1. Fixes bug #1372500 + +* Tue Jul 19 2016 Fedora Release Engineering - 4.3.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Tue Jun 21 2016 Orion Poplawski - 4.3.0-1 +- Update to 4.3.0 + +* Mon May 16 2016 Orion Poplawski - 3.2.1-6 +- Use modern provides filter +- Update URL +- Use %%python3_pkgversion for EPEL7 compat + +* Fri Mar 11 2016 Than Ngo - 3.2.1-5 +- fix endian issue on s390x/ppc64 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Nov 10 2015 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Sep 4 2015 Michel Alexandre Salim - 3.2.1-2 +- Add Obsoletes for old package + +* Fri Sep 4 2015 Michel Alexandre Salim - 3.2.1-1 +- Update to 3.2.1 +- Update to latest Python guidelines (https://fedorahosted.org/fpc/ticket/281) + +* Wed Jul 22 2015 Michel Alexandre Salim - 3.1.1-2 +- Restore *.so files +- Enable tests + +* Tue Jul 21 2015 Michel Alexandre Salim - 3.1.1-1 +- Update to 3.1.1 + +* Thu Jun 18 2015 Fedora Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 18 2015 Ralph Bean - 2.2.0-1 +- new version + +* Wed Dec 3 2014 Michel Alexandre Salim - 2.1.3-1 +- Update to 2.1.3 + +* Sun Aug 17 2014 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 31 2014 Tom Callaway - 1.2.1-4 +- fix license handling + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 28 2014 Kalev Lember - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Mon Jan 06 2014 Mohamed El Morabity - 1.2.1-1 +- Update to 1.2.1 + +* Fri Aug 16 2013 Mohamed El Morabity - 1.0.1-1 +- Update to 1.0.1 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun May 12 2013 Mohamed El Morabity - 0.7.1-1 +- Update to 0.7.1 + +* Thu Feb 14 2013 Fedora Release Engineering - 0.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Aug 19 2012 Mohamed El Morabity - 0.6.1-1 +- Update to 0.6.1 + +* Sat Aug 04 2012 David Malcolm - 0.5.1-3 +- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 + +* Sat Jul 21 2012 Fedora Release Engineering - 0.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 01 2012 Mohamed El Morabity - 0.5.1-1 +- Update to 0.5.1 + +* Sat Jan 14 2012 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 16 2011 Mohamed El Morabity - 0.4.1-1 +- Update to 0.4.1 + +* Sun Nov 20 2011 Mohamed El Morabity - 0.4.0-1 +- Update to 0.4.0 + +* Mon Jul 18 2011 Mohamed El Morabity - 0.3.0-1 +- Update to 0.3.0 + +* Wed Mar 23 2011 Mohamed El Morabity - 0.2.1-1 +- Update to 0.2.1 +- Spec cleanup + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Nov 22 2010 Mohamed El Morabity - 0.2.0-1 +- Update to 0.2.0 + +* Wed Aug 25 2010 Thomas Spura - 0.1.3-5 +- rebuild with python3.2 + http://lists.fedoraproject.org/pipermail/devel/2010-August/141368.html + +* Fri Jul 30 2010 Thomas Spura - 0.1.3-4 +- bump, because previous build nvr already existed in F-14 + +* Thu Jul 22 2010 David Malcolm - 0.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Apr 13 2010 ELMORABITY Mohamed 0.1.3-2 +- Add missing popd in %%build + +* Sat Mar 27 2010 ELMORABITY Mohamed 0.1.3-1 +- Update to 0.1.3 +- Remove useless call to 2to3 and corresponding BuildRequires + python2-tools (this version supports Python 3) + +* Sat Feb 20 2010 ELMORABITY Mohamed 0.1.2-4 +- Change python-utils BuildRequires for python2-utils + +* Sat Feb 20 2010 ELMORABITY Mohamed 0.1.2-3 +- Add python3 subpackage + +* Thu Jan 14 2010 ELMORABITY Mohamed 0.1.2-2 +- Drop no-shebang patch for a sed command +- Drop test suite from %%doc tag + +* Fri Jan 8 2010 ELMORABITY Mohamed 0.1.2-1 +- Initial RPM release diff --git a/sources b/sources new file mode 100644 index 0000000..b9c9287 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (psutil-5.6.4.tar.gz) = 038eebeacabe8f11215961aae307818e4c5af85b diff --git a/test_bundled.fmf b/test_bundled.fmf new file mode 100644 index 0000000..998894f --- /dev/null +++ b/test_bundled.fmf @@ -0,0 +1,10 @@ +framework: shell +require: +- make +- gcc +- procps-ng +- python3-psutil +- python3-psutil-tests +- python3-devel +- python3-setuptools +test: python3 -m psutil.tests