rpms/dhcp/devel .cvsignore, 1.15, 1.16 dhcp.spec, 1.146, 1.147 sources, 1.16, 1.17 README.ldap, 1.1, NONE dhcp-3.0.5-ldap-configuration.patch, 1.3, NONE dhcpd-conf-to-ldap.pl, 1.1, NONE draft-ietf-dhc-ldap-schema-01.txt, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/dhcp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28013

Modified Files:
	.cvsignore dhcp.spec sources 
Removed Files:
	README.ldap dhcp-3.0.5-ldap-configuration.patch 
	dhcpd-conf-to-ldap.pl draft-ietf-dhc-ldap-schema-01.txt 
Log Message:
* Mon Mar 05 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-26
- Use better upstream version of the LDAP configuration patch (#225691)



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	7 Nov 2006 15:49:44 -0000	1.15
+++ .cvsignore	5 Mar 2007 22:47:40 -0000	1.16
@@ -1 +1,2 @@
 dhcp-3.0.5.tar.gz
+dhcp-3.0.5-ldap-patch


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- dhcp.spec	5 Mar 2007 18:19:42 -0000	1.146
+++ dhcp.spec	5 Mar 2007 22:47:40 -0000	1.147
@@ -10,7 +10,7 @@
 Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:    dhcp
 Version: 3.0.5
-Release: 25%{?dist}
+Release: 26%{?dist}
 Epoch:   12
 License: ISC
 Group:   System Environment/Daemons
@@ -21,10 +21,8 @@
 Source3: dhcrelay.init
 Source4: dhcpd.conf
 Source5: libdhcp4client.pc
-Source6: README.ldap
-Source7: draft-ietf-dhc-ldap-schema-01.txt
-Source8: dhcpd-conf-to-ldap.pl
-Source9: linux.dbus-example
+Source6: linux.dbus-example
+Source7: http://home.ntelos.net/~masneyb/%{name}-%{version}-ldap-patch
 
 Patch0:  dhcp-3.0.5-extended-new-option-info.patch
 Patch1:  dhcp-3.0.5-Makefile.patch
@@ -40,8 +38,7 @@
 Patch11: dhcp-3.0.5-timeouts.patch
 Patch12: dhcp-3.0.5-fix-warnings.patch
 Patch13: dhcp-3.0.5-xen-checksum.patch
-Patch14: dhcp-3.0.5-ldap-configuration.patch
-Patch15: dhcp-3.0.5-no-win32.patch
+Patch14: dhcp-3.0.5-no-win32.patch
 
 # adds libdhcp4client to the ISC code base
 Patch50: dhcp-3.0.5-libdhcp4client.patch
@@ -155,27 +152,25 @@
 # Fix Xen host networking problems (partial checksums)
 #%patch13 -p1 -b .xen
 
-# Add support for dhcpd.conf data in LDAP
-%patch14 -p1 -b .ldapconf
-
 # The contrib/ms2isc/Registry.pm file requires Win32API::Registry, which is
 # not part of Fedora by default.  We comment out this use line in the script
 # so that RPM doesn't automatically add perl(Win32API::Registry) dependency.
 # The patch puts a comment in the script telling the user which perl module
 # should be installed to use the Registry.pm contrib file.
-%patch15 -p1 -b .no-win32
+%patch14 -p1 -b .no-win32
 
-# Add the libdhcp4client target (library version of dhclient)
-%patch50 -p1 -b .libdhcp4client
+# Add support for dhcpd.conf data in LDAP.  This patch is from an upstream
+# location, so we refer to the source file here and manually invoke the
+# patch command.
+%{__patch} -p1 -b -z .ldap < %SOURCE7
 
-# Copy in documentation and example scripts for LDAP patch to dhcpd
-%{__cp} -p %SOURCE6 .
-%{__cp} -p %SOURCE7 doc
-%{__cp} -p %SOURCE8 contrib
+# Add the libdhcp4client target (library version of dhclient).  This must be
+# the last patch applied to the source tree.
+%patch50 -p1 -b .libdhcp4client
 
 # Copy in example dhclient script for use with D-BUS (requires extended
 # new option info patch too)
-%{__cp} -p %SOURCE9 client/scripts
+%{__cp} -p %SOURCE6 client/scripts
 
 %build
 %{__cp} %SOURCE1 .
@@ -335,6 +330,9 @@
 %{_libdir}/libdhcp4client.so
 
 %changelog
+* Mon Mar 05 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-26
+- Use better upstream version of the LDAP configuration patch (#225691)
+
 * Mon Mar 05 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-25
 - Man pages need 0644 permissions (#222572)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dhcp/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	7 Nov 2006 15:49:44 -0000	1.16
+++ sources	5 Mar 2007 22:47:40 -0000	1.17
@@ -1 +1,2 @@
 ce5d30d4645e4eab1f54561b487d1ec7  dhcp-3.0.5.tar.gz
+41cde9e9a768bf12390288465ef30bbd  dhcp-3.0.5-ldap-patch


--- README.ldap DELETED ---


--- dhcp-3.0.5-ldap-configuration.patch DELETED ---


--- dhcpd-conf-to-ldap.pl DELETED ---


--- draft-ietf-dhc-ldap-schema-01.txt DELETED ---