From aa59a9986b724b608831d528ceea627ceed23e1f Mon Sep 17 00:00:00 2001
From: Jiri Popelka <jpopelka@redhat.com>
Date: Thu, 14 Nov 2013 15:20:26 +0100
Subject: [PATCH] dhclient-script(RENEW6|REBIND6): delete old ip6_address if it
 changed (#1015729)

---
 dhclient-script |  4 +++-
 dhcp.spec       | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dhclient-script b/dhclient-script
index ac2b7ac..cedae26 100644
--- a/dhclient-script
+++ b/dhclient-script
@@ -3,7 +3,7 @@
 # dhclient-script: Network interface configuration script run by
 #                  dhclient based on DHCP client communication
 #
-# Copyright (C) 2008, 2009, 2010  Red Hat, Inc.
+# Copyright (C) 2008-2013  Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author(s): David Cantrell <dcantrell@redhat.com>
+#            Jiri Popelka <jpopelka@redhat.com>
 #
 # ----------
 # This script is a rewrite/reworking on dhclient-script originally
@@ -594,6 +595,7 @@ dh6config() {
             fi
 
             if [  ! "${new_ip6_address}" = "${old_ip6_address}" ]; then
+                [[ -n "${old_ip6_address}" ]] && ip -6 addr del ${old_ip6_address} dev ${interface}
                 add_ipv6_addr_with_DAD
             fi
 
diff --git a/dhcp.spec b/dhcp.spec
index 8ac138f..0ef4fc4 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -18,7 +18,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.2.5
-Release:  26%{?dist}
+Release:  27%{?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.
@@ -477,7 +477,7 @@ EOF
 %{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd.conf
 #
 # DHCP Server Configuration file.
-#   see /usr/share/doc/dhcp*/dhcpd.conf.example
+#   see /usr/share/doc/dhcp/dhcpd.conf.example
 #   see dhcpd.conf(5) man page
 #
 EOF
@@ -486,7 +486,7 @@ EOF
 %{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhcpd6.conf
 #
 # DHCPv6 Server Configuration file.
-#   see /usr/share/doc/dhcp*/dhcpd6.conf.example
+#   see /usr/share/doc/dhcp/dhcpd6.conf.example
 #   see dhcpd.conf(5) man page
 #
 EOF
@@ -496,7 +496,7 @@ EOF
 %{__cat} << EOF > %{buildroot}%{dhcpconfdir}/dhclient.conf
 #
 # DHCP Client Configuration file.
-#   see /usr/share/doc/dhclient-*/dhclient.conf.sample
+#   see /usr/share/doc/dhclient/dhclient.conf.example
 #   see dhclient.conf(5) man page
 #
 # Send client identifier as "hardware-type.link-layer address" (e.g. "1.c2.23.7d.c3.52.2c")
@@ -641,6 +641,9 @@ done
 
 
 %changelog
+* Thu Nov 14 2013 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-27
+- dhclient-script(RENEW6|REBIND6): delete old ip6_address if it changed (#1015729)
+
 * Thu Oct 31 2013 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.5-26
 - Provide default /etc/dhcp/dhclient.conf
 - Client always sends dhcp-client-identifier (#560361)