Package: owfs Version: 3.2p2-2 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: * from-upstream-major-fix.patch: Cherry-pick upstream fix for glibc 2.28. This should be fairly self-explanatory. Enjoy. ... 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 owfs-3.2p2/debian/patches/from-upstream-major-fix.patch owfs-3.2p2/debian/patches/from-upstream-major-fix.patch --- owfs-3.2p2/debian/patches/from-upstream-major-fix.patch 1969-12-31 17:00:00.000000000 -0700 +++ owfs-3.2p2/debian/patches/from-upstream-major-fix.patch 2018-11-02 14:59:35.000000000 -0600 @@ -0,0 +1,43 @@ +From 0d5e4ba51d2b90a64f5d310d715ed367bbcc8996 Mon Sep 17 00:00:00 2001 +From: Tomasz Torcz <to...@pipebreaker.pl> +Date: Sat, 17 Mar 2018 12:56:04 +0100 +Subject: [PATCH] include <sys/sysmacros.h> for major() + + Linux glibc ceased to include it in sys/types.h: +https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html +--- + configure.ac | 2 +- + module/owlib/src/include/ow.h | 6 +++++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 86751bf7..d625d3f0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4]) + # Checks for header files. + AC_HEADER_DIRENT + AC_HEADER_STDC +-AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) ++AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h]) + AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h]) + AC_CHECK_HEADERS(sys/event.h sys/inotify.h) + +diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h +index 9dbec5f3..0a310552 100644 +--- a/module/owlib/src/include/ow.h ++++ b/module/owlib/src/include/ow.h +@@ -188,8 +188,12 @@ + #include <netdb.h> /* for getaddrinfo */ + #endif /* HAVE_NETDB_H */ + ++#ifdef HAVE_SYS_SYSMACROS_H ++#include <sys/sysmacros.h> /* for major() */ ++#endif /* HAVE_SYS_SYSMACROS_H */ ++ + #ifdef HAVE_SYS_MKDEV_H +-#include <sys/mkdev.h> /* for major() */ ++#include <sys/mkdev.h> /* for major() on Solaris */ + #endif /* HAVE_SYS_MKDEV_H */ + + #include <stddef.h> // for offsetof() diff -Nru owfs-3.2p2/debian/patches/series owfs-3.2p2/debian/patches/series --- owfs-3.2p2/debian/patches/series 2018-09-23 14:10:39.000000000 -0600 +++ owfs-3.2p2/debian/patches/series 2018-11-02 15:00:20.000000000 -0600 @@ -6,3 +6,4 @@ deb-specific-python-install.patch deb-specific-owfs-use-config.patch deb-specific-systemd-use-conffile.patch +from-upstream-major-fix.patch
