tags 916111 patch
user 916111 ubuntu-de...@lists.ubuntu.com
usertags 916111 origin-ubuntu focal ubuntu-patch

thank you

The attached patch fixes the issue


diff -Nru ruby-sigar-0.7.3/debian/changelog ruby-sigar-0.7.3/debian/changelog
--- ruby-sigar-0.7.3/debian/changelog	2015-09-09 17:59:41.000000000 +0200
+++ ruby-sigar-0.7.3/debian/changelog	2019-12-16 15:39:55.000000000 +0100
@@ -1,3 +1,11 @@
+ruby-sigar (0.7.3-2) UNRELEASED; urgency=medium
+
+  * debian/patches/github-glibc-buildfix.patch:
+    - build fix for glibc 2.28, backported upstream proposed fix from
+      https://github.com/hyperic/sigar/pull/127 (Closes: #916111)
+
+ -- Sebastien Bacher <seb...@ubuntu.com>  Mon, 16 Dec 2019 15:31:01 +0100
+
 ruby-sigar (0.7.3-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru ruby-sigar-0.7.3/debian/control ruby-sigar-0.7.3/debian/control
--- ruby-sigar-0.7.3/debian/control	2015-09-09 17:59:41.000000000 +0200
+++ ruby-sigar-0.7.3/debian/control	2018-03-01 10:36:16.000000000 +0100
@@ -1,7 +1,8 @@
 Source: ruby-sigar
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintain...@lists.alioth.debian.org>
 Uploaders: Pirate Praveen <prav...@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.7.4~)
 Standards-Version: 3.9.6
diff -Nru ruby-sigar-0.7.3/debian/patches/github-glibc-buildfix.patch ruby-sigar-0.7.3/debian/patches/github-glibc-buildfix.patch
--- ruby-sigar-0.7.3/debian/patches/github-glibc-buildfix.patch	1970-01-01 01:00:00.000000000 +0100
+++ ruby-sigar-0.7.3/debian/patches/github-glibc-buildfix.patch	2019-12-16 15:30:29.000000000 +0100
@@ -0,0 +1,28 @@
+From b4e27b0b3167aac9a0f3f08dd2b2a0c0c9c4d797 Mon Sep 17 00:00:00 2001
+From: Logan Rosen <loganro...@gmail.com>
+Date: Fri, 11 Jan 2019 22:52:21 -0500
+Subject: [PATCH] Fix build with glibc 2.28
+https://github.com/hyperic/sigar/pull/127
+---
+ src/os/linux/linux_sigar.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/os/linux/linux_sigar.c b/src/os/linux/linux_sigar.c
+index a3fd2301..de9c960c 100644
+--- a/src/os/linux/linux_sigar.c
++++ b/src/os/linux/linux_sigar.c
+@@ -23,8 +23,13 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/times.h>
++#include <sys/types.h>
+ #include <sys/utsname.h>
+ 
++#ifdef __GNU_LIBRARY__
++#include <sys/sysmacros.h>
++#endif
++
+ #include "sigar.h"
+ #include "sigar_private.h"
+ #include "sigar_util.h"
+
diff -Nru ruby-sigar-0.7.3/debian/patches/series ruby-sigar-0.7.3/debian/patches/series
--- ruby-sigar-0.7.3/debian/patches/series	2015-09-09 17:59:41.000000000 +0200
+++ ruby-sigar-0.7.3/debian/patches/series	2019-12-16 14:24:50.000000000 +0100
@@ -1,2 +1,3 @@
 mips-TIOCGETC-undeclared.patch
 gnu89-inline.diff
+github-glibc-buildfix.patch

Reply via email to