Ticket #12629: macports-remotetime.patch

configure.ac

@@ -79 +79 @@
 AC_HEADER_SYS_WAIT
 AC_HEADER_STAT
 AC_CHECK_HEADERS([limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h libgen.h sys/socket.h \
-        readline/readline.h readline/history.h pwd.h sys/paths.h])
+        readline/readline.h readline/history.h pwd.h sys/paths.h utime.h])
 
 INCLUDES="-I.. -I. $INCLUDES"
 

src/pextlib1.0/curl.c

@@ -43 +43 @@
 #include <string.h>
 #endif
 
+#ifdef HAVE_UTIME_H
+#include <utime.h>
+#endif
+
 #include <curl/curl.h>
 
 #include <tcl.h>
@@ -124 +128 @@
 /**
  * curl fetch subcommand entry point.
  *
- * syntax: curl fetch [-v] [--disable-epsv] [--ignore-ssl-cert] [-u userpass] [--effective-url lasturlvar] url filename
+ * syntax: curl fetch [-v] [--disable-epsv] [--ignore-ssl-cert] [--remote-time] [-u userpass] [--effective-url lasturlvar] url filename
  *
  * @param interp                current interpreter
  * @param objc                  number of parameters
@@ -142 +146 @@
                 int noprogress = 1;
                 int useepsv = 1;
                 int ignoresslcert = 0;
+                int remotetime = 0;
                 const char* theUserPassString = NULL;
                 const char* effectiveURLVarName = NULL;
                 char* effectiveURL = NULL;
@@ -149 +154 @@
                 int lastoption;
                 const char* theURL;
                 const char* theFilePath;
+                long theFileTime = 0;
                 CURLcode theCurlCode;
                 struct curl_slist *headers = NULL;
                 
@@ -167 +173 @@
                                 useepsv = 0;
                         } else if (strcmp(theOption, "--ignore-ssl-cert") == 0) {
                                 ignoresslcert = 1;
+                        } else if (strcmp(theOption, "--remote-time") == 0) {
+                                remotetime = 1;
                         } else if (strcmp(theOption, "-u") == 0) {
                                 /* check we also have the parameter */
                                 if (optioncrsr < lastoption) {
@@ -296 +304 @@
                         }
                 }
 
+                /* we want/don't want remote time */
+                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FILETIME, remotetime);
+                if (theCurlCode != CURLE_OK) {
+                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
+                        break;
+                }
+
                 /* set the l/p, if any */
                 if (theUserPassString) {
                         theCurlCode = curl_easy_setopt(theHandle, CURLOPT_USERPWD, theUserPassString);
@@ -324 +339 @@
                 (void) fclose( theFile );
                 theFile = NULL;
                 
+#ifdef HAVE_UTIME_H
+                if (remotetime) {
+                        theCurlCode = curl_easy_getinfo(theHandle, CURLINFO_FILETIME, &theFileTime);
+                        if (theFileTime > 0) {
+                                struct utimbuf times;
+                                times.actime = (time_t)theFileTime;
+                                times.modtime = (time_t)theFileTime;
+                                utime(theFilePath, &times); /* set the time we got */
+                        }
+                }
+#endif /*HAVE_UTIME_H*/
+                
                 /* free header memory */
                 curl_slist_free_all(headers);
 

src/port1.0/portfetch.tcl

@@ -433 +433 @@
                                 ui_msg "$UI_PREFIX [format [msgcat::mc "Attempting to fetch %s from %s"] $distfile $site]"
                                 set file_url [portfetch::assemble_url $site $distfile]
                                 set effectiveURL ""
-                                if {![catch {eval curl fetch --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] &&
+                                if {![catch {eval curl fetch --remote-time --effective-url effectiveURL $fetch_options {$file_url} ${distpath}/${distfile}.TMP} result] &&
                                         ![catch {system "mv ${distpath}/${distfile}.TMP ${distpath}/${distfile}"}]} {
 
                                         # Special hack to check for sourceforge mirrors, which don't return a proper error code on failure