From 6eaa7c49fcc31634a9f1d67d3de58a2058aa57e6 Mon Sep 17 00:00:00 2001 From: Eivind Uggedal Date: Sat, 15 Aug 2015 07:27:07 +0000 Subject: [PATCH] python-psutil: update to 3.1.1. --- srcpkgs/python-psutil/patches/musl.patch | 24 ++++++++++++++++++++++++ srcpkgs/python-psutil/template | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python-psutil/patches/musl.patch diff --git a/srcpkgs/python-psutil/patches/musl.patch b/srcpkgs/python-psutil/patches/musl.patch new file mode 100644 index 00000000000..779ad84f32f --- /dev/null +++ b/srcpkgs/python-psutil/patches/musl.patch @@ -0,0 +1,24 @@ +--- psutil/_psutil_linux.c ++++ psutil/_psutil_linux.c +@@ -517,7 +517,7 @@ psutil_net_if_stats(PyObject* self, PyObject* args) + // duplex and speed + memset(ðcmd, 0, sizeof ethcmd); + ethcmd.cmd = ETHTOOL_GSET; +- ifr.ifr_data = (caddr_t)ðcmd; ++ ifr.ifr_data = (void *)ðcmd; + ret = ioctl(sock, SIOCETHTOOL, &ifr); + + if (ret != -1) { +diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c +index 183dab0e12ee..4ff410601e85 100644 +--- psutil/_psutil_posix.c ++++ psutil/_psutil_posix.c +@@ -418,7 +418,7 @@ psutil_net_if_stats(PyObject *self, PyObject *args) + // speed / duplex + memset(&ifmed, 0, sizeof(struct ifmediareq)); + strlcpy(ifmed.ifm_name, nic_name, sizeof(ifmed.ifm_name)); +- ret = ioctl(sock, SIOCGIFMEDIA, (caddr_t)&ifmed); ++ ret = ioctl(sock, SIOCGIFMEDIA, (void *)&ifmed); + if (ret == -1) { + speed = 0; + duplex = 0; diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index 19ed57d7705..5721f95fe72 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -1,6 +1,6 @@ # Template file for 'python-psutil' pkgname=python-psutil -version=2.2.1 +version=3.1.1 revision=1 wrksrc="psutil-${version}" build_style=python-module @@ -13,11 +13,11 @@ homepage="https://github.com/giampaolo/psutil" license="BSD" short_desc="Cross-platform process and system utilities module for Python2" distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz" -checksum=a0e9b96f1946975064724e242ac159f3260db24ffa591c3da0a355361a3a337f +checksum=d3290bd4a027fa0b3a2e2ee87728056fe49d4112640e2b8c2ea4dd94ba0cf057 pre_build() { # remove shebangs - sed -i '1d' psutil/*.py + sed -i '/^#!/d' psutil/*.py } python3.4-psutil_package() {