- Fix ldap patch to explicitly link with liblber (#564810)

dhcp-4.1.1-capability.patch

@@ -1,6 +1,16 @@
 diff -up dhcp-4.1.1/client/dhclient.8.capability dhcp-4.1.1/client/dhclient.8
 --- dhcp-4.1.1/client/dhclient.8.capability	2010-02-03 11:19:39.854958099 -0500
 +++ dhcp-4.1.1/client/dhclient.8	2010-02-03 11:44:57.949895909 -0500
+@@ -105,6 +105,9 @@ relay
+ .B -n
+ ]
+ [
++.B -nc
++]
++[
+ .B -nw
+ ]
+ [
 @@ -381,6 +381,32 @@ Do not configure any interfaces.  Most u
  option.
  

dhcp-4.1.1-implicit-DSO-linking.patch

@@ -0,0 +1,12 @@
+diff -up dhcp-4.1.1/configure.ac.DSO dhcp-4.1.1/configure.ac
+--- dhcp-4.1.1/configure.ac.DSO	2010-02-16 11:52:30.000000000 +0100
++++ dhcp-4.1.1/configure.ac	2010-02-16 11:52:55.000000000 +0100
+@@ -548,7 +548,7 @@ AC_ARG_WITH(ldap,
+     [ldap=no])
+ if test x$ldap = xyes ; then
+     AM_CHECK_LDAP
+-    ldap_libs="-lldap"
++    ldap_libs="-lldap -llber"
+     AC_SUBST(LDAP_CFLAGS, [-DLDAP_CONFIGURATION])
+     AC_SUBST(LDAP_LIBS, [$ldap_libs])
+ fi

dhcp.spec

@@ -13,7 +13,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  %{basever}
-Release:  5%{?dist}
+Release:  6%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -54,6 +54,7 @@ Patch18:  %{name}-4.1.1-add_timeout_when_NULL.patch
 Patch19:  %{name}-4.1.1-64_bit_lease_parse.patch
 Patch20:  %{name}-4.1.1-capability.patch
 Patch21:  %{name}-4.1.1-logpid.patch
+Patch22:  %{name}-4.1.1-implicit-DSO-linking.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf
@@ -207,6 +208,9 @@ libdhcpctl and libomapi static libraries are also included in this package.
 # with multiple dhclients running easier (#546792)
 %patch21 -p1 -b .logpid
 
+# implicit DSO linking (remove this patch when upstream fix this in ldap-for-dhcp)
+%patch22 -p1 -b .DSO
+
 # Copy in documentation and example scripts for LDAP patch to dhcpd
 %{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
 
@@ -500,6 +504,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Tue Feb 16 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-6
+- Fix ldap patch to explicitly link with liblber (#564810)
+
 * Mon Feb 08 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-5
 - Fix dhclient-decline-backoff.patch (#562854)