Fix for CVE-2010-3611 (#649880)

This commit is contained in:
Jiri Popelka 2010-11-04 20:10:20 +01:00
parent 81227ae2b3
commit 25d2dbf720
3 changed files with 15 additions and 8 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
dhcp-4.2.0.tar.gz /dhcp-4.2.0-P1.tar.gz

View File

@ -4,10 +4,15 @@
# Where dhcp configuration files are stored # Where dhcp configuration files are stored
%global dhcpconfdir %{_sysconfdir}/dhcp %global dhcpconfdir %{_sysconfdir}/dhcp
# Patch version
%global patchver P1
%global VERSION %{version}-%{patchver}
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.2.0 Version: 4.2.0
Release: 15%{?dist} Release: 16.%{patchver}%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # 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. # that's why it is at 12 now. It should have never been used, but it was.
@ -16,7 +21,7 @@ Epoch: 12
License: ISC License: ISC
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://isc.org/products/DHCP/ URL: http://isc.org/products/DHCP/
Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz Source0: ftp://ftp.isc.org/isc/dhcp/dhcp-%{VERSION}.tar.gz
Source1: dhcpd.init Source1: dhcpd.init
Source2: dhcpd6.init Source2: dhcpd6.init
Source3: dhcrelay.init Source3: dhcrelay.init
@ -124,15 +129,14 @@ Summary: Development headers and libraries for interfacing to the DHCP server
Group: Development/Libraries Group: Development/Libraries
Obsoletes: libdhcp4client-devel <= 12:4.0.0-34.fc10 Obsoletes: libdhcp4client-devel <= 12:4.0.0-34.fc10
Obsoletes: libdhcp-devel <= 1.99.8-1 Obsoletes: libdhcp-devel <= 1.99.8-1
Provides: %{name}-static = %{epoch}:%{version}-%{release} Requires: %{name}-libs = %{epoch}:%{VERSION}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description devel %description devel
Header files and API documentation for using the ISC DHCP libraries. The Header files and API documentation for using the ISC DHCP libraries. The
libdhcpctl and libomapi static libraries are also included in this package. libdhcpctl and libomapi static libraries are also included in this package.
%prep %prep
%setup -q %setup -q -n dhcp-%{VERSION}
# Remove bundled BIND source # Remove bundled BIND source
rm bind/bind.tar.gz rm bind/bind.tar.gz
@ -301,7 +305,7 @@ popd
%{__perl_requires} \ %{__perl_requires} \
| %{__grep} -v 'perl(' | %{__grep} -v 'perl('
EOF EOF
%global __perl_requires %{_builddir}/dhcp-%{version}/dhcp-req %global __perl_requires %{_builddir}/dhcp-%{VERSION}/dhcp-req
%{__chmod} +x %{__perl_requires} %{__chmod} +x %{__perl_requires}
# Replace @PRODUCTNAME@ # Replace @PRODUCTNAME@
@ -571,6 +575,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Thu Nov 04 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-16.P1
- 4.2.0-P1: fix for CVE-2010-3611 (#649880)
* Wed Oct 20 2010 Adam Tkac <atkac redhat com> - 12:4.2.0-15 * Wed Oct 20 2010 Adam Tkac <atkac redhat com> - 12:4.2.0-15
- build dhcp's libraries as shared libs instead of static libs - build dhcp's libraries as shared libs instead of static libs

View File

@ -1 +1 @@
83abd7c4f9c24d8dd024ca5a71380c0a dhcp-4.2.0.tar.gz 1c268a2368b2565252b5f9d7255d3c72 dhcp-4.2.0-P1.tar.gz