diff --git a/.gitignore b/.gitignore index 4f2ee97..5d7dcc4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /dhcp-4.3.1b1.tar.gz /dhcp-4.3.1.tar.gz /dhcp-4.3.2b1.tar.gz +/dhcp-4.3.2.tar.gz diff --git a/dhcp-remove-bind.patch b/dhcp-remove-bind.patch index 40e6321..4af3478 100644 --- a/dhcp-remove-bind.patch +++ b/dhcp-remove-bind.patch @@ -1,6 +1,6 @@ -diff -up dhcp-4.3.2b1/client/Makefile.am.SRPsDM dhcp-4.3.2b1/client/Makefile.am ---- dhcp-4.3.2b1/client/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/client/Makefile.am 2015-02-08 15:13:29.091275576 +0100 +diff -up dhcp-4.3.2/client/Makefile.am.remove-bind dhcp-4.3.2/client/Makefile.am +--- dhcp-4.3.2/client/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/client/Makefile.am 2015-03-05 19:01:27.748586948 +0100 @@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ @@ -12,9 +12,9 @@ diff -up dhcp-4.3.2b1/client/Makefile.am.SRPsDM dhcp-4.3.2b1/client/Makefile.am man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.2b1/common/tests/Makefile.am.SRPsDM dhcp-4.3.2b1/common/tests/Makefile.am ---- dhcp-4.3.2b1/common/tests/Makefile.am.SRPsDM 2015-02-08 15:13:29.092275562 +0100 -+++ dhcp-4.3.2b1/common/tests/Makefile.am 2015-02-08 15:14:29.583437471 +0100 +diff -up dhcp-4.3.2/common/tests/Makefile.am.remove-bind dhcp-4.3.2/common/tests/Makefile.am +--- dhcp-4.3.2/common/tests/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/common/tests/Makefile.am 2015-03-05 19:03:51.316530568 +0100 @@ -13,14 +13,14 @@ ATF_TESTS += alloc_unittest dns_unittest alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c alloc_unittest_LDADD = $(ATF_LDFLAGS) @@ -34,22 +34,21 @@ diff -up dhcp-4.3.2b1/common/tests/Makefile.am.SRPsDM dhcp-4.3.2b1/common/tests/ misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c misc_unittest_LDADD = $(ATF_LDFLAGS) -@@ -31,9 +31,8 @@ misc_unittest_LDADD += ../libdhcp.a \ +@@ -31,8 +31,8 @@ misc_unittest_LDADD += ../libdhcp.a \ ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c ns_name_unittest_LDADD = $(ATF_LDFLAGS) ns_name_unittest_LDADD += ../libdhcp.a \ - ../../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 - check: $(ATF_TESTS) - atf-run | atf-report -diff -up dhcp-4.3.2b1/configure.ac.SRPsDM dhcp-4.3.2b1/configure.ac ---- dhcp-4.3.2b1/configure.ac.SRPsDM 2015-01-29 14:59:59.000000000 +0100 -+++ dhcp-4.3.2b1/configure.ac 2015-02-08 15:13:29.092275562 +0100 -@@ -562,20 +562,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro + check: $(ATF_TESTS) + sh ${top_srcdir}/tests/unittest.sh +diff -up dhcp-4.3.2/configure.ac.remove-bind dhcp-4.3.2/configure.ac +--- dhcp-4.3.2/configure.ac.remove-bind 2015-02-26 20:51:28.000000000 +0100 ++++ dhcp-4.3.2/configure.ac 2015-03-05 19:01:27.756586833 +0100 +@@ -582,20 +582,37 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t libbind= AC_ARG_WITH(libbind, @@ -92,7 +91,7 @@ diff -up dhcp-4.3.2b1/configure.ac.SRPsDM dhcp-4.3.2b1/configure.ac # OpenLDAP support. AC_ARG_WITH(ldap, -@@ -610,7 +627,7 @@ fi +@@ -630,7 +647,7 @@ fi CFLAGS="$CFLAGS $STD_CWARNINGS" # Try to add the bind include directory @@ -101,9 +100,9 @@ diff -up dhcp-4.3.2b1/configure.ac.SRPsDM dhcp-4.3.2b1/configure.ac case "$host" in *-darwin*) -diff -up dhcp-4.3.2b1/dhcpctl/Makefile.am.SRPsDM dhcp-4.3.2b1/dhcpctl/Makefile.am ---- dhcp-4.3.2b1/dhcpctl/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/dhcpctl/Makefile.am 2015-02-08 15:13:29.092275562 +0100 +diff -up dhcp-4.3.2/dhcpctl/Makefile.am.remove-bind dhcp-4.3.2/dhcpctl/Makefile.am +--- dhcp-4.3.2/dhcpctl/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/dhcpctl/Makefile.am 2015-03-05 19:01:27.756586833 +0100 @@ -6,12 +6,9 @@ EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c @@ -119,9 +118,9 @@ diff -up dhcp-4.3.2b1/dhcpctl/Makefile.am.SRPsDM dhcp-4.3.2b1/dhcpctl/Makefile.a - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc -diff -up dhcp-4.3.2b1/Makefile.am.SRPsDM dhcp-4.3.2b1/Makefile.am ---- dhcp-4.3.2b1/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/Makefile.am 2015-02-08 15:13:29.092275562 +0100 +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 @@ -25,7 +25,13 @@ EXTRA_DIST = RELNOTES LICENSE \ bind/Makefile bind/bind.tar.gz bind/version.tmp \ common/tests/Atffile server/tests/Atffile @@ -137,9 +136,9 @@ diff -up dhcp-4.3.2b1/Makefile.am.SRPsDM dhcp-4.3.2b1/Makefile.am nobase_include_HEADERS = dhcpctl/dhcpctl.h -diff -up dhcp-4.3.2b1/omapip/Makefile.am.SRPsDM dhcp-4.3.2b1/omapip/Makefile.am ---- dhcp-4.3.2b1/omapip/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/omapip/Makefile.am 2015-02-08 15:13:29.093275549 +0100 +diff -up dhcp-4.3.2/omapip/Makefile.am.remove-bind dhcp-4.3.2/omapip/Makefile.am +--- dhcp-4.3.2/omapip/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/omapip/Makefile.am 2015-03-05 19:01:27.757586819 +0100 @@ -10,6 +10,5 @@ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) @@ -149,9 +148,9 @@ diff -up dhcp-4.3.2b1/omapip/Makefile.am.SRPsDM dhcp-4.3.2b1/omapip/Makefile.am - +svtest_LDADD = libomapi.a \ + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc -diff -up dhcp-4.3.2b1/relay/Makefile.am.SRPsDM dhcp-4.3.2b1/relay/Makefile.am ---- dhcp-4.3.2b1/relay/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/relay/Makefile.am 2015-02-08 15:13:29.093275549 +0100 +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 @@ -3,8 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c @@ -162,9 +161,9 @@ diff -up dhcp-4.3.2b1/relay/Makefile.am.SRPsDM dhcp-4.3.2b1/relay/Makefile.am man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.2b1/server/Makefile.am.SRPsDM dhcp-4.3.2b1/server/Makefile.am ---- dhcp-4.3.2b1/server/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/server/Makefile.am 2015-02-08 15:13:29.093275549 +0100 +diff -up dhcp-4.3.2/server/Makefile.am.remove-bind dhcp-4.3.2/server/Makefile.am +--- dhcp-4.3.2/server/Makefile.am.remove-bind 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/server/Makefile.am 2015-03-05 19:01:27.757586819 +0100 @@ -13,10 +13,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c dhcpv6.c mdb6.c ldap.c ldap_casa.c @@ -178,9 +177,9 @@ diff -up dhcp-4.3.2b1/server/Makefile.am.SRPsDM dhcp-4.3.2b1/server/Makefile.am man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.2b1/server/tests/Makefile.am.SRPsDM dhcp-4.3.2b1/server/tests/Makefile.am ---- dhcp-4.3.2b1/server/tests/Makefile.am.SRPsDM 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/server/tests/Makefile.am 2015-02-08 15:13:29.093275549 +0100 +diff -up dhcp-4.3.2/server/tests/Makefile.am.remove-bind dhcp-4.3.2/server/tests/Makefile.am +--- dhcp-4.3.2/server/tests/Makefile.am.remove-bind 2015-03-05 19:01:27.757586819 +0100 ++++ dhcp-4.3.2/server/tests/Makefile.am 2015-03-05 19:02:51.949380907 +0100 @@ -18,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa ../ldap.c ../ldap_casa.c ../dhcpd.c @@ -188,8 +187,8 @@ diff -up dhcp-4.3.2b1/server/tests/Makefile.am.SRPsDM dhcp-4.3.2b1/server/tests/ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ - $(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 ++ $(top_builddir)/dhcpctl/libdhcpctl.a \ ++ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc ATF_TESTS = - TESTS = + if HAVE_ATF diff --git a/dhcp-sharedlib.patch b/dhcp-sharedlib.patch index 02914bf..45dcfe4 100644 --- a/dhcp-sharedlib.patch +++ b/dhcp-sharedlib.patch @@ -1,6 +1,6 @@ -diff -up dhcp-4.3.2b1/client/Makefile.am.SfzxjY dhcp-4.3.2b1/client/Makefile.am ---- dhcp-4.3.2b1/client/Makefile.am.SfzxjY 2015-02-08 15:13:29.091275576 +0100 -+++ dhcp-4.3.2b1/client/Makefile.am 2015-02-08 15:14:40.970279718 +0100 +diff -up dhcp-4.3.2/client/Makefile.am.sharedlib dhcp-4.3.2/client/Makefile.am +--- dhcp-4.3.2/client/Makefile.am.sharedlib 2015-03-05 19:03:58.045434187 +0100 ++++ dhcp-4.3.2/client/Makefile.am 2015-03-05 19:03:58.053434072 +0100 @@ -10,7 +10,7 @@ dhclient_SOURCES = clparse.c dhclient.c scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ @@ -10,10 +10,10 @@ diff -up dhcp-4.3.2b1/client/Makefile.am.SfzxjY dhcp-4.3.2b1/client/Makefile.am $(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.2b1/common/tests/Makefile.am.SfzxjY dhcp-4.3.2b1/common/tests/Makefile.am ---- dhcp-4.3.2b1/common/tests/Makefile.am.SfzxjY 2015-02-08 15:14:40.971279704 +0100 -+++ dhcp-4.3.2b1/common/tests/Makefile.am 2015-02-08 15:15:10.455871224 +0100 -@@ -13,12 +13,12 @@ ATF_TESTS += alloc_unittest dns_unittest +diff -up dhcp-4.3.2/common/tests/Makefile.am.sharedlib dhcp-4.3.2/common/tests/Makefile.am +--- dhcp-4.3.2/common/tests/Makefile.am.sharedlib 2015-03-05 19:03:58.045434187 +0100 ++++ dhcp-4.3.2/common/tests/Makefile.am 2015-03-05 19:05:00.665537255 +0100 +@@ -13,25 +13,25 @@ ATF_TESTS += alloc_unittest dns_unittest alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c alloc_unittest_LDADD = $(ATF_LDFLAGS) alloc_unittest_LDADD += ../libdhcp.a \ @@ -24,22 +24,29 @@ diff -up dhcp-4.3.2b1/common/tests/Makefile.am.SfzxjY dhcp-4.3.2b1/common/tests/ dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) -dns_unittest_LDADD += ../libdhcp.a \ +- ../../omapip/libomapi.a \ +dns_unittest_LDADD += ../libdhcp.la \ - ../../omapip/libomapi.a \ ++ ../../omapip/libomapi.la \ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc -@@ -31,7 +31,7 @@ misc_unittest_LDADD += ../libdhcp.a \ + 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 ../../bind/lib/libirs.a \ ++ ../../omapip/libomapi.la ../../bind/lib/libirs.a \ + ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a + ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c ns_name_unittest_LDADD = $(ATF_LDFLAGS) ns_name_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a \ + ../../omapip/libomapi.la \ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc + check: $(ATF_TESTS) - atf-run | atf-report -diff -up dhcp-4.3.2b1/configure.ac.SfzxjY dhcp-4.3.2b1/configure.ac ---- dhcp-4.3.2b1/configure.ac.SfzxjY 2015-02-08 15:14:40.951279981 +0100 -+++ dhcp-4.3.2b1/configure.ac 2015-02-08 15:14:40.971279704 +0100 +diff -up dhcp-4.3.2/configure.ac.sharedlib dhcp-4.3.2/configure.ac +--- dhcp-4.3.2/configure.ac.sharedlib 2015-03-05 19:03:58.049434130 +0100 ++++ dhcp-4.3.2/configure.ac 2015-03-05 19:03:58.053434072 +0100 @@ -39,7 +39,8 @@ fi # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. AC_USE_SYSTEM_EXTENSIONS @@ -50,9 +57,9 @@ diff -up dhcp-4.3.2b1/configure.ac.SfzxjY dhcp-4.3.2b1/configure.ac AC_CONFIG_HEADERS([includes/config.h]) # we sometimes need to know byte order for building packets -diff -up dhcp-4.3.2b1/dhcpctl/Makefile.am.SfzxjY dhcp-4.3.2b1/dhcpctl/Makefile.am ---- dhcp-4.3.2b1/dhcpctl/Makefile.am.SfzxjY 2015-02-08 15:13:29.092275562 +0100 -+++ dhcp-4.3.2b1/dhcpctl/Makefile.am 2015-02-08 15:14:40.971279704 +0100 +diff -up dhcp-4.3.2/dhcpctl/Makefile.am.sharedlib dhcp-4.3.2/dhcpctl/Makefile.am +--- dhcp-4.3.2/dhcpctl/Makefile.am.sharedlib 2015-03-05 19:03:58.046434173 +0100 ++++ dhcp-4.3.2/dhcpctl/Makefile.am 2015-03-05 19:03:58.054434058 +0100 @@ -1,14 +1,14 @@ bin_PROGRAMS = omshell -lib_LIBRARIES = libdhcpctl.a @@ -72,9 +79,9 @@ diff -up dhcp-4.3.2b1/dhcpctl/Makefile.am.SfzxjY dhcp-4.3.2b1/dhcpctl/Makefile.a -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 -diff -up dhcp-4.3.2b1/omapip/Makefile.am.SfzxjY dhcp-4.3.2b1/omapip/Makefile.am ---- dhcp-4.3.2b1/omapip/Makefile.am.SfzxjY 2015-02-08 15:13:29.093275549 +0100 -+++ dhcp-4.3.2b1/omapip/Makefile.am 2015-02-08 15:14:40.972279690 +0100 +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 @@ -1,7 +1,7 @@ -lib_LIBRARIES = libomapi.a +lib_LTLIBRARIES = libomapi.la @@ -92,9 +99,9 @@ diff -up dhcp-4.3.2b1/omapip/Makefile.am.SfzxjY dhcp-4.3.2b1/omapip/Makefile.am -svtest_LDADD = libomapi.a \ +svtest_LDADD = libomapi.la \ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc -diff -up dhcp-4.3.2b1/relay/Makefile.am.SfzxjY dhcp-4.3.2b1/relay/Makefile.am ---- dhcp-4.3.2b1/relay/Makefile.am.SfzxjY 2015-02-08 15:13:29.093275549 +0100 -+++ dhcp-4.3.2b1/relay/Makefile.am 2015-02-08 15:14:40.972279690 +0100 +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 @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst sbin_PROGRAMS = dhcrelay @@ -104,9 +111,9 @@ diff -up dhcp-4.3.2b1/relay/Makefile.am.SfzxjY dhcp-4.3.2b1/relay/Makefile.am $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) -diff -up dhcp-4.3.2b1/server/Makefile.am.SfzxjY dhcp-4.3.2b1/server/Makefile.am ---- dhcp-4.3.2b1/server/Makefile.am.SfzxjY 2015-02-08 15:13:29.093275549 +0100 -+++ dhcp-4.3.2b1/server/Makefile.am 2015-02-08 15:14:40.972279690 +0100 +diff -up dhcp-4.3.2/server/Makefile.am.sharedlib dhcp-4.3.2/server/Makefile.am +--- dhcp-4.3.2/server/Makefile.am.sharedlib 2015-03-05 19:03:58.046434173 +0100 ++++ dhcp-4.3.2/server/Makefile.am 2015-03-05 19:03:58.054434058 +0100 @@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c dhcpv6.c mdb6.c ldap.c ldap_casa.c @@ -116,17 +123,17 @@ diff -up dhcp-4.3.2b1/server/Makefile.am.SfzxjY dhcp-4.3.2b1/server/Makefile.am $(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.2b1/server/tests/Makefile.am.SfzxjY dhcp-4.3.2b1/server/tests/Makefile.am ---- dhcp-4.3.2b1/server/tests/Makefile.am.SfzxjY 2015-02-08 15:13:29.093275549 +0100 -+++ dhcp-4.3.2b1/server/tests/Makefile.am 2015-02-08 15:14:40.972279690 +0100 +diff -up dhcp-4.3.2/server/tests/Makefile.am.sharedlib dhcp-4.3.2/server/tests/Makefile.am +--- dhcp-4.3.2/server/tests/Makefile.am.sharedlib 2015-03-05 19:03:58.054434058 +0100 ++++ dhcp-4.3.2/server/tests/Makefile.am 2015-03-05 19:05:54.779762155 +0100 @@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \ ../ldap.c ../ldap_casa.c ../dhcpd.c -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ -- $(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 +- $(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 ATF_TESTS = diff --git a/dhcp-systemtap.patch b/dhcp-systemtap.patch index 8e186f2..3b752b6 100644 --- a/dhcp-systemtap.patch +++ b/dhcp-systemtap.patch @@ -1,7 +1,7 @@ -diff -up dhcp-4.3.2b1/configure.ac.systemtap dhcp-4.3.2b1/configure.ac ---- dhcp-4.3.2b1/configure.ac.systemtap 2015-02-08 17:42:45.701754886 +0100 -+++ dhcp-4.3.2b1/configure.ac 2015-02-08 17:42:45.768753919 +0100 -@@ -534,6 +534,35 @@ else +diff -up dhcp-4.3.2/configure.ac.systemtap dhcp-4.3.2/configure.ac +--- dhcp-4.3.2/configure.ac.systemtap 2015-03-05 19:06:12.874502977 +0100 ++++ dhcp-4.3.2/configure.ac 2015-03-05 19:06:42.786074542 +0100 +@@ -550,6 +550,35 @@ else AC_MSG_RESULT(no) fi @@ -37,17 +37,17 @@ diff -up dhcp-4.3.2b1/configure.ac.systemtap dhcp-4.3.2b1/configure.ac # Solaris needs some libraries for functions AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(inet_ntoa, [nsl]) -@@ -686,6 +715,7 @@ AC_CONFIG_FILES([ - tests/Makefile +@@ -707,6 +736,7 @@ AC_CONFIG_FILES([ + tests/unittest.sh server/tests/Makefile doc/devel/doxyfile + tapset/Makefile ]) AC_OUTPUT -diff -up dhcp-4.3.2b1/Makefile.am.systemtap dhcp-4.3.2b1/Makefile.am ---- dhcp-4.3.2b1/Makefile.am.systemtap 2015-02-08 17:42:45.632755881 +0100 -+++ dhcp-4.3.2b1/Makefile.am 2015-02-08 17:42:45.769753905 +0100 +diff -up dhcp-4.3.2/Makefile.am.systemtap dhcp-4.3.2/Makefile.am +--- dhcp-4.3.2/Makefile.am.systemtap 2015-03-05 19:06:12.799504051 +0100 ++++ dhcp-4.3.2/Makefile.am 2015-03-05 19:06:12.931502161 +0100 @@ -33,5 +33,8 @@ endif SUBDIRS += includes tests common omapip client dhcpctl relay server @@ -57,9 +57,9 @@ diff -up dhcp-4.3.2b1/Makefile.am.systemtap dhcp-4.3.2b1/Makefile.am + nobase_include_HEADERS = dhcpctl/dhcpctl.h -diff -up dhcp-4.3.2b1/server/dhcp.c.systemtap dhcp-4.3.2b1/server/dhcp.c ---- dhcp-4.3.2b1/server/dhcp.c.systemtap 2015-02-08 17:42:45.750754179 +0100 -+++ dhcp-4.3.2b1/server/dhcp.c 2015-02-08 17:46:12.956764712 +0100 +diff -up dhcp-4.3.2/server/dhcp.c.systemtap dhcp-4.3.2/server/dhcp.c +--- dhcp-4.3.2/server/dhcp.c.systemtap 2015-03-05 19:06:12.919502333 +0100 ++++ dhcp-4.3.2/server/dhcp.c 2015-03-05 19:06:12.932502146 +0100 @@ -30,7 +30,7 @@ #include #include @@ -233,9 +233,9 @@ diff -up dhcp-4.3.2b1/server/dhcp.c.systemtap dhcp-4.3.2b1/server/dhcp.c return 0; } -diff -up dhcp-4.3.2b1/server/dhcpd.c.systemtap dhcp-4.3.2b1/server/dhcpd.c ---- dhcp-4.3.2b1/server/dhcpd.c.systemtap 2015-02-08 17:42:45.740754323 +0100 -+++ dhcp-4.3.2b1/server/dhcpd.c 2015-02-08 17:42:45.772753862 +0100 +diff -up dhcp-4.3.2/server/dhcpd.c.systemtap dhcp-4.3.2/server/dhcpd.c +--- dhcp-4.3.2/server/dhcpd.c.systemtap 2015-03-05 19:06:12.910502462 +0100 ++++ dhcp-4.3.2/server/dhcpd.c 2015-03-05 19:06:12.933502132 +0100 @@ -52,6 +52,8 @@ static const char url [] = # undef group #endif /* PARANOIA */ @@ -254,9 +254,9 @@ diff -up dhcp-4.3.2b1/server/dhcpd.c.systemtap dhcp-4.3.2b1/server/dhcpd.c /* * Receive packets and dispatch them... * dispatch() will never return. -diff -up dhcp-4.3.2b1/server/dhcpv6.c.systemtap dhcp-4.3.2b1/server/dhcpv6.c ---- dhcp-4.3.2b1/server/dhcpv6.c.systemtap 2015-02-08 17:42:45.730754468 +0100 -+++ dhcp-4.3.2b1/server/dhcpv6.c 2015-02-08 17:42:45.774753833 +0100 +diff -up dhcp-4.3.2/server/dhcpv6.c.systemtap dhcp-4.3.2/server/dhcpv6.c +--- dhcp-4.3.2/server/dhcpv6.c.systemtap 2015-03-05 19:06:12.904502548 +0100 ++++ dhcp-4.3.2/server/dhcpv6.c 2015-03-05 19:06:12.934502118 +0100 @@ -17,6 +17,7 @@ /*! \file server/dhcpv6.c */ @@ -427,9 +427,9 @@ diff -up dhcp-4.3.2b1/server/dhcpv6.c.systemtap dhcp-4.3.2b1/server/dhcpv6.c } static void -diff -up dhcp-4.3.2b1/server/failover.c.systemtap dhcp-4.3.2b1/server/failover.c ---- dhcp-4.3.2b1/server/failover.c.systemtap 2015-01-29 14:52:57.000000000 +0100 -+++ dhcp-4.3.2b1/server/failover.c 2015-02-08 17:42:45.775753818 +0100 +diff -up dhcp-4.3.2/server/failover.c.systemtap dhcp-4.3.2/server/failover.c +--- dhcp-4.3.2/server/failover.c.systemtap 2015-02-26 20:35:43.000000000 +0100 ++++ dhcp-4.3.2/server/failover.c 2015-03-05 19:06:12.936502089 +0100 @@ -30,6 +30,8 @@ #include "dhcpd.h" #include @@ -475,9 +475,9 @@ diff -up dhcp-4.3.2b1/server/failover.c.systemtap dhcp-4.3.2b1/server/failover.c return leases_queued; } -diff -up dhcp-4.3.2b1/server/Makefile.am.systemtap dhcp-4.3.2b1/server/Makefile.am ---- dhcp-4.3.2b1/server/Makefile.am.systemtap 2015-02-08 17:42:45.637755809 +0100 -+++ dhcp-4.3.2b1/server/Makefile.am 2015-02-08 17:42:45.775753818 +0100 +diff -up dhcp-4.3.2/server/Makefile.am.systemtap dhcp-4.3.2/server/Makefile.am +--- dhcp-4.3.2/server/Makefile.am.systemtap 2015-03-05 19:06:12.805503966 +0100 ++++ dhcp-4.3.2/server/Makefile.am 2015-03-05 19:06:12.936502089 +0100 @@ -10,7 +10,7 @@ dist_sysconf_DATA = dhcpd.conf.example sbin_PROGRAMS = dhcpd dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c \ @@ -501,9 +501,9 @@ diff -up dhcp-4.3.2b1/server/Makefile.am.systemtap dhcp-4.3.2b1/server/Makefile. + +dhcpd_LDADD += probes.o +endif -diff -up dhcp-4.3.2b1/server/probes.d.systemtap dhcp-4.3.2b1/server/probes.d ---- dhcp-4.3.2b1/server/probes.d.systemtap 2015-02-08 17:42:45.775753818 +0100 -+++ dhcp-4.3.2b1/server/probes.d 2015-02-08 17:42:45.775753818 +0100 +diff -up dhcp-4.3.2/server/probes.d.systemtap dhcp-4.3.2/server/probes.d +--- dhcp-4.3.2/server/probes.d.systemtap 2015-03-05 19:06:12.936502089 +0100 ++++ dhcp-4.3.2/server/probes.d 2015-03-05 19:06:12.936502089 +0100 @@ -0,0 +1,43 @@ +provider dhcpd { + probe main(); @@ -548,23 +548,23 @@ diff -up dhcp-4.3.2b1/server/probes.d.systemtap dhcp-4.3.2b1/server/probes.d + probe failover_set_state_start(int, int); + probe failover_set_state_done(); +}; -diff -up dhcp-4.3.2b1/server/tests/Makefile.am.systemtap dhcp-4.3.2b1/server/tests/Makefile.am ---- dhcp-4.3.2b1/server/tests/Makefile.am.systemtap 2015-02-08 17:42:45.637755809 +0100 -+++ dhcp-4.3.2b1/server/tests/Makefile.am 2015-02-08 17:42:45.776753804 +0100 +diff -up dhcp-4.3.2/server/tests/Makefile.am.systemtap dhcp-4.3.2/server/tests/Makefile.am +--- dhcp-4.3.2/server/tests/Makefile.am.systemtap 2015-03-05 19:06:12.936502089 +0100 ++++ 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 + $(top_builddir)/dhcpctl/libdhcpctl.la \ + $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc +if ENABLE_SYSTEMTAP +DHCPLIBS += ../probes.o +endif + ATF_TESTS = - TESTS = if HAVE_ATF -diff -up dhcp-4.3.2b1/server/trace.h.systemtap dhcp-4.3.2b1/server/trace.h ---- dhcp-4.3.2b1/server/trace.h.systemtap 2015-02-08 17:42:45.776753804 +0100 -+++ dhcp-4.3.2b1/server/trace.h 2015-02-08 17:42:45.776753804 +0100 + +diff -up dhcp-4.3.2/server/trace.h.systemtap dhcp-4.3.2/server/trace.h +--- dhcp-4.3.2/server/trace.h.systemtap 2015-03-05 19:06:12.937502075 +0100 ++++ dhcp-4.3.2/server/trace.h 2015-03-05 19:06:12.937502075 +0100 @@ -0,0 +1,11 @@ +// trace.h + @@ -577,9 +577,9 @@ diff -up dhcp-4.3.2b1/server/trace.h.systemtap dhcp-4.3.2b1/server/trace.h +// Wrap the probe to allow it to be removed when no systemtap available +#define TRACE(probe) +#endif -diff -up dhcp-4.3.2b1/tapset/dhcpd.stp.systemtap dhcp-4.3.2b1/tapset/dhcpd.stp ---- dhcp-4.3.2b1/tapset/dhcpd.stp.systemtap 2015-02-08 17:42:45.776753804 +0100 -+++ dhcp-4.3.2b1/tapset/dhcpd.stp 2015-02-08 17:42:45.776753804 +0100 +diff -up dhcp-4.3.2/tapset/dhcpd.stp.systemtap dhcp-4.3.2/tapset/dhcpd.stp +--- dhcp-4.3.2/tapset/dhcpd.stp.systemtap 2015-03-05 19:06:12.937502075 +0100 ++++ dhcp-4.3.2/tapset/dhcpd.stp 2015-03-05 19:06:12.937502075 +0100 @@ -0,0 +1,212 @@ +/* dhcpd tapset + Copyright (C) 2011, Red Hat Inc. @@ -793,9 +793,9 @@ diff -up dhcp-4.3.2b1/tapset/dhcpd.stp.systemtap dhcp-4.3.2b1/tapset/dhcpd.stp +{ + probestr = sprintf("%s", $$name); +} -diff -up dhcp-4.3.2b1/tapset/Makefile.am.systemtap dhcp-4.3.2b1/tapset/Makefile.am ---- dhcp-4.3.2b1/tapset/Makefile.am.systemtap 2015-02-08 17:42:45.776753804 +0100 -+++ dhcp-4.3.2b1/tapset/Makefile.am 2015-02-08 17:42:45.776753804 +0100 +diff -up dhcp-4.3.2/tapset/Makefile.am.systemtap dhcp-4.3.2/tapset/Makefile.am +--- dhcp-4.3.2/tapset/Makefile.am.systemtap 2015-03-05 19:06:12.937502075 +0100 ++++ dhcp-4.3.2/tapset/Makefile.am 2015-03-05 19:06:12.937502075 +0100 @@ -0,0 +1,26 @@ +# Makefile.am for dhcp/tapset +# Jiri Popelka diff --git a/dhcp.spec b/dhcp.spec index 93b6bb1..0e42181 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -9,16 +9,16 @@ #%%global patchver P2 -%global prever b1 +#%%global prever b1 #%%global VERSION %{version}-%{patchver} -#%%global VERSION %{version} -%global VERSION %{version}%{prever} +#%%global VERSION %{version}%{prever} +%global VERSION %{version} Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.3.2 -Release: 0.6%{prever}%{?dist} +Release: 1%{?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. @@ -675,6 +675,9 @@ done %doc doc/html/ %changelog +* Thu Mar 05 2015 Jiri Popelka - 12:4.3.2-1 +- 4.3.2 + * Wed Feb 25 2015 Jiri Popelka - 12:4.3.2-0.6b1 - correctly set IB's hw->hlen (#1185075) diff --git a/sources b/sources index 718fdd7..1192da1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bef604a01f442c3dd27b0793d88eac86 dhcp-4.3.2b1.tar.gz +5a284875dd2c12ddd388416d69156a67 dhcp-4.3.2.tar.gz