Attachment 318035 Details for Bug 450545 – dhcp.spec.patch

[patch] dhcp.spec.patch

dhcp.spec.patch (text/plain), 2.80 KB, created by David Cantrell on 2008-09-30 02:49:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cantrell

Created: 2008-09-30 02:49:42 UTC

Size: 2.80 KB

patch

obsolete

>Index: dhcp.spec
>===================================================================
>RCS file: /cvs/dist/rpms/dhcp/RHEL-5/dhcp.spec,v
>retrieving revision 1.136
>diff -u -p -r1.136 dhcp.spec
>--- dhcp.spec	25 Jul 2008 00:26:32 -0000	1.136
>+++ dhcp.spec	30 Sep 2008 02:48:45 -0000
>@@ -4,11 +4,22 @@
> %endif
> 
> %define workdir work.linux-2.2
>+%define netmethod USE_LPF
>+
>+%define with_USE_SOCKETS %{?_with_USE_SOCKETS: 1} %{?!_with_USE_SOCKETS: 0}
>+%if %{with_USE_SOCKETS}
>+%define netmethod USE_SOCKETS
>+%endif
>+
>+%define with_USE_LPF %{?_with_USE_LPF: 1} %{?!_with_USE_LPF: 0}
>+%if %{with_USE_LPF}
>+%define netmethod USE_LPF
>+%endif
> 
> Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent.
> Name:    dhcp
> Version: 3.0.5
>-Release: 18%{?dist}
>+Release: 19%{?dist}
> Epoch:   12
> License: distributable
> Group:   System Environment/Daemons
>@@ -38,6 +49,7 @@ Patch14: %{name}-3.0.5-xen-checksum.patc
> Patch15: %{name}-3.0.5-dhclient-man-page.patch
> Patch16: %{name}-3.0.5-lease-file-parse.patch
> Patch17: %{name}-3.0.5-RES_OPTIONS.patch
>+Patch18: %{name}-3.0.5-emergency-relay-agent-options-hologram.patch
> 
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Requires(post): chkconfig, coreutils
>@@ -104,6 +116,16 @@ Dynamic Host Configuration Protocol (DHC
> client library.
> 
> %prep
>+case "%{netmethod}" in
>+    USE_LPF|USE_SOCKETS)
>+        continue ;;
>+    *)
>+        echo >&2
>+        echo "ERROR: Only --with options supported:  USE_LPF, USE_SOCKETS" >&2
>+        echo >&2
>+        exit 1 ;;
>+esac
>+
> %setup -q
> 
> # Extended new option info patch.  Adds the -x option to dhclient, which is
>@@ -161,6 +183,12 @@ client library.
> # Carry over RES_OPTIONS from ifcfg-ethX files to resolv.conf (RHBZ #202923)
> %patch17 -p1 -b .res_options
> 
>+# Backport from dhcp-3.0.6 to fix the 'emergency relay agent options hologram',
>+# which retains relay agent option contents from when the client was in INIT
>+# or REBIND states.  This solves problems where relay agent options were not
>+# echoed from the server, even when giaddr was set.
>+%patch18 -p1 -b .hologram
>+
> %build
> %{__cp} %SOURCE1 .
> %{__cat} << EOF > site.conf
>@@ -175,6 +203,7 @@ EOF
> %{__cat} << EOF >> includes/site.h
> #define _PATH_DHCPD_DB    "%{_localstatedir}/lib/dhcpd/dhcpd.leases"
> #define _PATH_DHCLIENT_DB "%{_localstatedir}/lib/dhclient/dhclient.leases"
>+#define %{netmethod}
> EOF
> 
> OPT_FLAGS="%{optflags} -fPIC -Werror -Dlint -DEXTENDED_NEW_OPTION_INFO"
>@@ -358,6 +387,10 @@ exit 0
> %{_libdir}/libdhcp4client.so
> 
> %changelog
>+* Mon Sep 29 2008 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-19
>+- Carry over relay agent options when client enters INIT or REBIND
>+  Resolves: rhbz#450545
>+
> * Thu Jul 24 2008 David Cantrell <dcantrell@redhat.com> - 12:3.0.5-18
> - Fix up requires and make sure epoch is specified consistently
>   Related: rhbz#447003

Actions: View | Diff

Attachments on bug 450545: 317945 | 318030 | 318035 | 318036 | 353808 | 353809