Date: Wednesday, January 24, 2018 @ 20:09:53
Author: bgyorgy
Revision: 286691
archrelease: copy trunk to community-x86_64
Added:
gkrellm/repos/community-x86_64/PKGBUILD
(from rev 286689, gkrellm/trunk/PKGBUILD)
gkrellm/repos/community-x86_64/fix-critical-warning.patch
(from rev 286689, gkrellm/trunk/fix-critical-warning.patch)
gkrellm/repos/community-x86_64/gkrellm.service
(from rev 286689, gkrellm/trunk/gkrellm.service)
Deleted:
gkrellm/repos/community-x86_64/PKGBUILD
gkrellm/repos/community-x86_64/gkrellm.service
----------------------------+
PKGBUILD | 84 ++++++++++++++++++++++++-------------------
fix-critical-warning.patch | 35 +++++++++++++++++
gkrellm.service | 22 +++++------
3 files changed, 93 insertions(+), 48 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-24 20:09:47 UTC (rev 286690)
+++ PKGBUILD 2018-01-24 20:09:53 UTC (rev 286691)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: dorphell <dorph...@archlinux.org>
-# Contributor: Matt Smith (Majik) <darkkni...@helpdesk.zaz.net>
-# Contributor: Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
-# Contributor: Jozef Riha <jose1...@gmail.com>
-# Contributor: Alexander Rødseth <rods...@gmail.com>
-
-pkgname=gkrellm
-pkgver=2.3.10
-pkgrel=2
-pkgdesc="System monitor package for GTK2"
-arch=('x86_64' 'i686')
-url="http://gkrellm.srcbox.net/";
-license=('GPL3')
-depends=('gtk2' 'libsm' 'lm_sensors')
-makedepends=('gettext')
-backup=('etc/gkrellmd.conf')
-source=("${url}/releases/${pkgname}-${pkgver}.tar.bz2"
- "gkrellm.service")
-sha256sums=('8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766'
- '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make LOCALEDIR=/usr/share/locale
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" PREFIX=/usr install
- install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf"
- install -Dm644 "../gkrellm.service"
"$pkgdir/usr/lib/systemd/system/gkrellm.service"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gkrellm/repos/community-x86_64/PKGBUILD (from rev 286689,
gkrellm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-24 20:09:53 UTC (rev 286691)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: dorphell <dorph...@archlinux.org>
+# Contributor: Matt Smith (Majik) <darkkni...@helpdesk.zaz.net>
+# Contributor: Jaroslav Lichtblau <dragonl...@aur.archlinux.org>
+# Contributor: Jozef Riha <jose1...@gmail.com>
+# Contributor: Alexander Rødseth <rods...@gmail.com>
+
+pkgname=gkrellm
+pkgver=2.3.10
+pkgrel=3
+pkgdesc="System monitor package for GTK2"
+arch=('x86_64')
+url="http://gkrellm.srcbox.net/";
+license=('GPL3')
+depends=('gtk2' 'libsm' 'lm_sensors')
+makedepends=('gettext')
+backup=('etc/gkrellmd.conf')
+source=("${url}/releases/${pkgname}-${pkgver}.tar.bz2"
+ "fix-critical-warning.patch"
+ "gkrellm.service")
+sha256sums=('8b9ec8baadcd5830c6aff04ba86dc9ed317a15c1c3787440bd1e680fb2fcd766'
+ '05c02428065b8774637db3efe564fb597e3d9d3d9200e004077fbe9a04412e36'
+ '2829931127632d0391f6749024809594b78c138fe4f03c98cd65fdbd47cea376')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Avoid calling g_strstr_len with NULL haystack (FS#51413)
+ #
https://git.srcbox.net/gkrellm/commit/?id=3db76c647a04a603bafae19cc699bd50436d66a2
+ patch -Np1 -i ../fix-critical-warning.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make LOCALEDIR=/usr/share/locale
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" PREFIX=/usr install
+ install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf"
+ install -Dm644 "../gkrellm.service"
"$pkgdir/usr/lib/systemd/system/gkrellm.service"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gkrellm/repos/community-x86_64/fix-critical-warning.patch (from rev
286689, gkrellm/trunk/fix-critical-warning.patch)
===================================================================
--- fix-critical-warning.patch (rev 0)
+++ fix-critical-warning.patch 2018-01-24 20:09:53 UTC (rev 286691)
@@ -0,0 +1,35 @@
+From 3db76c647a04a603bafae19cc699bd50436d66a2 Mon Sep 17 00:00:00 2001
+From: Jindřich Makovička
+Date: Sat, 20 May 2017 10:34:52 +0200
+Subject: Avoid calling g_strstr_len with NULL haystack
+
+---
+ src/sysdeps/linux.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
+index 460a03d..99e7261 100644
+--- a/src/sysdeps/linux.c
++++ b/src/sysdeps/linux.c
+@@ -3157,6 +3157,7 @@ sensors_nvidia_smi_read(gboolean setup)
+ || !strcmp(id, ":")
+ )
+ continue;
++ stmp = str;
+ if ((str = g_strstr_len(str, -1,
"Temperature")) != NULL)
+ {
+ str += 11;
+@@ -3185,6 +3186,10 @@ sensors_nvidia_smi_read(gboolean setup)
+ else if ((smi = nvidia_smi_lookup(id))
!= NULL)
+ smi->temp = temp;
+ }
++ else
++ {
++ str = stmp;
++ }
+ }
+ }
+ if (output)
+--
+cgit v0.12
+
Deleted: gkrellm.service
===================================================================
--- gkrellm.service 2018-01-24 20:09:47 UTC (rev 286690)
+++ gkrellm.service 2018-01-24 20:09:53 UTC (rev 286691)
@@ -1,11 +0,0 @@
-[Unit]
-Description=GNU Krell Monitors server
-After=network.target
-# If hddtemp is added to the dependencies in the PKGBUILD, then use
-#After=network.target hddtemp.service
-
-[Service]
-ExecStart=/usr/bin/gkrellmd
-
-[Install]
-WantedBy=multi-user.target
Copied: gkrellm/repos/community-x86_64/gkrellm.service (from rev 286689,
gkrellm/trunk/gkrellm.service)
===================================================================
--- gkrellm.service (rev 0)
+++ gkrellm.service 2018-01-24 20:09:53 UTC (rev 286691)
@@ -0,0 +1,11 @@
+[Unit]
+Description=GNU Krell Monitors server
+After=network.target
+# If hddtemp is added to the dependencies in the PKGBUILD, then use
+#After=network.target hddtemp.service
+
+[Service]
+ExecStart=/usr/bin/gkrellmd
+
+[Install]
+WantedBy=multi-user.target
