rpms/dhcp
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix bug 191470: prevent dhcpd putting 8-byte dhcp-lease-time option in

Browse Source 
packets
This commit is contained in:
jvdias 2006-05-16 16:40:03 +00:00
parent c61520012d
commit 2c3ccbb0df
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dhcp.spec
View File

@ -1,5 +1,6 @@
%{?!DHCLIENT_EXTENDED_OPTION_ENVIRONMENT:%define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1} %{?!DHCLIENT_EXTENDED_OPTION_ENVIRONMENT:%define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1}
%{?!NODEBUGINFO: %define NODEBUGINFO 0} %{?!NODEBUGINFO: %define NODEBUGINFO 0}
%{?!LIBDHCP4CLIENT: %define LIBDHCP4CLIENT 0}
Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
Name: dhcp Name: dhcp
Version: 3.0.4 Version: 3.0.4
@ -87,6 +88,7 @@ Patch171: dhcp-3.0.3-bz181482.patch
Patch172: dhcp-3.0.4-dhcient_ibmzSeries_broadcast.patch Patch172: dhcp-3.0.4-dhcient_ibmzSeries_broadcast.patch
Patch173: dhcp-3.0.4-dhclient_ibmzSeries_-I_option.patch Patch173: dhcp-3.0.4-dhclient_ibmzSeries_-I_option.patch
Patch174: dhcp-3.0.4-H_host-name_-F_fqdn_-T_timeout_options.patch Patch174: dhcp-3.0.4-H_host-name_-F_fqdn_-T_timeout_options.patch
Patch175: dhcp-3.0.4-bz191470.patch
URL: http://isc.org/products/DHCP/ URL: http://isc.org/products/DHCP/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
Prereq: /sbin/chkconfig Prereq: /sbin/chkconfig
@ -230,6 +232,7 @@ client library .
%patch172 -p1 -b .dhclient_ibmzSeries_broadcast %patch172 -p1 -b .dhclient_ibmzSeries_broadcast
%patch173 -p1 -b .dhclient_ibmzSeries_-I_option %patch173 -p1 -b .dhclient_ibmzSeries_-I_option
%patch174 -p1 -b .dhclient_-H_host-name_-F_fqdn_-T_timeout_options %patch174 -p1 -b .dhclient_-H_host-name_-F_fqdn_-T_timeout_options
%patch175 -p1 -b .bz191470
cp %SOURCE1 . cp %SOURCE1 .
cat <<EOF >site.conf cat <<EOF >site.conf
VARDB=%{_localstatedir}/lib/dhcpd VARDB=%{_localstatedir}/lib/dhcpd
@ -267,11 +270,12 @@ CC="%{__cc}" ./configure --copts "$RPM_OPT_FLAGS"
# -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3" # -DDEBUG_MEMORY_LEAKAGE -DDEBUG_MALLOC_POOL -DDEBUG_REFCNT_DMALLOC_FREE -DDEBUG_RC_HISTORY -DDEBUG_MALLOC_POOL_EXHAUSTIVELY -DDEBUG_MEMORY_LEAKAGE_ON_EXIT -DRC_MALLOC=3"
#make %{?_smp_mflags} CC="gcc33" #make %{?_smp_mflags} CC="gcc33"
make %{?_smp_mflags} CC="%{__cc}" make %{?_smp_mflags} CC="%{__cc}"
%if %{LIBDHCP4CLIENT}
cp -fp %{SOURCE6} libdhcp4client.Makefile cp -fp %{SOURCE6} libdhcp4client.Makefile
cp -fp %{SOURCE7} libdhcp4client.patch cp -fp %{SOURCE7} libdhcp4client.patch
sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 >libdhcp4client.pc sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE5 >libdhcp4client.pc
make -f libdhcp4client.Makefile %{?_smp_mflags} CC="%{__cc}" make -f libdhcp4client.Makefile %{?_smp_mflags} CC="%{__cc}"
%endif
%if %{NODEBUGINFO} %if %{NODEBUGINFO}
%define debug_package %{nil} %define debug_package %{nil}
@ -317,9 +321,11 @@ chmod +x %SOURCE9
# Fix bug 163367: install default (empty) dhcpd.conf: # Fix bug 163367: install default (empty) dhcpd.conf:
cp -fp %SOURCE4 %{buildroot}/etc cp -fp %SOURCE4 %{buildroot}/etc
# #
%if %{LIBDHCP4CLIENT}
# libdhcp4client install # libdhcp4client install
sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE8 >libdhcp4client.pc sed 's/@DHCP_VERSION@/'%{version}'/' < %SOURCE8 >libdhcp4client.pc
make -f libdhcp4client.Makefile install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} make -f libdhcp4client.Makefile install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
%endif
%if !%{NODEBUGINFO} %if !%{NODEBUGINFO}
# #
# Fix debuginfo files list - don't ship links to .c files in the buildroot :-) # Fix debuginfo files list - don't ship links to .c files in the buildroot :-)
@ -391,12 +397,15 @@ exit 0
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%if %{LIBDHCP4CLIENT}
%exclude %{_libdir}/libdhcp4client* %exclude %{_libdir}/libdhcp4client*
%exclude %{_includedir}/dhcp4client %exclude %{_includedir}/dhcp4client
%endif
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.a %{_libdir}/*.a
%{_mandir}/man3/* %{_mandir}/man3/*
%if %{LIBDHCP4CLIENT}
%files -n libdhcp4client %files -n libdhcp4client
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libdhcp4client* %{_libdir}/libdhcp4client*
@ -405,8 +414,13 @@ exit 0
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_includedir}/dhcp4client* %{_includedir}/dhcp4client*
/usr/lib/pkgconfig/libdhcp4client.pc /usr/lib/pkgconfig/libdhcp4client.pc
%endif
%changelog %changelog
* Tue May 16 2006 Jason Vas Dias <jvdias@redhat.com> - 12:3.0.4-2
- Fix bug 191470: prevent dhcpd writing 8 byte dhcp-lease-time
option in packets on 64-bit platforms
* Sun May 14 2006 Jason Vas Dias <jvdias@redhat.com> - 12:3.0.4-2 * Sun May 14 2006 Jason Vas Dias <jvdias@redhat.com> - 12:3.0.4-2
- Add the libdhcp4client library package for use by the new libdhcp - Add the libdhcp4client library package for use by the new libdhcp
package, which enables dhclient to be invoked by programs in a package, which enables dhclient to be invoked by programs in a