aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.dk>2017-11-07 22:06:31 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-13 11:40:46 +0000
commitad1dc3afc60b2a8efb7b9c1f59a02c4fd2c66c6f (patch)
tree78e275e27d5cfd54cf4f75bc945c5d5549bb5d7f /main
parentbba444126ebebcec29110da3113a1ce4f1689de7 (diff)
downloadaports-ad1dc3afc60b2a8efb7b9c1f59a02c4fd2c66c6f.tar.bz2
aports-ad1dc3afc60b2a8efb7b9c1f59a02c4fd2c66c6f.tar.xz
main/smartmontools: upgrade to 6.6; modernize
Diffstat (limited to 'main')
-rw-r--r--main/smartmontools/APKBUILD25
-rw-r--r--main/smartmontools/musl-canonicalize_file_name.patch12
2 files changed, 25 insertions, 12 deletions
diff --git a/main/smartmontools/APKBUILD b/main/smartmontools/APKBUILD
index 5e74d24546..160e55b695 100644
--- a/main/smartmontools/APKBUILD
+++ b/main/smartmontools/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=smartmontools
-pkgver=6.5
+pkgver=6.6
pkgrel=0
pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives."
url="http://smartmontools.sourceforge.net"
@@ -11,6 +11,7 @@ subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
smartd.initd
smartd.confd
+ musl-canonicalize_file_name.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -21,9 +22,14 @@ build() {
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
- --sysconfdir=/etc \
- || return 1
- make || return 1
+ --sysconfdir=/etc
+ make
+}
+
+check() {
+ cd "$builddir"
+
+ make check
}
package() {
@@ -35,12 +41,7 @@ package() {
install -Dm644 "$srcdir"/smartd.confd "$pkgdir"/etc/conf.d/smartd
}
-md5sums="093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz
-b646176ec1b5b1eb7175b39cbef1be2f smartd.initd
-371cdb7cc9dc924b6d12224d66b193c6 smartd.confd"
-sha256sums="89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc smartmontools-6.5.tar.gz
-a4d1974318cf2d12c702f6a6db34a35373139c409ca6b796ce3370d65025a4eb smartd.initd
-714cc1b253e1f59b884be89693757fec91ca878c62f37451a49ef6bb72263e85 smartd.confd"
-sha512sums="dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3 smartmontools-6.5.tar.gz
+sha512sums="64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf smartmontools-6.6.tar.gz
61cae548fc9f3a9fbea20d684502d3816e7b0b60fcf533ae4e1ab850725c208eb6ba5012ae154a46f0b7bb7285a9e63cbdecafed8db7fd63fda0ba59081260cc smartd.initd
-ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 smartd.confd"
+ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437 smartd.confd
+eff9a1ca8e10be5b05a4be609973065d6f02f12c9d511d3a7c87fa172934d3739594f00e5a61ed2d6dc65de5fd1ff23ec049b21078d5b1620c5dbafa56d78bbe musl-canonicalize_file_name.patch"
diff --git a/main/smartmontools/musl-canonicalize_file_name.patch b/main/smartmontools/musl-canonicalize_file_name.patch
new file mode 100644
index 0000000000..bdc7cc6f1f
--- /dev/null
+++ b/main/smartmontools/musl-canonicalize_file_name.patch
@@ -0,0 +1,12 @@
+# Ticket: https://smartmontools.org/ticket/921#ticket
+--- a/os_linux.cpp
++++ b/os_linux.cpp
+@@ -3176,7 +3176,7 @@
+ {
+ char path[128];
+ snprintf(path, sizeof(path), "/sys/block/%s/device", name);
+- char * syshostpath = canonicalize_file_name(path);
++ char * syshostpath = realpath(path, NULL);
+ if (!syshostpath)
+ return false;
+