[activemq-cpp,apr,arrow] Switch apache urls to pull from "archive" (m…

…icrosoft#29388) Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
ms-iot · Feb 6, 2023 · 924ee5c · 924ee5c
1 parent c04da63
commit 924ee5c
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 16 deletions.
diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake
@@ -11,7 +11,7 @@ if (NOT VCPKG_TARGET_IS_LINUX)
 endif()
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
+    URLS "https://archive.apache.org/dist/activemq/activemq-cpp/${VERSION}/activemq-cpp-library-${VERSION}-src.tar.bz2"
     FILENAME "activemq-cpp-library-${VERSION}-src.tar.bz2"
     SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2
 )

diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,8 +1,9 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 8,
+  "port-version": 10,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
+  "license": "Apache-2.0",
   "supports": "!(uwp | osx)",
   "dependencies": [
     "apr",

diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
@@ -2,7 +2,7 @@
 set(VERSION 1.7.0)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
+    URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
     SHA512 3dc42d5caf17aab16f5c154080f020d5aed761e22db4c5f6506917f6bfd2bf8becfb40af919042bd4ce1077d5de74aa666f5edfba7f275efba78e8893c115148
 )

diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr",
   "version": "1.7.0",
-  "port-version": 7,
+  "port-version": 12,
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "supports": "!uwp",

diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake
@@ -1,9 +1,12 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO apache/arrow
-    REF apache-arrow-7.0.0
-    SHA512 4df480e03dcd85c1c04f93ca55968cf64eb96b4bdb586d9ad3bd1d5ba6d9ec7cca34fefef43d84b921ba74ceaeb48f8ac9d1d1355f2408ebffd2b2a00a3da2bd
-    HEAD_REF master
+vcpkg_download_distfile(
+    ARCHIVE_PATH
+    URLS "https://archive.apache.org/dist/arrow/arrow-${VERSION}/apache-arrow-${VERSION}.tar.gz"
+    FILENAME apache-arrow-${VERSION}.tar.gz
+    SHA512 c6198e5c9b8fe5ccd89e445c9252da44d8d7c9e0c8eb5a802fa0cabf89482fddf775ed383bac1acc9331bc3195d21df7ea02c4a73aa6ee163c2959f34175d650
+)
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE ${ARCHIVE_PATH}
     PATCHES
         all.patch
         fix-dependencies.patch

diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "arrow",
-  "version": "7.0.0",
-  "port-version": 2,
+  "version": "10.0.1",
+  "port-version": 4,
   "description": "Cross-language development platform for in-memory analytics",
   "homepage": "https://arrow.apache.org",
   "license": "Apache-2.0",

diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
@@ -1,5 +1,15 @@
 {
   "versions": [
+    {
+      "git-tree": "2cf2310a238e646e62043be2f553332d8bd4c171",
+      "version-semver": "3.9.5",
+      "port-version": 10
+    },
+    {
+      "git-tree": "4f5d3901f612afe54e714fb14e47d343822e398e",
+      "version-semver": "3.9.5",
+      "port-version": 9
+    },
     {
       "git-tree": "ec8c68847a3d3950cec058e76a3963fac34fd682",
       "version-semver": "3.9.5",

diff --git a/versions/a-/apr.json b/versions/a-/apr.json
@@ -1,5 +1,30 @@
 {
   "versions": [
+    {
+      "git-tree": "beb9b88a2d3bcc63f32177c58622d7ad4b6717cf",
+      "version": "1.7.0",
+      "port-version": 12
+    },
+    {
+      "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9",
+      "version": "1.7.0",
+      "port-version": 11
+    },
+    {
+      "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da",
+      "version": "1.7.0",
+      "port-version": 10
+    },
+    {
+      "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514",
+      "version": "1.7.0",
+      "port-version": 9
+    },
+    {
+      "git-tree": "9fd8035a5cce96ad1b89000ac34431551ca39458",
+      "version": "1.7.0",
+      "port-version": 8
+    },
     {
       "git-tree": "e73f548920cc5add8a47af9b8775a26c89050101",
       "version": "1.7.0",

diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json
@@ -1,5 +1,60 @@
 {
   "versions": [
+    {
+      "git-tree": "04944a4d39fe590b7fed071475502fa8bcfe5a27",
+      "version": "10.0.1",
+      "port-version": 4
+    },
+    {
+      "git-tree": "3829a0697ffe3ba8cb1274e2edd7cfbcbc48482b",
+      "version": "10.0.1",
+      "port-version": 3
+    },
+    {
+      "git-tree": "ea9873418e3de2180518389baa3562084a566702",
+      "version": "10.0.1",
+      "port-version": 2
+    },
+    {
+      "git-tree": "91895876dde6f03ad68b3711923d55f841588536",
+      "version": "10.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "42a4cdb1defb73cc86758beb77949124e2cbbf6c",
+      "version": "10.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "ab325846893f2dc3382b7b403bf195645ab93a39",
+      "version": "10.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "757fb3dc2404c152b9628f324087a761070406c4",
+      "version": "9.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "d53797d201548a07be19eaf7d12d87198c458636",
+      "version": "8.0.1",
+      "port-version": 1
+    },
+    {
+      "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a",
+      "version": "8.0.1",
+      "port-version": 0
+    },
+    {
+      "git-tree": "4334074d163357f9002145ca722dc8dbcc546dbc",
+      "version": "8.0.0",
+      "port-version": 0
+    },
+    {
+      "git-tree": "9beefb8449a167f6dbcbe35a2bd2b7d3cb2889a2",
+      "version": "7.0.0",
+      "port-version": 3
+    },
     {
       "git-tree": "3d3371b4741fc81354b2033d584c48a1929373f4",
       "version": "7.0.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -22,7 +22,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 8
+      "port-version": 10
     },
     "ade": {
       "baseline": "0.1.1f",
@@ -110,7 +110,7 @@
     },
     "apr": {
       "baseline": "1.7.0",
-      "port-version": 7
+      "port-version": 11
     },
     "apr-util": {
       "baseline": "1.6.1",
@@ -169,8 +169,8 @@
       "port-version": 0
     },
     "arrow": {
-      "baseline": "7.0.0",
-      "port-version": 2
+      "baseline": "10.0.1",
+      "port-version": 3
     },
     "ashes": {
       "baseline": "2022-04-03",