|
|
@@ -1,22 +1,28 @@
|
|
|
# vendor string (e.g., Fedora, EL)
|
|
|
%define vvendor Vine
|
|
|
|
|
|
+%define pversion 4.1.ESV.R2
|
|
|
+%define sversion 4.1-ESV-R2
|
|
|
+
|
|
|
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
|
|
|
Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
|
|
|
Name: dhcp
|
|
|
-Version: 4.1.0p1
|
|
|
-Release: 4%{?_dist_release}
|
|
|
|
|
|
+# ---- historical reason of epoch ------------------------------------------
|
|
|
# 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.
|
|
|
# So we are stuck with it.
|
|
|
-Epoch: 12
|
|
|
-License: ISC
|
|
|
+# --------------------------------------------------------------------------
|
|
|
+Epoch: 13
|
|
|
+Version: %{pversion}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
+License: ISC
|
|
|
Group: System Environment/Daemons
|
|
|
URL: http://isc.org/products/DHCP/
|
|
|
-Source0: ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
|
|
|
+
|
|
|
+Source0: ftp://ftp.isc.org/isc/%{name}/%{name}-%{sversion}.tar.gz
|
|
|
Source1: dhcpd.init
|
|
|
Source2: dhcrelay.init
|
|
|
Source5: README.ldap
|
|
|
@@ -28,8 +34,7 @@ Source10: get-ldap-patch.sh
|
|
|
|
|
|
Patch0: %{name}-4.1.0-errwarn-message.patch
|
|
|
Patch1: %{name}-4.1.0-ldap-configuration.patch
|
|
|
-Patch2: %{name}-4.1.0-memory.patch
|
|
|
-Patch3: %{name}-4.1.0-options.patch
|
|
|
+Patch3: %{name}-4.1-ESV-R2-options.patch
|
|
|
Patch4: %{name}-4.1.0-release-by-ifup.patch
|
|
|
Patch5: %{name}-4.1.0-dhclient-decline-backoff.patch
|
|
|
Patch6: %{name}-4.1.0-unicast-bootp.patch
|
|
|
@@ -37,19 +42,14 @@ Patch7: %{name}-4.1.0-failover-ports.patch
|
|
|
Patch8: %{name}-4.1.0-dhclient-usage.patch
|
|
|
Patch9: %{name}-4.1.0-default-requested-options.patch
|
|
|
Patch10: %{name}-4.1.0-xen-checksum.patch
|
|
|
-Patch11: %{name}-4.1.0-dhclient-anycast.patch
|
|
|
+Patch11: %{name}-4.1-ESV-R2-dhclient-anycast.patch
|
|
|
Patch12: %{name}-4.1.0-manpages.patch
|
|
|
Patch13: %{name}-4.1.0-paths.patch
|
|
|
Patch15: %{name}-4.1.0-inherit-leases.patch
|
|
|
Patch16: %{name}-4.1.0-garbage-chars.patch
|
|
|
-Patch17: %{name}-4.1.0-port-validation.patch
|
|
|
-Patch18: %{name}-4.1.0-invalid-dhclient-conf.patch
|
|
|
Patch19: %{name}-4.1.0-dhclient-option.patch
|
|
|
|
|
|
# security
|
|
|
-Patch100: dhcp-4.1.0-CVE-2009-1892.diff
|
|
|
-Patch110: dhcp-4.1.0-CVE-2010-2156.diff
|
|
|
-Patch120: dhcp-4.1.0p1-CVE-2010-3611.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
BuildRequires: autoconf
|
|
|
@@ -110,7 +110,7 @@ Header files and API documentation for using the ISC DHCP libraries. The
|
|
|
libdhcpctl and libomapi static libraries are also included in this package.
|
|
|
|
|
|
%prep
|
|
|
-%setup -q
|
|
|
+%setup -q -n %{name}-%{sversion}
|
|
|
|
|
|
# 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
|
|
|
@@ -122,11 +122,6 @@ libdhcpctl and libomapi static libraries are also included in this package.
|
|
|
# it for this package.
|
|
|
%patch1 -p1
|
|
|
|
|
|
-# Fix memory alignment and initialization problems in common/packet.c
|
|
|
-# Fix buffer overflow in minires library
|
|
|
-# Init struct sock_prog in common/lpf.c to NULL
|
|
|
-%patch2 -p1
|
|
|
-
|
|
|
# Add more dhclient options (-I, -B, -H, -F, -timeout, -V, and -R)
|
|
|
%patch3 -p1
|
|
|
|
|
|
@@ -164,7 +159,7 @@ libdhcpctl and libomapi static libraries are also included in this package.
|
|
|
%patch11 -p1
|
|
|
|
|
|
# Patch man page contents
|
|
|
-%patch12 -p1
|
|
|
+#%patch12 -p1
|
|
|
|
|
|
# Change paths to conform to our standards
|
|
|
%patch13 -p1
|
|
|
@@ -175,20 +170,8 @@ libdhcpctl and libomapi static libraries are also included in this package.
|
|
|
# Fix 'garbage in format string' error (#450052)
|
|
|
%patch16 -p1
|
|
|
|
|
|
-# Validate port numbers specified for dhclient, dhcpd, and dhcrelay
|
|
|
-# to make sure they are within 1-65535, inclusive. (#438149)
|
|
|
-%patch17 -p1
|
|
|
-
|
|
|
-# The sample dhclient.conf should say 'supersede domain-search' (#467955)
|
|
|
-%patch18 -p1
|
|
|
-
|
|
|
%patch19 -p1
|
|
|
|
|
|
-# security fixes
|
|
|
-%patch100 -p0 -b .CVE-2009-1892
|
|
|
-%patch110 -p0 -b .CVE-2010-2156
|
|
|
-%patch120 -p0 -b .CVE-2010-3611
|
|
|
-
|
|
|
# Copy in documentation and example scripts for LDAP patch to dhcpd
|
|
|
%{__install} -p -m 0644 %{SOURCE5} .
|
|
|
%{__install} -p -m 0644 %{SOURCE6} doc/
|
|
|
@@ -408,6 +391,10 @@ fi
|
|
|
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 13:4.1.ESV.R2-1
|
|
|
+- update to Extended Support Version
|
|
|
+- increment Epoch
|
|
|
+
|
|
|
* Mon Jan 10 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 12:4.1.0p1-4
|
|
|
- rebuild with openssl-1.0.0c
|
|
|
|
daisuke