dhcp/patches/0002-dhcp-sharedlib.patch

   1 diff -up dhcp-4.3.4/client/Makefile.am.sharedlib dhcp-4.3.4/client/Makefile.am
   2 --- dhcp-4.3.4/client/Makefile.am.sharedlib     2016-04-29 11:48:30.389923087 +0200
   3 +++ dhcp-4.3.4/client/Makefile.am       2016-04-29 11:48:30.393923084 +0200
   4 @@ -13,7 +13,7 @@ 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 \
   9 +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
  10                  $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  11  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  12  EXTRA_DIST = $(man_MANS)
  13 diff -up dhcp-4.3.4/common/tests/Makefile.am.sharedlib dhcp-4.3.4/common/tests/Makefile.am
  14 --- dhcp-4.3.4/common/tests/Makefile.am.sharedlib       2016-04-29 11:48:30.394923084 +0200
  15 +++ dhcp-4.3.4/common/tests/Makefile.am 2016-04-29 11:54:16.890716651 +0200
  16 @@ -13,25 +13,25 @@ ATF_TESTS += alloc_unittest dns_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 \
  21 +       ../../omapip/libomapi.la \
  22         $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  23
  24  dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  25  dns_unittest_LDADD = $(ATF_LDFLAGS)
  26  dns_unittest_LDADD += ../libdhcp.a  \
  27 -       ../../omapip/libomapi.a \
  28 +       ../../omapip/libomapi.la \
  29         $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  30
  31  misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
  32  misc_unittest_LDADD = $(ATF_LDFLAGS)
  33  misc_unittest_LDADD += ../libdhcp.a  \
  34 -       ../../omapip/libomapi.a \
  35 +       ../../omapip/libomapi.la \
  36         $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  37
  38  ns_name_unittest_SOURCES = ns_name_test.c $(top_srcdir)/tests/t_api_dhcp.c
  39  ns_name_unittest_LDADD = $(ATF_LDFLAGS)
  40  ns_name_unittest_LDADD += ../libdhcp.a  \
  41 -       ../../omapip/libomapi.a \
  42 +       ../../omapip/libomapi.la \
  43         $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  44
  45  check: $(ATF_TESTS)
  46 diff -up dhcp-4.3.4/configure.ac.sharedlib dhcp-4.3.4/configure.ac
  47 --- dhcp-4.3.4/configure.ac.sharedlib   2016-04-29 11:48:30.394923084 +0200
  48 +++ dhcp-4.3.4/configure.ac     2016-04-29 11:55:22.729691668 +0200
  49 @@ -47,7 +47,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test "$c
  50  # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
  51  AC_USE_SYSTEM_EXTENSIONS
  52
  53 -AC_PROG_RANLIB
  54 +# Use libtool to simplify building of shared libraries
  55 +AC_PROG_LIBTOOL
  56
  57  AC_PATH_PROG(AR, ar)
  58  AC_SUBST(AR)
  59 diff -up dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib dhcp-4.3.4/dhcpctl/Makefile.am
  60 --- dhcp-4.3.4/dhcpctl/Makefile.am.sharedlib    2016-04-29 11:48:30.394923084 +0200
  61 +++ dhcp-4.3.4/dhcpctl/Makefile.am      2016-04-29 11:56:18.390670546 +0200
  62 @@ -1,15 +1,15 @@
  63  bin_PROGRAMS = omshell
  64 -lib_LIBRARIES = libdhcpctl.a
  65 +lib_LTLIBRARIES = libdhcpctl.la
  66  noinst_PROGRAMS = cltest
  67  man_MANS = omshell.1 dhcpctl.3
  68  EXTRA_DIST = $(man_MANS)
  69
  70  omshell_SOURCES = omshell.c
  71 -omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  72 +omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  73                 $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  74
  75 -libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  76 +libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
  77
  78  cltest_SOURCES = cltest.c
  79 -cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
  80 +cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
  81                $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
  82 diff -up dhcp-4.3.4/omapip/Makefile.am.sharedlib dhcp-4.3.4/omapip/Makefile.am
  83 --- dhcp-4.3.4/omapip/Makefile.am.sharedlib     2016-04-29 11:48:30.392923085 +0200
  84 +++ dhcp-4.3.4/omapip/Makefile.am       2016-04-29 11:57:33.709641969 +0200
  85 @@ -1,7 +1,7 @@
  86 -lib_LIBRARIES = libomapi.a
  87 +lib_LTLIBRARIES = libomapi.la
  88  noinst_PROGRAMS = svtest
  89
  90 -libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  91 +libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
  92                      errwarn.c listener.c dispatch.c generic.c support.c \
  93                      handle.c message.c convert.c hash.c auth.c inet_addr.c \
  94                      array.c trace.c toisc.c iscprint.c isclib.c
  95 @@ -10,6 +10,6 @@ man_MANS = omapi.3
  96  EXTRA_DIST = $(man_MANS)
  97
  98  svtest_SOURCES = test.c
  99 -svtest_LDADD = libomapi.a \
 100 +svtest_LDADD = libomapi.la \
 101                $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 102
 103 diff -up dhcp-4.3.4/relay/Makefile.am.sharedlib dhcp-4.3.4/relay/Makefile.am
 104 --- dhcp-4.3.4/relay/Makefile.am.sharedlib      2016-04-29 11:48:30.392923085 +0200
 105 +++ dhcp-4.3.4/relay/Makefile.am        2016-04-29 11:48:30.395923083 +0200
 106 @@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
 107
 108  sbin_PROGRAMS = dhcrelay
 109  dhcrelay_SOURCES = dhcrelay.c
 110 -dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 111 +dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la \
 112                  $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 113  man_MANS = dhcrelay.8
 114  EXTRA_DIST = $(man_MANS)
 115 diff -up dhcp-4.3.4/server/Makefile.am.sharedlib dhcp-4.3.4/server/Makefile.am
 116 --- dhcp-4.3.4/server/Makefile.am.sharedlib     2016-04-29 11:48:30.392923085 +0200
 117 +++ dhcp-4.3.4/server/Makefile.am       2016-04-29 11:48:30.395923083 +0200
 118 @@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
 119                 dhcpv6.c mdb6.c ldap.c ldap_casa.c leasechain.c ldap_krb_helper.c
 120
 121  dhcpd_CFLAGS = $(LDAP_CFLAGS)
 122 -dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
 123 +dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \
 124               $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export \
 125               $(LDAP_LIBS)
 126
 127 diff -up dhcp-4.3.4/server/tests/Makefile.am.sharedlib dhcp-4.3.4/server/tests/Makefile.am
 128 --- dhcp-4.3.4/server/tests/Makefile.am.sharedlib       2016-04-29 11:48:30.395923083 +0200
 129 +++ dhcp-4.3.4/server/tests/Makefile.am 2016-04-29 11:59:13.414604130 +0200
 130 @@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
 131            ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c        \
 132            ../ldap.c ../ldap_casa.c ../dhcpd.c ../leasechain.c
 133
 134 -DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
 135 -          $(top_builddir)/dhcpctl/libdhcpctl.a \
 136 +DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
 137 +          $(top_builddir)/dhcpctl/libdhcpctl.la \
 138            $(BIND9_LIBDIR) -lirs-export -ldns-export -lisccfg-export -lisc-export
 139
 140  ATF_TESTS =