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

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