From a696251b98620da5fbc402027dbbfcefdfe63d04 Mon Sep 17 00:00:00 2001 From: David Michael Date: Fri, 21 Apr 2017 11:53:59 -0700 Subject: [PATCH] net-dns/dnsmasq: import latest Gentoo stable --- .../coreos-overlay/net-dns/dnsmasq/Manifest | 1 + .../net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild | 192 ++++++++++++++++++ .../dnsmasq/files/dnsmasq-init-dhcp-r1 | 29 +++ .../net-dns/dnsmasq/files/dnsmasq-init-r2 | 23 +++ .../net-dns/dnsmasq/files/dnsmasq.confd-r1 | 4 + .../net-dns/dnsmasq/files/dnsmasq.service-r1 | 12 ++ .../net-dns/dnsmasq/metadata.xml | 20 ++ 7 files changed, 281 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-r2 create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.confd-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.service-r1 create mode 100644 sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/Manifest b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/Manifest new file mode 100644 index 0000000000..24a420d02f --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/Manifest @@ -0,0 +1 @@ +DIST dnsmasq-2.76.tar.xz 480796 SHA256 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 SHA512 8a930f3e7cdc0c291ce89bea8128a4b8438b9aa9e660a2ac037e0baa4c5c74f4482a8f83b0410066a759444b3c4e1cf62a9beb625e38509690227996de10e06a WHIRLPOOL e0710f879fd6f8e27581b8c400704660941601cd2077f32d7c2b3f9791c6be8404469770e74f7e1a03880507a32a30c19b89f6a953a757ad01305f829448f0bc diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild new file mode 100644 index 0000000000..27f157cd66 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/dnsmasq-2.76-r1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils 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 idn +inotify 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? ( net-dns/libidn ) + lua? ( dev-lang/lua:* ) + conntrack? ( net-libs/libnetfilter_conntrack ) + nls? ( + sys-devel/gettext + net-dns/libidn + ) +" + +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 )" + +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_have idn)" + COPTS+="$(use_have -n inotify)" + COPTS+="$(use_have -n dhcp dhcp dhcp6)" + COPTS+="$(use_have -n ipv6 ipv6 dhcp6)" + 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 +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 new file mode 100644 index 0000000000..f520d9327a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-dhcp-r1 @@ -0,0 +1,29 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +extra_started_commands="reload" + +pidfile="/var/run/dnsmasq.pid" +command="/usr/sbin/dnsmasq" +command_args="-x ${pidfile} ${DNSMASQ_OPTS}" +start_stop_daemon_args="--retry TERM/3/TERM/5" + +depend() { + provide dns + need localmount net + after bootmisc + use logger +} + +start_pre() { + checkpath --owner dnsmasq:dnsmasq \ + --mode 0644 \ + --file /var/lib/misc/dnsmasq.leases +} + +reload() { + ebegin "Reloading ${RC_SVCNAME}" + kill -HUP $(cat "${pidfile}") + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-r2 b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-r2 new file mode 100644 index 0000000000..acbd1477bc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq-init-r2 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later + +extra_started_commands="reload" + +pidfile="/var/run/dnsmasq.pid" +command="/usr/sbin/dnsmasq" +command_args="-x ${pidfile} ${DNSMASQ_OPTS}" +start_stop_daemon_args="--retry TERM/3/TERM/5" + +depend() { + provide dns + need localmount net + after bootmisc + use logger +} + +reload() { + ebegin "Reloading ${SVCNAME}" + kill -HUP $(cat "${pidfile}") + eend $? +} diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.confd-r1 b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.confd-r1 new file mode 100644 index 0000000000..0e94463074 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.confd-r1 @@ -0,0 +1,4 @@ +# /etc/conf.d/dnsmasq: config file for /etc/init.d/dnsmasq + +# See the dnsmasq(8) man page for possible options to put here. +DNSMASQ_OPTS="--user=dnsmasq --group=dnsmasq" diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.service-r1 b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.service-r1 new file mode 100644 index 0000000000..8e313bcfd9 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/files/dnsmasq.service-r1 @@ -0,0 +1,12 @@ +[Unit] +Description=A lightweight DHCP and caching DNS server +After=network.target + +[Service] +Type=simple +ExecStartPre=/usr/sbin/dnsmasq --test +ExecStart=/usr/sbin/dnsmasq -k --user=dnsmasq --group=dnsmasq +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/metadata.xml b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/metadata.xml new file mode 100644 index 0000000000..6c712464c2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/net-dns/dnsmasq/metadata.xml @@ -0,0 +1,20 @@ + + + + +chutzpah@gentoo.org +Patrick McLean + + + Add support for acting as an authorative DNS server. + Add support for Linux conntrack connection marking. + Install extra command line tools for manually managing DHCP leases. + Enable support for acting as a DHCP server. + Enable support DNSSEC validation and caching. + Enable support for calling scripts when leases change. + Enables built in TFTP server for netbooting. + + + cpe:/a:thekelleys:dnsmasq + +