net-dns/dnsmasq: Compatibility with dev-libs/nettle-3.5

Closes: https://bugs.gentoo.org/688778
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Craig Andrews <candrews@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/12342
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>

diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
new file mode 100644 (file)
index 0000000..20c55be
--- /dev/null
+++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2019 Gentoo Authors
+# Copyright 2017-2018 Sony Interactive Entertainment Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~x86-fbsd"
+
+IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2"
+IUSE+=" +inotify ipv6 lua nls script selinux static tftp"
+
+PATCHES=(
+       "${FILESDIR}/${P}-nettle-3.5.patch"
+)
+
+DM_LINGUAS=(de es fi fr id it no pl pt_BR ro)
+
+BDEPEND="app-arch/xz-utils
+       virtual/pkgconfig
+       nls? ( sys-devel/gettext )
+"
+
+COMMON_DEPEND="dbus? ( sys-apps/dbus:= )
+       idn? (
+               !libidn2? ( net-dns/libidn:0= )
+               libidn2? ( >=net-dns/libidn2-2.0:= )
+       )
+       lua? ( dev-lang/lua:* )
+       conntrack? ( net-libs/libnetfilter_conntrack:= )
+       nls? ( sys-devel/gettext )
+"
+
+DEPEND="${COMMON_DEPEND}
+       dnssec? (
+               dev-libs/nettle:=[gmp]
+               static? ( >=dev-libs/nettle-3.4[static-libs(+)] )
+       )
+"
+
+RDEPEND="${COMMON_DEPEND}
+       dnssec? (
+               !static? (
+                       >=dev-libs/nettle-3.4:=[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
+                       printf -- " -DNO_%s" "${uword}"
+               elif [[ -z "${no_only}" ]]; then
+                       printf -- " -DHAVE_%s" "${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)"
+               "$(use_have conntrack)"
+               "$(use_have dbus)"
+               "$(use libidn2 || use_have idn)"
+               "$(use_have libidn2)"
+               "$(use_have -n inotify)"
+               "$(use_have -n dhcp dhcp dhcp6)"
+               "$(use_have -n ipv6 ipv6 dhcp6)"
+               "$(use_have -n id id)"
+               "$(use_have lua luascript)"
+               "$(use_have -n script)"
+               "$(use_have -n tftp)"
+               "$(use_have dnssec)"
+               "$(use_have static dnssec_static)"
+               "$(use_have -n dumpfile)"
+       )
+}
+
+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 && printf -- "-i18n\n")
+
+       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="${ED}" \
+               install$(use nls && printf -- "-i18n\n")
+
+       for lingua in "${DM_LINGUAS[@]}"; do
+               has ${lingua} ${LINGUAS-${lingua}} \
+                       || rm -rf "${ED}"/usr/share/locale/${lingua}
+       done
+       [[ -d "${D}"/usr/share/locale/ ]] && \
+               rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/locale/
+
+       dodoc CHANGELOG CHANGELOG.archive FAQ dnsmasq.conf.example
+       dodoc -r logo
+
+       docinto html/
+       dodoc *.html
+
+       newinitd "${FILESDIR}"/dnsmasq-init-r4 ${PN}
+       newconfd "${FILESDIR}"/dnsmasq.confd-r1 ${PN}
+
+       insinto /etc/logrotate.d
+       newins "${FILESDIR}"/dnsmasq.logrotate ${PN}
+
+       insinto /etc
+       newins dnsmasq.conf.example dnsmasq.conf
+
+       insinto /usr/share/dnsmasq
+       doins trust-anchors.conf
+
+       if use dhcp; then
+               keepdir /var/lib/misc
+               newinitd "${FILESDIR}"/dnsmasq-init-dhcp-r3 ${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/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch
new file mode 100644 (file)
index 0000000..7d77a21
--- /dev/null
+++ b/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch
@@ -0,0 +1,42 @@
+From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001
+From: Vladislav Grishenko <themiron@mail.ru>
+Date: Wed, 26 Jun 2019 20:27:11 +0500
+Subject: [PATCH] Fix build with libnettle 3.5
+
+---
+ src/crypto.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/crypto.c b/src/crypto.c
+index 1f1c12b..9cfe371 100644
+--- a/src/crypto.c
++++ b/src/crypto.c
+@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+   static struct ecc_point *key_256 = NULL, *key_384 = NULL;
+   static mpz_t x, y;
+   static struct dsa_signature *sig_struct;
++#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
++#define nettle_get_secp_256r1() (&nettle_secp_256r1)
++#define nettle_get_secp_384r1() (&nettle_secp_384r1)
++#endif
+   
+   if (!sig_struct)
+     {
+@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+         if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
+           return 0;
+         
+-        nettle_ecc_point_init(key_256, &nettle_secp_256r1);
++        nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
+       }
+       
+       key = key_256;
+@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
+         if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
+           return 0;
+         
+-        nettle_ecc_point_init(key_384, &nettle_secp_384r1);
++        nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
+       }
+       
+       key = key_384;