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

   1 diff -up dhcp-4.2.5b1/client/Makefile.am.remove-bind dhcp-4.2.5b1/client/Makefile.am
   2 --- dhcp-4.2.5b1/client/Makefile.am.remove-bind 2012-12-05 02:17:38.000000000 +0100
   3 +++ dhcp-4.2.5b1/client/Makefile.am     2012-12-17 16:20:58.692538252 +0100
   4 @@ -5,7 +5,7 @@ dhclient_SOURCES = clparse.c dhclient.c
   5                    scripts/netbsd scripts/nextstep scripts/openbsd \
   6                    scripts/solaris scripts/openwrt
   7  dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
   8 -                ../bind/lib/libdns.a ../bind/lib/libisc.a
   9 +                $(BIND9_LIBDIR) -ldns-export -lisc-export
  10  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  11  EXTRA_DIST = $(man_MANS)
  12
  13 diff -up dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind dhcp-4.2.5b1/common/tests/Makefile.am
  14 --- dhcp-4.2.5b1/common/tests/Makefile.am.remove-bind   2012-12-05 02:17:38.000000000 +0100
  15 +++ dhcp-4.2.5b1/common/tests/Makefile.am       2012-12-17 16:20:58.693538239 +0100
  16 @@ -13,8 +13,8 @@ ATF_TESTS += alloc_unittest
  17  alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
  18  alloc_unittest_LDADD = $(ATF_LDFLAGS)
  19  alloc_unittest_LDADD += ../libdhcp.a  \
  20 -       ../../omapip/libomapi.a ../../bind/lib/libdns.a \
  21 -        ../../bind/lib/libisc.a
  22 +       ../../omapip/libomapi.a \
  23 +        $(BIND9_LIBDIR) -ldns-export -lisc-export
  24
  25  check: $(ATF_TESTS)
  26         atf-run | atf-report
  27 diff -up dhcp-4.2.5b1/configure.ac.remove-bind dhcp-4.2.5b1/configure.ac
  28 --- dhcp-4.2.5b1/configure.ac.remove-bind       2012-12-05 02:18:44.000000000 +0100
  29 +++ dhcp-4.2.5b1/configure.ac   2012-12-17 16:20:58.693538239 +0100
  30 @@ -581,20 +581,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
  31  libbind=
  32  AC_ARG_WITH(libbind,
  33         AC_HELP_STRING([--with-libbind=PATH],
  34 -                      [bind includes and libraries are in PATH
  35 -                       (default is ./bind)]),
  36 +                      [bind includes are in PATH
  37 +                       (default is ./bind/includes)]),
  38         use_libbind="$withval", use_libbind="no")
  39  case "$use_libbind" in
  40 +yes|no)
  41 +       libbind="\${top_srcdir}/bind/include"
  42 +       ;;
  43 +*)
  44 +       libbind="$use_libbind"
  45 +       ;;
  46 +esac
  47 +
  48 +BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
  49 +AC_ARG_WITH(libbind-libs,
  50 +       AC_HELP_STRING([--with-libbind-libs=PATH],
  51 +                      [bind9 export libraries are in PATH]),
  52 +                      [libbind_libs="$withval"], [libbind_libs='no'])
  53 +case "$libbind_libs" in
  54  yes)
  55 -       libbind="\${top_srcdir}/bind"
  56 +       AC_MSG_ERROR([Specify path to bind9 libraries])
  57         ;;
  58  no)
  59 -       libbind="\${top_srcdir}/bind"
  60 +       BUNDLED_BIND=yes
  61         ;;
  62  *)
  63 -       libbind="$use_libbind"
  64 +       BIND9_LIBDIR="-L$libbind_libs"
  65 +       BUNDLED_BIND=no
  66         ;;
  67  esac
  68 +AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
  69 +AC_SUBST([BIND9_LIBDIR])
  70
  71  # OpenLDAP support.
  72  AC_ARG_WITH(ldap,
  73 @@ -631,7 +648,7 @@ fi
  74  CFLAGS="$CFLAGS $STD_CWARNINGS"
  75
  76  # Try to add the bind include directory
  77 -CFLAGS="$CFLAGS -I$libbind/include"
  78 +CFLAGS="$CFLAGS -I$libbind"
  79
  80  AC_C_FLEXIBLE_ARRAY_MEMBER
  81
  82 diff -up dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind dhcp-4.2.5b1/dhcpctl/Makefile.am
  83 --- dhcp-4.2.5b1/dhcpctl/Makefile.am.remove-bind        2012-12-05 02:17:39.000000000 +0100
  84 +++ dhcp-4.2.5b1/dhcpctl/Makefile.am    2012-12-17 16:20:58.693538239 +0100
  85 @@ -6,10 +6,10 @@ EXTRA_DIST = $(man_MANS)
  86
  87  omshell_SOURCES = omshell.c
  88  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  89 -               ../bind/lib/libdns.a ../bind/lib/libisc.a
  90 +               $(BIND9_LIBDIR) -ldns-export -lisc-export
  91
  92  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  93
  94  cltest_SOURCES = cltest.c
  95  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  96 -              ../bind/lib/libdns.a ../bind/lib/libisc.a
  97 \ No newline at end of file
  98 +              $(BIND9_LIBDIR) -ldns-export -lisc-export
  99 diff -up dhcp-4.2.5b1/Makefile.am.remove-bind dhcp-4.2.5b1/Makefile.am
 100 --- dhcp-4.2.5b1/Makefile.am.remove-bind        2012-12-05 02:17:38.000000000 +0100
 101 +++ dhcp-4.2.5b1/Makefile.am    2012-12-17 16:20:58.693538239 +0100
 102 @@ -22,7 +22,13 @@ EXTRA_DIST = RELNOTES LICENSE \
 103              bind/Makefile bind/bind.tar.gz bind/version.tmp \
 104              common/tests/Atffile server/tests/Atffile
 105
 106 -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
 107 +if BUNDLED_BIND
 108 +SUBDIRS = bind
 109 +else
 110 +SUBDIRS =
 111 +endif
 112 +
 113 +SUBDIRS += includes tests common dst omapip client dhcpctl relay server
 114
 115  nobase_include_HEADERS = dhcpctl/dhcpctl.h
 116
 117 diff -up dhcp-4.2.5b1/omapip/Makefile.am.remove-bind dhcp-4.2.5b1/omapip/Makefile.am
 118 --- dhcp-4.2.5b1/omapip/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
 119 +++ dhcp-4.2.5b1/omapip/Makefile.am     2012-12-17 16:20:58.693538239 +0100
 120 @@ -10,5 +10,5 @@ man_MANS = omapi.3
 121  EXTRA_DIST = $(man_MANS)
 122
 123  svtest_SOURCES = test.c
 124 -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
 125 +svtest_LDADD = libomapi.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 126
 127 diff -up dhcp-4.2.5b1/relay/Makefile.am.remove-bind dhcp-4.2.5b1/relay/Makefile.am
 128 --- dhcp-4.2.5b1/relay/Makefile.am.remove-bind  2012-12-05 02:17:39.000000000 +0100
 129 +++ dhcp-4.2.5b1/relay/Makefile.am      2012-12-17 16:20:58.694538225 +0100
 130 @@ -3,7 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
 131  sbin_PROGRAMS = dhcrelay
 132  dhcrelay_SOURCES = dhcrelay.c
 133  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 134 -                ../bind/lib/libdns.a ../bind/lib/libisc.a
 135 +                $(BIND9_LIBDIR) -ldns-export -lisc-export
 136  man_MANS = dhcrelay.8
 137  EXTRA_DIST = $(man_MANS)
 138
 139 diff -up dhcp-4.2.5b1/server/Makefile.am.remove-bind dhcp-4.2.5b1/server/Makefile.am
 140 --- dhcp-4.2.5b1/server/Makefile.am.remove-bind 2012-12-05 02:17:39.000000000 +0100
 141 +++ dhcp-4.2.5b1/server/Makefile.am     2012-12-17 16:20:58.694538225 +0100
 142 @@ -14,8 +14,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
 143
 144  dhcpd_CFLAGS = $(LDAP_CFLAGS)
 145  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 146 -             ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
 147 -             ../bind/lib/libisc.a
 148 +             ../dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 149
 150  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 151  EXTRA_DIST = $(man_MANS)
 152 diff -up dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind dhcp-4.2.5b1/server/tests/Makefile.am
 153 --- dhcp-4.2.5b1/server/tests/Makefile.am.remove-bind   2012-12-05 02:17:39.000000000 +0100
 154 +++ dhcp-4.2.5b1/server/tests/Makefile.am       2012-12-17 16:26:01.093346768 +0100
 155 @@ -18,8 +18,7 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
 156            ../ldap.c ../ldap_casa.c ../dhcpd.c
 157
 158  DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a    \
 159 -          $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libdns.a \
 160 -          $(top_builddir)/bind/lib/libisc.a
 161 +          $(top_builddir)/dhcpctl/libdhcpctl.a $(BIND9_LIBDIR) -ldns-export -lisc-export
 162
 163  ATF_TESTS =
 164  TESTS =