packages: dhcp/dhcp.spec - updated ldap.patch, now works; rel 2

[zbyniu]

Author: zbyniu                       Date: Tue Mar 30 19:13:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated ldap.patch, now works; rel 2

---- Files affected:
packages/dhcp:
   dhcp.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: packages/dhcp/dhcp.spec
diff -u packages/dhcp/dhcp.spec:1.173 packages/dhcp/dhcp.spec:1.174
--- packages/dhcp/dhcp.spec:1.173	Wed Jul 15 22:43:23 2009
+++ packages/dhcp/dhcp.spec	Tue Mar 30 21:13:19 2010
@@ -14,7 +14,7 @@
 Name:		dhcp
 # 4.1.0a1 is on DEVEL
 Version:	4.0.1p1
-Release:	1
+Release:	2
 Epoch:		4
 License:	MIT
 Group:		Networking/Daemons
@@ -35,7 +35,7 @@
 Source13:	dhcpd-conf-to-ldap
 Source14:	dhcp-dhclient-script
 Patch0:		%{name}-release-by-ifup.patch
-# from fedora 9-dev
+# http://github.com/dcantrell/ldap-for-dhcp/raw/9cfd4c277d7615777f372ea08f44cc7de9ed7959/dhcp-4.0.1-ldap.patch
 Patch1:		%{name}-ldap.patch
 Patch2:		%{name}-3.0.3-x-option.patch
 Patch3:		%{name}-paths.patch
@@ -217,7 +217,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_ldap:%patch1 -p1}
+%patch1 -p1
 # This patch is required for dhcdbd to function
 # CHECK ME: adds -x (formerly -y):
 #The -x argument enables extended option information to be created in the
@@ -290,11 +290,12 @@
 %configure \
 	%{!?with_static_libs:--disable-static} \
 	--enable-dhcpv6 \
-    --with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
-    --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
-    --with-srv-pid-file=/var/run/dhcpd.pid \
-    --with-cli-pid-file=/var/run/dhclient.pid \
-    --with-relay-pid-file=/var/run/dhcrelay.pid
+	--with-srv-lease-file=/var/lib/dhcpd/dhcpd.leases \
+	--with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
+	--with-srv-pid-file=/var/run/dhcpd.pid \
+	--with-cli-pid-file=/var/run/dhclient.pid \
+	--with-relay-pid-file=/var/run/dhcrelay.pid \
+	--with%{!?with_ldap:out}-ldap
 %{__make}
 
 %install
@@ -412,7 +413,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc doc/* README RELNOTES server/dhcpd.conf LICENSE contrib/ms2isc
+%doc doc/* README RELNOTES server/dhcpd.conf LICENSE 
+%doc contrib/ms2isc %{?with_ldap:contrib/dhcpd-conf-to-ldap README.ldap}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/dhcpd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dhcpd.conf
 %attr(755,root,root) %{_bindir}/omshell
@@ -490,6 +492,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2010/03/30 19:13:19  zbyniu
+- updated ldap.patch, now works; rel 2
+
 Revision 1.173  2009/07/15 20:43:23  arekm
 - up to 4.0.1p1 (fixes CVE-2009-0692 but Th wasn't vulnerable due to FORTIFY_SOURCE being used)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dhcp/dhcp.spec?r1=1.173&r2=1.174&f=u