Prepared release 2.33.91

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 @@
+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 
+* Updated translations.
+
 21 September 2015: Overview of changes in 2.32.0
 
 * Stable release

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], [32])
+m4_define([libgtop_minor_version], [33])
-m4_define([libgtop_micro_version], [0])
+m4_define([libgtop_micro_version], [91])
 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

@@ -1,46 +1,44 @@
 # Occitan translation of libgtop.
 # Copyright (C) 1998-2004 Free Software Foundation, Inc.
 # This file is distributed under the GNU General Public License Version 2.
-# 
+# Cédric Valmary <cvalmary@yahoo.fr>, 2015.
-# 
+# Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>, 2015.
-# 
-# Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: libgtop 2.9.91\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgto"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"p&keywords=I18N+L10N&component=general\n"
+"product=libgtop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-12-19 14:39+0000\n"
+"POT-Creation-Date: 2015-11-10 14:02+0000\n"
-"PO-Revision-Date: 2015-04-30 09:46+0200\n"
+"PO-Revision-Date: 2015-10-31 08:15+0200\n"
-"Last-Translator: Cédric Valmary (Tot en Òc) <cvalmary@yahoo.fr>\n"
+"Last-Translator: Cédric Valmary (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: www.totenoc.eu\n"
+"Language-Team: Tot en òc (totenoc.eu)\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.7.0\n"
+"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"
@@ -53,7 +51,7 @@ msgstr "Activa lo desbugatge"
 
 #: ../src/daemon/gnuserv.c:457
 msgid "Enable verbose output"
-msgstr "Activa la sortida charraira"
+msgstr "Activa la sortida verbosa"
 
 #: ../src/daemon/gnuserv.c:459
 msgid "Don't fork into background"
@@ -61,12 +59,13 @@ msgstr "Aviar pas en prètzfach de fons"
 
 #: ../src/daemon/gnuserv.c:461
 msgid "Invoked from inetd"
-msgstr "Invocat a partir de inetd"
+msgstr "Invocat a partir d'inetd"
 
 #: ../src/daemon/gnuserv.c:495
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Aviar « %s --help » per afichar la lista de las opcions de la linha de "
+msgstr ""
+"Aviar « %s --help » per afichar la lista de las opcions de la linha de "
 "comanda.\n"
 
 #: ../sysdeps/osf1/siglist.c:27 ../sysdeps/sun4/siglist.c:27

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/glibtop_suid.h

@@ -28,6 +28,8 @@ G_BEGIN_DECLS
 #include <sys/param.h>
 #endif
 
+#include <glibtop_machine.h>
+
 #define KI_PROC(ki) (&(ki))->kp_proc)
 #define KI_EPROC(ki) (&(ki))->kp_eproc)
 

sysdeps/openbsd/open.c

@@ -21,6 +21,7 @@
 
 #include <config.h>
 #include <sys/types.h>
+#include <sys/sysctl.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/cpu.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));
 
-	/*
+	/* Ignore init */
-	 * Don't bother with PIDs below 20, because everything below this
+	if (pid < 2) return NULL;
-	 * number is highly likely to be a kernel thread.
-	 */
-	if (pid < 19) return NULL;
 
 	glibtop_suid_enter (server);
 

sysdeps/openbsd/procmap.c

@@ -284,7 +284,7 @@ glibtop_get_proc_map_p (glibtop *server, glibtop_proc_map *buf,
 			mentry->perm |= GLIBTOP_MAP_PERM_READ;
 		if (entry->protection & PROT_WRITE)
 			mentry->perm |= GLIBTOP_MAP_PERM_WRITE;
-		if (entry->protection & PROT_EXECUTE)
+		if (entry->protection & PROT_EXEC)
 			mentry->perm |= GLIBTOP_MAP_PERM_EXECUTE;
 	}
 

sysdeps/openbsd/procopenfiles.c

@@ -42,6 +42,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 #include <stdlib.h>
+#include <kvm.h>
 
 #include "glibtop_private.h"
 

sysdeps/openbsd/suid_open.c

@@ -25,7 +25,10 @@
 #include <glibtop/cpu.h>
 #include <glibtop/open.h>
 #include <glibtop/init_hooks.h>
+#include <glibtop/machine.h>
 
+#include <fcntl.h>
+#include <kvm.h>
 
 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
 

sysdeps/openbsd/uptime.c

@@ -26,6 +26,8 @@
 
 #include <glibtop/cpu.h>
 
+#include <sys/sysctl.h>
+
 static const unsigned long _glibtop_sysdeps_uptime =
 (1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME) +
 (1UL << GLIBTOP_UPTIME_BOOT_TIME);