Tweak patches so that IF_METRIC is applied to the subnet route too.

Package-Manager: portage-2.1_pre10-r5

4 files changed, 90 insertions, 32 deletions

diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
index abe6dea1130c..db1568c10edd 100644
--- a/net-misc/dhcp/ChangeLog
+++ b/net-misc/dhcp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/dhcp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.93 2006/05/09 16:09:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.94 2006/05/10 12:57:04 uberlord Exp $
+
+  10 May 2006; Roy Marples <uberlord@gentoo.org>
+  files/dhcp-3.0.3-dhclient-metric.patch,
+  files/dhcp-3.0.3-dhclient-no-down.patch:
+  Tweak patches so that IF_METRIC is applied to the subnet route too.
 
   09 May 2006; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4.ebuild:
   Correct location for default dhclient conf and pid files.
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 9a00c93ab34e..d7fd7607b4b6 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -18,18 +18,18 @@ AUX dhcp-3.0.3-dhclient-hostname.patch 437 RMD160 5a1bd6bec0edf591eab4557f2e0f23
 MD5 79cefb676f3abc197b30c120c09e46b0 files/dhcp-3.0.3-dhclient-hostname.patch 437
 RMD160 5a1bd6bec0edf591eab4557f2e0f23539c673548 files/dhcp-3.0.3-dhclient-hostname.patch 437
 SHA256 bdb152ff929f561a93983d647efd027a0193d2a12678076b3203d73bff966383 files/dhcp-3.0.3-dhclient-hostname.patch 437
-AUX dhcp-3.0.3-dhclient-metric.patch 5352 RMD160 c7c9b03eb4705ae955650b4f51d53187f348788b SHA1 8861af2627abccfb4e1ea61e9c4b215512e860d9 SHA256 e5422c4ac155d907b2f4e010e8c43acba1c7d0e89e18ac120919f5e1df2c6935 size 5352
-MD5 8b827ad098c2349505909199546f93bb files/dhcp-3.0.3-dhclient-metric.patch 5352
-RMD160 c7c9b03eb4705ae955650b4f51d53187f348788b files/dhcp-3.0.3-dhclient-metric.patch 5352
-SHA256 e5422c4ac155d907b2f4e010e8c43acba1c7d0e89e18ac120919f5e1df2c6935 files/dhcp-3.0.3-dhclient-metric.patch 5352
+AUX dhcp-3.0.3-dhclient-metric.patch 7220 RMD160 612ac4298159e8d612a5b4dfa2354d2d58c566e8 SHA1 4af3f6c836049c13e7e4de3c427ada522f3eafb1 SHA256 c73b88454fab56f88377da0e35615061b3ca8210f53c4a239eecba6af768f380 size 7220
+MD5 518e90d168cf4a34f68f9fccfcb53268 files/dhcp-3.0.3-dhclient-metric.patch 7220
+RMD160 612ac4298159e8d612a5b4dfa2354d2d58c566e8 files/dhcp-3.0.3-dhclient-metric.patch 7220
+SHA256 c73b88454fab56f88377da0e35615061b3ca8210f53c4a239eecba6af768f380 files/dhcp-3.0.3-dhclient-metric.patch 7220
 AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06 size 6413
 MD5 3bcd2752845eff3da0231a6eccee762a files/dhcp-3.0.3-dhclient-mtu.patch 6413
 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 files/dhcp-3.0.3-dhclient-mtu.patch 6413
 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06 files/dhcp-3.0.3-dhclient-mtu.patch 6413
