public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/
Date: Tue,  1 Aug 2017 22:45:22 +0000 (UTC)	[thread overview]
Message-ID: <1501627516.06cd85532dc39498e24c0a3364e0fcf689219e3e.chutzpah@gentoo> (raw)

commit:     06cd85532dc39498e24c0a3364e0fcf689219e3e
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  1 22:44:58 2017 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Aug  1 22:45:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06cd8553

net-dns/dnsmasq: Revision bump on 2.77, unify idn/libidn2 USE semantics

Make the "libidn2" USE flag a sub-flag of "idn", as described in the
bug.

Gentoo-Bug: 625616
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild | 198 +++++++++++++++++++++++++++++++++
 1 file changed, 198 insertions(+)

diff --git a/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
new file mode 100644
index 00000000000..17e3d67699d
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.77-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic user systemd
+
+DESCRIPTION="Small forwarding DNS server"
+HOMEPAGE="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +id idn libidn2 +inotify"
+IUSE+=" ipv6 lua nls script selinux static tftp"
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+for dm_lingua in "${DM_LINGUAS[@]}"; do
+	IUSE+=" linguas_${dm_lingua}"
+done
+
+CDEPEND="dbus? ( sys-apps/dbus )
+	idn? (
+		!libidn2? ( net-dns/libidn )
+		libidn2? ( >=net-dns/libidn2-2.0 )
+	)
+	lua? ( dev-lang/lua:* )
+	conntrack? ( net-libs/libnetfilter_conntrack )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	dnssec? (
+		dev-libs/nettle[gmp]
+		static? ( dev-libs/nettle[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+RDEPEND="${CDEPEND}
+	dnssec? (
+		!static? (
+			dev-libs/nettle[gmp]
+		)
+	)
+	selinux? ( sec-policy/selinux-dnsmasq )
+"
+
+REQUIRED_USE="dhcp-tools? ( dhcp )
+	lua? ( script )
+	libidn2? ( idn )"
+
+use_have() {
+	local useflag no_only uword
+	if [[ $1 == '-n' ]]; then
+		no_only=1
+		shift
+	fi
+	useflag="${1}"
+	shift
+
+	uword="${1:-${useflag}}"
+	shift
+
+	while [[ ${uword} ]]; do
+		uword="${uword^^}"
+
+		if ! use "${useflag}"; then
+			echo -n " -DNO_${uword}"
+		elif [[ -z "${no_only}" ]]; then
+			echo -n " -DHAVE_${uword}"
+		fi
+		uword="${1}"
+		shift
+	done
+}
+
+pkg_pretend() {
+	if use static; then
+		einfo "Only sys-libs/gmp and dev-libs/nettle are statically linked."
+		use dnssec || einfo "Thus, ${P}[!dnssec,static] makes no sense; the static USE flag is ignored."
+	fi
+}
+
+pkg_setup() {
+	enewgroup dnsmasq
+	enewuser dnsmasq -1 -1 /dev/null dnsmasq
+}
+
+src_prepare() {
+	default
+
+	sed -i -r 's:lua5.[0-9]+:lua:' Makefile
+	sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+}
+
+src_configure() {
+	COPTS="$(use_have -n auth-dns auth)"
+	COPTS+="$(use_have conntrack)"
+	COPTS+="$(use_have dbus)"
+	COPTS+="$(use libidn2 || $(use_have idn))"
+	COPTS+="$(use_have libidn2)"
+	COPTS+="$(use_have -n inotify)"
+	COPTS+="$(use_have -n dhcp dhcp dhcp6)"
+	COPTS+="$(use_have -n ipv6 ipv6 dhcp6)"
+	COPTS+="$(use_have -n id id)"
+	COPTS+="$(use_have lua luascript)"
+	COPTS+="$(use_have -n script)"
+	COPTS+="$(use_have -n tftp)"
+	COPTS+="$(use_have dnssec)"
+	COPTS+="$(use_have static dnssec_static)"
+}
+
+src_compile() {
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		COPTS="${COPTS}" \
+		CONFFILE="/etc/${PN}.conf" \
+		all$(use nls && echo "-i18n")
+
+	use dhcp-tools && emake -C contrib/lease-tools \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		all
+}
+
+src_install() {
+	local lingua puid
+	emake \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man \
+		COPTS="${COPTS}" \
+		DESTDIR="${D}" \
+		install$(use nls && echo "-i18n")
+
+	for lingua in "${DM_LINGUAS[@]}"; do
+		use linguas_${lingua} || rm -rf "${D}"/usr/share/locale/${lingua}
+	done
+	[[ -d "${D}"/usr/share/locale/ ]] && rmdir --ignore-fail-on-non-empty "${D}"/usr/share/locale/
+
+	dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+	dodoc -r logo
+
+	docinto html/
+	dodoc *.html
+
+	newinitd "${FILESDIR}"/dnsmasq-init-r2 ${PN}
+	newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+	insinto /etc
+	newins dnsmasq.conf.example dnsmasq.conf
+
+	insinto /usr/share/dnsmasq
+	doins trust-anchors.conf
+
+	if use dhcp; then
+		dodir /var/lib/misc
+		newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r1 ${PN}
+	fi
+	if use dbus; then
+		insinto /etc/dbus-1/system.d
+		doins dbus/dnsmasq.conf
+	fi
+
+	if use dhcp-tools; then
+		dosbin contrib/lease-tools/{dhcp_release,dhcp_lease_time}
+		doman contrib/lease-tools/{dhcp_release,dhcp_lease_time}.1
+		if use ipv6; then
+			dosbin contrib/lease-tools/dhcp_release6
+			doman contrib/lease-tools/dhcp_release6.1
+		fi
+	fi
+
+	systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service
+}
+
+pkg_preinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f /var/lib/misc/dnsmasq.leases ]] && cp /var/lib/misc/dnsmasq.leases "${T}"
+}
+
+pkg_postinst() {
+	# temporary workaround to (hopefully) prevent leases file from being removed
+	[[ -f "${T}"/dnsmasq.leases ]] && cp "${T}"/dnsmasq.leases /var/lib/misc/dnsmasq.leases
+}


             reply	other threads:[~2017-08-01 22:45 UTC|newest]

