Changeset 81446

Timestamp:

07/30/11 17:37:13 (4 years ago)

Author:

fotanus@…

Message:

Fixed some bugs testing agains real ports.
Added whitelist conf files to installation.

Location:

branches/gsoc11-post-destroot/base

Files:

• doc/Makefile (modified) (1 diff)
• doc/files_whitelist.conf (added)
• doc/folders_whitelist.conf (added)
• src/port1.0/portcheckdestroot.tcl (modified) (5 diffs)

branches/gsoc11-post-destroot/base/doc/Makefile

@@ -2 +2 @@
 MAN5=           macports.conf.5
 MAN7=           portfile.7 portstyle.7 porthier.7 portgroup.7
-CONF=       macports.conf pubkeys.conf sources.conf variants.conf
+CONF=       macports.conf pubkeys.conf sources.conf variants.conf files_whitelist.conf folders_whitelist.conf
 INSTALLDIR=     ${DESTDIR}${prefix}
 TOPSRCDIR=      ..

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

@@ -36 +36 @@
 }
 
+# escape chars in order to be usable as regexp. This function is for internal use. 
+proc portcheckdestroot::escape_chars {str} {
+        return [regsub -all {\W} $str {\\&}]
+}
 
 # List all links on a directory recursively. This function is for internal use.
@@ -206 +210 @@
     set dep_files {}
     foreach dep [get_dependencies] {
-        lappend dep_files [file tail [registry_port_registered $dep]]
-    }
+        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
@@ -216 +220 @@
         foreach file_lib [list_dlibs $file] {
             set valid_lib 0
-            if { [regexp $file_lib $file] } {
+            # File itself
+            if { [regexp [escape_chars $file_lib] $file] } {
                 set valid_lib 1
             }
-            if { ! $valid_lib } {
-                if { [lsearch $dep_files $file_lib] != -1 } {
-                    set valid_lib 1
-                    ui_debug "$file_lib binary dependency is met"
-                }
-            }
+
+            # File from the package or its depended ports
+            if { ! $valid_lib } {
+                foreach dep_file $dep_files {
+                    if { [regexp [escape_chars $file_lib] $dep_file] } {
+                        set valid_lib 1
+                        ui_debug "$file_lib binary dependency is met"
+                    }
+                }
+            }
+            # on files whitelist
             if { ! $valid_lib } {
                 foreach dep_file $files_whitelist {
-                    if { [regexp $dep_file [regsub ".*/" $file_lib ""]] } {
+                    if { [regexp [escape_chars $dep_file] [file tail $file_lib]] } {
                         ui_debug "$file_lib binary dependency folder is on whitelist"
                         set valid_lib 1
@@ -234 +244 @@
                 }
             }
+            # on folders whitelist
             if { ! $valid_lib } {
                 foreach dep_folder $folders_whitelist {
@@ -244 +255 @@
             }
             if { ! $valid_lib } {
-                   return -code error "$file_lib binary dependencies are NOT met"
+                   return -code error "$file '$file_lib' binary dependencies are NOT met"
             }
         }