xnu-344.21.74.tar.gz

diff --git a/bsd/conf/version.minor b/bsd/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/bsd/conf/version.minor
+++ b/bsd/conf/version.minor
@@ -1 +1 @@
-7
+8

diff --git a/bsd/netinet/if_ether.c b/bsd/netinet/if_ether.c
index 55f109aae591bc9f34eafae4ef1fd87e08321a75..c5a79397d89b29afec367f5e07dfc1284a70a0b5 100644 (file)
--- a/bsd/netinet/if_ether.c
+++ b/bsd/netinet/if_ether.c
@@ -886,9 +886,18 @@ arplookup(addr, create, proxy)
        if (rt == 0)
                return (0);
        rtunref(rt);
-
-       if (rt->rt_flags & RTF_GATEWAY)
+       
+       if (rt->rt_flags & RTF_GATEWAY) {
                why = "host is not on local network";
+               
+               /* If there are no references to this route, purge it */
+               if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_WASCLONED) != 0) {
+                       rtrequest(RTM_DELETE,
+                                       (struct sockaddr *)rt_key(rt),
+                                       rt->rt_gateway, rt_mask(rt),
+                                       rt->rt_flags, 0);
+               }
+       }
        else if ((rt->rt_flags & RTF_LLINFO) == 0)
                why = "could not allocate llinfo";
        else if (rt->rt_gateway->sa_family != AF_LINK)

diff --git a/config/System.kext/Contents/Info.plist b/config/System.kext/Contents/Info.plist
index 08e58bfb8f9d71ac1937982fc73ce97c9ad00369..30291cdf5fe9f6e610a7271c83db365ef0e03f86 100644 (file)
--- a/config/System.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>System Resource Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>System Resource Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,13 +15,13 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>

diff --git a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
index 2d73cf67360bb3bf614592d09d38c8b94f12d07b..71b641b1c24cd23c595bc7db1151b783248fea03 100644 (file)
--- a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.driver.AppleNMI</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleRequired</key>
        <string>Root</string>
        <key>OSKernelResource</key>

diff --git a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
index d24c1fbe44423a8bb0974a3a1a70fc43c2cd7c57..d3211438031c81d2c62b1a077803d7f60bbf03c7 100644 (file)
--- a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>Apple Platform Family Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>Apple Platform Family Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.ApplePlatformFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
index 7962bb0dd09253d48a8810782f53a70916e5a8f0..e806c88fbe94c3fb335b71f3dcd75298bcf63a0a 100644 (file)
--- a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>BSD Kernel Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>BSD Kernel Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.bsd</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
index 0971c3ebdbf1dc00e22a29d09ecba9dcd3349201..0178d8d1e8935514fae2ac62110cc2ee8ab44ce1 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>ADB Family Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>ADB Family Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOADBFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
index d9a5b7a6bdaea9af8011b5c0484f900d648a5884..1ffc7a7b6795d3dc9b1d7801dbc1c40db58c8460 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>I/O Kit Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>I/O Kit Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.iokit</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
index bcbfb9cffa4acbc22aae476ca362db28edba89cb..30325acf1f47f3248367cfb442967327c3db4433 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>AppleNMI Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IONVRAMFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
index d91cd768398e82d478952609d6c004c676135368..18d5ee76152082e3c475dbc042a05926fc676f6d 100644 (file)
--- a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>System Management Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>System Management Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.iokit.IOSystemManagementFamily</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
index 507f1c9db218a3a96e17a6ee5fc3c535d3c9c48b..0f8ed7672dac59eac6dc33746df4e6ca4ba5281a 100644 (file)
--- a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>Libkern Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>Libkern Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.libkern</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
index f1eb10424f646eaad94e4c97975c532163f86a85..233af64bc1a118264ab191de6223ddabc84907ae 100644 (file)
--- a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
+++ b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist
@@ -5,7 +5,7 @@
        <key>CFBundleDevelopmentRegion</key>
        <string>English</string>
        <key>CFBundleGetInfoString</key>
-       <string>Mach Kernel Pseudoextension, Apple Computer Inc, 6.7.5</string>
+       <string>Mach Kernel Pseudoextension, Apple Computer Inc, 6.8.5</string>
        <key>CFBundleIdentifier</key>
        <string>com.apple.kernel.mach</string>
        <key>CFBundleInfoDictionaryVersion</key>
@@ -15,11 +15,11 @@
        <key>CFBundlePackageType</key>
        <string>KEXT</string>
        <key>CFBundleShortVersionString</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>6.7.5</string>
+       <string>6.8.5</string>
        <key>OSBundleCompatibleVersion</key>
        <string>1.0.0b1</string>
        <key>OSBundleRequired</key>

diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp
index 88a6f899d0efca28f5902aaca271de8ccfec2402..daf20ac17571bae096c74ff3b191beea18fec050 100644 (file)
--- a/iokit/KernelConfigTables.cpp
+++ b/iokit/KernelConfigTables.cpp
@@ -31,16 +31,16 @@
  */
 const char * gIOKernelKmods =
 "{
-    'com.apple.kernel'                         = '6.7.5';
-    'com.apple.kernel.bsd'                     = '6.7.5';
-    'com.apple.kernel.iokit'                   = '6.7.5';
-    'com.apple.kernel.libkern'                 = '6.7.5';
-    'com.apple.kernel.mach'                    = '6.7.5';
-    'com.apple.iokit.IOADBFamily'              = '6.7.5';
-    'com.apple.iokit.IONVRAMFamily'            = '6.7.5';
-    'com.apple.iokit.IOSystemManagementFamily' = '6.7.5';
-    'com.apple.iokit.ApplePlatformFamily'      = '6.7.5';
-    'com.apple.driver.AppleNMI'                = '6.7.5';
+    'com.apple.kernel'                         = '6.8.5';
+    'com.apple.kernel.bsd'                     = '6.8.5';
+    'com.apple.kernel.iokit'                   = '6.8.5';
+    'com.apple.kernel.libkern'                 = '6.8.5';
+    'com.apple.kernel.mach'                    = '6.8.5';
+    'com.apple.iokit.IOADBFamily'              = '6.8.5';
+    'com.apple.iokit.IONVRAMFamily'            = '6.8.5';
+    'com.apple.iokit.IOSystemManagementFamily' = '6.8.5';
+    'com.apple.iokit.ApplePlatformFamily'      = '6.8.5';
+    'com.apple.driver.AppleNMI'                = '6.8.5';
 }";
 
 

diff --git a/iokit/conf/version.minor b/iokit/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/iokit/conf/version.minor
+++ b/iokit/conf/version.minor
@@ -1 +1 @@
-7
+8

diff --git a/libkern/conf/version.minor b/libkern/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/libkern/conf/version.minor
+++ b/libkern/conf/version.minor
@@ -1 +1 @@
-7
+8

diff --git a/libsa/conf/version.minor b/libsa/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/libsa/conf/version.minor
+++ b/libsa/conf/version.minor
@@ -1 +1 @@
-7
+8

diff --git a/osfmk/conf/kernelversion.minor b/osfmk/conf/kernelversion.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/osfmk/conf/kernelversion.minor
+++ b/osfmk/conf/kernelversion.minor
@@ -1 +1 @@
-7
+8

diff --git a/osfmk/conf/version.minor b/osfmk/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/osfmk/conf/version.minor
+++ b/osfmk/conf/version.minor
@@ -1 +1 @@
-7
+8

diff --git a/pexpert/conf/version.minor b/pexpert/conf/version.minor
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/pexpert/conf/version.minor
+++ b/pexpert/conf/version.minor
@@ -1 +1 @@
-7
+8