diff options
| -rw-r--r-- | user/lm_sensors/APKBUILD | 23 | ||||
| -rw-r--r-- | user/lm_sensors/musl-fix-includes.patch | 62 | ||||
| -rw-r--r-- | user/lm_sensors/use-module-load.d-dir.patch (renamed from user/lm_sensors/sensors-detect-alpine.patch) | 0 |
3 files changed, 9 insertions, 76 deletions
diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD index e16b0bc35..3b46a20f1 100644 --- a/user/lm_sensors/APKBUILD +++ b/user/lm_sensors/APKBUILD @@ -1,27 +1,23 @@ # Maintainer: pkgname=lm_sensors -pkgver=3.4.0 -pkgrel=5 +pkgver=3.5.0 +pkgrel=0 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring." -url="https://hwmon.wiki.kernel.org/" +url="https://hwmon.wiki.kernel.org/lm_sensors" arch="all" options="!check" # No test suite. license="GPL-2.0-only AND LGPL-2.1+ AND GPL-2.0+" depends="bash sysfsutils" makedepends="bison flex perl rrdtool-dev cmd:which" subpackages="$pkgname-dev $pkgname-doc $pkgname-detect $pkgname-sensord - $pkgname-sensord-openrc:sensord_openrc" -#install=sensors.install - -# 2015-11-11 (bpiotrowski): upstream website is down, Fedora mirrored the file -#source="http://dl.lm-sensors.org/lm-sensors/releases/$pkgname-$pkgver.tar.bz2 -source="http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-3.4.0.tar.bz2/c03675ae9d43d60322110c679416901a/lm_sensors-3.4.0.tar.bz2 - sensors-detect-alpine.patch - musl-fix-includes.patch + $pkgname-sensord-openrc:sensord_openrc:noarch" +source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archive/V3-5-0.tar.gz + use-module-load.d-dir.patch fancontrol.initd sensord.confd sensord.initd " +builddir="$srcdir/${pkgname/_/-}-${pkgver//./-}" prepare() { cd "$builddir" @@ -77,9 +73,8 @@ sensord_openrc() { install -Dm755 "$srcdir"/sensord.confd "$subpkgdir"/etc/conf.d/sensord } -sha512sums="993064bd14b855c1ae8c057e89313df5b3d5efe441fb2e8c3e508f42bb15658564df2563fac8fabbdb0d650dfdbc694037736c748d45cb9d85dfb8fb5a3d1ea9 lm_sensors-3.4.0.tar.bz2 -794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb sensors-detect-alpine.patch -333751cb580c94f2d32ef5520d2f2acc0ef7e1cd4a6390ea75cae4c755fbdfcade1805c979ba3319905f1267bdc120a6746e6f70d89e0c72a8c2faefd34a9e79 musl-fix-includes.patch +sha512sums="bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1 lm_sensors-3.5.0.tar.gz +794cf2aaa2a9e809c6b67f4c888a89064bba3e5b9333a9f0101a92372c25012e506fa48e86523f57cf30e5c2a808bc38058fd8640c870ea6b48faab44794cfbb use-module-load.d-dir.patch 04756c3844033dc7897e1348181140a43f8470c1bb863f1524b21bbe6be2f13fbf17ac3a68270c96a70d8c148124fea569d1ef75619bbe383e15ec705ea18b21 fancontrol.initd a77d81ab7ded085ba19e4c637e93268f889ccb8ce9e008a210ae135cb6e2140be07e5d455cf7fcc1084fd57cfbfb3f2bb37207123aebe9566f78b5183806fd7d sensord.confd 9a19874c158e82ab076ed5fb96a40d4bfb4957bfd5a2ce66aa207c06e577bc1b048336c0046a9f856f6d00dc10e68a0dc9726f6e726a8f7bfd50c4043ee1e26a sensord.initd" diff --git a/user/lm_sensors/musl-fix-includes.patch b/user/lm_sensors/musl-fix-includes.patch deleted file mode 100644 index 501f2dd76..000000000 --- a/user/lm_sensors/musl-fix-includes.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- lm_sensors-3.3.4.orig/prog/dump/isadump.c -+++ lm_sensors-3.3.4/prog/dump/isadump.c -@@ -36,13 +36,7 @@ - #include "util.h" - #include "superio.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ ---- lm_sensors-3.3.4.orig/prog/dump/isaset.c -+++ lm_sensors-3.3.4/prog/dump/isaset.c -@@ -32,13 +32,7 @@ - #include <string.h> - #include "util.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ ---- lm_sensors-3.3.4.orig/prog/dump/superio.c -+++ lm_sensors-3.3.4/prog/dump/superio.c -@@ -20,12 +20,7 @@ - */ - - #include <stdlib.h> -- --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - #include "superio.h" - ---- lm_sensors-3.3.4.orig/prog/dump/util.c -+++ lm_sensors-3.3.4/prog/dump/util.c -@@ -11,12 +11,7 @@ - #include <stdio.h> - #include "util.h" - --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include <sys/io.h> --#else --#include <asm/io.h> --#endif - - /* Return 1 if we should continue, 0 if we should abort */ - int user_ack(int def) diff --git a/user/lm_sensors/sensors-detect-alpine.patch b/user/lm_sensors/use-module-load.d-dir.patch index 319fcec06..319fcec06 100644 --- a/user/lm_sensors/sensors-detect-alpine.patch +++ b/user/lm_sensors/use-module-load.d-dir.patch |