1 |
chutzpah 15/04/29 17:26:40 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: dnsmasq-2.72-r2.ebuild |
5 |
Log: |
6 |
Revision bump, allow lua to come from either slot 0 or slot 5.1 (bug #548104) |
7 |
|
8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF) |
9 |
|
10 |
Revision Changes Path |
11 |
1.266 net-dns/dnsmasq/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.266&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?rev=1.266&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/ChangeLog?r1=1.265&r2=1.266 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v |
20 |
retrieving revision 1.265 |
21 |
retrieving revision 1.266 |
22 |
diff -u -r1.265 -r1.266 |
23 |
--- ChangeLog 28 Apr 2015 18:16:54 -0000 1.265 |
24 |
+++ ChangeLog 29 Apr 2015 17:26:40 -0000 1.266 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-dns/dnsmasq |
27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.265 2015/04/28 18:16:54 chutzpah Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.266 2015/04/29 17:26:40 chutzpah Exp $ |
30 |
+ |
31 |
+*dnsmasq-2.72-r2 (29 Apr 2015) |
32 |
+ |
33 |
+ 29 Apr 2015; Patrick McLean <chutzpah@g.o> +dnsmasq-2.72-r2.ebuild: |
34 |
+ Revision bump, allow lua to come from either slot 0 or slot 5.1 (bug #548104) |
35 |
|
36 |
*dnsmasq-2.72-r1 (28 Apr 2015) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: dnsmasq-2.72-r2.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2015 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.72-r2.ebuild,v 1.1 2015/04/29 17:26:40 chutzpah Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
|
54 |
inherit eutils toolchain-funcs flag-o-matic user systemd |
55 |
|
56 |
DESCRIPTION="Small forwarding DNS server" |
57 |
HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/" |
58 |
SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" |
59 |
|
60 |
LICENSE="|| ( GPL-2 GPL-3 )" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
63 |
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn ipv6 lua nls script selinux static tftp" |
64 |
DM_LINGUAS="de es fi fr id it no pl pt_BR ro" |
65 |
for dm_lingua in ${DM_LINGUAS}; do |
66 |
IUSE+=" linguas_${dm_lingua}" |
67 |
done |
68 |
|
69 |
CDEPEND="dbus? ( sys-apps/dbus ) |
70 |
idn? ( net-dns/libidn ) |
71 |
lua? ( |
72 |
|| ( |
73 |
dev-lang/lua:0 |
74 |
dev-lang/lua:5.1 |
75 |
) |
76 |
) |
77 |
conntrack? ( !s390? ( net-libs/libnetfilter_conntrack ) ) |
78 |
nls? ( |
79 |
sys-devel/gettext |
80 |
net-dns/libidn |
81 |
) |
82 |
" |
83 |
|
84 |
DEPEND="${CDEPEND} |
85 |
app-arch/xz-utils |
86 |
dnssec? ( |
87 |
dev-libs/nettle[gmp] |
88 |
static? ( |
89 |
dev-libs/nettle[static-libs(+)] |
90 |
) |
91 |
) |
92 |
virtual/pkgconfig" |
93 |
|
94 |
RDEPEND="${CDEPEND} |
95 |
dnssec? ( |
96 |
!static? ( |
97 |
dev-libs/nettle[gmp] |
98 |
) |
99 |
) |
100 |
selinux? ( sec-policy/selinux-dnsmasq ) |
101 |
" |
102 |
|
103 |
REQUIRED_USE="dhcp-tools? ( dhcp ) |
104 |
lua? ( script ) |
105 |
s390? ( !conntrack )" |
106 |
|
107 |
use_have() { |
108 |
local useflag no_only uword |
109 |
if [[ $1 == '-n' ]]; then |
110 |
no_only=1 |
111 |
shift |
112 |
fi |
113 |
useflag="${1}" |
114 |
shift |
115 |
|
116 |
uword="${1:-${useflag}}" |
117 |
shift |
118 |
|
119 |
while [[ ${uword} ]]; do |
120 |
uword=${uword^^*} |
121 |
|
122 |
if ! use "${useflag}"; then |
123 |
echo -n " -DNO_${uword}" |
124 |
elif [[ -z "${no_only}" ]]; then |
125 |
echo -n " -DHAVE_${uword}" |
126 |
fi |
127 |
uword="${1}" |
128 |
shift |
129 |
done |
130 |
} |
131 |
|
132 |
pkg_pretend() { |
133 |
if use static; then |
134 |
einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked." |
135 |
use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored." |
136 |
fi |
137 |
} |
138 |
|
139 |
pkg_setup() { |
140 |
enewgroup dnsmasq |
141 |
enewuser dnsmasq -1 -1 /dev/null dnsmasq |
142 |
} |
143 |
|
144 |
src_prepare() { |
145 |
sed -i -r 's:lua5.[0-9]+:lua:' Makefile |
146 |
sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example |
147 |
|
148 |
epatch "${FILESDIR}"/${P}-Fix-crash-on-receipt-of-certain-malformed-DNS-requests.patch |
149 |
epatch "${FILESDIR}"/${P}-Fix-crash-caused-by-looking-up-servers.bind-when-many-servers-defined.patch |
150 |
} |
151 |
|
152 |
src_configure() { |
153 |
COPTS="$(use_have -n auth-dns auth)" |
154 |
COPTS+="$(use_have conntrack)" |
155 |
COPTS+="$(use_have dbus)" |
156 |
COPTS+="$(use_have idn)" |
157 |
COPTS+="$(use_have -n dhcp dhcp dhcp6)" |
158 |
COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" |
159 |
COPTS+="$(use_have lua luascript)" |
160 |
COPTS+="$(use_have -n script)" |
161 |
COPTS+="$(use_have -n tftp)" |
162 |
COPTS+="$(use_have dnssec)" |
163 |
COPTS+="$(use_have static dnssec_static)" |
164 |
} |
165 |
|
166 |
src_compile() { |
167 |
emake \ |
168 |
PREFIX=/usr \ |
169 |
CC="$(tc-getCC)" \ |
170 |
CFLAGS="${CFLAGS}" \ |
171 |
LDFLAGS="${LDFLAGS}" \ |
172 |
COPTS="${COPTS}" \ |
173 |
CONFFILE="/etc/${PN}.conf" \ |
174 |
all$(use nls && echo "-i18n") |
175 |
|
176 |
use dhcp-tools && emake -C contrib/wrt \ |
177 |
PREFIX=/usr \ |
178 |
CC="$(tc-getCC)" \ |
179 |
CFLAGS="${CFLAGS}" \ |
180 |
LDFLAGS="${LDFLAGS}" \ |
181 |
all |
182 |
} |
183 |
|
184 |
src_install() { |
185 |
local lingua puid |
186 |
emake \ |
187 |
PREFIX=/usr \ |
188 |
MANDIR=/usr/share/man \ |
189 |
DESTDIR="${D}" \ |
190 |
install$(use nls && echo "-i18n") |
191 |
|
192 |
for lingua in ${DM_LINGUAS}; do |
193 |
use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua} |
194 |
done |
195 |
[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/ |
196 |
|
197 |
dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example |
198 |
dodoc -r logo |
199 |
|
200 |
dodoc CHANGELOG FAQ |
201 |
dohtml *.html |
202 |
|
203 |
newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN} |
204 |
newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN} |
205 |
|
206 |
insinto /etc |
207 |
newins dnsmasq.conf.example dnsmasq.conf |
208 |
|
209 |
insinto /usr/share/dnsmasq |
210 |
doins trust-anchors.conf |
211 |
|
212 |
if use dhcp; then |
213 |
dodir /var/lib/misc |
214 |
newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN} |
215 |
fi |
216 |
if use dbus; then |
217 |
insinto /etc/dbus-1/system.d |
218 |
doins dbus/dnsmasq.conf |
219 |
fi |
220 |
|
221 |
if use dhcp-tools; then |
222 |
dosbin contrib/wrt/{dhcp_release,dhcp_lease_time} |
223 |
doman contrib/wrt/{dhcp_release,dhcp_lease_time}.1 |
224 |
fi |
225 |
|
226 |
systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service |
227 |
|
228 |
} |
229 |
|
230 |
pkg_preinst() { |
231 |
# temporary workaround to (hopefully) prevent leases file from being removed |
232 |
[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}" |
233 |
} |
234 |
|
235 |
pkg_postinst() { |
236 |
# temporary workaround to (hopefully) prevent leases file from being removed |
237 |
[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases |
238 |
} |