Changeset 80618

Timestamp:

07/15/11 16:02:25 (4 years ago)

Author:

fotanus@…

Message:

Added macho C extension

*) to get the dynamic libraries from a binary
*) to get the archs from a binary

The C and Tcl code needs a cleanup and more comments.

Location:

branches/gsoc11-post-destroot/base/src

Files:

• pextlib1.0/Makefile (modified) (1 diff)
• pextlib1.0/Pextlib.c (modified) (2 diffs)
• pextlib1.0/macho.c (added)
• pextlib1.0/macho.h (added)
• port1.0/portcheckdestroot.tcl (modified) (3 diffs)

branches/gsoc11-post-destroot/base/src/pextlib1.0/Makefile

@@ -4 +4 @@
         sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \
         tracelib.o tty.o readdir.o pipe.o flock.o \
-        system.o mktemp.o realpath.o
+        system.o mktemp.o realpath.o macho.o
 SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
 INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0

branches/gsoc11-post-destroot/base/src/pextlib1.0/Pextlib.c

@@ -79 +79 @@
 #include "mktemp.h"
 #include "realpath.h"
+#include "macho.h"
 
 #if HAVE_CRT_EXTERNS_H
@@ -514 +515 @@
         Tcl_CreateObjCommand(interp, "name_to_gid", name_to_gidCmd, NULL, NULL);
         Tcl_CreateObjCommand(interp, "gid_to_name", gid_to_nameCmd, NULL, NULL);
+        Tcl_CreateObjCommand(interp, "list_dlibs", list_dlibs, NULL, NULL);
+        Tcl_CreateObjCommand(interp, "list_archs", list_archs, NULL, NULL);
 
         Tcl_CreateObjCommand(interp, "tracelib", TracelibCmd, NULL, NULL);

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

@@ -4 +4 @@
 package provide portcheckdestroot 1.0
 package require portutil 1.0
+package require Pextlib 1.0
 
 
@@ -151 +152 @@
     global UI_PREFIX
 
