Gentoo Archives: gentoo-commits

From: Christoph Junghans <junghans@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/snapraid/, sys-fs/snapraid/files/
Date: Wed, 04 Jan 2017 05:02:26
Message-Id: 1483506132.01d008ab9f404257b9e71ff8fa3b3634a3197cc6.junghans@gentoo
1 commit: 01d008ab9f404257b9e71ff8fa3b3634a3197cc6
2 Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 4 05:01:55 2017 +0000
4 Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 4 05:02:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d008ab
7
8 sys-fs/snapraid: fix undefined minor (bug #604478)
9
10 Package-Manager: portage-2.3.0
11
12 sys-fs/snapraid/files/snapraid-11.0-minor.patch | 39 ++++++++++++++++++++++
13 ...napraid-11.0.ebuild => snapraid-11.0-r1.ebuild} | 2 ++
14 2 files changed, 41 insertions(+)
15
16 diff --git a/sys-fs/snapraid/files/snapraid-11.0-minor.patch b/sys-fs/snapraid/files/snapraid-11.0-minor.patch
17 new file mode 100644
18 index 00000000..f212e9a
19 --- /dev/null
20 +++ b/sys-fs/snapraid/files/snapraid-11.0-minor.patch
21 @@ -0,0 +1,39 @@
22 +From 04dfeea107f81afa50e4888dd7da2f4a9c82d6ee Mon Sep 17 00:00:00 2001
23 +From: Andrea Mazzoleni <amadvance@×××××.com>
24 +Date: Wed, 4 Jan 2017 00:25:56 +0100
25 +Subject: [PATCH] Tentative fix for major/minor missing
26 +
27 +---
28 + cmdline/portable.h | 6 ++++++
29 + configure.ac | 1 +
30 + 2 files changed, 7 insertions(+)
31 +
32 +diff --git a/cmdline/portable.h b/cmdline/portable.h
33 +index 58826c6..059cd38 100644
34 +--- a/cmdline/portable.h
35 ++++ b/cmdline/portable.h
36 +@@ -198,6 +198,12 @@
37 + #include <sys/types.h>
38 + #endif
39 +
40 ++#if MAJOR_IN_MKDEV
41 ++#include <sys/mkdev.h>
42 ++#elif MAJOR_IN_SYSMACROS
43 ++#include <sys/sysmacros.h>
44 ++#endif
45 ++
46 + #if HAVE_SYS_STAT_H
47 + #include <sys/stat.h>
48 + #endif
49 +diff --git a/configure.ac b/configure.ac
50 +index 125dae9..8f34f43 100644
51 +--- a/configure.ac
52 ++++ b/configure.ac
53 +@@ -31,6 +31,7 @@ AC_HEADER_ASSERT
54 + AC_HEADER_DIRENT
55 + AC_HEADER_TIME
56 + AC_HEADER_SYS_WAIT
57 ++AC_HEADER_MAJOR
58 + AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h limits.h])
59 + AC_CHECK_HEADERS([unistd.h getopt.h fnmatch.h io.h inttypes.h byteswap.h])
60 + AC_CHECK_HEADERS([pthread.h math.h])
61
62 diff --git a/sys-fs/snapraid/snapraid-11.0.ebuild b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
63 similarity index 91%
64 rename from sys-fs/snapraid/snapraid-11.0.ebuild
65 rename to sys-fs/snapraid/snapraid-11.0-r1.ebuild
66 index 7e5c4ae..82b10c3 100644
67 --- a/sys-fs/snapraid/snapraid-11.0.ebuild
68 +++ b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
69 @@ -14,3 +14,5 @@ KEYWORDS="~amd64 ~x86"
70 IUSE="test"
71
72 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
73 +
74 +PATCHES=( "${FILESDIR}/${P}-minor.patch" )