-AUX dhcp-3.0.3-dhclient-no-down.patch 2242 RMD160 3fb3d052bf65ddb00a764112fe1cc5e2714bfcda SHA1 8b73080deca10b5f6adfd56050e23d88572c2689 SHA256 98cccc79564e41a5261e3683933a34293957b7cb923f2567d1acb8ae744e9755 size 2242
-MD5 3b6b311dd0be66f2601e6fd44df92eae files/dhcp-3.0.3-dhclient-no-down.patch 2242
-RMD160 3fb3d052bf65ddb00a764112fe1cc5e2714bfcda files/dhcp-3.0.3-dhclient-no-down.patch 2242
-SHA256 98cccc79564e41a5261e3683933a34293957b7cb923f2567d1acb8ae744e9755 files/dhcp-3.0.3-dhclient-no-down.patch 2242
+AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44 size 2332
+MD5 0579a1b0e12f48c466ba6893d76c5fff files/dhcp-3.0.3-dhclient-no-down.patch 2332
+RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c files/dhcp-3.0.3-dhclient-no-down.patch 2332
+SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44 files/dhcp-3.0.3-dhclient-no-down.patch 2332
 AUX dhcp-3.0.3-dhclient-ntp.patch 5868 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa SHA1 48b5dd346e714880f8b4af1d95f3ec2ce8074a66 SHA256 751fdfa0b36eab386f4029284d61c0c2b41b3135878738caa02e512999f2ca65 size 5868
 MD5 3eab8a40f0a84d3b2d9d406fa4b687c0 files/dhcp-3.0.3-dhclient-ntp.patch 5868
 RMD160 41522438308fc8b82dc298752192d1c77b4c26aa files/dhcp-3.0.3-dhclient-ntp.patch 5868
@@ -100,10 +100,10 @@ EBUILD dhcp-3.0.4.ebuild 6728 RMD160 474958f105901448503494b90762f26206f087bf SH
 MD5 659d30979078da7726375d8a45b9093d dhcp-3.0.4.ebuild 6728
 RMD160 474958f105901448503494b90762f26206f087bf dhcp-3.0.4.ebuild 6728
 SHA256 f1d51b5edd52fac3260d34c5df7b0892c52060c01a88948aaf40411d7ce788a1 dhcp-3.0.4.ebuild 6728
-MISC ChangeLog 16930 RMD160 b8cd930217d2ea5b8c7873a34b29f5d45b24600a SHA1 2754fdc1af7b5e5040e50c08980d0a289a7d61d2 SHA256 377eb56f4f11b2f106d0c5b4267bf1797f1c365f7bb90697162fb144a10a9428 size 16930
-MD5 a123ebb6717887cd8ffc2bc60a7a645a ChangeLog 16930
-RMD160 b8cd930217d2ea5b8c7873a34b29f5d45b24600a ChangeLog 16930
-SHA256 377eb56f4f11b2f106d0c5b4267bf1797f1c365f7bb90697162fb144a10a9428 ChangeLog 16930
+MISC ChangeLog 17135 RMD160 b240f53636bae275a148204da5c7c83ef6a33c73 SHA1 ad4b37136802eeb865eee45f87700d0d146459d6 SHA256 8b32a22d2bb06fdf936a0d322693ea8b3ffc15ac18bf2285de7b78899f540103 size 17135
+MD5 c7ca63637cf93d17333345fe7d0061e3 ChangeLog 17135
+RMD160 b240f53636bae275a148204da5c7c83ef6a33c73 ChangeLog 17135
+SHA256 8b32a22d2bb06fdf936a0d322693ea8b3ffc15ac18bf2285de7b78899f540103 ChangeLog 17135
 MISC metadata.xml 330 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe SHA1 d00a77cf9fff7ed1570a77ff306fdb03081e9e48 SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af size 330
 MD5 436163172942ee1a0bcfb47534a71cce metadata.xml 330
 RMD160 216100112bb6a0ffcd8f7779fb876e4a726913fe metadata.xml 330
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
index b040a9bbfa3f..492cd56c329b 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
@@ -60,7 +60,19 @@
    $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
 --- client/scripts/linux
 +++ client/scripts/linux
-@@ -106,6 +106,9 @@
+@@ -83,11 +83,6 @@
+   fi
+ fi
+ 
+-release=`uname -r`
+-release=`expr $release : '\(.*\)\..*'`
+-relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+-relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
+-
+ if [ x$new_broadcast_address != x ]; then
+   new_broadcast_arg="broadcast $new_broadcast_address"
+ fi
+@@ -106,6 +101,9 @@
  if [ x$new_interface_mtu != x ]; then
    mtu_arg="mtu $new_interface_mtu"
  fi
@@ -70,8 +82,35 @@
  
  if [ x$reason = xMEDIUM ]; then
    # Linux doesn't do mediums (ok, ok, media).
