rpms/dhcp/devel .cvsignore, 1.27, 1.28 dhcp.spec, 1.265, 1.266 sources, 1.29, 1.30 dhcp-4.1.0-CVE-2009-0692.patch, 1.1, NONE
David Cantrell
dcantrel at fedoraproject.org
Wed Aug 5 23:59:10 UTC 2009
Author: dcantrel
Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6754
Modified Files:
.cvsignore dhcp.spec sources
Removed Files:
dhcp-4.1.0-CVE-2009-0692.patch
Log Message:
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
CVE-2009-0692
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore 9 Jul 2009 20:08:40 -0000 1.27
+++ .cvsignore 5 Aug 2009 23:59:10 -0000 1.28
@@ -1,2 +1,2 @@
-dhcp-4.1.0.tar.gz
ldap-for-dhcp-4.1.0-4.tar.gz
+dhcp-4.1.0p1.tar.gz
Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -p -r1.265 -r1.266
--- dhcp.spec 5 Aug 2009 21:48:30 -0000 1.265
+++ dhcp.spec 5 Aug 2009 23:59:10 -0000 1.266
@@ -4,13 +4,16 @@
# Where dhcp configuration files are stored
%define dhcpconfdir %{_sysconfdir}/dhcp
+# Base version number from ISC
+%define basever 4.1.0
+
# LDAP patch version
-%define ldappatchver %{version}-4
+%define ldappatchver %{basever}-4
Summary: Dynamic host configuration protocol software
Name: dhcp
-Version: 4.1.0
-Release: 27%{?dist}
+Version: %{basever}p1
+Release: 1%{?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.
@@ -49,8 +52,7 @@ Patch18: %{name}-4.1.0-missing-ipv6-not
Patch19: %{name}-4.1.0-IFNAMSIZ.patch
Patch20: %{name}-4.1.0-add_timeout_when_NULL.patch
Patch21: %{name}-4.1.0-64_bit_lease_parse.patch
-Patch22: %{name}-4.1.0-CVE-2009-0692.patch
-Patch23: %{name}-4.1.0-CVE-2009-1892.patch
+Patch22: %{name}-4.1.0-CVE-2009-1892.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf
@@ -116,7 +118,7 @@ libdhcpctl and libomapi static libraries
%setup -T -D -a 1
# Add in LDAP support
-%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{version}-ldap.patch
+%{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{basever}-ldap.patch
# Replace the standard ISC warning message about requesting help with an
# explanation that this is a patched build of ISC DHCP and bugs should be
@@ -205,13 +207,9 @@ libdhcpctl and libomapi static libraries
# Ensure 64-bit platforms parse lease file dates & times correctly (#448615)
%patch21 -p1
-# Fix for CVE-2009-0692 (patch from Mandriva SRPM)
-# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-0692
-%patch22 -p1
-
# Fix for CVE-2009-1892 (patch from Mandriva SRPM)
# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-1892
-%patch23 -p1
+%patch22 -p1
# Copy in documentation and example scripts for LDAP patch to dhcpd
%{__install} -p -m 0755 ldap-for-dhcp-%{ldappatchver}/dhcpd-conf-to-ldap contrib/
@@ -467,6 +465,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog
+* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-1
+- Upgrade to dhcp-4.1.0p1, which is the official upstream release to fix
+ CVE-2009-0692
+
* Wed Aug 05 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-27
- Fix for CVE-2009-0692
- Fix for CVE-2009-1892 (#511834)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 10 Jul 2009 02:29:08 -0000 1.29
+++ sources 5 Aug 2009 23:59:10 -0000 1.30
@@ -1,2 +1,2 @@
-1fffed2e8c3d67b111316d6a9b33db7a dhcp-4.1.0.tar.gz
39b4ff6ce0fcf84c69c12f221b0b6eb4 ldap-for-dhcp-4.1.0-4.tar.gz
+325ff8338c5a21f89d5304ac13ffebdf dhcp-4.1.0p1.tar.gz
--- dhcp-4.1.0-CVE-2009-0692.patch DELETED ---
More information about the fedora-extras-commits
mailing list