From dd98fa455be90b0b17092721d94adb9ed1b5a8f856a6d2901de5003e2cadf412 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 25 Aug 2014 08:27:14 +0000 Subject: [PATCH 1/2] Accepting request 245716 from home:msmeissn:branches:network - actually build with relro and pie. (bnc#893057) OBS-URL: https://build.opensuse.org/request/show/245716 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=62 --- dnsmasq.changes | 5 +++++ dnsmasq.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dnsmasq.changes b/dnsmasq.changes index 58f3faf..bb69fb0 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 22 07:08:36 UTC 2014 - meissner@suse.com + +- actually build with relro and pie. (bnc#893057) + ------------------------------------------------------------------- Wed Aug 6 06:48:20 UTC 2014 - vwallfahrer@suse.com diff --git a/dnsmasq.spec b/dnsmasq.spec index c93cdea..a3cc66c 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -71,7 +71,7 @@ echo "#define HAVE_IDN" >> src/config.h mv po/no.po po/nb.po export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie" export LDFLAGS="-Wl,-z,relro,-z,now -pie" -make %{?_smp_mflags} AWK=gawk all-i18n +make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" make -C contrib/wrt %{?_smp_mflags} %pre From 746d5ca9b688a9f3a5be9df41568270cb94b6c50b600fd9de5d45cf8e2214123 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 26 Aug 2014 12:34:11 +0000 Subject: [PATCH 2/2] Accepting request 246498 from home:dsterba:branches:network Enable DNSSEC for dnsmasq. I've been testing it for a few days, all ok. The pending SR 246184 is for devel->Factory, thus I'm not superseding it OBS-URL: https://build.opensuse.org/request/show/246498 OBS-URL: https://build.opensuse.org/package/show/network/dnsmasq?expand=0&rev=63 --- dnsmasq.changes | 10 ++++++++++ dnsmasq.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dnsmasq.changes b/dnsmasq.changes index bb69fb0..958a496 100644 --- a/dnsmasq.changes +++ b/dnsmasq.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Aug 26 14:05:14 CEST 2014 - dsterba@suse.cz + +- enable DNSSEC + - require libnettle + - package trust-anchors.conf +- spec fixes: + - define HAVE_ flags on commandline, otherwise 'dnsmasq --version' + will not correctly reflect the feature status + ------------------------------------------------------------------- Fri Aug 22 07:08:36 UTC 2014 - meissner@suse.com diff --git a/dnsmasq.spec b/dnsmasq.spec index a3cc66c..65f8200 100644 --- a/dnsmasq.spec +++ b/dnsmasq.spec @@ -35,6 +35,7 @@ Patch1: group_and_isc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: dbus-1-devel BuildRequires: libidn-devel +BuildRequires: libnettle-devel BuildRequires: pkg-config BuildRequires: pkgconfig(libnetfilter_conntrack) %if 0%{?suse_version} >= 1210 @@ -68,8 +69,9 @@ server's leases. echo "#define HAVE_DBUS" >> src/config.h echo "#define HAVE_CONNTRACK" >> src/config.h echo "#define HAVE_IDN" >> src/config.h +echo "#define HAVE_DNSSEC" >> src/config.h mv po/no.po po/nb.po -export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie" +export CFLAGS="%optflags -std=gnu99 -fPIC -DPIC -fpie -DHAVE_DBUS -DHAVE_CONNTRACK -DHAVE_IDN -DHAVE_DNSSEC" export LDFLAGS="-Wl,-z,relro,-z,now -pie" make %{?_smp_mflags} AWK=gawk all-i18n CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" make -C contrib/wrt %{?_smp_mflags} @@ -110,6 +112,7 @@ install -m 644 dbus/dnsmasq.conf ${RPM_BUILD_ROOT}/etc/dbus-1/system.d/dnsmasq.c install -D -m 0644 %SOURCE2 %{buildroot}%{_unitdir}/dnsmasq.service install -d -m 0750 ${RPM_BUILD_ROOT}/srv/tftpboot ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcdnsmasq +install -D -m 0644 trust-anchors.conf %{buildroot}%{_datadir}/%{name}/trust-anchors.conf # utils subpackage mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 @@ -139,6 +142,8 @@ rm -rf contrib/MacOSX-launchd %{_mandir}/man8/dnsmasq.8.gz %config(noreplace) /etc/dbus-1/system.d/dnsmasq.conf %{_unitdir}/dnsmasq.service +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/trust-anchors.conf %dir %attr(0750,tftp,tftp) /srv/tftpboot