Skip to content
This repository has been archived by the owner on Oct 27, 2022. It is now read-only.

Commit

Permalink
[update to 5.7.0] Win: fix segfault cause by FREE/MALLOC macros
Browse files Browse the repository at this point in the history
Adam Johnson (1):
      Reference exact CVE in HISTORY for 5.6.6 (#1653)

Anselm Kruis (1):
      Fix a compile error in _psutil_linux.c if PSUTIL_HAVE_IOPRIO is false (#1695)

Caleb Bassi (1):
      Remove links to abandoned psutil ports in readme (#1669)

Giampaolo Rodola (129):
      fix compilation err on win
      Readme tidelift update (#1636)
      SunOS, fix #1642: PID 0 raises FileNotFoundError
      HERE: use realpath() instead of abspath() because of failures seen in giampaolo/psutil#1638 (comment)
      update HISTORY for #1646
      setup.py: print instructions if C compiler is not installed
      credits for #1648
      lint
      update/fix wait_procs() doc
      bump version
      windows: move net_connections() in socks.c
      win: split code into new process_utils.c
      highlight cmd.exe warnings/errs from VS
      Drop windows XP support (#1652)
      small refactoring
      move custom exceptions in _common.py
      #1652: also drop support for Windows Server 2003
      Windows: split C modules (#1655)
      #1652: remove inet_ntop.c
      winmake / uninstall: remove installation path from easy-install.pth file
      move AF_INET6 def in global.h
      use HeapAlloc() instead of malloc() around GetAdaptersAddresses
      rename global.c -> globals.c
      fix compiler warning
      fix compiler warning + remove cruft
      win: move ObjectNameInformation in ntextapi.h
      win: provide alias for HeapAlloc()
      cleanup ntextapi.h
      fix open_files() tests broken on windows due to case sensitiveness
      winmake.py: accept builtiple targets/args
      include ntextapi.h from globals.h so that we won't have to import it ever
      windows: move get_process_info() into process_info.c to make room for Cygwin
      fix compiler warnings; move some defss into process_info.h
      move PEB structs into ntextapi.h
      rm duplicated C code
      refactor win C code: use original WinAPI functions and remove psuil_ prefix
      move send_signal() code into windows module
      refactoring + remove dead code
      Win: fix compilation err on python 32 bit
      Win: fix segfault cause by FREE/MALLOC macros
      winmake.py: use argparse
      fix #1656: [Windows] Process.memory_full_info() raises AccessDenied even for the current user and os.getpid()
      fix some win tests
      just move stuff around
      get rid of globals.c; move stuff in _psutil_common.c
      #1652 / win / XP support: remove routine to collect files on win < vista
      refactoring test_contracts.py
      #1652: ionice(), remove code checking if we're on Win Vista+
      add contract tests for IOPRIO_ win constants
      add more types tests
      #1020: remove doc part mentionin open_files() on win is only able to list files living on the C drive
      [Windows] rewrite of open_files()  (#1660)
      #1652: remove win XP code path checking avilability of GetTickCount64
      #1652 remove Windows Vista references
      update setup.py classifiers
      print/set syscall origin when raising NSP or AD
      exec make install before 2 targets
      check MALLOC_ZERO ret code
      properly cleanup C thread
      fix #1662: QueryFullProcessImageNameW may fail with error code = 0 (Win API bug?)
      AD script: print AD percentage + elapsed time
      update HISTORY
      Add *new_only* parameter for process_iter() (#1667)
      set proper NTSTATUS error code
      [Windows] psutil_handle_from_pid() refactoring (#1668)
      Add CI testing for FreeBSD (#1671)
      fix Cirrus failure
      Cirrus: enable python 2
      run py2 tests on cirrus
      OpenBSD fixes (#1673)
      Properly handle PID type in C (#1672)
      update HISTORY
      small C refactoring
      [Windows] use NtQuerySystemInformation to determine process exe()  (#1677)
      print-ad.py: double sort
      [Windows] connections() refactoring (#1678)
      #1610: clarify in the doc what cpu_count means
      [Windows] speedup connections (#1679)
      fix #1674, SunOS: disk_partitions() may raise OSError.
      update doc
      fix #1650 [Linux] sensors_temperatures() no longer emit warnings on file not found (print debug msg instead)
      [Linux] disk_io_counters() ValueError when parsing /sys/block (#1684)
      #1672, #1682: SIZEOF_INT is not available on pypy3; assume that on systems where pid_t size can't be determined at runtime pid_t is an int
      Fix test errors for PYPY.
      skip memleak tests on PyPy: they are unreliable probably because of the JIT
      fix #1681 / linux / disk_partitions: show swap
      small refact
      fix #1627: [Linux] Process.memory_maps() can raise KeyError
      fix #1576: remove code duplicate for create_time / boot_time
      try to fix travis test
      merge from master
      windows: convert pid_t to DWORD
      Add support for PyPy on Windows (#1686)
      refactor doc
      fix pypy on Linux
      refactoring
      #1672: determine pid_t size at runtime in setup.py
      fix #1688: use python3 in GIT commit hook hashbang
      small refactoring to accomodate #1691
      #1672: warning pre-processor directive don't work on win + py2; also if struct.calcsize('l') < 8 assume int
      [Windows] increase precision of boot_time() and proc create_time() (#1693)
      refactoring: get rid of duplicated code; use one function to return (user, sys, create time)
      rename method
      remove unnecessary wrap_exceptions deco
      bind cpu_times() and create_time() with oneshot()
      rename var
      remove cache for proc_times(): unnecessary because create_time() is already cached
      refactoring: get rid of duplicated code; use one function to return (user, sys, create time)
      #1681, revert 00a3398
      small refactoring
      #1659: provide error message in case of bugged PYPY2 version
      fix tests
      divide test_system.py unit tests in multiple classes
      #1693: also increase precision of users()'s login time
      update doc
      update doc
      update doc
      update history for #1695
      update doc
      refactor print colors utils
      point all shebangs to python 3
      get rid of pip_install() code for py2; move everything in runner.py
      remove deprecation test: it fails intermittently because warnings uses a global state
      #1053 fix syntax incompatible with py2.6
      fix Makefile for freebsd
      revert #1667 process_iter() new_only param
      revert process_iter() exactly how it was pre #1667
      Add C linter script (#1698)
      fix KeyError

Javad Karabi (1):
      sensors_temperatures: also search /sys/devices/platform/coretemp.* for temperatures (#1648)

Jon Dufresne (1):
      Remove use of deprecated setuptools test_suite & tests_require (#1696)

Kamil Rytarowski (1):
      Add special case for psutil_proc_cwd/NetBSD (#1538)

Mike Hommey (1):
      Future-proof disk_io_counters on Linux. (#1665)

Po-Chuan Hsieh (1):
      Fix Process on FreeBSD 12.0+ i386 (#1646)

Thomas Güttler (1):
      total physical memory (exclusive swap). (#1634)

Tim Gates (1):
      Fix simple typo: whish -> wish (#1640)

johnthagen (1):
      Enable PyPy3 on CI (#1682)

vser1 (1):
      [Solaris] Fix #1637 (#1638)
  • Loading branch information
fenrus75 authored and clrpackages committed Mar 10, 2020
1 parent 5a1e44e commit 0b21dde
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := psutil
URL = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb/psutil-5.6.7.tar.gz
URL = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41/psutil-5.7.0.tar.gz
ARCHIVES =

include ../common/Makefile.common
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = psutil
url = https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb/psutil-5.6.7.tar.gz
url = https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41/psutil-5.7.0.tar.gz
archives =
giturl = https://github.com/giampaolo/psutil.git
domain =
Expand Down
29 changes: 15 additions & 14 deletions psutil.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : psutil
Version : 5.6.7
Release : 73
URL : https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb/psutil-5.6.7.tar.gz
Source0 : https://files.pythonhosted.org/packages/73/93/4f8213fbe66fc20cb904f35e6e04e20b47b85bee39845cc66a0bcf5ccdcb/psutil-5.6.7.tar.gz
Version : 5.7.0
Release : 74
URL : https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41/psutil-5.7.0.tar.gz
Source0 : https://files.pythonhosted.org/packages/c4/b8/3512f0e93e0db23a71d82485ba256071ebef99b227351f0f5540f744af41/psutil-5.7.0.tar.gz
Summary : Cross-platform lib for process and system monitoring in Python.
Group : Development/Tools
License : BSD-3-Clause
Expand All @@ -18,8 +18,8 @@ BuildRequires : procps-ng
BuildRequires : python3-dev

%description
| |version| |py-versions| |packages| |license|
| |travis| |appveyor| |doc| |twitter| |tidelift|
This directory contains scripts which are meant to be used internally
(benchmarks, CI automation, etc.).

%package license
Summary: license components for the psutil package.
Expand Down Expand Up @@ -49,31 +49,32 @@ python3 components for the psutil package.


%prep
%setup -q -n psutil-5.6.7
cd %{_builddir}/psutil-5.6.7
%setup -q -n psutil-5.7.0
cd %{_builddir}/psutil-5.7.0

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1583522014
export SOURCE_DATE_EPOCH=1583524009
# -Werror is for werrorists
export GCC_IGNORE_WERROR=1
export AR=gcc-ar
export RANLIB=gcc-ranlib
export NM=gcc-nm
export CFLAGS="$CFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
export FCFLAGS="$CFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
export FFLAGS="$CFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
export CXXFLAGS="$CXXFLAGS -O3 -ffat-lto-objects -flto=4 -fstack-protector-strong -mzero-caller-saved-regs=used "
export CFLAGS="$CFLAGS -O3 -fcf-protection=full -ffat-lto-objects -flto=4 -fstack-protector-strong "
export FCFLAGS="$CFLAGS -O3 -fcf-protection=full -ffat-lto-objects -flto=4 -fstack-protector-strong "
export FFLAGS="$CFLAGS -O3 -fcf-protection=full -ffat-lto-objects -flto=4 -fstack-protector-strong "
export CXXFLAGS="$CXXFLAGS -O3 -fcf-protection=full -ffat-lto-objects -flto=4 -fstack-protector-strong "
export MAKEFLAGS=%{?_smp_mflags}
python3 setup.py build

%install
export MAKEFLAGS=%{?_smp_mflags}
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/psutil
cp %{_builddir}/psutil-5.6.7/LICENSE %{buildroot}/usr/share/package-licenses/psutil/51ede753f5d20b28226ab01c133ad67797eaf716
cp %{_builddir}/psutil-5.7.0/LICENSE %{buildroot}/usr/share/package-licenses/psutil/51ede753f5d20b28226ab01c133ad67797eaf716
python3 -tt setup.py build install --root=%{buildroot}
echo ----[ mark ]----
cat %{buildroot}/usr/lib/python3*/site-packages/*/requires.txt || :
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
73
74
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
96b5d98ec385b6ab08d703f8b75a8d371261437f/psutil-5.6.7.tar.gz
8c26a9336998e0ba7939979b480fd4a64c0b3d77/psutil-5.7.0.tar.gz
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.6.7
5.7.0

0 comments on commit 0b21dde

Please sign in to comment.