<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch release-2.10
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/ad6029a38706d0fb830aae1db3343bf8c0d2f008">https://github.com/macports/macports-base/commit/ad6029a38706d0fb830aae1db3343bf8c0d2f008</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ad6029a38706d0fb830aae1db3343bf8c0d2f008
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 8 12:25:59 2025 +1100
<span style='display:block; white-space:pre;color:#404040;'> sortsites: stay unprivileged longer
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (cherry picked from commit f6e8a68b2cedfb62f31456af85c771f54b38bcb0)
</span>---
src/port1.0/fetch_common.tcl | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/fetch_common.tcl b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index ba5187fa0..1de75d90b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/fetch_common.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,13 +238,6 @@ proc portfetch::sortsites {urls default_listvar} {
</span> continue
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # can't do the ping with dropped privileges (though it works fine if we didn't start as root)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[getuid] == 0 && [geteuid] != 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldeuid [geteuid]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set oldegid [getegid]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seteuid 0; setegid 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set hosts [list]
foreach site $urllist {
if {[string range $site 0 6] eq "file://"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -278,6 +271,13 @@ proc portfetch::sortsites {urls default_listvar} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # can't do the ping with dropped privileges (though it works fine if we didn't start as root)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[getuid] == 0 && [geteuid] != 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set oldeuid [geteuid]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set oldegid [getegid]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seteuid 0; setegid 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set pinged_hosts [list]
foreach host $hosts {
if {[llength $pinged_hosts] < $max_hosts_to_ping} {
</pre><pre style='margin:0'>
</pre>