- build with bundled bind for now, dhcp code is incompatible with
authorMarcin Krol <hawk@tld-linux.org>
Tue, 7 May 2019 08:25:57 +0000 (10:25 +0200)
committerMarcin Krol <hawk@tld-linux.org>
Tue, 7 May 2019 08:25:57 +0000 (10:25 +0200)
  recent bind libs and needs partial rewrite

dhcp-capability.patch
dhcp-remove-bind.patch [deleted file]
dhcp-systemtap.patch
dhcp.spec

index 425bc7ea36237d8e81278b3fb1bdb4648ee8013f..acd3b38c62295b4bddd58d2d143561f9d784c5ad 100644 (file)
@@ -1,6 +1,6 @@
 diff -urNpa dhcp-4.4.1.orig/client/dhclient.8 dhcp-4.4.1/client/dhclient.8
---- dhcp-4.4.1.orig/client/dhclient.8  2019-04-17 14:34:58.114000000 +0200
-+++ dhcp-4.4.1/client/dhclient.8       2019-04-17 14:35:23.502000000 +0200
+--- dhcp-4.4.1.orig/client/dhclient.8  2019-05-07 09:33:41.284000000 +0200
++++ dhcp-4.4.1/client/dhclient.8       2019-05-07 09:34:13.807000000 +0200
 @@ -134,6 +134,9 @@ dhclient - Dynamic Host Configuration Pr
  .B -w
  ]
@@ -45,8 +45,8 @@ diff -urNpa dhcp-4.4.1.orig/client/dhclient.8 dhcp-4.4.1/client/dhclient.8
  Do not configure any interfaces.  This is most likely to be useful in
  combination with the
 diff -urNpa dhcp-4.4.1.orig/client/dhclient.c dhcp-4.4.1/client/dhclient.c
---- dhcp-4.4.1.orig/client/dhclient.c  2019-04-17 14:34:58.285000000 +0200
-+++ dhcp-4.4.1/client/dhclient.c       2019-04-17 14:35:23.503000000 +0200
+--- dhcp-4.4.1.orig/client/dhclient.c  2019-05-07 09:33:41.285000000 +0200
++++ dhcp-4.4.1/client/dhclient.c       2019-05-07 09:34:13.807000000 +0200
 @@ -41,6 +41,10 @@
  #include <sys/wait.h>
  #include <limits.h>
@@ -100,8 +100,8 @@ diff -urNpa dhcp-4.4.1.orig/client/dhclient.c dhcp-4.4.1/client/dhclient.c
        initialize_common_option_spaces();
  
 diff -urNpa dhcp-4.4.1.orig/client/dhclient-script.8 dhcp-4.4.1/client/dhclient-script.8
---- dhcp-4.4.1.orig/client/dhclient-script.8   2019-04-17 14:34:58.186000000 +0200
-+++ dhcp-4.4.1/client/dhclient-script.8        2019-04-17 14:35:23.503000000 +0200
+--- dhcp-4.4.1.orig/client/dhclient-script.8   2019-05-07 09:33:41.284000000 +0200
++++ dhcp-4.4.1/client/dhclient-script.8        2019-05-07 09:34:13.807000000 +0200
 @@ -243,6 +243,16 @@ repeatedly initialized to the values pro
  the other.   Assuming the information provided by both servers is
  valid, this shouldn't cause any real problems, but it could be
@@ -120,19 +120,20 @@ diff -urNpa dhcp-4.4.1.orig/client/dhclient-script.8 dhcp-4.4.1/client/dhclient-
  dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
  dhclient.leases(5).
 diff -urNpa dhcp-4.4.1.orig/client/Makefile.am dhcp-4.4.1/client/Makefile.am
---- dhcp-4.4.1.orig/client/Makefile.am 2019-04-17 14:34:58.112000000 +0200
-+++ dhcp-4.4.1/client/Makefile.am      2019-04-17 14:36:22.662000000 +0200
-@@ -14,6 +14,6 @@ dhclient_SOURCES = client_tables.c clpar
-                  scripts/netbsd scripts/nextstep scripts/openbsd \
-                  scripts/solaris scripts/openwrt
- dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
--               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-+               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc $(CAPNG_LDADD)
+--- dhcp-4.4.1.orig/client/Makefile.am 2019-05-07 09:33:41.284000000 +0200
++++ dhcp-4.4.1/client/Makefile.am      2019-05-07 09:36:43.205000000 +0200
+@@ -17,6 +17,7 @@ dhclient_LDADD = ../common/libdhcp.@A@ .
+                @BINDLIBIRSDIR@/libirs.@A@ \
+                @BINDLIBDNSDIR@/libdns.@A@ \
+                @BINDLIBISCCFGDIR@/libisccfg.@A@ \
+-               @BINDLIBISCDIR@/libisc.@A@
++               @BINDLIBISCDIR@/libisc.@A@ \
++               $(CAPNG_LDADD)
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
 diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
