From cccec22272f1b2dcf177652927d4ed9e48178770 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mar 13 2015 10:39:06 +0000 Subject: rebuild against bind99 9.9.7 package Signed-off-by: Tomas Hozza --- diff --git a/dhcp-capability.patch b/dhcp-capability.patch index 1bcfc1d..ae0d9f3 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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export 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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/dhcp-remove-bind.patch b/dhcp-remove-bind.patch index 4af3478..bf5b30b 100644 --- a/dhcp-remove-bind.patch +++ b/dhcp-remove-bind.patch @@ -8,7 +8,7 @@ diff -up dhcp-4.3.2/client/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export 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.2/common/tests/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export 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.2/common/tests/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) @@ -41,7 +41,7 @@ diff -up dhcp-4.3.2/common/tests/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export check: $(ATF_TESTS) sh ${top_srcdir}/tests/unittest.sh @@ -110,14 +110,14 @@ diff -up dhcp-4.3.2/dhcpctl/Makefile.am.remove-bind dhcp-4.3.2/dhcpctl/Makefile. - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a - -+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export 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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff -up dhcp-4.3.2/Makefile.am.remove-bind dhcp-4.3.2/Makefile.am --- dhcp-4.3.2/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 +++ dhcp-4.3.2/Makefile.am 2015-03-05 19:01:27.757586819 +0100 @@ -147,7 +147,7 @@ diff -up dhcp-4.3.2/omapip/Makefile.am.remove-bind dhcp-4.3.2/omapip/Makefile.am - ../bind/lib/libisccfg.a ../bind/lib/libisc.a - +svtest_LDADD = libomapi.a \ -+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff -up dhcp-4.3.2/relay/Makefile.am.remove-bind dhcp-4.3.2/relay/Makefile.am --- dhcp-4.3.2/relay/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 +++ dhcp-4.3.2/relay/Makefile.am 2015-03-05 19:01:27.757586819 +0100 @@ -157,7 +157,7 @@ diff -up dhcp-4.3.2/relay/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) @@ -173,7 +173,7 @@ diff -up dhcp-4.3.2/server/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) @@ -188,7 +188,7 @@ diff -up dhcp-4.3.2/server/tests/Makefile.am.remove-bind dhcp-4.3.2/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 -ldns -lisccfg -lisc ++ $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ATF_TESTS = if HAVE_ATF diff --git a/dhcp-sharedlib.patch b/dhcp-sharedlib.patch index 45dcfe4..41394f6 100644 --- a/dhcp-sharedlib.patch +++ b/dhcp-sharedlib.patch @@ -7,7 +7,7 @@ diff -up dhcp-4.3.2/client/Makefile.am.sharedlib dhcp-4.3.2/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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.2/common/tests/Makefile.am.sharedlib dhcp-4.3.2/common/tests/Makefile.am @@ -19,7 +19,7 @@ diff -up dhcp-4.3.2/common/tests/Makefile.am.sharedlib dhcp-4.3.2/common/tests/M alloc_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a \ + ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) @@ -27,7 +27,7 @@ diff -up dhcp-4.3.2/common/tests/Makefile.am.sharedlib dhcp-4.3.2/common/tests/M - ../../omapip/libomapi.a \ +dns_unittest_LDADD += ../libdhcp.la \ + ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) @@ -41,7 +41,7 @@ diff -up dhcp-4.3.2/common/tests/Makefile.am.sharedlib dhcp-4.3.2/common/tests/M ns_name_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a \ + ../../omapip/libomapi.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export check: $(ATF_TESTS) diff -up dhcp-4.3.2/configure.ac.sharedlib dhcp-4.3.2/configure.ac @@ -71,14 +71,14 @@ diff -up dhcp-4.3.2/dhcpctl/Makefile.am.sharedlib dhcp-4.3.2/dhcpctl/Makefile.am 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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export -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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff -up dhcp-4.3.2/omapip/Makefile.am.sharedlib dhcp-4.3.2/omapip/Makefile.am --- dhcp-4.3.2/omapip/Makefile.am.sharedlib 2015-03-05 19:03:58.046434173 +0100 +++ dhcp-4.3.2/omapip/Makefile.am 2015-03-05 19:03:58.054434058 +0100 @@ -98,7 +98,7 @@ diff -up dhcp-4.3.2/omapip/Makefile.am.sharedlib dhcp-4.3.2/omapip/Makefile.am svtest_SOURCES = test.c -svtest_LDADD = libomapi.a \ +svtest_LDADD = libomapi.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export diff -up dhcp-4.3.2/relay/Makefile.am.sharedlib dhcp-4.3.2/relay/Makefile.am --- dhcp-4.3.2/relay/Makefile.am.sharedlib 2015-03-05 19:03:58.046434173 +0100 +++ dhcp-4.3.2/relay/Makefile.am 2015-03-05 19:03:58.054434058 +0100 @@ -108,7 +108,7 @@ diff -up dhcp-4.3.2/relay/Makefile.am.sharedlib dhcp-4.3.2/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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.2/server/Makefile.am.sharedlib dhcp-4.3.2/server/Makefile.am @@ -120,7 +120,7 @@ diff -up dhcp-4.3.2/server/Makefile.am.sharedlib dhcp-4.3.2/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 -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) diff -up dhcp-4.3.2/server/tests/Makefile.am.sharedlib dhcp-4.3.2/server/tests/Makefile.am @@ -134,6 +134,6 @@ diff -up dhcp-4.3.2/server/tests/Makefile.am.sharedlib dhcp-4.3.2/server/tests/M - $(top_builddir)/dhcpctl/libdhcpctl.a \ +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \ + $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export ATF_TESTS = diff --git a/dhcp-systemtap.patch b/dhcp-systemtap.patch index 3b752b6..c345368 100644 --- a/dhcp-systemtap.patch +++ b/dhcp-systemtap.patch @@ -553,7 +553,7 @@ diff -up dhcp-4.3.2/server/tests/Makefile.am.systemtap dhcp-4.3.2/server/tests/M +++ dhcp-4.3.2/server/tests/Makefile.am 2015-03-05 19:07:12.581647768 +0100 @@ -21,6 +21,10 @@ DHCPLIBS = $(top_builddir)/common/libdhc $(top_builddir)/dhcpctl/libdhcpctl.la \ - $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export +if ENABLE_SYSTEMTAP +DHCPLIBS += ../probes.o diff --git a/dhcp.spec b/dhcp.spec index 0e42181..86f3cea 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -18,7 +18,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.2 -Release: 1%{?dist} +Release: 2%{?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. @@ -81,7 +81,7 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: openldap-devel BuildRequires: libcap-ng-devel -BuildRequires: bind-lite-devel >= 32:9.9.5-0.1.b1 +BuildRequires: bind99-devel BuildRequires: systemd systemd-devel # dhcp-sd_notify.patch BuildRequires: pkgconfig(libsystemd) @@ -395,8 +395,8 @@ CFLAGS="%{optflags} -fno-strict-aliasing" \ --with-relay-pid-file=%{_localstatedir}/run/dhcrelay.pid \ --with-ldap \ --with-ldapcrypto \ - --with-libbind=%{_includedir}/bind9 \ - --with-libbind-libs=%{_libdir} \ + --with-libbind=%{_includedir}/bind99 \ + --with-libbind-libs=%{_libdir}/bind99 \ --disable-static \ --enable-log-pid \ %if %sdt @@ -675,6 +675,9 @@ done %doc doc/html/ %changelog +* Fri Mar 13 2015 Tomas Hozza - 12:4.3.2-2 +- rebuild against bind99 9.9.7 package + * Thu Mar 05 2015 Jiri Popelka - 12:4.3.2-1 - 4.3.2