From c7dbb5f48727ff36b5ce717a9f1bdc4b61dcb03a Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Wed, 14 Jan 2015 13:29:41 +0100 Subject: [PATCH] rebuild against bind 9.10.1-P1 Signed-off-by: Tomas Hozza --- dhcp-capability.patch | 4 ++-- dhcp-remove-bind.patch | 20 ++++++++++---------- dhcp-sharedlib.patch | 20 ++++++++++---------- dhcp-systemtap.patch | 2 +- dhcp.spec | 8 ++++++-- 5 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dhcp-capability.patch b/dhcp-capability.patch index ae0d9f3..1bcfc1d 100644 --- a/dhcp-capability.patch +++ b/dhcp-capability.patch @@ -128,7 +128,7 @@ diff -up dhcp-4.3.1b1/client/Makefile.am.zzftXp dhcp-4.3.1b1/client/Makefile.am scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.1b1/configure.ac.zzftXp dhcp-4.3.1b1/configure.ac @@ -245,6 +245,6 @@ diff -up dhcp-4.3.1b1/relay/Makefile.am.zzftXp dhcp-4.3.1b1/relay/Makefile.am dhcrelay_SOURCES = dhcrelay.c -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/dhcp-remove-bind.patch b/dhcp-remove-bind.patch index 02f4ffc..5ab0338 100644 --- a/dhcp-remove-bind.patch +++ b/dhcp-remove-bind.patch @@ -8,7 +8,7 @@ diff -up dhcp-4.3.1b1/client/Makefile.am.brGmwh dhcp-4.3.1b1/client/Makefile.am -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) @@ -22,7 +22,7 @@ diff -up dhcp-4.3.1b1/common/tests/Makefile.am.brGmwh dhcp-4.3.1b1/common/tests/ - ../../omapip/libomapi.a ../../bind/lib/libirs.a \ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) @@ -30,7 +30,7 @@ diff -up dhcp-4.3.1b1/common/tests/Makefile.am.brGmwh dhcp-4.3.1b1/common/tests/ - ../../omapip/libomapi.a ../../bind/lib/libirs.a \ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) @@ -39,7 +39,7 @@ diff -up dhcp-4.3.1b1/common/tests/Makefile.am.brGmwh dhcp-4.3.1b1/common/tests/ - ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a - + ../../omapip/libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc check: $(ATF_TESTS) atf-run | atf-report @@ -108,14 +108,14 @@ diff -up dhcp-4.3.1b1/dhcpctl/Makefile.am.brGmwh dhcp-4.3.1b1/dhcpctl/Makefile.a - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a - -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc diff -up dhcp-4.3.1b1/Makefile.am.brGmwh dhcp-4.3.1b1/Makefile.am --- dhcp-4.3.1b1/Makefile.am.brGmwh 2014-07-02 19:58:38.000000000 +0200 +++ dhcp-4.3.1b1/Makefile.am 2014-07-10 17:36:30.484250976 +0200 @@ -145,7 +145,7 @@ diff -up dhcp-4.3.1b1/omapip/Makefile.am.brGmwh dhcp-4.3.1b1/omapip/Makefile.am - ../bind/lib/libisccfg.a ../bind/lib/libisc.a - +svtest_LDADD = libomapi.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc diff -up dhcp-4.3.1b1/relay/Makefile.am.brGmwh dhcp-4.3.1b1/relay/Makefile.am --- dhcp-4.3.1b1/relay/Makefile.am.brGmwh 2014-07-02 19:58:39.000000000 +0200 +++ dhcp-4.3.1b1/relay/Makefile.am 2014-07-10 17:36:30.486250948 +0200 @@ -155,7 +155,7 @@ diff -up dhcp-4.3.1b1/relay/Makefile.am.brGmwh dhcp-4.3.1b1/relay/Makefile.am dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) @@ -171,7 +171,7 @@ diff -up dhcp-4.3.1b1/server/Makefile.am.brGmwh dhcp-4.3.1b1/server/Makefile.am - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a - +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) @@ -186,7 +186,7 @@ diff -up dhcp-4.3.1b1/server/tests/Makefile.am.brGmwh dhcp-4.3.1b1/server/tests/ - $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \ - $(top_builddir)/bind/lib/libisc.a + $(top_builddir)/dhcpctl/libdhcpctl.a \ -+ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc ATF_TESTS = TESTS = diff --git a/dhcp-sharedlib.patch b/dhcp-sharedlib.patch index 0646e33..12b4647 100644 --- a/dhcp-sharedlib.patch +++ b/dhcp-sharedlib.patch @@ -7,7 +7,7 @@ diff -up dhcp-4.3.1b1/client/Makefile.am.uCWMBl dhcp-4.3.1b1/client/Makefile.am scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/common/tests/Makefile.am @@ -19,21 +19,21 @@ diff -up dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/common/tests/ alloc_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a \ + ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) -dns_unittest_LDADD += ../libdhcp.a \ +dns_unittest_LDADD += ../libdhcp.la \ ../../omapip/libomapi.a \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) misc_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a \ + ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc check: $(ATF_TESTS) atf-run | atf-report diff -up dhcp-4.3.1b1/configure.ac.uCWMBl dhcp-4.3.1b1/configure.ac @@ -63,14 +63,14 @@ diff -up dhcp-4.3.1b1/dhcpctl/Makefile.am.uCWMBl dhcp-4.3.1b1/dhcpctl/Makefile.a omshell_SOURCES = omshell.c -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc diff -up dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl dhcp-4.3.1b1/omapip/Makefile.am --- dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl 2014-07-10 17:36:30.486250948 +0200 +++ dhcp-4.3.1b1/omapip/Makefile.am 2014-07-10 17:38:10.780828554 +0200 @@ -90,7 +90,7 @@ diff -up dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl dhcp-4.3.1b1/omapip/Makefile.am svtest_SOURCES = test.c -svtest_LDADD = libomapi.a \ +svtest_LDADD = libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc diff -up dhcp-4.3.1b1/relay/Makefile.am.uCWMBl dhcp-4.3.1b1/relay/Makefile.am --- dhcp-4.3.1b1/relay/Makefile.am.uCWMBl 2014-07-10 17:36:30.486250948 +0200 +++ dhcp-4.3.1b1/relay/Makefile.am 2014-07-10 17:38:10.780828554 +0200 @@ -100,7 +100,7 @@ diff -up dhcp-4.3.1b1/relay/Makefile.am.uCWMBl dhcp-4.3.1b1/relay/Makefile.am dhcrelay_SOURCES = dhcrelay.c -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.1b1/server/Makefile.am.uCWMBl dhcp-4.3.1b1/server/Makefile.am @@ -112,7 +112,7 @@ diff -up dhcp-4.3.1b1/server/Makefile.am.uCWMBl dhcp-4.3.1b1/server/Makefile.am dhcpd_CFLAGS = $(LDAP_CFLAGS) -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \ +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/server/tests/Makefile.am @@ -126,6 +126,6 @@ diff -up dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/server/tests/ - $(top_builddir)/dhcpctl/libdhcpctl.a \ +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ + $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc ATF_TESTS = diff --git a/dhcp-systemtap.patch b/dhcp-systemtap.patch index fcd789b..fb01076 100644 --- a/dhcp-systemtap.patch +++ b/dhcp-systemtap.patch @@ -551,7 +551,7 @@ diff -up dhcp-4.3.1b1/server/tests/Makefile.am.systemtap dhcp-4.3.1b1/server/tes +++ dhcp-4.3.1b1/server/tests/Makefile.am 2014-07-10 18:31:06.034879442 +0200 @@ -21,6 +21,10 @@ DHCPLIBS = $(top_builddir)/common/libdhc $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc +if ENABLE_SYSTEMTAP +DHCPLIBS += ../probes.o diff --git a/dhcp.spec b/dhcp.spec index b010c98..f5687f2 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -18,7 +18,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.1 -Release: 18%{?dist} +Release: 19%{?dist} # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # dcantrell maintaining the package) made incorrect use of the epoch and # that's why it is at 12 now. It should have never been used, but it was. @@ -424,7 +424,8 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \ --with-relay-pid-file=%{_localstatedir}/run/dhcrelay.pid \ --with-ldap \ --with-ldapcrypto \ - --with-libbind=%{_includedir} --with-libbind-libs=%{_libdir} \ + --with-libbind=%{_includedir}/bind9 \ + --with-libbind-libs=%{_libdir} \ --disable-static \ --enable-log-pid \ %if %sdt @@ -685,6 +686,9 @@ done %doc doc/html/ %changelog +* Wed Jan 14 2015 Tomas Hozza - 12:4.3.1-19 +- rebuild against bind 9.10.1-P1 + * Thu Dec 18 2014 Jiri Popelka - 12:4.3.1-18 - dhclient: write DUID_LLT even in stateless mode (#1156356)