---- dhcp-4.4.1.orig/configure.ac       2019-04-17 14:34:58.112000000 +0200
-+++ dhcp-4.4.1/configure.ac    2019-04-17 14:35:23.503000000 +0200
+--- dhcp-4.4.1.orig/configure.ac       2019-05-07 09:33:41.287000000 +0200
++++ dhcp-4.4.1/configure.ac    2019-05-07 09:34:13.807000000 +0200
 @@ -612,6 +612,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
  # Look for optional headers.
  AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
@@ -176,8 +177,8 @@ diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
  AC_SEARCH_LIBS(socket, [socket])
  AC_SEARCH_LIBS(inet_ntoa, [nsl])
 diff -urNpa dhcp-4.4.1.orig/relay/dhcrelay.c dhcp-4.4.1/relay/dhcrelay.c
---- dhcp-4.4.1.orig/relay/dhcrelay.c   2019-04-17 14:34:58.286000000 +0200
-+++ dhcp-4.4.1/relay/dhcrelay.c        2019-04-17 14:35:23.504000000 +0200
+--- dhcp-4.4.1.orig/relay/dhcrelay.c   2019-05-07 09:33:41.291000000 +0200
++++ dhcp-4.4.1/relay/dhcrelay.c        2019-05-07 09:34:13.807000000 +0200
 @@ -32,6 +32,11 @@
  #include <sys/time.h>
  #include <isc/file.h>
@@ -236,14 +237,15 @@ diff -urNpa dhcp-4.4.1.orig/relay/dhcrelay.c dhcp-4.4.1/relay/dhcrelay.c
        dispatch();
  
 diff -urNpa dhcp-4.4.1.orig/relay/Makefile.am dhcp-4.4.1/relay/Makefile.am
