dhcp/patches/0001-dhcp-remove-bind.patch

   1 diff -up dhcp-4.3.5b1/client/Makefile.am.remove-bind dhcp-4.3.5b1/client/Makefile.am
   2 --- dhcp-4.3.5b1/client/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
   3 +++ dhcp-4.3.5b1/client/Makefile.am     2016-09-12 17:00:22.797902248 +0200
   4 @@ -4,8 +4,6 @@
   5  # production code. Sadly, we are not there yet.
   6  SUBDIRS = . tests
   7
   8 -BINDLIBDIR = @BINDDIR@/lib
   9 -
  10  AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
  11               -DLOCALSTATEDIR='"$(localstatedir)"'
  12
  13 @@ -15,7 +13,7 @@ dhclient_SOURCES = clparse.c dhclient.c
  14                    scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
  15                    scripts/netbsd scripts/nextstep scripts/openbsd \
  16                    scripts/solaris scripts/openwrt
  17 -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
  18 -                $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
  19 +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
  20 +                $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  21  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  22  EXTRA_DIST = $(man_MANS)
  23 diff -up dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind dhcp-4.3.5b1/common/tests/Makefile.am
  24 --- dhcp-4.3.5b1/common/tests/Makefile.am.remove-bind   2016-08-26 20:19:53.000000000 +0200
  25 +++ dhcp-4.3.5b1/common/tests/Makefile.am       2016-09-12 17:07:42.168232452 +0200
  26 @@ -1,7 +1,5 @@
  27  SUBDIRS = .
  28
  29 -BINDLIBDIR = @BINDDIR@/lib
  30 -
  31  AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes
  32
  33  EXTRA_DIST = Atffile
  34 @@ -15,26 +13,26 @@ ATF_TESTS += alloc_unittest dns_unittest
  35  alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
  36  alloc_unittest_LDADD = $(ATF_LDFLAGS)
  37  alloc_unittest_LDADD += ../libdhcp.a  \
  38 -       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
  39 -       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
  40 +       ../../omapip/libomapi.a \
  41 +       $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  42
  43  dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  44  dns_unittest_LDADD = $(ATF_LDFLAGS)
  45  dns_unittest_LDADD += ../libdhcp.a  \
  46 -       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
  47 -       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
  48 +       ../../omapip/libomapi.a \
  49 +       $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  50
  51  misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  52  misc_unittest_LDADD = $(ATF_LDFLAGS)
  53  misc_unittest_LDADD += ../libdhcp.a  \
  54 -       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
  55 -       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
  56 +       ../../omapip/libomapi.a \
  57 +       $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  58
  59  ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
  60  ns_name_unittest_LDADD = $(ATF_LDFLAGS)
  61  ns_name_unittest_LDADD += ../libdhcp.a  \
  62 -       ../../omapip/libomapi.a $(BINDLIBDIR)/libirs.a \
  63 -       $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a  $(BINDLIBDIR)/libisc.a
  64 +       ../../omapip/libomapi.a \
  65 +       $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  66
  67  check: $(ATF_TESTS)
  68         @if test $(top_srcdir) != ${top_builddir}; then \
  69 diff -up dhcp-4.3.5b1/configure.ac.remove-bind dhcp-4.3.5b1/configure.ac
  70 --- dhcp-4.3.5b1/configure.ac.remove-bind       2016-08-26 20:24:41.000000000 +0200
  71 +++ dhcp-4.3.5b1/configure.ac   2016-09-12 17:00:22.798902249 +0200
  72 @@ -682,20 +682,33 @@ AC_CHECK_MEMBER(struct tpacket_auxdata.t
  73  BINDDIR=
  74  BINDSRCDIR=
  75  AC_ARG_WITH(libbind,
  76 -       AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH
  77 -                       (default is ./bind)]),
  78 +       AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH
  79 +                       (default is ./bind/includes)]),
  80         use_libbind="$withval", use_libbind="no")
  81  case "$use_libbind" in
  82 +yes|no)
  83 +       libbind="\${top_srcdir}/bind/include"
  84 +       ;;
  85 +*)
  86 +       libbind="$use_libbind"
  87 +       ;;
  88 +esac
  89 +
  90 +BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
  91 +AC_ARG_WITH(libbind-libs,
  92 +       AC_HELP_STRING([--with-libbind-libs=PATH],
  93 +                      [bind9 export libraries are in PATH]),
  94 +                      [libbind_libs="$withval"], [libbind_libs='no'])
  95 +case "$libbind_libs" in
  96  yes)
  97 -       BINDDIR="\${top_srcdir}/bind"
  98 -       BINDSRCDIR="\${top_srcdir}/bind"
  99 +       AC_MSG_ERROR([Specify path to bind9 libraries])
 100         ;;
 101  no)
 102 -       BINDDIR="\${top_srcdir}/bind"
 103 -       BINDSRCDIR="\${top_srcdir}/bind"
 104 +       BUNDLED_BIND=yes
 105         ;;
 106  *)
 107 -       BINDDIR="$use_libbind"
 108 +       BIND9_LIBDIR="-L$libbind_libs"
 109 +       BUNDLED_BIND=no
 110         if test ! -d "$srcdir/bind"; then
 111                 # no bind directory, create it with a fake Makefile.in
 112                 # (AC_CONFIG_FILES and top Makefile refer to it so
 113 @@ -709,8 +722,8 @@ EOF
 114         fi
 115         ;;
 116  esac
 117 -AC_SUBST(BINDDIR)
 118 -AC_SUBST(BINDSRCDIR)
 119 +AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
 120 +AC_SUBST([BIND9_LIBDIR])
 121
 122  # OpenLDAP support.
 123  AC_ARG_WITH(ldap,
 124 @@ -788,7 +801,7 @@ fi
 125  CFLAGS="$CFLAGS $STD_CWARNINGS"
 126
 127  # Try to add the bind and dhcp include directories
 128 -CFLAGS="$CFLAGS -I\$(top_srcdir)/includes -I$BINDDIR/include"
 129 +CFLAGS="$CFLAGS -I$libbind"
 130
 131  case "$host" in
 132  *-darwin*)
 133 diff -up dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.3.5b1/dhcpctl/Makefile.am
 134 --- dhcp-4.3.5b1/dhcpctl/Makefile.am.remove-bind        2016-08-26 20:19:53.000000000 +0200
 135 +++ dhcp-4.3.5b1/dhcpctl/Makefile.am    2016-09-12 17:00:22.798902249 +0200
 136 @@ -1,5 +1,3 @@
 137 -BINDLIBDIR = @BINDDIR@/lib
 138 -
 139  bin_PROGRAMS = omshell
 140  lib_LIBRARIES = libdhcpctl.a
 141  noinst_PROGRAMS = cltest
 142 @@ -8,12 +6,10 @@ EXTRA_DIST = $(man_MANS)
 143
 144  omshell_SOURCES = omshell.c
 145  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 146 -               $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
 147 -               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 148 +               $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 149
 150  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
 151
 152  cltest_SOURCES = cltest.c
 153  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 154 -              $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
 155 -               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 156 +              $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 157 diff -up dhcp-4.3.5b1/Makefile.am.remove-bind dhcp-4.3.5b1/Makefile.am
 158 --- dhcp-4.3.5b1/Makefile.am.remove-bind        2016-08-26 20:19:53.000000000 +0200
 159 +++ dhcp-4.3.5b1/Makefile.am    2016-09-12 17:00:22.798902249 +0200
 160 @@ -26,7 +26,13 @@ EXTRA_DIST = RELNOTES LICENSE \
 161              bind/Makefile.in bind/bind.tar.gz bind/version.tmp \
 162              common/tests/Atffile server/tests/Atffile
 163
 164 -SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server
 165 +if BUNDLED_BIND
 166 +SUBDIRS = bind
 167 +else
 168 +SUBDIRS =
 169 +endif
 170 +
 171 +SUBDIRS += includes tests common omapip client dhcpctl relay server
 172
 173  nobase_include_HEADERS = dhcpctl/dhcpctl.h
 174
 175 diff -up dhcp-4.3.5b1/omapip/Makefile.am.remove-bind dhcp-4.3.5b1/omapip/Makefile.am
 176 --- dhcp-4.3.5b1/omapip/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
 177 +++ dhcp-4.3.5b1/omapip/Makefile.am     2016-09-12 17:00:22.798902249 +0200
 178 @@ -1,5 +1,3 @@
 179 -BINDLIBDIR = @BINDDIR@/lib
 180 -
 181  lib_LIBRARIES = libomapi.a
 182  noinst_PROGRAMS = svtest
 183
 184 @@ -12,6 +10,6 @@ man_MANS = omapi.3
 185  EXTRA_DIST = $(man_MANS)
 186
 187  svtest_SOURCES = test.c
 188 -svtest_LDADD = libomapi.a $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
 189 -               $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 190 +svtest_LDADD = libomapi.a \
 191 +              $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 192
 193 diff -up dhcp-4.3.5b1/relay/Makefile.am.remove-bind dhcp-4.3.5b1/relay/Makefile.am
 194 --- dhcp-4.3.5b1/relay/Makefile.am.remove-bind  2016-08-26 20:19:53.000000000 +0200
 195 +++ dhcp-4.3.5b1/relay/Makefile.am      2016-09-12 17:00:22.798902249 +0200
 196 @@ -1,12 +1,9 @@
 197 -BINDLIBDIR = @BINDDIR@/lib
 198 -
 199  AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
 200
 201  sbin_PROGRAMS = dhcrelay
 202  dhcrelay_SOURCES = dhcrelay.c
 203  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 204 -                $(BINDLIBDIR)/libirs.a $(BINDLIBDIR)/libdns.a \
 205 -                $(BINDLIBDIR)/libisccfg.a $(BINDLIBDIR)/libisc.a
 206 +                $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 207  man_MANS = dhcrelay.8
 208  EXTRA_DIST = $(man_MANS)
 209
 210 diff -up dhcp-4.3.5b1/server/Makefile.am.remove-bind dhcp-4.3.5b1/server/Makefile.am
 211 --- dhcp-4.3.5b1/server/Makefile.am.remove-bind 2016-08-26 20:19:53.000000000 +0200
 212 +++ dhcp-4.3.5b1/server/Makefile.am     2016-09-12 17:00:22.798902249 +0200
 213 @@ -4,8 +4,6 @@
 214  # production code. Sadly, we are not there yet.
 215  SUBDIRS = . tests
 216
 217 -BINDLIBDIR = @BINDDIR@/lib
 218 -
 219  AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
 220
 221  dist_sysconf_DATA = dhcpd.conf.example
 222 @@ -15,10 +13,9 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
 223                 dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
 224
 225  dhcpd_CFLAGS = $(LDAP_CFLAGS)
 226 -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 227 -             ../dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
 228 -             $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
 229 -             $(BINDLIBDIR)/libisc.a $(LDAP_LIBS)
 230 +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
 231 +             $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \
 232 +             $(LDAP_LIBS)
 233
 234  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 235  EXTRA_DIST = $(man_MANS)
 236 diff -up dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind dhcp-4.3.5b1/server/tests/Makefile.am
 237 --- dhcp-4.3.5b1/server/tests/Makefile.am.remove-bind   2016-08-26 20:19:53.000000000 +0200
 238 +++ dhcp-4.3.5b1/server/tests/Makefile.am       2016-09-12 17:00:22.799902249 +0200
 239 @@ -1,9 +1,7 @@
 240  SUBDIRS = .
 241
 242 -BINDLIBDIR = @BINDDIR@/lib
 243 -
 244  AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes
 245 -AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir)
 246 +AM_CPPFLAGS += -I$(top_srcdir)
 247  AM_CPPFLAGS += -DLOCALSTATEDIR='"."'
 248
 249  EXTRA_DIST = Atffile
 250 @@ -20,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
 251            ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
 252
 253  DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
 254 -          $(top_builddir)/dhcpctl/libdhcpctl.a $(BINDLIBDIR)/libirs.a \
 255 -         $(BINDLIBDIR)/libdns.a $(BINDLIBDIR)/libisccfg.a \
 256 -         $(BINDLIBDIR)/libisc.a
 257 +          $(top_builddir)/dhcpctl/libdhcpctl.a \
 258 +          $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 259
 260  ATF_TESTS =
 261  if HAVE_ATF