Changeset 79793

Timestamp:

06/25/11 20:15:55 (4 years ago)

Author:

fotanus@…

Message:

Tested agains real ports and fixed broken checks

Major changes:

• Add self files to check for dynamic library
• Get errors form lipo and otool output
• Change whitelist to work with directories

File:

• branches/gsoc11-post-destroot/base/src/port1.0/portcheckdestroot.tcl (modified) (9 diffs)

branches/gsoc11-post-destroot/base/src/port1.0/portcheckdestroot.tcl

@@ -12 +12 @@
 namespace eval portcheckdestroot {
 }
-
 #options
 options destroot.violate_mtree destroot.asroot depends_lib
@@ -35 +34 @@
 }
 
+# Check if a file is binary file
+# TODO: Somewhat probabilistic. Must be a better way.
+proc portcheckdestroot::binary? filename {
+    set f [open $filename]
+    set data [read $f 1024]
+    close $f
+    expr {[string first \x00 $data]>=0}
+}
+
+
+# escape chars in order to be usable as regexp. This function is for internal use.
+proc portcheckdestroot::escape_chars {str} {
+    return [regsub {\+} $str {\+}]
+}
+
 # List all links on a directory recursively. This function is for internal use.
 proc portcheckdestroot::links_list {dir} {
@@ -40 +54 @@
 }
 
-# List all links on a directory recursively. This function is for internal use.
+# List all binary files on a directory recursively. This function is for internal use.
+proc portcheckdestroot::bin_list {dir} {
+    return [types_list $dir "f" 1]
+}
+
+# List all files on a directory recursively. This function is for internal use.
 proc portcheckdestroot::files_list {dir} {
     return [types_list $dir "f"]
@@ -46 +65 @@
 
 # List all files of a type on a directory recursively. This function is for internal use.
-proc portcheckdestroot::types_list {dir type} {
+proc portcheckdestroot::types_list {dir type {bin 0} } {
     set ret {}
     foreach item [glob -nocomplain -type "d $type" -directory $dir *] {
@@ -53 +72 @@
         } else {
             #is from the correct type
-            lappend ret $item
+            if { $bin } {
+                if { [binary? $item] } {
+                    lappend ret $item
+                }
+            } else {
+                lappend ret $item
+            }
         }
     }
@@ -200 +225 @@
 # Check for dynamic links that aren't in the dependency list
 proc portcheckdestroot::checkdestroot_libs {} {
-    global destroot destroot.depends_lib subport depends_lib UI_PREFIX
+    global destroot prefix UI_PREFIX subport
     ui_notice "$UI_PREFIX Checking for wrong dynamic links"
 
-    #Files that don't need to be alerted if not on dependencies.
-    #TODO: Compile these files (and move for configuration folder?)
-    set dep_whitelist {/usr/lib/libSystem.B.dylib}
+    #Folders that don't need to be alerted if not on dependencies.
+    #TODO: Compile whitelist folders
+    set dep_whitelist {/usr/lib/ /System/Library/ /lib/}
 
     #Get dependencies files list.
@@ -212 +237 @@
         lappend dep_files [get_files [exec port contents $dep]]
     }
-    set dep_files [concat $dep_files $dep_whitelist]
+    set self_files [bin_list $destroot$prefix]
+    set dep_files [concat $dep_files $self_files]
 
     #Get package files
     foreach file [files_list $destroot] {
-        if { [file executable "$file"] } {
+        if { [binary? "$file"] } {
             #Check it dinamic links with otool
-            foreach line [split [exec -keepnewline otool -L $file] "\n"] {
-                #match they with dependency files
-                if { [regexp {\(.*} $line] } {
-                    set lib [string trim [regsub {\(.*} $line ""]]
-                    if { [regexp $lib $file] } {
-                        ui_debug "skipping, should be the file itself"
-                    } else {
-                        if { [regexp $lib [join $dep_files]] } {
-                            ui_debug "$lib binary dependency is met"
+            set otool_output [get_otool_libs $file]
+            if { $otool_output == "ignore" } {
+                ui_debug "Ignoring $file otool output"
+            } else {
+                foreach line [get_otool_libs $file] {
+                    #match they with dependency files
+                    if { [regexp {\(.*} $line] } {
+                        set lib [string trim [regsub {\(.*} $line ""]]
+                        #match against itself
+                        if { [regexp [escape_chars $lib] $file] } {
+                            ui_debug "skipping, should be the file itself"
                         } else {
-                            return -code error "$lib binary dependencies are NOT met"
+                            #match against dependencies or self files
+                            if { [regexp [escape_chars $lib] [join $dep_files]] } {
+                                ui_debug "$lib binary dependency is met"
+                            } else {
+                                #match file folder agains whitelist
+                                set found 0
+                                foreach dep $dep_whitelist {
+                                    if { [regexp "^$dep" [regsub $prefix $lib ""]] } {
+                                        set found 1
+                                        break
+                                    }
+                                }
+                                if { $found } {
+                                    ui_debug "$lib binary dependency folder is on whitelist"
+                                } else {
+                                    return -code error "$lib binary dependencies are NOT met"
+                                }
+                            }
                         }
                     }
@@ -241 +286 @@
     global destroot
     foreach file [files_list $destroot] {
-        if { [file executable "$file"] } {
-            set lipo_arches [checkdestroot_get_lipo_arches $file]
+        if { [binary? "$file"] } {
+            set lipo_arches [get_lipo_arches $file]
             # Chekcs if every arch is present on the lipo output
-            foreach arch $archs {
-                if { [regexp $arch $lipo_arches] == 0 } {
-                    return -code error "$file supports the arch $arch, and should not"
+            if { $lipo_arches == "ignore" } {
+                ui_debug "Ignoring arch check for $file"
+            } else {
+                foreach arch $archs {
+                    if { [regexp $arch $lipo_arches] == 0 } {
+                        return -code error "$file supports the arch $arch, and should not"
+                    }
                 }
             }
@@ -254 +303 @@
 
 # Recover the arches from a file, from it's lipo output. For internal use only.
-proc portcheckdestroot::checkdestroot_get_lipo_arches { file } {
-    set lipo_output [exec lipo -info $file]
+proc portcheckdestroot::get_lipo_arches { file } {
+    if { [ catch { set lipo_output [exec lipo -info $file 2>/dev/null] } ] } {
+        return "ignore"
+    }
     return [regsub "Architectures in the.*are:" $lipo_output ""]
+}
+
+# Recover the arches from a file, from it's lipo output. For internal use only.
+proc portcheckdestroot::get_otool_libs { file } {
+    if { [ catch { set output [exec -keepnewline otool -L $file 2>/dev/null] } ] } {
+        return "ignore"
+    }
+    return [split $output "\n"]
 }