-@@ -169,7 +172,7 @@
-       route add -net $new_network_number $new_subnet_arg dev $interface
+@@ -117,15 +115,7 @@
+     # Bring down alias interface. Its routes will disappear too.
+     ifconfig $interface:0- inet 0
+   fi
+-  if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+-   then
+-    ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+-		broadcast 255.255.255.255 up
+-    # Add route to make broadcast work. Do not omit netmask.
+-    route add default dev $interface netmask 0.0.0.0
+-  else
+-    ifconfig $interface 0 up
+-  fi
++  ifconfig $interface 0 up
+ 
+   # We need to give the kernel some time to get the interface up.
+   sleep 1
+@@ -164,12 +154,14 @@
+     ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ 					$new_broadcast_arg $mtu_arg
+     # Add a network route to the computed network address.
+-    if [ $relmajor -lt 2 ] || \
+-		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+-      route add -net $new_network_number $new_subnet_arg dev $interface
++    if [ $IF_METRIC -gt 0 ]; then
++      route del -net $new_network_number $new_subnet_arg \
++        dev $interface
++      route add -net $new_network_number $new_subnet_arg $metric_arg \
++      	dev $interface
      fi
      for router in $new_routers; do
 -      route add default gw $router
@@ -79,8 +118,19 @@
      done
    fi
    if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
-@@ -218,7 +221,7 @@
-       route add -net $new_network_number
+@@ -213,12 +205,15 @@
+       ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+       route add -host $alias_ip_address dev $interface:0
+     fi
+-    if [ $relmajor -lt 2 ] || \
+-		( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+-      route add -net $new_network_number
++    # Add a network route to the computed network address.
++    if [ $IF_METRIC -gt 0 ]; then
++      route del -net $new_network_number $new_subnet_arg \
++        dev $interface
++      route add -net $new_network_number $new_subnet_arg $metric_arg \
++      	dev $interface
      fi
      for router in $new_routers; do
 -      route add default gw $router
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
index d20406625657..518efec11c53 100644
--- a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
@@ -1,24 +1,18 @@
 --- client/scripts/linux
 +++ client/scripts/linux
-@@ -118,7 +118,7 @@
+@@ -118,9 +118,9 @@
  if [ x$reason = xPREINIT ]; then
    if [ x$alias_ip_address != x ]; then
      # Bring down alias interface. Its routes will disappear too.
 -    ifconfig $interface:0- inet 0
 +    ifconfig $interface:0- inet 0.0.0.0
    fi
-   if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
-    then
-@@ -127,7 +127,7 @@
-     # Add route to make broadcast work. Do not omit netmask.
-     route add default dev $interface netmask 0.0.0.0
-   else
--    ifconfig $interface 0 up
-+    ifconfig $interface 0.0.0.0 up
-   fi
+-  ifconfig $interface 0 up
++  ifconfig $interface 0.0.0.0 up
  
    # We need to give the kernel some time to get the interface up.
-@@ -153,12 +153,12 @@
+   sleep 1
+@@ -145,12 +145,12 @@
    if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
  		[ x$alias_ip_address != x$old_ip_address ]; then
      # Possible new alias. Remove old alias.
@@ -33,7 +27,16 @@
  
    fi
    if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-@@ -189,11 +189,11 @@
+@@ -171,7 +171,7 @@
+   fi
+   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+    then
+-    ifconfig $interface:0- inet 0
++    ifconfig $interface:0- inet 0.0.0.0
+     ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+     route add -host $alias_ip_address $interface:0
+   fi
+@@ -183,11 +183,11 @@
     || [ x$reason = xSTOP ]; then
    if [ x$alias_ip_address != x ]; then
      # Turn off alias interface.
@@ -47,7 +50,7 @@
    fi
    if [ x$alias_ip_address != x ]; then
      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-@@ -204,7 +204,7 @@
+@@ -198,7 +198,7 @@
  
  if [ x$reason = xTIMEOUT ]; then
    if [ x$alias_ip_address != x ]; then
@@ -56,7 +59,7 @@
    fi
    ifconfig $interface inet $new_ip_address $new_subnet_arg \
  					$new_broadcast_arg $mtu_arg
-@@ -226,7 +226,7 @@
+@@ -223,7 +223,7 @@
      make_resolv_conf
      exit_with_hooks 0
    fi