Thread overview: 148+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-01 22:45 Patrick McLean [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-14  7:43 [gentoo-commits] repo/gentoo:master commit in: net-dns/dnsmasq/ Arthur Zamarin
2024-03-13 20:58 Sam James
2024-03-13  4:48 Sam James
2024-03-12 21:35 Arthur Zamarin
2024-02-29 22:17 Sam James
2024-02-28 18:52 Arthur Zamarin
2024-02-28 18:52 Arthur Zamarin
2024-02-21 11:01 Sam James
2023-10-17  7:56 Sam James
2023-05-01 13:36 Sam James
2023-03-05  9:14 Arthur Zamarin
2023-03-05  9:07 Arthur Zamarin
2023-03-05  9:06 Arthur Zamarin
2023-02-05 18:50 Sam James
2023-02-05 18:50 Sam James
2023-02-05 18:50 Sam James
2023-02-05 18:31 Sam James
2023-02-05 17:18 Sam James
2023-01-12  4:22 Sam James
2022-11-29 15:58 WANG Xuerui
2022-10-24 20:52 Patrick McLean
2022-08-25  3:33 Sam James
2022-08-15 14:04 Sam James
2022-08-12 10:19 Agostino Sarubbo
2022-08-12 10:17 Agostino Sarubbo
2022-08-12  7:25 Agostino Sarubbo
2022-08-12  7:24 Agostino Sarubbo
2022-08-11 17:34 Arthur Zamarin
2022-08-11  6:48 Agostino Sarubbo
2022-08-11  6:45 Agostino Sarubbo
2021-09-15  0:49 Patrick McLean
2021-08-08 21:39 Marek Szuba
2021-05-15  2:41 Sam James
2021-05-14  6:45 Agostino Sarubbo
2021-05-14  6:42 Agostino Sarubbo
2021-05-13 21:15 Sam James
2021-05-13 16:24 Sam James
2021-05-12 20:12 Agostino Sarubbo
2021-05-12  7:58 Agostino Sarubbo
2021-04-15 23:37 Patrick McLean
2021-03-25 23:52 Conrad Kostecki
2021-01-28 19:26 Patrick McLean
2021-01-28 19:26 Patrick McLean
2021-01-28 19:19 Patrick McLean
2021-01-28  1:17 Sam James
2021-01-28  1:14 Sam James
2021-01-27 23:28 Sam James
2021-01-27 23:28 Sam James
2021-01-27 23:15 Sam James
2021-01-27 23:14 Sam James
2021-01-27 17:45 Sergei Trofimovich
2021-01-24  3:52 Sam James
2021-01-23 22:51 Sam James
2021-01-23 22:51 Sam James
2021-01-23 22:42 Sam James
2021-01-23  5:56 Sam James
2021-01-23  4:20 Sam James
2021-01-23  4:09 Sam James
2021-01-22 20:29 Sam James
2021-01-22 16:53 Agostino Sarubbo
2021-01-20 18:25 Patrick McLean
2021-01-19 18:55 Patrick McLean
2020-11-03  7:29 Sam James
2020-10-28 22:35 Sergei Trofimovich
2020-10-28 22:33 Sergei Trofimovich
2020-10-28 22:30 Sergei Trofimovich
2020-10-28 22:27 Sergei Trofimovich
2020-10-28 16:18 Sam James
2020-10-28  4:10 Sam James
2020-10-27 22:00 Thomas Deutschmann
2020-07-20  0:38 Patrick McLean
2020-05-16 19:47 Sergei Trofimovich
2020-05-13 21:07 Mart Raudsepp
2020-05-11  9:27 Agostino Sarubbo
2020-05-11  9:26 Agostino Sarubbo
2020-05-10  9:28 Sergei Trofimovich
2020-05-09 23:00 Sergei Trofimovich
2020-05-09 22:37 Sergei Trofimovich
2020-04-12 18:51 Patrick McLean
2019-11-26  3:11 Matt Turner
2019-11-09 22:55 Matt Turner
2019-11-08  1:15 Aaron Bauman
2019-11-01 10:30 Mikle Kolyada
2019-10-03  8:16 Agostino Sarubbo
2019-09-26 19:02 Thomas Deutschmann
2019-09-26 18:32 Mikle Kolyada
2019-09-26  6:52 Sergei Trofimovich
2019-09-26  6:49 Sergei Trofimovich
2019-09-26  6:40 Sergei Trofimovich
2019-09-22 11:50 Sergei Trofimovich
2019-09-20 21:18 Matt Turner
2019-08-19 22:02 Patrick McLean
2019-05-23  6:39 Aaron Bauman
2019-03-02 20:59 Matt Turner
2019-01-03 19:00 Mikle Kolyada
2018-12-15 12:50 Sergei Trofimovich
2018-12-11 23:32 Sergei Trofimovich
2018-12-11 23:27 Sergei Trofimovich
2018-12-11 23:24 Sergei Trofimovich
2018-12-09 23:51 Thomas Deutschmann
2018-12-09 11:33 Jeroen Roovers
2018-12-07 22:59 Patrick McLean
2018-12-07 22:55 Patrick McLean
2018-10-18 21:40 Patrick McLean
2018-10-18 21:40 Patrick McLean
2018-07-23 17:50 Patrick McLean
2018-07-22  9:01 Sergei Trofimovich
2018-07-22  2:31 Mikle Kolyada
2018-07-20 22:48 Sergei Trofimovich
2018-07-20 22:40 Thomas Deutschmann
2018-07-20 22:24 Sergei Trofimovich
2018-07-20 12:11 Tobias Klausmann
2018-07-20  8:08 Sergei Trofimovich
2018-07-17 11:29 Mikle Kolyada
2018-01-25  1:23 Aaron Bauman
2018-01-07 14:33 Ulrich Müller
2017-10-16 18:15 Markus Meier
2017-10-05  9:47 Sergei Trofimovich
2017-10-05  8:37 Sergei Trofimovich
2017-10-04  8:52 Sergei Trofimovich
2017-10-03 15:25 Sergei Trofimovich
2017-10-03 10:53 Agostino Sarubbo
2017-10-02 23:45 Thomas Deutschmann
2017-09-12  0:54 Patrick McLean
2017-09-08  1:51 Patrick McLean
2017-07-11 18:01 Patrick McLean
2017-07-10 23:58 Patrick McLean
2017-06-02  1:46 Patrick McLean
2017-06-01 23:33 Patrick McLean
2017-03-26  4:16 Matt Thode
2017-03-01 17:00 Matt Thode
2016-11-27  9:17 Mike Frysinger
2016-07-16 18:28 Patrick McLean
2016-07-08 12:02 Agostino Sarubbo
2016-07-08 10:02 Agostino Sarubbo
2016-07-08  7:53 Agostino Sarubbo
2016-07-05 20:59 Markus Meier
2016-07-04 11:24 Tobias Klausmann
2016-07-03 10:02 Jeroen Roovers
2016-07-02 12:42 Agostino Sarubbo
2016-07-02 12:42 Agostino Sarubbo
2016-06-03 21:39 Patrick McLean
2016-05-31 22:19 Patrick McLean
2016-05-26 12:15 Tobias Klausmann
2016-04-23 10:55 Jeroen Roovers
2016-03-24  5:59 Markus Meier
2016-03-05 16:13 Mikle Kolyada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1501627516.06cd85532dc39498e24c0a3364e0fcf689219e3e.chutzpah@gentoo \
    --to=chutzpah@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox