Update embedded pkgdepends

To fix untar() on the GHA freebsd VM.
r-lib · Oct 22, 2024 · b940875 · b940875
1 parent fd28536
commit b940875
Show file tree

Hide file tree

Showing 46 changed files with 429 additions and 111 deletions.
diff --git a/src/library/pkgdepends/DESCRIPTION b/src/library/pkgdepends/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: pkgdepends
 Title: Package Dependency Resolution and Downloads
-Version: 0.7.2.9000
+Version: 0.8.0.9000
 Authors@R: c(
     person("Gábor", "Csárdi", , "[email protected]", role = c("aut", "cre")),
     person("Posit Software, PBC", role = c("cph", "fnd"))
@@ -26,7 +26,6 @@ Suggests: asciicast (>= 2.2.0.9000), codetools, covr, debugme, fansi,
         fs, gh, gitcreds, glue, htmlwidgets, mockery, pak, pingr (>=
         2.0.0), rmarkdown, rstudioapi, spelling, svglite, testthat (>=
         3.2.0), tibble, webfakes (>= 1.1.5.9000), withr (>= 2.1.1),
-Remotes: r-lib/pkgcache
 Config/Needs/builder: gh, pkgsearch, withr (>= 2.1.1)
 Config/Needs/coverage: r-lib/asciicast, covr
 Config/Needs/website: r-lib/asciicast, pkgdown (>= 2.0.2),
@@ -35,7 +34,7 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 RoxygenNote: 7.3.1.9000
 NeedsCompilation: no
-Packaged: 2024-09-12 08:23:16 UTC; gaborcsardi
+Packaged: 2024-10-22 16:19:06 UTC; gaborcsardi
 Author: Gábor Csárdi [aut, cre],
   Posit Software, PBC [cph, fnd]
 Maintainer: Gábor Csárdi <[email protected]>
diff --git a/src/library/pkgdepends/R/install-tar.R b/src/library/pkgdepends/R/install-tar.R
@@ -205,6 +205,8 @@ eup_get_args <- function(options) {
   c(
     "-x", "-f", path_norm(options$tarfile),
     "-C", path_norm(options$exdir),
+    # do not restore ownership, this is problematic on some mounts, e.f. sshfs
+    "-o",
     get_untar_decompress_arg(options$tarfile),
     if (! options$restore_times) "-m",
     options$files

diff --git a/src/library/pkgdepends/inst/sysreqs/HEAD b/src/library/pkgdepends/inst/sysreqs/HEAD
@@ -1 +1 @@
-cab2105ca4d2bdd111b37ef51f36f96aba16691f
+a98516da7c5725d52d40f4c40f0ae46e7f94c238
diff --git a/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json b/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json
@@ -24,7 +24,7 @@
       ],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [
@@ -41,7 +41,7 @@
       ],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/chrome.json b/src/library/pkgdepends/inst/sysreqs/rules/chrome.json
@@ -1,90 +1,133 @@
 {
-  "patterns": [
-    "\\bchrome\\b"
-  ],
+  "patterns": ["\\bchrome\\b", "\\bchromium\\b"],
   "dependencies": [
     {
       "pre_install": [
-        { "command": "[ $(which google-chrome) ] || apt-get install -y gnupg curl" },
-        { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" },
-        { "command": "[ $(which google-chrome) ] || DEBIAN_FRONTEND='noninteractive' apt-get install -y /tmp/google-chrome.deb" }
-      ],
-      "packages": [],
-      "post_install": [
-        { "command": "rm -f /tmp/google-chrome.deb" }
+        { "command": "apt-get install -y software-properties-common" },
+        { "command": "add-apt-repository -y ppa:xtradeb/apps" },
+        { "command": "apt-get update" }
       ],
+      "packages": ["chromium"],
+      "post_install": [],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "ubuntu"
-        },
-        {
-          "os": "linux",
-          "distribution": "debian"
+          "distribution": "ubuntu",
+          "versions": ["22.04", "24.04"]
         }
       ]
     },
     {
       "pre_install": [
-        { "command": "yum install -y which" },
-        { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm" },
-        { "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm" }
+        {
+          "command": "[ $(which google-chrome) ] || apt-get install -y gnupg curl"
+        },
+        {
+          "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
+        },
+        {
+          "command": "[ $(which google-chrome) ] || DEBIAN_FRONTEND='noninteractive' apt-get install -y /tmp/google-chrome.deb"
+        }
       ],
       "packages": [],
-      "post_install": [
-        { "command": "rm -f /tmp/google-chrome.rpm" }
-      ],
+      "post_install": [{ "command": "rm -f /tmp/google-chrome.deb" }],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "centos",
-          "versions": ["8"]
-        },
+          "distribution": "ubuntu",
+          "versions": ["20.04"]
+        }
+      ]
+    },
+    {
+      "pre_install": [
+        { "command": "dnf install -y dnf-plugins-core" },
+        { "command": "dnf config-manager --set-enabled crb" },
+        { "command": "dnf install -y epel-release" }
+      ],
+      "packages": ["chromium"],
+      "post_install": [],
+      "constraints": [
         {
           "os": "linux",
           "distribution": "rockylinux"
+        }
+      ]
+    },
+    {
+      "pre_install": [
+        {
+          "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms"
         },
+        {
+          "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm"
+        }
+      ],
+      "packages": ["chromium"],
+      "post_install": [],
+      "constraints": [
         {
           "os": "linux",
           "distribution": "redhat",
           "versions": ["8"]
+        }
+      ]
+    },
+    {
+      "pre_install": [
+        {
+          "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms"
         },
+        {
+          "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
+        }
+      ],
+      "packages": ["chromium"],
+      "post_install": [],
+      "constraints": [
         {
           "os": "linux",
-          "distribution": "fedora",
-          "versions": [ "36", "37" ]
+          "distribution": "redhat",
+          "versions": ["9"]
         }
       ]
     },
     {
-      "pre_install": [
-        { "command": "yum install -y which" },
-        { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-125.0.6422.141-1.x86_64.rpm" },
-        { "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm" }
-      ],
-      "packages": [],
-      "post_install": [
-        { "command": "rm -f /tmp/google-chrome.rpm" }
-      ],
+      "pre_install": [],
+      "packages": ["chromium"],
+      "post_install": [],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "centos",
-          "versions": ["7"]
+          "distribution": "debian"
         },
         {
           "os": "linux",
-          "distribution": "redhat",
-          "versions": ["7"]
+          "distribution": "fedora"
+        },
+        {
+          "os": "linux",
+          "distribution": "alpine"
         }
       ]
     },
     {
-      "packages": ["chromium"],
+      "pre_install": [
+        { "command": "yum install -y which" },
+        {
+          "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-125.0.6422.141-1.x86_64.rpm"
+        },
+        {
+          "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm"
+        }
+      ],
+      "packages": [],
+      "post_install": [{ "command": "rm -f /tmp/google-chrome.rpm" }],
       "constraints": [
         {
           "os": "linux",
-            "distribution": "alpine"
+          "distribution": "centos",
+          "versions": ["7", "8"]
         }
       ]
     }

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/cmake.json b/src/library/pkgdepends/inst/sysreqs/rules/cmake.json
@@ -56,7 +56,7 @@
       "packages": ["cmake", "cmake3"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/eigen.json b/src/library/pkgdepends/inst/sysreqs/rules/eigen.json
@@ -50,7 +50,7 @@
       "packages": ["eigen3-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json b/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json
@@ -45,7 +45,7 @@
       "packages": ["perl-Image-ExifTool"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [
@@ -60,7 +60,7 @@
       "packages": ["perl-Image-ExifTool"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/gdal.json b/src/library/pkgdepends/inst/sysreqs/rules/gdal.json
@@ -45,7 +45,7 @@
       ],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [
@@ -63,7 +63,7 @@
       ],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/geos.json b/src/library/pkgdepends/inst/sysreqs/rules/geos.json
@@ -33,7 +33,7 @@
       "packages": ["geos-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [
@@ -48,7 +48,7 @@
       "packages": ["geos-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json b/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json
@@ -33,7 +33,7 @@
       "packages": ["ggobi-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/glpk.json b/src/library/pkgdepends/inst/sysreqs/rules/glpk.json
@@ -79,7 +79,7 @@
       "packages": ["glpk-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/haveged.json b/src/library/pkgdepends/inst/sysreqs/rules/haveged.json
@@ -61,7 +61,7 @@
         "packages": ["haveged-devel"],
         "pre_install": [
           {
-            "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+            "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
           }
         ],
         "constraints": [
@@ -76,7 +76,7 @@
         "packages": ["haveged-devel"],
         "pre_install": [
           {
-            "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+            "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
           }
         ],
         "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json b/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json
@@ -61,7 +61,7 @@
       "packages": ["hdf5-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm"
         }
       ],
       "constraints": [
@@ -76,7 +76,7 @@
       "packages": ["hdf5-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [

diff --git a/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json b/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json
@@ -61,7 +61,7 @@
       "packages": ["hiredis-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
         }
       ],
       "constraints": [