Package: comedilib Version: 0.10.2-4 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu disco ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: * 04_glibc2.28_fix.patch: Cherrypick fix to define minor() with new glibc. This should be pretty self-explanatory. ... Adam -- System Information: Debian Release: buster/sid APT prefers disco APT policy: (500, 'disco') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.18.0-10-lowlatency (SMP w/4 CPU cores; PREEMPT) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_CA:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru comedilib-0.10.2/debian/control comedilib-0.10.2/debian/control --- comedilib-0.10.2/debian/control 2016-11-01 10:14:34.000000000 -0600 +++ comedilib-0.10.2/debian/control 2018-11-06 10:54:06.000000000 -0700 @@ -1,8 +1,7 @@ Source: comedilib Section: devel Priority: optional -Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> -XSBC-Original-Maintainer: Gudjon I. Gudjonsson <gud...@gudjon.org> +Maintainer: Gudjon I. Gudjonsson <gud...@gudjon.org> Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), autotools-dev, swig, docbook-utils, dblatex, bison, flex, libtool, xmlto, imagemagick, fop, libboost-program-options-dev, libgsl-dev, diff -Nru comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch --- comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch 1969-12-31 17:00:00.000000000 -0700 +++ comedilib-0.10.2/debian/patches/04_glibc2.28_fix.patch 2018-11-06 10:53:34.000000000 -0700 @@ -0,0 +1,30 @@ +From 3f8514739a2d799d2e6dbb6cd43a7f6bb624a319 Mon Sep 17 00:00:00 2001 +From: Ian Abbott <abbo...@mev.co.uk> +Date: Mon, 10 Apr 2017 19:02:55 +0100 +Subject: [PATCH] lib/calib.c: Include <sys/sysmacros.h> for fstat() + +Relying on <sys/types.h> to define major(), minor() and makedev() is +deprecated, so include <sys/sysmacros.h> to define them. + +Als include <sys/types.h> and <unistd.h> as the Linux man page for +fstat() has them in the synopsys. +--- + lib/calib.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/calib.c b/lib/calib.c +index ee823bc..d60bf2c 100644 +--- a/lib/calib.c ++++ b/lib/calib.c +@@ -27,7 +27,11 @@ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> ++#include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> ++#include <unistd.h> ++ + #include "libinternal.h" + + static int set_calibration( comedi_t *dev, const comedi_calibration_t *parsed_file, diff -Nru comedilib-0.10.2/debian/patches/series comedilib-0.10.2/debian/patches/series --- comedilib-0.10.2/debian/patches/series 2015-08-02 22:33:18.000000000 -0600 +++ comedilib-0.10.2/debian/patches/series 2018-11-06 10:54:00.000000000 -0700 @@ -1,3 +1,4 @@ 01_fix_spelling.patch 02_configure.patch 03_manpages.patch +04_glibc2.28_fix.patch
