1 |
commit: c2688349694c17c401694990e069ab5efeacca0a |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 28 22:44:02 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 28 22:44:16 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2688349 |
7 |
|
8 |
net-misc/dibbler: move musl patch from overlay to main tree |
9 |
|
10 |
Closes: https://bugs.gentoo.org/551818 |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
13 |
|
14 |
net-misc/dibbler/dibbler-1.0.1-r3.ebuild | 63 ++++++++++++++++ |
15 |
net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch | 83 ++++++++++++++++++++++ |
16 |
2 files changed, 146 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild |
19 |
new file mode 100644 |
20 |
index 00000000000..8db74de7aae |
21 |
--- /dev/null |
22 |
+++ b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild |
23 |
@@ -0,0 +1,63 @@ |
24 |
+# Copyright 1999-2020 Gentoo Authors |
25 |
+# Distributed under the terms of the GNU General Public License v2 |
26 |
+ |
27 |
+EAPI=7 |
28 |
+inherit readme.gentoo-r1 systemd |
29 |
+ |
30 |
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)" |
31 |
+HOMEPAGE="http://klub.com.pl/dhcpv6/" |
32 |
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz" |
33 |
+ |
34 |
+LICENSE="GPL-2" |
35 |
+SLOT="0" |
36 |
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86" |
37 |
+IUSE="doc resolvconf" |
38 |
+ |
39 |
+RDEPEND="resolvconf? ( virtual/resolvconf )" |
40 |
+DEPEND="${RDEPEND} |
41 |
+ doc? ( |
42 |
+ || ( |
43 |
+ dev-texlive/texlive-latexextra |
44 |
+ dev-tex/floatflt |
45 |
+ ) |
46 |
+ )" |
47 |
+ |
48 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch |
49 |
+ "${FILESDIR}"/${P}-gnu-ism.patch |
50 |
+ ) |
51 |
+ |
52 |
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf |
53 |
+to suit your needs. They are stored in /etc/dibbler" |
54 |
+ |
55 |
+src_configure() { |
56 |
+ econf $(use_enable resolvconf) |
57 |
+} |
58 |
+ |
59 |
+src_compile() { |
60 |
+ default |
61 |
+ # devel documentation is broken and users should consult the online version |
62 |
+ # http://klub.com.pl/dhcpv6/doxygen/ |
63 |
+ use doc && emake -C doc/ user |
64 |
+} |
65 |
+ |
66 |
+src_install() { |
67 |
+ default |
68 |
+ readme.gentoo_create_doc |
69 |
+ |
70 |
+ dosbin dibbler-{client,relay,server} |
71 |
+ doman doc/man/*.8 |
72 |
+ |
73 |
+ insinto /etc/dibbler |
74 |
+ doins doc/examples/*.conf |
75 |
+ keepdir /var/lib/dibbler |
76 |
+ |
77 |
+ dodoc AUTHORS CHANGELOG RELNOTES TODO |
78 |
+ use doc && dodoc doc/dibbler-user.pdf |
79 |
+ |
80 |
+ doinitd "${FILESDIR}"/dibbler-{client,relay,server} |
81 |
+ systemd_dounit "${FILESDIR}"/dibbler-client.service |
82 |
+} |
83 |
+ |
84 |
+pkg_postinst() { |
85 |
+ readme.gentoo_print_elog |
86 |
+} |
87 |
|
88 |
diff --git a/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch b/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch |
89 |
new file mode 100644 |
90 |
index 00000000000..aedc3e81cbb |
91 |
--- /dev/null |
92 |
+++ b/net-misc/dibbler/files/dibbler-1.0.1-gnu-ism.patch |
93 |
@@ -0,0 +1,83 @@ |
94 |
+From f8352ac6dfc61a99b1162e0fd28d30b1e9340fde Mon Sep 17 00:00:00 2001 |
95 |
+From: Robert Gerus <arachnist@××××××.cat> |
96 |
+Date: Thu, 11 Jun 2015 21:34:39 +0200 |
97 |
+Subject: [PATCH] Compatybility patch for musl |
98 |
+ |
99 |
+Minor header/include/typedef changes to fix compatybility with musl libc. |
100 |
+Doesn't break compatybility with glibc, as far as I can tell. |
101 |
+--- |
102 |
+ Misc/Portable.h.in | 4 ++++ |
103 |
+ Port-linux/ethtool-local.h | 6 +++--- |
104 |
+ Port-linux/lowlevel-linux-link-state.c | 4 +++- |
105 |
+ Port-linux/utils.h | 5 +++++ |
106 |
+ 4 files changed, 15 insertions(+), 4 deletions(-) |
107 |
+ |
108 |
+diff --git a/Misc/Portable.h.in b/Misc/Portable.h.in |
109 |
+index 1a96293..2d94d0d 100644 |
110 |
+--- a/Misc/Portable.h.in |
111 |
++++ b/Misc/Portable.h.in |
112 |
+@@ -29,6 +29,10 @@ |
113 |
+ #include <arpa/inet.h> |
114 |
+ #endif |
115 |
+ |
116 |
++#if defined(LINUX) |
117 |
++# include <sys/select.h> |
118 |
++#endif |
119 |
++ |
120 |
+ #include <stdint.h> |
121 |
+ #include <unistd.h> |
122 |
+ |
123 |
+diff --git a/Port-linux/ethtool-local.h b/Port-linux/ethtool-local.h |
124 |
+index 2940090..555f06b 100644 |
125 |
+--- a/Port-linux/ethtool-local.h |
126 |
++++ b/Port-linux/ethtool-local.h |
127 |
+@@ -22,9 +22,9 @@ |
128 |
+ */ |
129 |
+ |
130 |
+ typedef unsigned long long u64; |
131 |
+-typedef __uint32_t u32; |
132 |
+-typedef __uint16_t u16; |
133 |
+-typedef __uint8_t u8; |
134 |
++typedef uint32_t u32; |
135 |
++typedef uint16_t u16; |
136 |
++typedef uint8_t u8; |
137 |
+ |
138 |
+ #include "ethtool-kernel.h" |
139 |
+ |
140 |
+diff --git a/Port-linux/lowlevel-linux-link-state.c b/Port-linux/lowlevel-linux-link-state.c |
141 |
+index 7ca9f6b..76293ea 100644 |
142 |
+--- a/Port-linux/lowlevel-linux-link-state.c |
143 |
++++ b/Port-linux/lowlevel-linux-link-state.c |
144 |
+@@ -18,7 +18,9 @@ |
145 |
+ #include <stdlib.h> |
146 |
+ #include <string.h> |
147 |
+ #include <unistd.h> |
148 |
+-#include <bits/sigthread.h> |
149 |
++#if defined(__GLIBC__) |
150 |
++# include <bits/sigthread.h> |
151 |
++#endif |
152 |
+ #include "Portable.h" |
153 |
+ #include "interface.h" |
154 |
+ |
155 |
+diff --git a/Port-linux/utils.h b/Port-linux/utils.h |
156 |
+index e40d95f..579dffb 100644 |
157 |
+--- a/Port-linux/utils.h |
158 |
++++ b/Port-linux/utils.h |
159 |
+@@ -1,9 +1,14 @@ |
160 |
+ #ifndef __UTILS_H__ |
161 |
+ #define __UTILS_H__ 1 |
162 |
+ |
163 |
++#ifndef _GNU_SOURCE |
164 |
++# define _GNU_SOURCE 1 |
165 |
++#endif |
166 |
++ |
167 |
+ #include <asm/types.h> |
168 |
+ //#include <resolv.h> |
169 |
+ #include <linux/types.h> |
170 |
++#include <sys/types.h> |
171 |
+ |
172 |
+ #include "libnetlink.h" |
173 |
+ #include "ll_map.h" |
174 |
+-- |
175 |
+2.4.3 |
176 |
+ |