Prepared release 2.34.0

libgtop fails to build on musl libc, due to the header
resulting in the headers that would be loaded for libc 5 being
loaded on musl libc.
musl defines headers which are also defined in linux-headers'
in.h, causing redefinition errors.

https://bugzilla.gnome.org/show_bug.cgi?id=760655

Signed-off-by: Benoît Dejean <bdejean@gmail.com>

NEWS

@@ -1,3 +1,18 @@
+22 March 2016: Overview of changes in 2.34.0
+================================================
+
+* Stable release
+
+29 February 2016: Overview of changes in 2.33.91
+
+* Updated translations
+* Fix building on must-libc
+
+18 January 2016: Overview of changes in 2.33.4
+
+* On OpenBSD only PID 1 is special
+* Call setlocale in main
+
 14 December: Overview of changes in 2.33.3
 
 * Fixed borken compilation on OpenBSD 

configure.ac

@@ -3,8 +3,8 @@ dnl Configure script for the Gnome library
 dnl
 
 m4_define([libgtop_major_version], [2])
-m4_define([libgtop_minor_version], [33])
-m4_define([libgtop_micro_version], [3])
+m4_define([libgtop_minor_version], [34])
+m4_define([libgtop_micro_version], [0])
 m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
 
 dnl  increment if the interface has additions, changes, removals.

po/oc.po

@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop"
-"&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-04-30 07:47+0000\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=libgtop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-11-10 14:02+0000\n"
 "PO-Revision-Date: 2015-10-31 08:15+0200\n"
 "Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Tot en òc (totenoc.eu)\n"
@@ -20,25 +20,25 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../lib/read.c:51
+#: ../lib/read.c:49
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "%d octet legit"
 msgstr[1] "%d octets legits"
 
-#: ../lib/read_data.c:51
+#: ../lib/read_data.c:49
 msgid "read data size"
 msgstr "talha de las donadas legidas"
 
-#: ../lib/read_data.c:70
+#: ../lib/read_data.c:66
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "lectura de %lu octet de donadas"
 msgstr[1] "lectura de %lu octets de donadas"
 
-#: ../lib/write.c:51
+#: ../lib/write.c:49
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -150,11 +150,11 @@ msgstr "L'estat del filh a cambiat"
 
 #: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
 msgid "Background read from tty"
-msgstr "Lectura sus tty en rèire plan"
+msgstr "Lectura sus tty en rèireplan"
 
 #: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
 msgid "Background write to tty"
-msgstr "Escritura sus tty en rèire plan"
+msgstr "Escritura sus tty en rèireplan"
 
 #: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
 msgid "I/O now possible"

src/daemon/gnuserv.c

@@ -43,6 +43,7 @@
 #include <glibtop/gnuserv.h>
 
 #include <errno.h>
+#include <locale.h>
 
 #include "daemon.h"
 
@@ -473,6 +474,8 @@ main (int argc, char **argv)
 
     int ils = -1;		/* internet domain listen socket */
 
+    setlocale (LC_ALL, "");
+
     /* On non-glibc systems, this is not set up for us.  */
     if (!program_invocation_name) {
 	char *arg;

sysdeps/linux/netload.c

@@ -34,7 +34,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if !defined (__GLIBC__) || __GNU_LIBRARY__ > 1
 /* GNU LibC */
 #include <net/if.h>
 #include <netinet/ip_icmp.h>
@@ -43,7 +43,7 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <net/if.h>
-#else /* Libc 5 */
+#elif defined (__GLIBC__) /* Libc 5 */
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/ip.h>

sysdeps/openbsd/procargs.c

@@ -56,11 +56,8 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
 
 	memset (buf, 0, sizeof (glibtop_proc_args));
 
-	/*
-	 * Don't bother with PIDs below 20, because everything below this
-	 * number is highly likely to be a kernel thread.
-	 */
-	if (pid < 19) return NULL;
+	/* Ignore init */
+	if (pid < 2) return NULL;
 
 	glibtop_suid_enter (server);