Merge branch 'master' into keepassxc

Author: contextnerror

.github/workflows/bootstrap.sh

@@ -17,7 +17,7 @@ endgroup() {
     printtag "endgroup"
 }
 
-MACPORTS_VERSION=${MP_CI_RELEASE:-2.11.5}
+MACPORTS_VERSION=${MP_CI_RELEASE:-2.11.6}
 
 OS_MAJOR=$(uname -r | cut -f 1 -d .)
 OS_ARCH=$(uname -m)

.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14, macos-15]
+        os: [macos-14, macos-15, macos-26]
 
     steps:
       - name: Checkout ports
@@ -40,6 +40,14 @@ jobs:
           repository: macports/mpbb
           path: mpbb
           show-progress: false
+      - name: Set checkout permissions
+        run: |
+            chmod -R a+rX ./ports
+            CUR_DIR="$(dirname "$(realpath ./ports)")"
+            while [ -n "$CUR_DIR" -a "$CUR_DIR" != "/" ]; do
+                sudo chmod a+rx "$CUR_DIR"
+                CUR_DIR="$(dirname "$CUR_DIR")"
+            done
       - name: Bootstrap MacPorts
         env:
             MP_CI_RELEASE: ${{ vars.MP_CI_RELEASE }}

.github/workflows/mirror.yml

@@ -109,13 +109,9 @@ jobs:
       - name: Update PortIndex files
         env:
           OLDEST_DARWIN: 9
-          NEWEST_DARWIN: 24
+          NEWEST_DARWIN: 25
           MIRROR_UPLOAD_URL: ${{ secrets.MIRROR_UPLOAD_URL }}
           MIRROR_UPLOAD_CREDENTIALS: ${{ secrets.MIRROR_UPLOAD_CREDENTIALS }}
-          MIRROR_SSH_HOST: ${{ secrets.MIRROR_SSH_HOST }}
-          MIRROR_SSH_HOSTKEY: ${{ secrets.MIRROR_SSH_HOSTKEY }}
-          MIRROR_SSH_KEY: ${{ secrets.MIRROR_SSH_KEY }}
-          MIRROR_SSH_USER: ${{ secrets.MIRROR_SSH_USER }}
         run: |
           set -eu
 
@@ -183,12 +179,7 @@ jobs:
           tar -C tarball -cjf "portindex-${CURRENT_COMMIT}.tar.bz2" .
 
           echo "Uploading tarball for commit ${CURRENT_COMMIT}"
-          touch ssh_key
-          chmod 0600 ssh_key
-          echo "$MIRROR_SSH_KEY" > ssh_key
-          echo "$MIRROR_SSH_HOSTKEY" > ssh_known_hosts
-          export RSYNC_RSH="ssh -l $MIRROR_SSH_USER -i ssh_key -oUserKnownHostsFile=ssh_known_hosts -p 23"
-          rsync -av --ignore-existing --progress "portindex-${CURRENT_COMMIT}.tar.bz2" "${MIRROR_SSH_HOST}:"
+          curl -fL -u "$MIRROR_UPLOAD_CREDENTIALS" --upload-file "portindex-${CURRENT_COMMIT}.tar.bz2" "$MIRROR_UPLOAD_URL" > /dev/null
 
       - name: Mirror all changed ports
         env:
@@ -197,6 +188,8 @@ jobs:
           MIRROR_DB_CREDENTIALS: ${{ secrets.MIRROR_DB_CREDENTIALS }}
           MIRROR_SSH_HOST: ${{ secrets.MIRROR_SSH_HOST }}
           MIRROR_SSH_USER: ${{ secrets.MIRROR_SSH_USER }}
+          MIRROR_SSH_HOSTKEY: ${{ secrets.MIRROR_SSH_HOSTKEY }}
+          MIRROR_SSH_KEY: ${{ secrets.MIRROR_SSH_KEY }}
           portlist: ${{ steps.portlist.outputs.portlist }}
         run: |
           set -eu
@@ -211,6 +204,10 @@ jobs:
           echo "Making distfiles readable"
           sudo chmod -R a+rX ./macports
 
+          touch ssh_key
+          chmod 0600 ssh_key
+          echo "$MIRROR_SSH_KEY" > ssh_key
+          echo "$MIRROR_SSH_HOSTKEY" > ssh_known_hosts
           export RSYNC_RSH="ssh -l $MIRROR_SSH_USER -i ssh_key -oUserKnownHostsFile=ssh_known_hosts -p 23"
           echo "Uploading distfiles"
           rsync -av --ignore-existing --progress ./macports/distfiles/ "${MIRROR_SSH_HOST}:pub/distfiles"

R/R-RcppRedis/Portfile

@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           R 1.0
 
 R.setup             cran eddelbuettel RcppRedis 0.2.4
-revision            2
+revision            3
 categories-append   devel
 maintainers         nomaintainer
 license             GPL-2+

R/R-gdalBindings/Portfile

@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           R 1.0
 
 R.setup             cran caiohamamura gdalBindings 0.1.17
-revision            4
+revision            5
 categories-append   gis
 maintainers         nomaintainer
 license             GPL-3

R/R-gdalraster/Portfile

@@ -5,7 +5,7 @@ PortGroup           R 1.0
 
 # Revert to GitHub once updated there.
 R.setup             cran USDAForestService gdalraster 1.11.1 v
-revision            2
+revision            3
 categories-append   gis
 maintainers         nomaintainer
 license             MIT

R/R-redux/Portfile

@@ -5,7 +5,7 @@ PortGroup           R 1.0
 
 # GitHub version is outdated.
 R.setup             cran richfitz redux 1.1.4
-revision            1
+revision            2
 categories-append   devel
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 license             GPL-2

R/R-rgdal/Portfile

@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           R 1.0
 
 R.setup             cran r-forge rgdal 1.6-7
-revision            9
+revision            10
 categories-append   gis
 maintainers         nomaintainer
 license             GPL-2+

R/R-sf/Portfile

@@ -6,7 +6,7 @@ PortGroup           R 1.0
 
 # GitHub version is old.
 R.setup             cran r-spatial sf 1.0-19
-revision            2
+revision            3
 categories-append   math
 maintainers         {@barracuda156 gmail.com:vital.had} openmaintainer
 license             {GPL-2 MIT}

R/R-terra/Portfile

@@ -4,7 +4,7 @@ PortSystem          1.0
 PortGroup           R 1.0
 
 R.setup             cran rspatial terra 1.8-5
-revision            1
+revision            2
 categories-append   gis
 maintainers         nomaintainer
 license             GPL-3+