Accepting request 668197 from home:elvigia:branches:network

- libidn should not be used anymore, switch to libidn2

OBS-URL: https://build.opensuse.org/request/show/668197
OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=103
This commit is contained in:
Tomáš Chvátal 2019-01-24 08:33:18 +00:00 committed by Git OBS Bridge
parent c95068e949
commit 943aafc77b
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 23 23:03:22 UTC 2019 - Cristian Rodríguez <crrodriguez@opensuse.org>
- libidn should not be used anymore, switch to libidn2
-------------------------------------------------------------------
Mon Oct 22 08:29:46 UTC 2018 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package dnsmasq
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -38,7 +38,7 @@ Patch0: dnsmasq-groups.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-devel
BuildRequires: dos2unix
BuildRequires: libidn-devel
BuildRequires: libidn2-devel
BuildRequires: libnettle-devel
BuildRequires: lua-devel
BuildRequires: pkg-config
@ -105,7 +105,7 @@ export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie"
export LDFLAGS="-Wl,-z,relro,-z,now -pie"
# the dnsmasq make system hashes the configuration flags, so we have to supply the
# same flags for make and make install, else everything gets recompiled
%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC -DHAVE_LUASCRIPT"
%define _copts "-DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_LIBIDN2 -DHAVE_DNSSEC -DHAVE_LUASCRIPT"
make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" COPTS=%{_copts}
make -C contrib/lease-tools %{?_smp_mflags}