Gentoo Archives: gentoo-commits

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