Changeset 81397

Timestamp:

07/29/11 19:31:44 (4 years ago)

Author:

fotanus@…

Message:

Moved whitelist configuration to .conf files

also removed some orphaned functions and fixed a bug, pointed out in the review

Location:

branches/gsoc11-post-destroot/base/src

Files:

• macports1.0/macports.tcl (modified) (2 diffs)
• port1.0/portcheckdestroot.tcl (modified) (4 diffs)

branches/gsoc11-post-destroot/base/src/macports1.0/macports.tcl

@@ -52 +52 @@
     variable portinterp_options "\
         portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
+        files_whitelist folders_whitelist \
         registry.path registry.format \
         portarchivetype archivefetch_pubkeys portautoclean porttrace keeplogs portverbose destroot_umask \
@@ -526 +527 @@
             }
             close $fd
+        }
+    }
+
+    # Read dynamic libraries whitelist config files
+    set whitelist_conf_files {folders_whitelist files_whitelist}
+    foreach whitelist $whitelist_conf_files {
+        set file "${macports_conf_path}/${whitelist}.conf"
+        if { [file exists $file] } {
+            set macports::${whitelist} {}
+            set fd [open $file]
+            while { [gets $fd line] >= 0 } {
+                lappend macports::${whitelist} $line
+            }
+            global macports::${whitelist}
         }
     }

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

@@ -36 +36 @@
 }
 
-# List contents for a given port.
-proc portcheckdestroot::get_port_files {portname} {
-}
 
 # escape chars in order to be usable as regexp. This function is for internal use.
@@ -76 +73 @@
     }
     return $ret
-}
-
-# Get files from a list. For internal use only
-proc portcheckdestroot::get_files { list } {
-    set files {}
-    foreach element $list {
-        if { [regexp {^/?[A-Za-z0-9\.-]+(/[A-Za-z0-9\.-]+)*$} $element] } {
-            if { [file exists $element] } {
-                lappend files $element
-            }
-        }
-    }
-    return $files
 }
 
@@ -220 +204 @@
 proc portcheckdestroot::checkdestroot_libs {} {
     global destroot prefix UI_PREFIX subport
+    global files_whitelist folders_whitelist
+
     ui_notice "$UI_PREFIX Checking for wrong dynamic links"
-
-    #Folders that don't need to be alerted if not on dependencies.
-    set files_whitelist {libSystem.B.dylib}
-    set folders_whitelist {/System/Library}
 
     #Get dependencies files list.
@@ -259 +241 @@
             if { ! $valid_lib } {
                 foreach dep_folder $folders_whitelist {
-                    if { [regexp "^$dep" [regsub $prefix $file_lib ""]] } {
+                    if { [regexp "^$dep_folder" [regsub $prefix $file_lib ""]] } {
                         ui_debug "$file_lib binary dependency folder is on whitelist"
                         set valid_lib 1