Ticket #8571: dp_remote_archive.3.patch

src/darwinports1.0/darwinports.tcl

@@ -37 +37 @@
 
 namespace eval darwinports {
     namespace export bootstrap_options portinterp_options open_dports ui_priorities
-    variable bootstrap_options "portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat portinstalltype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir startupitem_type xcodeversion xcodebuildcmd"
-    variable portinterp_options "portdbpath portpath portbuildpath auto_path prefix portsharepath registry.path registry.format registry.installtype portarchivemode portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server rsync_options rsync_dir startupitem_type"
+    variable bootstrap_options "portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat portinstalltype portarchivemode remotearchiveurl portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask variants_conf rsync_server rsync_options rsync_dir startupitem_type xcodeversion xcodebuildcmd"
+    variable portinterp_options "portdbpath portpath portbuildpath auto_path prefix portsharepath registry.path registry.format registry.installtype portarchivemode remotearchiveurl portarchivepath portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server rsync_options rsync_dir startupitem_type"
     # deferred options are only computed when needed.
     # they are not exported to the trace thread.
     # they are not exported to the interpreter in system_options array.
@@ -360 +360 @@
                 global darwinports::portarchivemode
         }
 
+        if {[info exists remotearchiveurl]} {
+                set darwinports::remotearchiveurl $remotearchiveurl
+                global darwinports::remotearchiveurl
+        }
+
         # Archive path, where to store/retrieve binary archive packages
         if {![info exists portarchivepath]} {
                 set darwinports::portarchivepath [file join $portdbpath packages]

src/package1.0/portunarchive.tcl

@@ -62 +62 @@
         global ports_force ports_source_only ports_binary_only
         global portname portversion portrevision portvariants portpath
         global unarchive.srcpath unarchive.type unarchive.file unarchive.path
+        global remotearchiveurl portverbose
 
         # Check mode in case archive called directly by user
         if {[option portarchivemode] != "yes"} {
@@ -108 +109 @@
                                 if {[file exist ${unarchive.path}]} {
                                         set found 1
                                         break
+                                } elseif {[string match "http://*" $remotearchiveurl]} {
+                                        set platform [option os.platform]
+                                        set arch [option os.arch]
+                                        set remotefile "${remotearchiveurl}/${platform}/${arch}/${unarchive.file}"
+                                        set fetch_options {}
+                                        if {$portverbose == "yes"} {
+                                                lappend fetch_options "-v"
+                                        }
+
+                                        ui_info "$UI_PREFIX Attempting to fetch ${remotefile}"
+
+                                        if {![catch {eval curl fetch $fetch_options {$remotefile} ${unarchive.srcpath}/${unarchive.file}.TMP} result] &&
+                                                        ![catch {system "mv ${unarchive.srcpath}/${unarchive.file}.TMP ${unarchive.path}"}]} {
+                                                set found 1
+                                                break
+                                        } else {
+                                                ui_debug "Remote Archive fetching failed: $result"
+                                                exec rm -f ${unarchive.srcpath}/${unarchive.file}.TMP
+                                        }
                                 } else {
                                         ui_debug "No [string toupper ${unarchive.type}] archive: ${unarchive.path}"
                                 }