---- dhcp-4.4.1.orig/relay/Makefile.am  2019-04-17 14:34:58.112000000 +0200
-+++ dhcp-4.4.1/relay/Makefile.am       2019-04-17 14:35:23.504000000 +0200
-@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
- dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
--               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-+               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc $(CAPNG_LDADD)
+--- dhcp-4.4.1.orig/relay/Makefile.am  2019-05-07 09:33:41.291000000 +0200
++++ dhcp-4.4.1/relay/Makefile.am       2019-05-07 09:37:17.455000000 +0200
+@@ -6,7 +6,8 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ .
+                @BINDLIBIRSDIR@/libirs.@A@ \
+                @BINDLIBDNSDIR@/libdns.@A@ \
+                @BINDLIBISCCFGDIR@/libisccfg.@A@ \
+-               @BINDLIBISCDIR@/libisc.@A@
++               @BINDLIBISCDIR@/libisc.@A@ \
++               $(CAPNG_LDADD)
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  
diff --git a/dhcp-remove-bind.patch b/dhcp-remove-bind.patch
deleted file mode 100644 (file)
index 9a18111..0000000
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -urNpa dhcp-4.4.1.orig/client/Makefile.am dhcp-4.4.1/client/Makefile.am
---- dhcp-4.4.1.orig/client/Makefile.am 2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/client/Makefile.am      2019-04-17 14:51:05.807000000 +0200
-@@ -14,9 +14,6 @@ dhclient_SOURCES = client_tables.c clpar
-                  scripts/netbsd scripts/nextstep scripts/openbsd \
-                  scripts/solaris scripts/openwrt
- dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
--               @BINDLIBIRSDIR@/libirs.@A@ \
--               @BINDLIBDNSDIR@/libdns.@A@ \
--               @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--               @BINDLIBISCDIR@/libisc.@A@
-+               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
- EXTRA_DIST = $(man_MANS)
-diff -urNpa dhcp-4.4.1.orig/client/tests/Makefile.am dhcp-4.4.1/client/tests/Makefile.am
---- dhcp-4.4.1.orig/client/tests/Makefile.am   2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/client/tests/Makefile.am        2019-04-17 15:06:57.216000000 +0200
-@@ -19,10 +19,7 @@ DHCPSRC = ../clparse.c ../dhc6.c ../dhcl
- DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
-         $(top_builddir)/omapip/libomapi.@A@    \
-           $(top_builddir)/dhcpctl/libdhcpctl.@A@ \
--        @BINDLIBIRSDIR@/libirs.@A@ \
--        @BINDLIBDNSDIR@/libdns.@A@ \
--        @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--        @BINDLIBISCDIR@/libisc.@A@
-+        $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- ATF_TESTS =
- if HAVE_ATF
-diff -urNpa dhcp-4.4.1.orig/common/tests/Makefile.am dhcp-4.4.1/common/tests/Makefile.am
---- dhcp-4.4.1.orig/common/tests/Makefile.am   2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/common/tests/Makefile.am        2019-04-17 14:51:05.808000000 +0200
-@@ -14,42 +14,27 @@ 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@ ../../omapip/libomapi.@A@ \
--      @BINDLIBIRSDIR@/libirs.@A@ \
--      @BINDLIBDNSDIR@/libdns.@A@ \
--      @BINDLIBISCCFGDIR@/libisccfg.@A@  \
--      @BINDLIBISCDIR@/libisc.@A@
-+      $(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@ ../../omapip/libomapi.@A@ \
--      @BINDLIBIRSDIR@/libirs.@A@ \
--      @BINDLIBDNSDIR@/libdns.@A@ \
--      @BINDLIBISCCFGDIR@/libisccfg.@A@  \
--      @BINDLIBISCDIR@/libisc.@A@
-+      $(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@ \
--      @BINDLIBIRSDIR@/libirs.@A@ \
--      @BINDLIBDNSDIR@/libdns.@A@ \
--      @BINDLIBISCCFGDIR@/libisccfg.@A@  \
--      @BINDLIBISCDIR@/libisc.@A@
-+      $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- 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@ \
--      @BINDLIBIRSDIR@/libirs.@A@ \
--      @BINDLIBDNSDIR@/libdns.@A@ \
--      @BINDLIBISCCFGDIR@/libisccfg.@A@  \
--      @BINDLIBISCDIR@/libisc.@A@
-+      $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- option_unittest_SOURCES = option_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- option_unittest_LDADD = $(ATF_LDFLAGS)
- option_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \
--      @BINDLIBIRSDIR@/libirs.@A@ \
--      @BINDLIBDNSDIR@/libdns.@A@ \
--      @BINDLIBISCCFGDIR@/libisccfg.@A@  \
--      @BINDLIBISCDIR@/libisc.@A@
-+      $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- check: $(ATF_TESTS)
-       @if test $(top_srcdir) != ${top_builddir}; then \
-diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
---- dhcp-4.4.1.orig/configure.ac       2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/configure.ac    2019-04-17 14:51:05.808000000 +0200
-@@ -757,77 +757,37 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t
-     ,, [#include <linux/if_packet.h>])
- # bind/Makefile.in is not from automake so we need 2 variables for bind dir
--BINDSUBDIR=
--BINDDIR=
--BINDSRCDIR=
--BINDLIBIRSDIR=
--BINDLIBDNSDIR=
--BINDLIBISCCFGDIR=
--BINDLIBISCDIR=
--DISTCHECK_LIBBIND_CONFIGURE_FLAG=
- AC_ARG_WITH(libbind,
--      AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH]),
-+      AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH]),
-       use_libbind="$withval", use_libbind="no")
- case "$use_libbind" in
-+yes|no)
-+      libbind="\${top_srcdir}/bind/include"
-+      ;;
-+*)
-+      libbind="$use_libbind"
-+      ;;
-+esac
-+
-+BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
-+AC_ARG_WITH(libbind-libs,
-+      AC_HELP_STRING([--with-libbind-libs=PATH],
-+              [bind9 export libraries are in PATH]),
-+              [libbind_libs="$withval"], [libbind_libs='no'])
-+case "$libbind_libs" in
- yes)
-       AC_MSG_ERROR([PATH is required in --with-libbind=PATH])
-       ;;
- no)
--      BINDSUBDIR="\${top_srcdir}/bind"
--      my_abs_srcdir=`cd $srcdir && pwd`
--      BINDDIR="${my_abs_srcdir}/bind"
--      if test ! -d "$srcdir/bind"; then
--              AC_MSG_ERROR([Where to find or build bind includes and libraries must be specified])
--      fi
--      if test -d "$srcdir/bind/bind9"; then
--              BINDSRCDIR="${my_abs_srcdir}/bind/bind9"
--      else
--              if test ! -f "$srcdir/bind/version.tmp"; then
--                      AC_MSG_ERROR([Cannot find $srcdir/bind/version.tmp])
--              fi
--              . "$srcdir/bind/version.tmp"
--              bindversion=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
--              BINDSRCDIR="${my_abs_srcdir}/bind/bind-$bindversion"
--      fi
--      AC_CONFIG_FILES([$srcdir/bind/Makefile])
--
--      BINDLIBIRSDIR="$BINDSRCDIR/lib/irs"
--      BINDLIBDNSDIR="$BINDSRCDIR/lib/dns"
--      BINDLIBISCCFGDIR="$BINDSRCDIR/lib/isccfg"
--      BINDLIBISCDIR="$BINDSRCDIR/lib/isc"
-+      BUNDLED_BIND=yes
-       ;;
- *)
--      if test ! -d "$use_libbind"; then
--              AC_MSG_ERROR([Cannot find bind directory at $use_libbind])
--      fi
--      if test ! -d "$use_libbind/include" -o \
--              ! -f "$use_libbind/include/isc/buffer.h"
--      then
--              AC_MSG_ERROR([Cannot find bind includes at $use_libbind/include])
--      fi
--      if test ! -d "$use_libbind/lib" -o \
--              \( ! -f "$use_libbind/lib/libisc.a" -a \
--                 ! -f "$use_libbind/lib/libisc.la" \)
--      then
--              AC_MSG_ERROR([Cannot find bind libraries at $use_libbind/lib])
--      fi
--      BINDDIR="$use_libbind"
--      BINDLIBIRSDIR="$BINDDIR/lib"
--      BINDLIBDNSDIR="$BINDDIR/lib"
--      BINDLIBISCCFGDIR="$BINDDIR/lib"
--      BINDLIBISCDIR="$BINDDIR/lib"    
--      DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
-+      BIND9_LIBDIR="-L$libbind_libs"
-+      BUNDLED_BIND=no
-       ;;
- esac
--AC_SUBST(BINDSUBDIR)
--AC_SUBST(BINDDIR)
--AC_SUBST(BINDSRCDIR)
--AC_SUBST(BINDLIBIRSDIR)
--AC_SUBST(BINDLIBDNSDIR)
--AC_SUBST(BINDLIBISCCFGDIR)
--AC_SUBST(BINDLIBISCDIR)
--AC_SUBST(DISTCHECK_LIBBIND_CONFIGURE_FLAG)
--AM_CONDITIONAL(HAVE_BINDDIR, test "$use_libbind" = "no")
-+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
-+AC_SUBST([BIND9_LIBDIR])
- #
- # GNU libtool support
-@@ -984,7 +944,7 @@ fi
- CFLAGS="$CFLAGS $STD_CWARNINGS"
- # Try to add the bind and dhcp include directories
--CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include"
-+CFLAGS="$CFLAGS -I$libbind"
- case "$host" in
- *-darwin*)
-diff -urNpa dhcp-4.4.1.orig/dhcpctl/Makefile.am dhcp-4.4.1/dhcpctl/Makefile.am
---- dhcp-4.4.1.orig/dhcpctl/Makefile.am        2018-02-21 16:53:59.000000000 +0100
-+++ dhcp-4.4.1/dhcpctl/Makefile.am     2019-04-17 15:06:32.816000000 +0200
-@@ -1,8 +1,3 @@
--BINDLIBIRSDIR=@BINDLIBIRSDIR@
--BINDLIBDNSDIR=@BINDLIBDNSDIR@
--BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
--BINDLIBISCDIR=@BINDLIBISCDIR@
--
- bin_PROGRAMS = omshell
- lib_LIBRARIES = libdhcpctl.a
- noinst_PROGRAMS = cltest
-@@ -11,16 +6,10 @@ EXTRA_DIST = $(man_MANS)
- omshell_SOURCES = omshell.c
- omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
--              $(BINDLIBIRSDIR)/libirs.a \
--              $(BINDLIBDNSDIR)/libdns.a \
--              $(BINDLIBISCCFGDIR)/libisccfg.a \
--              $(BINDLIBISCDIR)/libisc.a
-+      $(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 \
--             $(BINDLIBIRSDIR)/libirs.a \
--             $(BINDLIBDNSDIR)/libdns.a \
--             $(BINDLIBISCCFGDIR)/libisccfg.a \
--             $(BINDLIBISCDIR)/libisc.a
-+      $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -urNpa dhcp-4.4.1.orig/dhcpctl/Makefile.am.in dhcp-4.4.1/dhcpctl/Makefile.am.in
---- dhcp-4.4.1.orig/dhcpctl/Makefile.am.in     2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/dhcpctl/Makefile.am.in  2019-04-17 14:51:05.808000000 +0200
-@@ -11,16 +11,10 @@ EXTRA_DIST = $(man_MANS)
- omshell_SOURCES = omshell.c
- omshell_LDADD = libdhcpctl.@A@ ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
--              $(BINDLIBIRSDIR)/libirs.@A@ \
--              $(BINDLIBDNSDIR)/libdns.@A@ \
--              $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--              $(BINDLIBISCDIR)/libisc.@A@
-+             $(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@ \
--             $(BINDLIBIRSDIR)/libirs.@A@ \
--             $(BINDLIBDNSDIR)/libdns.@A@ \
--             $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--             $(BINDLIBISCDIR)/libisc.@A@
-+             $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -urNpa dhcp-4.4.1.orig/includes/dhcpd.h dhcp-4.4.1/includes/dhcpd.h
---- dhcp-4.4.1.orig/includes/dhcpd.h   2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/includes/dhcpd.h        2019-04-17 14:59:24.132000000 +0200
-@@ -62,6 +62,10 @@
- # include <net/if_dl.h>
- #endif
-+#include <isc/int.h>
-+#include <isc/util.h>
-+#include <isc/boolean.h>
-+
- #include <setjmp.h>
- #include "cdefs.h"
-diff -urNpa dhcp-4.4.1.orig/includes/omapip/omapip.h dhcp-4.4.1/includes/omapip/omapip.h
---- dhcp-4.4.1.orig/includes/omapip/omapip.h   2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/includes/omapip/omapip.h        2019-04-17 14:59:24.181000000 +0200
-@@ -32,6 +32,7 @@
- #include <stdarg.h>
- #include <dns/tsec.h>
-+#include <isc/boolean.h>
- typedef unsigned int omapi_handle_t;
-diff -urNpa dhcp-4.4.1.orig/Makefile.am dhcp-4.4.1/Makefile.am
---- dhcp-4.4.1.orig/Makefile.am        2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/Makefile.am     2019-04-17 14:54:34.753000000 +0200
-@@ -32,13 +32,9 @@ EXTRA_DIST = RELNOTES LICENSE configure.
-            client/tests/Kyuafile common/tests/Kyuafile server/tests/Kyuafile \
-          m4/README
--if HAVE_BINDDIR
--EXTRA_DIST += bind/Makefile.in bind/bind.tar.gz bind/version.tmp
--endif
--
--# Use an autoconf substitution vs an automake conditional here
--# to fool automake when the bind directory does not exist.
--SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
-+SUBDIRS =
-+
-+SUBDIRS += includes tests common omapip client dhcpctl relay server
- nobase_include_HEADERS = dhcpctl/dhcpctl.h
-@@ -50,10 +46,5 @@ DISTCHECK_CONFIGURE_FLAGS =  @DISTCHECK_
- DISTCHECK_CONFIGURE_FLAGS += @DISTCHECK_LIBBIND_CONFIGURE_FLAG@
- DISTCHECK_CONFIGURE_FLAGS += @DISTCHECK_LIBTOOL_CONFIGURE_FLAG@
--distcheck-hook:
--if HAVE_BINDDIR
--      chmod u+w $(distdir)/bind
--endif
--
- distclean-local:
-       rm -f config.report
-diff -urNpa dhcp-4.4.1.orig/omapip/Makefile.am dhcp-4.4.1/omapip/Makefile.am
---- dhcp-4.4.1.orig/omapip/Makefile.am 2018-02-21 16:53:59.000000000 +0100
-+++ dhcp-4.4.1/omapip/Makefile.am      2019-04-17 15:07:11.264000000 +0200
-@@ -1,8 +1,3 @@
--BINDLIBIRSDIR=@BINDLIBIRSDIR@
--BINDLIBDNSDIR=@BINDLIBDNSDIR@
--BINDLIBISCCFGDIR=@BINDLIBISCCFGDIR@
--BINDLIBISCDIR=@BINDLIBISCDIR@
--
- lib_LIBRARIES = libomapi.a
- noinst_PROGRAMS = svtest
-@@ -16,7 +11,4 @@ EXTRA_DIST = $(man_MANS)
- svtest_SOURCES = test.c
- svtest_LDADD = libomapi.a \
--             $(BINDLIBIRSDIR)/libirs.a \
--             $(BINDLIBDNSDIR)/libdns.a \
--             $(BINDLIBISCCFGDIR)/libisccfg.a \
--             $(BINDLIBISCDIR)/libisc.a
-+      $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -urNpa dhcp-4.4.1.orig/omapip/Makefile.am.in dhcp-4.4.1/omapip/Makefile.am.in
---- dhcp-4.4.1.orig/omapip/Makefile.am.in      2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/omapip/Makefile.am.in   2019-04-17 14:51:05.809000000 +0200
-@@ -16,7 +16,4 @@ EXTRA_DIST = $(man_MANS)
- svtest_SOURCES = test.c
- svtest_LDADD = libomapi.@A@ \
--             $(BINDLIBIRSDIR)/libirs.@A@ \
--             $(BINDLIBDNSDIR)/libdns.@A@ \
--             $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--             $(BINDLIBISCDIR)/libisc.@A@
-+             $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -urNpa dhcp-4.4.1.orig/relay/Makefile.am dhcp-4.4.1/relay/Makefile.am
---- dhcp-4.4.1.orig/relay/Makefile.am  2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/relay/Makefile.am       2019-04-17 14:51:05.809000000 +0200
-@@ -3,10 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
- dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
--               @BINDLIBIRSDIR@/libirs.@A@ \
--               @BINDLIBDNSDIR@/libdns.@A@ \
--               @BINDLIBISCCFGDIR@/libisccfg.@A@ \
--               @BINDLIBISCDIR@/libisc.@A@
-+               $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhcrelay.8
- EXTRA_DIST = $(man_MANS)
-diff -urNpa dhcp-4.4.1.orig/server/Makefile.am dhcp-4.4.1/server/Makefile.am
---- dhcp-4.4.1.orig/server/Makefile.am 2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/server/Makefile.am      2019-04-17 14:51:05.809000000 +0200
-@@ -15,10 +15,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
- dhcpd_CFLAGS = $(LDAP_CFLAGS)
- dhcpd_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
-             ../dhcpctl/libdhcpctl.@A@ \
--            $(BINDLIBIRSDIR)/libirs.@A@ \
--            $(BINDLIBDNSDIR)/libdns.@A@ \
--            $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--            $(BINDLIBISCDIR)/libisc.@A@ $(LDAP_LIBS)
-+            $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc \
-+            $(LDAP_LIBS)
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
-diff -urNpa dhcp-4.4.1.orig/server/tests/Makefile.am dhcp-4.4.1/server/tests/Makefile.am
---- dhcp-4.4.1.orig/server/tests/Makefile.am   2018-02-21 15:30:46.000000000 +0100
-+++ dhcp-4.4.1/server/tests/Makefile.am        2019-04-17 14:51:05.809000000 +0200
-@@ -19,11 +19,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
- DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \
-         $(top_builddir)/omapip/libomapi.@A@ \
--          $(top_builddir)/dhcpctl/libdhcpctl.@A@ \
--        $(BINDLIBIRSDIR)/libirs.@A@ \
--        $(BINDLIBDNSDIR)/libdns.@A@ \
--        $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
--        $(BINDLIBISCDIR)/libisc.@A@
-+        $(top_builddir)/dhcpctl/libdhcpctl.@A@ \
-+        $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- ATF_TESTS =
- if HAVE_ATF
index 78c35bc95c3bf4934a6a7a6e6a5386961645563a..c0c6fd3c28cc037a6530c0fd06936adf87c58edb 100644 (file)
@@ -1,6 +1,6 @@
 diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
---- dhcp-4.4.1.orig/configure.ac       2019-04-17 13:04:15.422000000 +0200
-+++ dhcp-4.4.1/configure.ac    2019-04-17 13:06:45.065000000 +0200
+--- dhcp-4.4.1.orig/configure.ac       2019-05-07 10:08:50.795000000 +0200
++++ dhcp-4.4.1/configure.ac    2019-05-07 10:09:08.193000000 +0200
 @@ -647,6 +647,35 @@ else
      AC_MSG_RESULT(no)
  fi
@@ -37,7 +37,7 @@ diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
  # Solaris needs some libraries for functions
  AC_SEARCH_LIBS(socket, [socket])
  AC_SEARCH_LIBS(inet_ntoa, [nsl])
-@@ -1013,6 +1042,7 @@ AC_CONFIG_FILES([
+@@ -1053,6 +1082,7 @@ AC_CONFIG_FILES([
    tests/unittest.sh
    server/tests/Makefile
    doc/devel/doxyfile
@@ -46,11 +46,11 @@ diff -urNpa dhcp-4.4.1.orig/configure.ac dhcp-4.4.1/configure.ac
  AC_OUTPUT
  
 diff -urNpa dhcp-4.4.1.orig/Makefile.am dhcp-4.4.1/Makefile.am
---- dhcp-4.4.1.orig/Makefile.am        2019-04-17 13:04:15.422000000 +0200
-+++ dhcp-4.4.1/Makefile.am     2019-04-17 13:06:45.065000000 +0200
-@@ -46,6 +46,9 @@ endif
- SUBDIRS += includes tests common omapip client dhcpctl relay server
+--- dhcp-4.4.1.orig/Makefile.am        2019-05-07 10:08:50.798000000 +0200
++++ dhcp-4.4.1/Makefile.am     2019-05-07 10:09:08.193000000 +0200
+@@ -40,6 +40,9 @@ endif
+ # to fool automake when the bind directory does not exist.
+ SUBDIRS = @BINDSUBDIR@ includes tests common omapip client dhcpctl relay server
  
 +SUBDIRS += tapset
 +#DIST_SUBDIRS = $(SUBDIRS)
@@ -59,8 +59,8 @@ diff -urNpa dhcp-4.4.1.orig/Makefile.am dhcp-4.4.1/Makefile.am
  
  #
 diff -urNpa dhcp-4.4.1.orig/server/dhcp.c dhcp-4.4.1/server/dhcp.c
---- dhcp-4.4.1.orig/server/dhcp.c      2019-04-17 13:04:15.423000000 +0200
-+++ dhcp-4.4.1/server/dhcp.c   2019-04-17 13:06:45.065000000 +0200
+--- dhcp-4.4.1.orig/server/dhcp.c      2019-05-07 10:08:50.800000000 +0200
++++ dhcp-4.4.1/server/dhcp.c   2019-05-07 10:09:08.194000000 +0200
 @@ -31,6 +31,8 @@
  #include <limits.h>
  #include <sys/time.h>
@@ -234,8 +234,8 @@ diff -urNpa dhcp-4.4.1.orig/server/dhcp.c dhcp-4.4.1/server/dhcp.c
  }
  
 diff -urNpa dhcp-4.4.1.orig/server/dhcpd.c dhcp-4.4.1/server/dhcpd.c
---- dhcp-4.4.1.orig/server/dhcpd.c     2019-04-17 13:04:15.424000000 +0200
-+++ dhcp-4.4.1/server/dhcpd.c  2019-04-17 13:06:45.066000000 +0200
+--- dhcp-4.4.1.orig/server/dhcpd.c     2019-05-07 10:08:50.799000000 +0200
++++ dhcp-4.4.1/server/dhcpd.c  2019-05-07 10:09:08.194000000 +0200
 @@ -147,6 +147,8 @@ static void omapi_listener_start (void *
        omapi_object_dereference (&listener, MDL);
  }
@@ -255,8 +255,8 @@ diff -urNpa dhcp-4.4.1.orig/server/dhcpd.c dhcp-4.4.1/server/dhcpd.c
         * Receive packets and dispatch them...
         * dispatch() will never return.
 diff -urNpa dhcp-4.4.1.orig/server/dhcpv6.c dhcp-4.4.1/server/dhcpv6.c
---- dhcp-4.4.1.orig/server/dhcpv6.c    2019-04-17 13:04:15.424000000 +0200
-+++ dhcp-4.4.1/server/dhcpv6.c 2019-04-17 13:06:45.066000000 +0200
+--- dhcp-4.4.1.orig/server/dhcpv6.c    2019-05-07 10:08:50.799000000 +0200
++++ dhcp-4.4.1/server/dhcpv6.c 2019-05-07 10:09:08.206000000 +0200
 @@ -17,6 +17,7 @@
  /*! \file server/dhcpv6.c */
  
@@ -421,8 +421,8 @@ diff -urNpa dhcp-4.4.1.orig/server/dhcpv6.c dhcp-4.4.1/server/dhcpv6.c
  
  #ifdef DHCP4o6
 diff -urNpa dhcp-4.4.1.orig/server/failover.c dhcp-4.4.1/server/failover.c
---- dhcp-4.4.1.orig/server/failover.c  2019-04-17 13:04:15.423000000 +0200
-+++ dhcp-4.4.1/server/failover.c       2019-04-17 13:06:45.067000000 +0200
+--- dhcp-4.4.1.orig/server/failover.c  2019-05-07 10:08:50.799000000 +0200
++++ dhcp-4.4.1/server/failover.c       2019-05-07 10:09:08.206000000 +0200
 @@ -30,6 +30,8 @@
  #include "dhcpd.h"
  #include <omapip/omapip_p.h>
@@ -469,8 +469,8 @@ diff -urNpa dhcp-4.4.1.orig/server/failover.c dhcp-4.4.1/server/failover.c
  }
  
 diff -urNpa dhcp-4.4.1.orig/server/Makefile.am dhcp-4.4.1/server/Makefile.am
---- dhcp-4.4.1.orig/server/Makefile.am 2019-04-17 13:04:15.423000000 +0200
-+++ dhcp-4.4.1/server/Makefile.am      2019-04-17 13:06:45.067000000 +0200
+--- dhcp-4.4.1.orig/server/Makefile.am 2019-05-07 10:08:50.800000000 +0200
++++ dhcp-4.4.1/server/Makefile.am      2019-05-07 10:09:08.207000000 +0200
 @@ -10,7 +10,8 @@ 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 \
@@ -481,7 +481,7 @@ diff -urNpa dhcp-4.4.1.orig/server/Makefile.am dhcp-4.4.1/server/Makefile.am
  
  dhcpd_CFLAGS = $(LDAP_CFLAGS)
  dhcpd_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \
-@@ -21,3 +22,13 @@ dhcpd_LDADD = ../common/libdhcp.@A@ ../o
+@@ -23,3 +24,13 @@ dhcpd_LDADD = ../common/libdhcp.@A@ ../o
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)
  
@@ -497,7 +497,7 @@ diff -urNpa dhcp-4.4.1.orig/server/Makefile.am dhcp-4.4.1/server/Makefile.am
 +endif
 diff -urNpa dhcp-4.4.1.orig/server/probes.d dhcp-4.4.1/server/probes.d
 --- dhcp-4.4.1.orig/server/probes.d    1970-01-01 01:00:00.000000000 +0100
-+++ dhcp-4.4.1/server/probes.d 2019-04-17 13:06:45.067000000 +0200
++++ dhcp-4.4.1/server/probes.d 2019-05-07 10:09:08.207000000 +0200
 @@ -0,0 +1,43 @@
 +provider dhcpd {
 +       probe main();
@@ -543,11 +543,11 @@ diff -urNpa dhcp-4.4.1.orig/server/probes.d dhcp-4.4.1/server/probes.d
 +       probe failover_set_state_done();
 +};
 diff -urNpa dhcp-4.4.1.orig/server/tests/Makefile.am dhcp-4.4.1/server/tests/Makefile.am
---- dhcp-4.4.1.orig/server/tests/Makefile.am   2019-04-17 13:04:15.424000000 +0200
-+++ dhcp-4.4.1/server/tests/Makefile.am        2019-04-17 13:06:45.067000000 +0200
-@@ -22,6 +22,10 @@ DHCPLIBS = $(top_builddir)/common/libdhc
-         $(top_builddir)/dhcpctl/libdhcpctl.@A@ \
-         $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
+--- dhcp-4.4.1.orig/server/tests/Makefile.am   2019-05-07 10:08:50.800000000 +0200
++++ dhcp-4.4.1/server/tests/Makefile.am        2019-05-07 10:09:08.207000000 +0200
+@@ -25,6 +25,10 @@ DHCPLIBS = $(top_builddir)/common/libdhc
+         $(BINDLIBISCCFGDIR)/libisccfg.@A@ \
+         $(BINDLIBISCDIR)/libisc.@A@
  
 +if ENABLE_SYSTEMTAP
 +DHCPLIBS += ../probes.o
@@ -558,7 +558,7 @@ diff -urNpa dhcp-4.4.1.orig/server/tests/Makefile.am dhcp-4.4.1/server/tests/Mak
  
 diff -urNpa dhcp-4.4.1.orig/server/trace.h dhcp-4.4.1/server/trace.h
 --- dhcp-4.4.1.orig/server/trace.h     1970-01-01 01:00:00.000000000 +0100
-+++ dhcp-4.4.1/server/trace.h  2019-04-17 13:06:45.067000000 +0200
++++ dhcp-4.4.1/server/trace.h  2019-05-07 10:09:08.207000000 +0200
 @@ -0,0 +1,11 @@
 +// trace.h
 +
@@ -573,7 +573,7 @@ diff -urNpa dhcp-4.4.1.orig/server/trace.h dhcp-4.4.1/server/trace.h
 +#endif
 diff -urNpa dhcp-4.4.1.orig/tapset/dhcpd.stp dhcp-4.4.1/tapset/dhcpd.stp
 --- dhcp-4.4.1.orig/tapset/dhcpd.stp   1970-01-01 01:00:00.000000000 +0100
-+++ dhcp-4.4.1/tapset/dhcpd.stp        2019-04-17 13:06:45.067000000 +0200
++++ dhcp-4.4.1/tapset/dhcpd.stp        2019-05-07 10:09:08.207000000 +0200
 @@ -0,0 +1,212 @@
 +/* dhcpd tapset
 +   Copyright (C) 2011, Red Hat Inc.
@@ -789,7 +789,7 @@ diff -urNpa dhcp-4.4.1.orig/tapset/dhcpd.stp dhcp-4.4.1/tapset/dhcpd.stp
 +}
 diff -urNpa dhcp-4.4.1.orig/tapset/Makefile.am dhcp-4.4.1/tapset/Makefile.am
 --- dhcp-4.4.1.orig/tapset/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ dhcp-4.4.1/tapset/Makefile.am      2019-04-17 13:06:45.067000000 +0200
++++ dhcp-4.4.1/tapset/Makefile.am      2019-05-07 10:09:08.207000000 +0200
 @@ -0,0 +1,26 @@
 +# Makefile.am for dhcp/tapset
 +# Jiri Popelka
index b55655c7626bf5890bebeffd041c7535c779d34a..d95d8f20e4d61138c473d6b63553900936c2802b 100644 (file)
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -36,7 +36,6 @@ Source11:     %{name}-README.ldap
 Source12:      draft-ietf-dhc-ldap-schema-01.txt
 Source13:      %{name}d-conf-to-ldap
 Source14:      %{name}-dhclient-script
-Patch0:                %{name}-remove-bind.patch
 Patch1:                %{name}-errwarn-message.patch
 Patch2:                %{name}-dhclient-options.patch
 Patch3:                %{name}-release-by-ifup.patch
@@ -45,7 +44,7 @@ Patch5:               %{name}-default-requested-options.patch
 Patch6:                %{name}-manpages.patch
 Patch7:                %{name}-paths.patch
 Patch8:                %{name}-CLOEXEC.patch
-Patch9:        %{name}-garbage-chars.patch
+Patch9:                %{name}-garbage-chars.patch
 Patch10:       %{name}-add_timeout_when_NULL.patch
 Patch11:       %{name}-64_bit_lease_parse.patch
 Patch12:       %{name}-capability.patch
@@ -209,7 +208,6 @@ komunikacji z działającym serwerem ISC DHCP i jego kontroli.
 
 %prep
 %setup -q -n %{name}-%{ver}%{pverdir}
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1