From 5a9133498562a0b69b287ad675ed3946803ea90c Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Fri, 23 Aug 2019 22:31:30 +0100 Subject: [PATCH] Debian package: link against libidn2. --- debian/changelog | 1 + debian/control | 2 +- debian/rules | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 193ffeb..d9d39a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ dnsmasq (2.81-1) unstable; urgency=low * Add systemd support for multiple daemon instances. (closes: #914305) * Add note explaining that ENABLED is SYSV-init only. (closes: #914755) * Replace ash with dash in contrib/reverse-dns. (closes: #920224) + * Move to libidn2. (closes: #932695) -- Simon Kelley Fri, 8 Apr 2019 17:14:15 +0000 diff --git a/debian/control b/debian/control index fb5519a..e30d592 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: dnsmasq Section: net Priority: optional Build-depends: gettext, libnetfilter-conntrack-dev [linux-any], - libidn11-dev, libdbus-1-dev (>=0.61), libgmp-dev, + libidn2-dev, libdbus-1-dev (>=0.61), libgmp-dev, nettle-dev (>=2.4-3), libbsd-dev [!linux-any], liblua5.2-dev Maintainer: Simon Kelley diff --git a/debian/rules b/debian/rules index c826039..fcb02c4 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ ifeq (,$(filter nodbus,$(DEB_BUILD_OPTIONS))) endif ifeq (,$(filter noidn, $(DEB_BUILD_OPTIONS))) - DEB_COPTS += -DHAVE_IDN + DEB_COPTS += -DHAVE_LIBIDN2 endif ifeq (,$(filter noconntrack,$(DEB_BUILD_OPTIONS)))