./0000775000175000017500000000000012511411356011434 5ustar nielsenrnielsenr./fixsepbuild.patch0000664000175000017500000000700312511411356014773 0ustar nielsenrnielsenrFix out of tree builds Upstream-Status: Pending RP 2013/03/21 Index: dhcp-4.2.5/common/Makefile.am =================================================================== --- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000 +++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000 @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' AM_CFLAGS = $(LDAP_CFLAGS) noinst_LIBRARIES = libdhcp.a Index: dhcp-4.2.5/dst/Makefile.am =================================================================== --- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000 +++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000 @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 +AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes lib_LIBRARIES = libdst.a Index: dhcp-4.2.5/omapip/Makefile.am =================================================================== --- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000 +++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000 @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes + lib_LIBRARIES = libomapi.a noinst_PROGRAMS = svtest Index: dhcp-4.2.5/client/Makefile.am =================================================================== --- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000 +++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000 @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes + dist_sysconf_DATA = dhclient.conf.example sbin_PROGRAMS = dhclient dhclient_SOURCES = clparse.c dhclient.c dhc6.c \ @@ -11,8 +13,8 @@ dhclient.o: dhclient.c $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhclient.c dhc6.o: dhc6.c $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ - -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c + -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c Index: dhcp-4.2.5/dhcpctl/Makefile.am =================================================================== --- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000 +++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000 @@ -1,3 +1,5 @@ +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) + bin_PROGRAMS = omshell lib_LIBRARIES = libdhcpctl.a noinst_PROGRAMS = cltest Index: dhcp-4.2.5/relay/Makefile.am =================================================================== --- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000 +++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000 @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c Index: dhcp-4.2.5/server/Makefile.am =================================================================== --- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000 +++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000 @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests -AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"' +AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes dist_sysconf_DATA = dhcpd.conf.example sbin_PROGRAMS = dhcpd ./dhclient-script-drop-resolv.conf.dhclient.patch0000664000175000017500000000470012511411356022541 0ustar nielsenrnielsenrdhcp-client: fix invoke dhclient-script failed on Read-only file system In read-only file system, '/etc' is on the readonly partition, and '/etc/resolv.conf' is symlinked to a separate writable partition. In this situation, we should use shell variable to instead of temp files '/etc/resolv.conf.dhclient' and '/etc/resolv.conf.dhclient6'. Upstream-Status: Pending Signed-off-by: Hongxu Jia --- client/scripts/linux | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/client/scripts/linux b/client/scripts/linux --- a/client/scripts/linux +++ b/client/scripts/linux @@ -27,27 +27,25 @@ ip=/sbin/ip make_resolv_conf() { if [ x"$new_domain_name_servers" != x ]; then - cat /dev/null > /etc/resolv.conf.dhclient - chmod 644 /etc/resolv.conf.dhclient + resolv_conf="" if [ x"$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient + resolv_conf="search ${new_domain_search}\n" elif [ x"$new_domain_name" != x ]; then # Note that the DHCP 'Domain Name Option' is really just a domain # name, and that this practice of using the domain name option as # a search path is both nonstandard and deprecated. - echo search $new_domain_name >> /etc/resolv.conf.dhclient + resolv_conf="search ${new_domain_name}\n" fi for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf.dhclient + resolv_conf="${resolv_conf}nameserver ${nameserver}\n" done - mv /etc/resolv.conf.dhclient /etc/resolv.conf + echo -e "${resolv_conf}" > /etc/resolv.conf elif [ "x${new_dhcp6_name_servers}" != x ] ; then - cat /dev/null > /etc/resolv.conf.dhclient6 - chmod 644 /etc/resolv.conf.dhclient6 + resolv_conf="" if [ "x${new_dhcp6_domain_search}" != x ] ; then - echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 + resolv_conf="search ${new_dhcp6_domain_search}\n" fi shopt -s nocasematch for nameserver in ${new_dhcp6_name_servers} ; do @@ -59,11 +57,11 @@ make_resolv_conf() { else zone_id= fi - echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6 + resolv_conf="${resolv_conf}nameserver ${nameserver}$zone_id\n" done shopt -u nocasematch - mv /etc/resolv.conf.dhclient6 /etc/resolv.conf + echo -e "${resolv_conf}" > /etc/resolv.conf fi } -- 1.8.1.2 ./replace-ifconfig-route.patch0000664000175000017500000001526312511411356017015 0ustar nielsenrnielsenrFound this patch here: https://lists.isc.org/pipermail/dhcp-users/2011-January/012910.html and made some adjustments/updates to make it work with this version. Wasn't able to find that why this patch was not accepted by ISC DHCP developers. Upstream-Status: Pending Signed-off-by: Muhammad Shakeel --- dhcp-4.2.5-P1/client/scripts/linux.orig 2013-09-04 12:22:55.000000000 +0500 +++ dhcp-4.2.5-P1/client/scripts/linux 2013-09-04 12:52:19.068761518 +0500 @@ -103,17 +103,11 @@ if [ x$old_broadcast_address != x ]; then old_broadcast_arg="broadcast $old_broadcast_address" fi -if [ x$new_subnet_mask != x ]; then - new_subnet_arg="netmask $new_subnet_mask" -fi -if [ x$old_subnet_mask != x ]; then - old_subnet_arg="netmask $old_subnet_mask" -fi -if [ x$alias_subnet_mask != x ]; then - alias_subnet_arg="netmask $alias_subnet_mask" +if [ -n "$new_subnet_mask" ]; then + new_mask="/$new_subnet_mask" fi -if [ x$new_interface_mtu != x ]; then - mtu_arg="mtu $new_interface_mtu" +if [ -n "$alias_subnet_mask" ]; then + alias_mask="/$alias_subnet_mask" fi if [ x$IF_METRIC != x ]; then metric_arg="metric $IF_METRIC" @@ -127,9 +121,9 @@ if [ x$reason = xPREINIT ]; then if [ x$alias_ip_address != x ]; then # Bring down alias interface. Its routes will disappear too. - ifconfig $interface:0- inet 0 + ${ip} -4 addr flush dev ${interface} label ${interface}:0 fi - ifconfig $interface 0 up + ${ip} link set dev ${interface} up # We need to give the kernel some time to get the interface up. sleep 1 @@ -156,25 +150,30 @@ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ [ x$alias_ip_address != x$old_ip_address ]; then # Possible new alias. Remove old alias. - ifconfig $interface:0- inet 0 + ${ip} -4 addr flush dev ${interface} label ${interface}:0 fi if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then # IP address changed. Bringing down the interface will delete all routes, # and clear the ARP cache. - ifconfig $interface inet 0 down + ${ip} -4 addr flush dev ${interface} label ${interface} fi if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg $mtu_arg + ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \ + dev ${interface} label ${interface} + if [ -n "$new_interface_mtu" ]; then + # set MTU + ${ip} link set dev ${interface} mtu ${new_interface_mtu} + fi # Add a network route to the computed network address. for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - route add -host $router dev $interface + ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1 fi - route add default gw $router $metric_arg dev $interface + ${ip} -4 route add default via ${router} dev ${interface} \ + ${metric_arg} >/dev/null 2>&1 done else # we haven't changed the address, have we changed other options @@ -182,21 +181,23 @@ if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then # if we've changed routers delete the old and add the new. for router in $old_routers; do - route del default gw $router + ${ip} -4 route delete default via ${router} done for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - route add -host $router dev $interface - fi - route add default gw $router $metric_arg dev $interface + ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1 + fi + ${ip} -4 route add default via ${router} dev ${interface} \ + ${metric_arg} >/dev/null 2>&1 done fi fi if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; then - ifconfig $interface:0- inet 0 - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 + ${ip} -4 addr flush dev ${interface} label ${interface}:0 + ${ip} -4 addr add ${alias_ip_address}${alias_mask} \ + dev ${interface} label ${interface}:0 + ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi make_resolv_conf exit_with_hooks 0 @@ -206,42 +207,49 @@ || [ x$reason = xSTOP ]; then if [ x$alias_ip_address != x ]; then # Turn off alias interface. - ifconfig $interface:0- inet 0 + ${ip} -4 addr flush dev ${interface} label ${interface}:0 fi if [ x$old_ip_address != x ]; then # Shut down interface, which will delete routes and clear arp cache. - ifconfig $interface inet 0 down + ${ip} -4 addr flush dev ${interface} label ${interface} fi if [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 + ${ip} -4 addr add ${alias_ip_address}${alias_network_arg} \ + dev ${interface} label ${interface}:0 + ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi exit_with_hooks 0 fi if [ x$reason = xTIMEOUT ]; then if [ x$alias_ip_address != x ]; then - ifconfig $interface:0- inet 0 + ${ip} -4 addr flush dev ${interface} label ${interface}:0 + fi + ${ip} -4 addr add ${new_ip_address}${new_mask} ${new_broadcast_arg} \ + dev ${interface} label ${interface} + if [ -n "$new_interface_mtu" ]; then + # set MTU + ip link set dev ${interface} mtu ${new_interface_mtu} fi - ifconfig $interface inet $new_ip_address $new_subnet_arg \ - $new_broadcast_arg $mtu_arg set $new_routers if ping -q -c 1 $1; then if [ x$new_ip_address != x$alias_ip_address ] && \ [ x$alias_ip_address != x ]; then - ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address dev $interface:0 + ${ip} -4 addr add ${alias_ip_address}${alias_mask} \ + dev ${interface} label ${interface}:0 + ${ip} -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1 fi for router in $new_routers; do if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - route add -host $router dev $interface + ${ip} -4 route add ${router} dev $interface >/dev/null 2>&1 fi - route add default gw $router $metric_arg dev $interface + ${ip} -4 route add default via ${router} dev ${interface} \ + ${metric_arg} >/dev/null 2>&1 done make_resolv_conf exit_with_hooks 0 fi - ifconfig $interface inet 0 down + ${ip} -4 addr flush dev ${interface} exit_with_hooks 1 fi ./site.h0000664000175000017500000000106212511411356012550 0ustar nielsenrnielsenr/* * define config file location in ${S}/includes/site.h * still need to take care of installation path (${sysconfdir}/dhcpd.conf) * * 7/22/2010 - qhe */ /* Define this if you want DNS update functionality to be available. */ #define NSUPDATE /* Define this if you aren't debugging and you want to save memory (potentially a _lot_ of memory) by allocating leases in chunks rather than one at a time. */ #define COMPACT_LEASES /* local */ #define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" #define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" ./dhcp-3.0.3-dhclient-dbus.patch0000664000175000017500000000540512511411356016561 0ustar nielsenrnielsenrUpstream-Status: Inappropriate [distribution] --- client/scripts/bsdos +++ client/scripts/bsdos @@ -47,6 +47,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } --- client/scripts/freebsd +++ client/scripts/freebsd @@ -57,6 +57,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } --- client/scripts/linux +++ client/scripts/linux @@ -69,6 +69,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } --- client/scripts/netbsd +++ client/scripts/netbsd @@ -47,6 +47,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } --- client/scripts/openbsd +++ client/scripts/openbsd @@ -47,6 +47,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } --- client/scripts/solaris +++ client/scripts/solaris @@ -47,6 +47,11 @@ . /etc/dhcp/dhclient-exit-hooks fi # probably should do something with exit status of the local script + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then + dbus-send --system --dest=com.redhat.dhcp \ + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" + fi exit $exit_status } ./fix-external-bind.patch0000664000175000017500000001055412511411356016002 0ustar nielsenrnielsenrUpstream-Status: Pending 11/30/2010 --with-libbind=PATH is available but not used by Makefile, this patch is to allow building with external bind Signed-off-by: Qing He Index: dhcp-4.3.0/Makefile.am =================================================================== --- dhcp-4.3.0.orig/Makefile.am +++ dhcp-4.3.0/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = RELNOTES LICENSE \ bind/Makefile bind/bind.tar.gz bind/version.tmp \ common/tests/Atffile server/tests/Atffile -SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server +SUBDIRS = includes tests common dst omapip client dhcpctl relay server nobase_include_HEADERS = dhcpctl/dhcpctl.h Index: dhcp-4.3.0/client/Makefile.am =================================================================== --- dhcp-4.3.0.orig/client/Makefile.am +++ dhcp-4.3.0/client/Makefile.am @@ -4,8 +4,8 @@ dhclient_SOURCES = clparse.c dhclient.c scripts/bsdos scripts/freebsd scripts/linux scripts/macos \ scripts/netbsd scripts/nextstep scripts/openbsd \ scripts/solaris scripts/openwrt -dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a +dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a $(libbind)/libirs.a \ + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5 EXTRA_DIST = $(man_MANS) Index: dhcp-4.3.0/configure.ac =================================================================== --- dhcp-4.3.0.orig/configure.ac +++ dhcp-4.3.0/configure.ac @@ -566,6 +566,7 @@ no) libbind="$use_libbind" ;; esac +AC_SUBST([libbind]) # OpenLDAP support. AC_ARG_WITH(ldap, Index: dhcp-4.3.0/dhcpctl/Makefile.am =================================================================== --- dhcp-4.3.0.orig/dhcpctl/Makefile.am +++ dhcp-4.3.0/dhcpctl/Makefile.am @@ -6,12 +6,12 @@ EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(libbind)/libirs.a $(libbind)/libdns.a \ + $(libbind)/libisccfg.a $(libbind)/libisc.a libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(libbind)/libirs.a $(libbind)/libdns.a \ + $(libbind)/libisccfg.a $(libbind)/libisc.a Index: dhcp-4.3.0/omapip/Makefile.am =================================================================== --- dhcp-4.3.0.orig/omapip/Makefile.am +++ dhcp-4.3.0/omapip/Makefile.am @@ -10,6 +10,6 @@ man_MANS = omapi.3 EXTRA_DIST = $(man_MANS) svtest_SOURCES = test.c -svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a +svtest_LDADD = libomapi.a $(libbind)/libirs.a $(libbind)/libdns.a \ + $(libbind)/libisccfg.a $(libbind)/libisc.a Index: dhcp-4.3.0/relay/Makefile.am =================================================================== --- dhcp-4.3.0.orig/relay/Makefile.am +++ dhcp-4.3.0/relay/Makefile.am @@ -3,8 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libirs.a ../bind/lib/libdns.a \ - ../bind/lib/libisccfg.a ../bind/lib/libisc.a + $(libbind)/libirs.a $(libbind)/libdns.a \ + $(libbind)/libisccfg.a $(libbind)/libisc.a man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) Index: dhcp-4.3.0/server/Makefile.am =================================================================== --- dhcp-4.3.0.orig/server/Makefile.am +++ dhcp-4.3.0/server/Makefile.am @@ -14,8 +14,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 ../bind/lib/libirs.a \ - ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a + ../dhcpctl/libdhcpctl.a $(libbind)/libirs.a \ + $(libbind)/libdns.a $(libbind)/libisccfg.a $(libbind)/libisc.a man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 EXTRA_DIST = $(man_MANS) ./link-with-lcrypto.patch0000664000175000017500000000164112511411356016057 0ustar nielsenrnielsenrAuthor: Andrei Gherzan Date: Thu Feb 2 23:59:11 2012 +0200 From 4.2.0 final release, -lcrypto check was removed and we compile static libraries from bind that are linked to libcrypto. This is why i added a patch in order to add -lcrypto to LIBS. Signed-off-by: Andrei Gherzan Upstream-Status: Pending Index: dhcp-4.2.3-P2-r0/dhcp-4.2.3-P2/configure.ac =================================================================== --- dhcp-4.2.3-P2.orig/configure.ac 2012-02-02 18:04:20.843023196 +0200 +++ dhcp-4.2.3-P2/configure.ac 2012-02-02 17:58:16.000000000 +0200 @@ -456,6 +456,10 @@ # Look for optional headers. AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h) +# find an MD5 library +AC_SEARCH_LIBS(MD5_Init, [crypto]) +AC_SEARCH_LIBS(MD5Init, [crypto]) + # Solaris needs some libraries for functions AC_SEARCH_LIBS(socket, [socket]) AC_SEARCH_LIBS(inet_ntoa, [nsl])