-    set mtree [findBinary mtree ${portutil::autoconf::mtree_path}]
-
-    # test for violations of mtree
-    if { ${destroot.violate_mtree} != "yes" } {
-        ui_notice "$UI_PREFIX Executing mtree check"
-        ui_debug "checking for mtree violations"
-        set mtree_violation "no"
-
-        set prefixPaths [list bin etc include lib libexec sbin share src var www Applications Developer Library]
-
-        set pathsToCheck [list /]
-        while {[llength $pathsToCheck] > 0} {
-            set pathToCheck [lshift pathsToCheck]
-            foreach file [glob -nocomplain -directory $destroot$pathToCheck .* *] {
-                if {[file tail $file] eq "." || [file tail $file] eq ".."} {
-                    continue
+        set mtree [findBinary mtree ${portutil::autoconf::mtree_path}]
+
+        # test for violations of mtree
+        if { ${destroot.violate_mtree} != "yes" } {
+            ui_notice "$UI_PREFIX Executing mtree check"
+            ui_debug "checking for mtree violations"
+            set mtree_violation "no"
+
+            set prefixPaths [list bin etc include lib libexec sbin share src var www Applications Developer Library]
+
+            set pathsToCheck [list /]
+            while {[llength $pathsToCheck] > 0} {
+                set pathToCheck [lshift pathsToCheck]
+                foreach file [glob -nocomplain -directory $destroot$pathToCheck .* *] {
+                    if {[file tail $file] eq "." || [file tail $file] eq ".."} {
+                        continue
+                    }
+                    if {[string equal -length [string length $destroot] $destroot $file]} {
+                        # just double-checking that $destroot is a prefix, as is appropriate
+                        set dfile [file join / [string range $file [string length $destroot] end]]
+                    } else {
+                        throw MACPORTS "Unexpected filepath `${file}' while checking for mtree violations"
+                    }
+                    if {$dfile eq $prefix} {
+                        # we've found our prefix
+                        foreach pfile [glob -nocomplain -tails -directory $file .* *] {
+                            if {$pfile eq "." || $pfile eq ".."} {
+                                continue
+                            }
+                            if {[lsearch -exact $prefixPaths $pfile] == -1} {
+                                ui_warn "violation by [file join $dfile $pfile]"
+                                set mtree_violation "yes"
+                            }
+                        }
+                    } elseif {[string equal -length [expr [string length $dfile] + 1] $dfile/ $prefix]} {
+                        # we've found a subpath of our prefix
+                        lpush pathsToCheck $dfile
+                    } else {
+                        set dir_allowed no
+                        # these files are (at least potentially) outside of the prefix
+                        foreach dir "$applications_dir $frameworks_dir /Library/LaunchAgents /Library/LaunchDaemons /Library/StartupItems" {
+                            if {[string equal -length [expr [string length $dfile] + 1] $dfile/ $dir]} {
+                                # it's a prefix of one of the allowed paths
+                                set dir_allowed yes
+                                break
+                            }
+                        }
+                        if {$dir_allowed} {
+                            lpush pathsToCheck $dfile
+                        } else {
+                            # not a prefix of an allowed path, so it's either the path itself or a violation
+                            switch -- $dfile \
+                                $applications_dir - \
+                                $frameworks_dir - \
+                                /Library/LaunchAgents - \
+                                /Library/LaunchDaemons - \
+                                /Library/StartupItems { ui_debug "port installs files in $dfile" } \
+                                default {
+                                    ui_warn "violation by $dfile"
+                                    set mtree_violation "yes"
+                                }
+                        }
+                    }
                 }
-                if {[string equal -length [string length $destroot] $destroot $file]} {
-                    # just double-checking that $destroot is a prefix, as is appropriate
-                    set dfile [file join / [string range $file [string length $destroot] end]]
+            }
+
+            # abort here only so all violations can be observed
+            if { ${mtree_violation} != "no" } {
+                ui_warn "[format [msgcat::mc "%s violates the layout of the ports-filesystems!"] [option subport]]"
+                ui_warn "Please fix or indicate this misbehavior (if it is intended), it will be an error in future releases!"
+                # error "mtree violation!"
+            }
+        } else {
+            ui_warn "[format [msgcat::mc "%s installs files outside the common directory structure."] [option subport]]"
+        }
+    }
+
+    # Check for dynamic links that aren't in the dependency list
+    proc portcheckdestroot::checkdestroot_libs {} {
+        global destroot prefix UI_PREFIX subport
+        ui_notice "$UI_PREFIX Checking for wrong dynamic links"
+
+        #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.
+        set dep_files {}
+        foreach dep [get_dependencies] {
+            lappend dep_files [file tail [registry_port_registered $dep]]
+        }
+        set self_files [bin_list $destroot$prefix]
+        set dep_files [concat $dep_files $self_files]
+
+
+        #Get package files
+        foreach file [files_list $destroot] {
+            if { [binary? "$file"] } {
+                foreach file_lib [list_dlibs $file] {
+                if { [lsearch $dep_files $file_lib] != -1 } {
+                    ui_debug "$file_lib binary dependency is met"
                 } else {
-                    throw MACPORTS "Unexpected filepath `${file}' while checking for mtree violations"
-                }
-                if {$dfile eq $prefix} {
-                    # we've found our prefix
-                    foreach pfile [glob -nocomplain -tails -directory $file .* *] {
-                        if {$pfile eq "." || $pfile eq ".."} {
-                            continue
-                        }
-                        if {[lsearch -exact $prefixPaths $pfile] == -1} {
-                            ui_warn "violation by [file join $dfile $pfile]"
-                            set mtree_violation "yes"
-                        }
-                    }
-                } elseif {[string equal -length [expr [string length $dfile] + 1] $dfile/ $prefix]} {
-                    # we've found a subpath of our prefix
-                    lpush pathsToCheck $dfile
-                } else {
-                    set dir_allowed no
-                    # these files are (at least potentially) outside of the prefix
-                    foreach dir "$applications_dir $frameworks_dir /Library/LaunchAgents /Library/LaunchDaemons /Library/StartupItems" {
-                        if {[string equal -length [expr [string length $dfile] + 1] $dfile/ $dir]} {
-                            # it's a prefix of one of the allowed paths
-                            set dir_allowed yes
+                    #match file folder agains whitelist
+                    set found 0
+                    foreach dep $dep_whitelist {
+                        if { [regexp "^$dep" [regsub $prefix $file_lib ""]] } {
+                            set found 1
                             break
                         }
                     }
-                    if {$dir_allowed} {
-                        lpush pathsToCheck $dfile
+                    if { $found } {
+                        ui_debug "$file_lib binary dependency folder is on whitelist"
                     } else {
-                        # not a prefix of an allowed path, so it's either the path itself or a violation
-                        switch -- $dfile \
-                            $applications_dir - \
-                            $frameworks_dir - \
-                            /Library/LaunchAgents - \
-                            /Library/LaunchDaemons - \
-                            /Library/StartupItems { ui_debug "port installs files in $dfile" } \
-                            default {
-                                ui_warn "violation by $dfile"
-                                set mtree_violation "yes"
-                            }
-                    }
-                }
-            }
-        }
-
-        # abort here only so all violations can be observed
-        if { ${mtree_violation} != "no" } {
-            ui_warn "[format [msgcat::mc "%s violates the layout of the ports-filesystems!"] [option subport]]"
-            ui_warn "Please fix or indicate this misbehavior (if it is intended), it will be an error in future releases!"
-            # error "mtree violation!"
-        }
-    } else {
-        ui_warn "[format [msgcat::mc "%s installs files outside the common directory structure."] [option subport]]"
-    }
-}
-
-# Check for dynamic links that aren't in the dependency list
-proc portcheckdestroot::checkdestroot_libs {} {
-    global destroot prefix UI_PREFIX subport
-    ui_notice "$UI_PREFIX Checking for wrong dynamic links"
-
-    #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.
-    set dep_files {}
-    foreach dep [get_dependencies] {
-        lappend dep_files [registry_port_registered $dep]
-    }
-    set self_files [bin_list $destroot$prefix]
-    set dep_files [concat $dep_files $self_files]
-
-    #Get package files
-    foreach file [files_list $destroot] {
-        if { [binary? "$file"] } {
-            #Check it dinamic links with otool
-            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 {
-                            #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"
-                                }
-                            }
-                        }
+                        return -code error "$file_lib binary dependencies are NOT met"
                     }
                 }
@@ -292 +278 @@
     foreach file [files_list $destroot] {
         if { [binary? "$file"] } {
-            set lipo_arches [get_lipo_arches $file]
-            # Chekcs if every arch is present on the lipo output
-            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"
-                    }
+            set file_archs [list_archs $file]
+            foreach arch $archs {
+                if { [lsearch $file_archs $arch] == -1 } {
+                    return -code error "$file supports the arch $arch, and should not"
                 }
             }