Merge branch 'master' into local_mode

pmetzger · web-flow · commit 33111db97a0d · 2026-06-10T09:02:01.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -7,19 +7,23 @@ Release 2.13.0 (unreleased)
       phases as a regular user using work, distfiles, and logs under the
       Portfile directory without modifying the MacPorts installation.
       (perry)
+      
+    - Added a --purge option for 'port clean' that quickly and
+      unconditionally deletes all files of the chosen type(s).
+      (jmr in 22e1abd)
 
     - Added a -T flag to prepend ISO 8601 timestamps to each line of
       output, and elapsed time logging for each phase.
       (#2020, herbygillot in 037d168)
 
-    - Update the bundled copy of Tcl to version 9.0.3. (jmr in d875700)
-
     - Add blake3 as new supported checksum type.
       (#63885, herbygillot in 1dadbbf8b)
 
     - Add livecheck.user_agent option.
       (#64369, herbygillot in 0d4b57b05)
 
+    - Update the bundled copy of Tcl to version 9.0.3. (jmr in d875700)
+
     - Fix trace mode on arm64 for macOS > 14.
       (#66358, cal in aacd364)
 
diff --git a/doc/port-clean.1 b/doc/port-clean.1
@@ -25,7 +25,7 @@ port-clean \- Remove temporary files used to build a port\&.
 .sp
 .nf
 \fBport\fR [\fB\-vdqypotf\fR] [\fB\-D\fR \fIportdir\fR] \fBclean\fR
-     [\-\-archive] [\-\-dist] [\-\-logs] [\-\-work] [\-\-all]
+     [\-\-archive] [\-\-dist] [\-\-logs] [\-\-work] [\-\-all] [\-\-purge]
      [[\fIportname\fR | \fIpseudo\-portname\fR | \fIport\-expressions\fR | \fIport\-url\fR]]
 .fi
 .SH "DESCRIPTION"
@@ -123,6 +123,13 @@ Remove all temporary files\&. The same as specifying
 \fB\-\-logs\fR, and
 \fB\-\-work\fR\&.
 .RE
+.PP
+\fB\-\-purge\fR
+.RS 4
+Remove all temporary files of the chosen types, regardless of which port(s) they are associated with\&. This is much faster than e\&.g\&. "port clean \-\-all all" and will also delete files created by ports that do not exist in the current ports tree\&.
+
+No ports need to be specified when using this option, and specifying ports has no effect, since all ports\*(Aq files are deleted regardless\&. This option combines with other options as you would expect, so the default is to delete all work directories, "port clean \-\-logs \-\-purge" will delete all logs, and so on\&.
+.RE
 .SH "GLOBAL OPTIONS"
 .sp
 Please see the section \fBGLOBAL OPTIONS\fR in the \fBport\fR(1) man page for a description of global port options\&.
diff --git a/doc/port-clean.1.txt b/doc/port-clean.1.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [cmdsynopsis]
 *port* [*-vdqypotf*] [*-D* 'portdir'] *clean*
-     [--archive] [--dist] [--logs] [--work] [--all]
+     [--archive] [--dist] [--logs] [--work] [--all] [--purge]
      [['portname' | 'pseudo-portname' | 'port-expressions' | 'port-url']]
 
 DESCRIPTION
@@ -59,6 +59,17 @@ OPTIONS
     Remove all temporary files. The same as specifying *--archive*, *--dist*,
     *--logs*, and *--work*.
 
+*--purge*::
+    Remove all temporary files of the chosen types, regardless of which port(s)
+    they are associated with. This is much faster than e.g. "port clean --all
+    all" and will also delete files created by ports that do not exist in the
+    current ports tree.
+    +
+    No ports need to be specified when using this option, and specifying ports
+    has no effect, since all ports' files are deleted regardless. This option
+    combines with other options as you would expect, so the default is to
+    delete all work directories, "port clean --logs --purge" will delete all
+    logs, and so on.
 
 include::global-flags.txt[]
 
diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
@@ -92,6 +92,9 @@ namespace eval macports {
     # Options set in the portfile interpreter but only in system_options
     variable portinterp_private_options [list clonebin_path macosx_sdk_path]
 
+    # Directories in portdbpath that are publicly known
+    variable wellknown_dirs [dict create build 1 distfiles 1 incoming 1 logs 1 registry 1 software 1 sources 1]
+
     # Only used via override_vars
     variable macosx_sdk_path
 
@@ -3522,6 +3525,16 @@ proc _source_is_obsolete_svn_repo {source_dir} {
     return 0
 }
 
+# Get path to a well-known directory used by MacPorts
+proc macports::get_dir_path {dir} {
+    variable wellknown_dirs
+    if {![dict exists $wellknown_dirs $dir]} {
+        error "Unknown directory: $dir"
+    }
+    variable portdbpath
+    return [file join $portdbpath $dir]
+}
+
 proc macports::getportbuildpath {id {portname {}}} {
     package require sha1
     variable portdbpath
@@ -3802,6 +3815,49 @@ proc macports::verify_ports_signature {path} {
     error "No known key verified signature for $path"
 }
 
+# Helper to delete files in the given ports tree dir that are not in
+# the given tarball or are updated in the tarball.
+proc macports::delete_ports_not_in_tarball {extractdir tarball} {
+    # First move the PortIndex to avoid deleting it.
+    set indexfile ${extractdir}/ports/PortIndex
+    if {[file isfile $indexfile]} {
+        file mkdir ${extractdir}/tmp
+        file rename -force $indexfile ${extractdir}/tmp/
+        if {[file isfile ${indexfile}.quick]} {
+            file rename -force ${indexfile}.quick ${extractdir}/tmp/
+        }
+    }
+    package require tar
+    set tarfiles [::tar::stat $tarball]
+    set subpath_start [expr {[string length $extractdir] + 1}]
+    fs-traverse -depth f [list ${extractdir}/ports] {
+        set subpath [string range $f $subpath_start end]
+        file lstat $f statinfo
+        if {$statinfo(type) eq "directory"} {
+            append subpath /
+        }
+        if {![dict exists $tarfiles $subpath]
+            || [dict get $tarfiles $subpath type] ne $statinfo(type)
+            || ($statinfo(type) ne "directory" && [dict get $tarfiles $subpath mtime] != $statinfo(mtime))
+            || ($statinfo(type) eq "file" && [dict get $tarfiles $subpath size] != $statinfo(size))
+            || ($statinfo(type) eq "link" && [dict get $tarfiles $subpath linkname] ne [file readlink $f])
+        } then {
+            file delete -force $f
+        }
+    }
+    # Put PortIndex back
+    if {[file isfile ${extractdir}/tmp/PortIndex]} {
+        set cur_uid [getuid]
+        file rename -force ${extractdir}/tmp/PortIndex $indexfile
+        chown $indexfile $cur_uid
+        if {[file isfile ${extractdir}/tmp/PortIndex.quick]} {
+            file rename -force ${extractdir}/tmp/PortIndex.quick ${indexfile}.quick
+            chown ${indexfile}.quick $cur_uid
+        }
+    }
+    file delete -force ${extractdir}/tmp
+}
+
 proc mportsync {{options {}}} {
     global macports::sources macports::ui_prefix \
            macports::os_platform macports::os_major \
@@ -3969,43 +4025,7 @@ proc mportsync {{options {}}} {
                         set kflag {}
                     } else {
                         # Extract only updated files, and delete ones not in the tarball.
-                        # First move the PortIndex to avoid deleting it.
-                        if {[file isfile $indexfile]} {
-                            file mkdir ${extractdir}/tmp
-                            file rename -force $indexfile ${extractdir}/tmp/
-                            if {[file isfile ${indexfile}.quick]} {
-                                file rename -force ${indexfile}.quick ${extractdir}/tmp/
-                            }
-                        }
-                        package require tar
-                        set tarfiles [::tar::stat $tarball]
-                        set subpath_start [expr {[string length $extractdir] + 1}]
-                        fs-traverse -depth f [list ${extractdir}/ports] {
-                            set subpath [string range $f $subpath_start end]
-                            file lstat $f statinfo
-                            if {$statinfo(type) eq "directory"} {
-                                append subpath /
-                            }
-                            if {![dict exists $tarfiles $subpath]
-                                || [dict get $tarfiles $subpath type] ne $statinfo(type)
-                                || ($statinfo(type) ne "directory" && [dict get $tarfiles $subpath mtime] != $statinfo(mtime))
-                                || ($statinfo(type) eq "file" && [dict get $tarfiles $subpath size] != $statinfo(size))
-                                || ($statinfo(type) eq "link" && [dict get $tarfiles $subpath linkname] ne [file readlink $f])
-                            } then {
-                                file delete -force $f
-                            }
-                        }
-                        unset tarfiles
-                        # Put PortIndex back
-                        if {[file isfile ${extractdir}/tmp/PortIndex]} {
-                            file rename -force ${extractdir}/tmp/PortIndex $indexfile
-                            macports::chown $indexfile $cur_uid
-                            if {[file isfile ${extractdir}/tmp/PortIndex.quick]} {
-                                file rename -force ${extractdir}/tmp/PortIndex.quick ${indexfile}.quick
-                                macports::chown ${indexfile}.quick $cur_uid
-                            }
-                        }
-                        file delete -force ${extractdir}/tmp
+                        macports::delete_ports_not_in_tarball $extractdir $tarball
                         # use -k if supported to skip extracting files that exist
                         global macports::prefix_frozen
                         if {[string match ${prefix_frozen}/bin/* $tar]} {
@@ -4092,7 +4112,8 @@ proc mportsync {{options {}}} {
                 # sync a port snapshot tarball
                 set indexfile [macports::getindex $source]
                 set destdir [file dirname $indexfile]
-                set tarpath [file join [file normalize [file join $destdir ..]] $filename]
+                set tardir [file dirname $destdir]
+                set tarpath [file join $tardir $filename]
 
                 set updated 1
                 if {[file isdirectory $destdir]} {
@@ -4116,7 +4137,7 @@ proc mportsync {{options {}}} {
                 set progressflag {}
                 if {$portverbose} {
                     set progressflag [list --progress builtin]
-                    set verboseflag "-v"
+                    set verboseflag v
                 } elseif {[info exists ui_options(progress_download)]} {
                     set progressflag [list --progress $ui_options(progress_download)]
                     set verboseflag ""
@@ -4142,13 +4163,39 @@ proc mportsync {{options {}}} {
                     continue
                 }
 
+                set tar {}
+                global macports::hfscompression
+                if {${hfscompression} && [getuid] == 0} {
+                    ui_debug "Using bsdtar with HFS+ compression (if valid)"
+                    set tar [macports::find_tar_with_hfscompression]
+                }
+                if {$tar ne {}} {
+                    set tar "$tar --hfsCompression"
+                } else {
+                    set tar [macports::findBinary tar $tar_path]
+                }
+                # Simply extract if there is no existing ports tree
+                if {[llength [glob -nocomplain -directory $destdir *]] == 0} {
+                    set kflag {}
+                } else {
+                    # Extract only updated files, and delete ones not in the tarball.
+                    macports::delete_ports_not_in_tarball $tardir $tarpath
+                    # use -k if supported to skip extracting files that exist
+                    global macports::prefix_frozen
+                    if {[string match ${prefix_frozen}/bin/* $tar]} {
+                        set kflag k
+                    } else {
+                        set kflag $::macports::autoconf::tar_k
+                    }
+                }
+
                 set extflag {}
                 switch -- $extension {
                     {tar.gz} {
-                        set extflag -z
+                        set extflag z
                     }
                     {tar.bz2} {
-                        set extflag -j
+                        set extflag j
                     }
                 }
 
@@ -4157,9 +4204,8 @@ proc mportsync {{options {}}} {
                 # as top-level directory name.
                 set striparg "--strip-components=1"
 
-                set tar [macports::findBinary tar $tar_path]
                 if {[catch {
-                        system -W ${destdir} "$tar $verboseflag $striparg $extflag -xf [macports::shellescape $tarpath]"
+                        system -W $destdir "$tar $striparg -x${extflag}${kflag}${verboseflag}f [macports::shellescape $tarpath]"
                 } error]} {
                     ui_error "Extracting $source failed ($error)"
                     incr numfailed
@@ -4177,7 +4223,7 @@ proc mportsync {{options {}}} {
                     set needs_portindex true
                 }
 
-                file delete $tarpath
+                file delete $tarpath ${tarpath}.sig
             }
             {^mports$} {
                 ui_error "Synchronization using the mports protocol no longer supported."
diff --git a/src/port/port.tcl b/src/port/port.tcl
@@ -3941,6 +3941,44 @@ proc action_sync { action portlist opts } {
 }
 
 
+proc action_clean {action portlist opts} {
+    if {![dict exists $opts ports_clean_purge]} {
+        return [action_target $action $portlist $opts]
+    }
+    # handle --purge (delete all files in the relevant dirs)
+    if {[dict exists $opts ports_clean_archive] || [dict exists $opts ports_clean_all]} {
+        set archives_dir [macports::get_dir_path incoming]
+        set to_delete [glob -directory $archives_dir -types f *]
+        set verified_dir [file join $archives_dir verified]
+        lappend to_delete {*}[glob -directory $verified_dir -types f *]
+        foreach f $to_delete {
+            ui_info "Deleting $f"
+            file delete $f
+        }
+    }
+    set delete_dirs [list]
+    if {[dict exists $opts ports_clean_dist] || [dict exists $opts ports_clean_all]} {
+        lappend delete_dirs [macports::get_dir_path distfiles]
+    }
+    if {[dict exists $opts ports_clean_logs] || [dict exists $opts ports_clean_all]} {
+        lappend delete_dirs [macports::get_dir_path logs]
+    }
+    # Match logic in portclean: work dir is cleaned unless only --logs was requested
+    if {[dict exists $opts ports_clean_work] || [dict exists $opts ports_clean_all]
+            || [dict exists $opts ports_clean_archive] || [dict exists $opts ports_clean_dist]
+            || ![dict exists $opts ports_clean_logs]} {
+        lappend delete_dirs [macports::get_dir_path build]
+    }
+    foreach dir $delete_dirs {
+        foreach direntry [glob -directory $dir *] {
+            ui_info "Deleting $direntry"
+            file delete -force $direntry
+        }
+    }
+    return 0
+}
+
+
 proc action_target { action portlist opts } {
     if {[require_portlist portlist]} {
         return 1
@@ -4181,6 +4219,7 @@ set action_array [dict create \
     unsetrequested [list action_setrequested  $action_args::PORTS] \
     setunrequested [list action_setrequested  $action_args::PORTS] \
     \
+    clean       [list action_clean          $action_args::PORTS] \
     upgrade     [list action_upgrade        $action_args::PORTS] \
     rev-upgrade [list action_revupgrade     $action_args::NONE] \
     reclaim     [list action_reclaim        $action_args::NONE] \
@@ -4225,7 +4264,6 @@ set action_array [dict create \
     build       [list action_target         $action_args::PORTS] \
     destroot    [list action_target         $action_args::PORTS] \
     install     [list action_target         $action_args::PORTS] \
-    clean       [list action_target         $action_args::PORTS] \
     test        [list action_target         $action_args::PORTS] \
     lint        [list action_target         $action_args::PORTS] \
     livecheck   [list action_target         $action_args::PORTS] \
@@ -4331,7 +4369,7 @@ set cmd_opts_array [dict create {*}{
     install     {allow-failing no-activate no-replace no-rev-upgrade unrequested}
     uninstall   {follow-dependents follow-dependencies no-exec}
     variants    {index}
-    clean       {all archive dist work logs}
+    clean       {all archive dist work logs purge}
     mirror      {new}
     lint        {nitpick}
     select      {list set show summary}
diff --git a/vendor/tcllib-2.0/modules/tar/tar.tcl b/vendor/tcllib-2.0/modules/tar/tar.tcl
@@ -138,7 +138,7 @@ proc ::tar::readHeader {data} {
         set $x [string trim [set $x] "\x00"]
     }
     foreach x {uid gid size mtime cksum} {
-        set $x [format %d 0[string trim [set $x] " \x00"]]
+        set $x [format %d 0o0[string trim [set $x] " \x00"]]
     }
     set mode [string trim $mode " \x00"]
 
@@ -149,15 +149,15 @@ proc ::tar::readHeader {data} {
             set $x [string trim [set $x] "\x00"]
         }
         foreach x {devmajor devminor} {
-            set $x [format %d 0[string trim [set $x] " \x00"]]
+            set $x [format %d 0o0[string trim [set $x] " \x00"]]
         }
     } elseif {$magic eq "ustar\x00"} {
         # posix tar
         foreach x {uname gname prefix} {
             set $x [string trim [set $x] "\x00"]
         }
         foreach x {devmajor devminor} {
-            set $x [format %d 0[string trim [set $x] " \x00"]]
+            set $x [format %d 0o0[string trim [set $x] " \x00"]]
         }
     } else {
         # old style tar

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ proc ::tar::readHeader {data} {`
`138`	`138`	`set $x [string trim [set $x] "\x00"]`
`139`	`139`	`}`
`140`	`140`	`foreach x {uid gid size mtime cksum} {`
`141`		`- set $x [format %d 0[string trim [set $x] " \x00"]]`
	`141`	`+ set $x [format %d 0o0[string trim [set $x] " \x00"]]`
`142`	`142`	`}`
`143`	`143`	`set mode [string trim $mode " \x00"]`
`144`	`144`
`@@ -149,15 +149,15 @@ proc ::tar::readHeader {data} {`
`149`	`149`	`set $x [string trim [set $x] "\x00"]`
`150`	`150`	`}`
`151`	`151`	`foreach x {devmajor devminor} {`
`152`		`- set $x [format %d 0[string trim [set $x] " \x00"]]`
	`152`	`+ set $x [format %d 0o0[string trim [set $x] " \x00"]]`
`153`	`153`	`}`
`154`	`154`	`} elseif {$magic eq "ustar\x00"} {`
`155`	`155`	`# posix tar`
`156`	`156`	`foreach x {uname gname prefix} {`
`157`	`157`	`set $x [string trim [set $x] "\x00"]`
`158`	`158`	`}`
`159`	`159`	`foreach x {devmajor devminor} {`
`160`		`- set $x [format %d 0[string trim [set $x] " \x00"]]`
	`160`	`+ set $x [format %d 0o0[string trim [set $x] " \x00"]]`
`161`	`161`	`}`
`162`	`162`	`} else {`
`163`	`163`	`# old style tar`