<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93b27caf80c138765d30a96d4b96d2c36bd1014a">https://github.com/macports/macports-ports/commit/93b27caf80c138765d30a96d4b96d2c36bd1014a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 93b27ca uhd: add patch to use HTTPS instead of HTTP for images download
</span>93b27ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93b27caf80c138765d30a96d4b96d2c36bd1014a
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Apr 27 11:08:45 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> uhd: add patch to use HTTPS instead of HTTP for images download
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also increase images downloading verbosity to show the actual download URL
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Rev-bump, since this is the future & we want everyone using it!
</span>---
science/uhd/Portfile | 9 +++++++--
.../patch-host-utils-uhd_images_downloader-use_https.diff | 13 +++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bf6a896..6b31ae0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ Provides the release version, which is typically updated every month or so.
</span> checksums rmd160 ac9ef6473cd5b034650e3979236d2535f398dec2 \
sha256 fe385e826b8fbf4e869b4b919b7b7b8f01fba283bc0b8ffb954947f819b9c07b \
size 12896898
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
conflicts uhd-devel uhd-39lts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,11 @@ Provides the release version, which is typically updated every month or so.
</span> # the latter on some Clang compilers.
patchfiles-append patch-host_lib_usrp_dboart_CMakeLists.txt_twinrx_gain_tables.cpp-fix-optim.release.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to move uhd images downloader to HTTPS from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # HTTP, to avoid accessibility issues on some networks; this is a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # backport of UHD commit b7216212 .
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-host-utils-uhd_images_downloader-use_https.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport uhd-39lts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -327,7 +332,7 @@ post-destroot {
</span>
ui_debug "Fetching images:"
ui_debug "${PythonExe} ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --install-location=${destroot}${prefix}/share/uhd/images"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${PythonExe} ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py --verbose --install-location=${destroot}${prefix}/share/uhd/images"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${PythonExe} ${destroot}${prefix}/share/uhd/utils/uhd_images_downloader.py -v -v -v -v --install-location=${destroot}${prefix}/share/uhd/images"
</span>
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-host-utils-uhd_images_downloader-use_https.diff b/science/uhd/files/patch-host-utils-uhd_images_downloader-use_https.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5f01cda
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-host-utils-uhd_images_downloader-use_https.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e569694..01c7aa7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/utils/uhd_images_downloader.py.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/utils/uhd_images_downloader.py.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,7 +55,7 @@ except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _DEFAULT_TARGET_REGEX = "(fpga|fw|windrv)_default"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _BASE_DIR_STRUCTURE_PARTS = ["share", "uhd", "images"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _DEFAULT_INSTALL_PATH = os.path.join("@CMAKE_INSTALL_PREFIX@", *_BASE_DIR_STRUCTURE_PARTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_DEFAULT_BASE_URL = "http://files.ettus.com/binaries/cache/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_DEFAULT_BASE_URL = "https://files.ettus.com/binaries/cache/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _INVENTORY_FILENAME = "inventory.json"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _CONTACT = "support@ettus.com"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _DEFAULT_BUFFER_SIZE = 8192
</span></pre><pre style='margin:0'>
</pre>