[Git][debian-gis-team/libapache2-mod-tile][upstream] New upstream version 0.8.1
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Mon May 5 06:00:34 BST 2025
Bas Couwenberg pushed to branch upstream at Debian GIS Project / libapache2-mod-tile
Commits:
0ba19f71 by Bas Couwenberg at 2025-05-05T05:56:59+02:00
New upstream version 0.8.1
- - - - -
28 changed files:
- .github/workflows/build-and-test.yml
- .github/workflows/docker-image-build.yml
- .github/workflows/install-package-and-test.yml
- CMakeLists.txt
- configure.ac
- docker/README.md
- docker/archlinux/Dockerfile
- docker/centos/stream/Dockerfile
- docker/centos/stream/Dockerfile.autotools
- docker/centos/stream/Dockerfile.mapnik-latest
- docker/debian/Dockerfile
- docker/debian/Dockerfile.autotools
- docker/docker-compose.yml
- docker/fedora/Dockerfile
- docker/opensuse/Dockerfile
- docker/ubuntu/Dockerfile
- docker/ubuntu/Dockerfile.autotools
- docs/build/building_on_fedora.md
- docs/man/convert_meta.1
- docs/man/openstreetmap-tiles-update-expire.1
- docs/man/render_expired.1
- docs/man/render_list.1
- docs/man/render_old.1
- docs/man/render_speedtest.1
- docs/man/renderd.1
- docs/man/renderd.conf.5
- src/mod_tile.c
- tests/CMakeLists.txt
Changes:
=====================================
.github/workflows/build-and-test.yml
=====================================
@@ -22,8 +22,8 @@ jobs:
image:
- "debian:11"
- "debian:12"
- - "fedora:40"
- "fedora:41"
+ - "fedora:42"
- "opensuse/leap:15"
- "quay.io/centos/centos:stream9"
- "ubuntu:22.04"
@@ -108,8 +108,8 @@ jobs:
strategy:
matrix:
image:
- - "debian:12"
- - "ubuntu:24.04"
+ - "debian:unstable"
+ - "ubuntu:devel"
build_system:
- CMake
compiler:
@@ -141,6 +141,8 @@ jobs:
uses: ./.github/actions/coverage
with:
codecov-token: ${{ secrets.CODECOV_TOKEN }}
+ genhtml-extra-options: --keep-going --ignore-errors inconsistent
+ lcov-extra-options: --keep-going --ignore-errors inconsistent
- name: Package `mod_tile`
uses: ./.github/actions/cmake/package
@@ -202,8 +204,8 @@ jobs:
uses: ./.github/actions/coverage
with:
codecov-token: ${{ secrets.CODECOV_TOKEN }}
- genhtml-extra-options: --keep-going --ignore-errors count,inconsistent,range
- lcov-extra-options: --keep-going --ignore-errors count,inconsistent,range
+ genhtml-extra-options: --keep-going --ignore-errors category,count,format,inconsistent,range
+ lcov-extra-options: --keep-going --ignore-errors count,format,inconsistent,range
if: matrix.os != 'macos-12'
- name: Package `mod_tile`
@@ -230,7 +232,7 @@ jobs:
strategy:
matrix:
box_freebsd:
- - FreeBSD-13.4-STABLE
+ - freebsd-13
build_system:
- CMake
compiler:
@@ -238,7 +240,7 @@ jobs:
on_default_branch:
- ${{ contains(github.ref, 'master') || contains(github.ref, 'develop') || contains(github.ref, 'CI') }}
include:
- - box_freebsd: FreeBSD-14.1-STABLE
+ - box_freebsd: freebsd-14
build_system: CMake
compiler: LLVM
exclude:
@@ -254,18 +256,19 @@ jobs:
echo "TEST_PARALLEL_LEVEL=$(nproc)" >> ${GITHUB_ENV}
- name: Provision VM
- uses: hummeltech/freebsd-vagrant-action at v3
+ uses: hummeltech/freebsd-vagrant-action at v4
with:
- box: freebsd/${{ matrix.box_freebsd }}
+ box: bento/${{ matrix.box_freebsd }}
cpus: ${{ env.BUILD_PARALLEL_LEVEL }}
memory: 4096
+ ssh_shell: sh
# Mapnik is not in the `quarterly` repository (2023.10.12)
- name: Use "latest" repository
run: |
sudo mkdir -p /usr/local/etc/pkg/repos
sed 's#/quarterly#/latest#g' /etc/pkg/FreeBSD.conf | sudo tee /usr/local/etc/pkg/repos/FreeBSD.conf
- sudo pkg upgrade
+ sudo pkg upgrade --yes
- name: Install dependencies
uses: ./.github/actions/dependencies/install
=====================================
.github/workflows/docker-image-build.yml
=====================================
@@ -35,8 +35,8 @@ jobs:
- centos-stream-9
- debian-11
- debian-12
- - fedora-40
- fedora-41
+ - fedora-42
- opensuse-leap-15
- ubuntu-22.04
- ubuntu-24.04
=====================================
.github/workflows/install-package-and-test.yml
=====================================
@@ -47,6 +47,8 @@ jobs:
mkdir -p /usr/share/renderd
cp -av utils/example-map /usr/share/renderd/
cp -av etc/apache2/renderd-example-map.conf /etc/apache2/sites-available/renderd-example-map.conf
+ MAPNIK_INPUT=$(find /usr -type d -name input | grep mapnik)
+ sed -i "s#/usr/lib/mapnik/3.1/input#${MAPNIK_INPUT}#g" /etc/renderd.conf
printf '
[example-map]
URI=/tiles/renderd-example
=====================================
CMakeLists.txt
=====================================
@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
project(mod_tile
DESCRIPTION "Renders map tiles with Mapnik and serves them using Apache HTTP Server"
HOMEPAGE_URL "https://github.com/openstreetmap/mod_tile"
- VERSION 0.8.0
+ VERSION 0.8.1
)
set(CMAKE_C_STANDARD 99)
=====================================
configure.ac
=====================================
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
# Define mod_tile version number
-m4_define([mod_tile_version], [0.8.0])
+m4_define([mod_tile_version], [0.8.1])
AC_PREREQ([2.61])
AX_CONFIG_NICE
=====================================
docker/README.md
=====================================
@@ -17,6 +17,8 @@ For your convenience, we have provided a Docker-based building and testing metho
- fedora-38 _(Fedora 38)_ [[Dockerfile](/docker/fedora/Dockerfile)]
- fedora-39 _(Fedora 39)_ [[Dockerfile](/docker/fedora/Dockerfile)]
- fedora-40 _(Fedora 40)_ [[Dockerfile](/docker/fedora/Dockerfile)]
+- fedora-41 _(Fedora 41)_ [[Dockerfile](/docker/fedora/Dockerfile)]
+- fedora-42 _(Fedora 42)_ [[Dockerfile](/docker/fedora/Dockerfile)]
- fedora-rawhide _(Fedora Rawhide)_ [[Dockerfile](/docker/fedora/Dockerfile)]
- opensuse-leap-15 _(openSUSE Leap 15)_ [[Dockerfile](/docker/opensuse/Dockerfile)]
- opensuse-tumbleweed _(openSUSE Tumbleweed)_ [[Dockerfile](/docker/opensuse/Dockerfile)]
=====================================
docker/archlinux/Dockerfile
=====================================
@@ -3,8 +3,19 @@
ARG archlinux_version=latest
ARG runner_additional_packages
+# Base
+FROM archlinux:${archlinux_version} AS base
+
+## Arguments
+ARG archlinux_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cache/pacman/pkg,target=/var/cache/pacman/pkg \
+ --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/lib/pacman/sync,target=/var/lib/pacman/sync \
+ pacman --sync --refresh --sysupgrade --noconfirm
+
# Builder
-FROM archlinux:${archlinux_version} AS builder
+FROM base AS builder
## Arguments
ARG archlinux_version
@@ -12,7 +23,7 @@ ARG archlinux_version
## Install builder dependencies
RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cache/pacman/pkg,target=/var/cache/pacman/pkg \
--mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/lib/pacman/sync,target=/var/lib/pacman/sync \
- pacman --sync --refresh --sysupgrade --noconfirm \
+ pacman --sync --refresh --noconfirm \
apache \
apr \
boost \
@@ -50,7 +61,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM archlinux:${archlinux_version} AS runner
+FROM base AS runner
## Arguments
ARG archlinux_version
@@ -59,7 +70,7 @@ ARG runner_additional_packages
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cache/pacman/pkg,target=/var/cache/pacman/pkg \
--mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/lib/pacman/sync,target=/var/lib/pacman/sync \
- pacman --sync --refresh --sysupgrade --noconfirm ${runner_additional_packages} \
+ pacman --sync --refresh --noconfirm ${runner_additional_packages} \
apache \
cairo \
curl \
=====================================
docker/centos/stream/Dockerfile
=====================================
@@ -4,22 +4,31 @@ ARG centos_stream_version=9
ARG extra_repository=crb
ARG mapnik_version=4.0.3
-# Mapnik Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder
+# Base
+FROM quay.io/centos/centos:stream${centos_stream_version} AS base
## Arguments
ARG centos_stream_version
ARG extra_repository
-ARG mapnik_version
-## Install mapnik-builder dependencies
+## Install base dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
echo "keepcache=True" >> /etc/dnf/dnf.conf && \
dnf --assumeyes install "dnf-command(config-manager)" && \
dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
+ dnf --assumeyes upgrade
+
+# Mapnik Builder
+FROM base AS mapnik-builder
+
+## Arguments
+ARG centos_stream_version
+ARG mapnik_version
+
+## Install mapnik-builder dependencies
+RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
dnf --assumeyes install \
boost-devel \
cairo-devel \
@@ -71,20 +80,13 @@ RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${map
cmake --install . --strip
# Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS builder
+FROM base AS builder
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install builder dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost-devel \
cairo-devel \
@@ -133,20 +135,13 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM quay.io/centos/centos:stream${centos_stream_version} AS runner
+FROM base AS runner
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost-regex \
cairo \
=====================================
docker/centos/stream/Dockerfile.autotools
=====================================
@@ -4,22 +4,31 @@ ARG centos_stream_version=9
ARG extra_repository=crb
ARG mapnik_version=4.0.3
-# Mapnik Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder
+# Base
+FROM quay.io/centos/centos:stream${centos_stream_version} AS base
## Arguments
ARG centos_stream_version
ARG extra_repository
-ARG mapnik_version
-## Install mapnik-builder dependencies
+## Install base dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
echo "keepcache=True" >> /etc/dnf/dnf.conf && \
dnf --assumeyes install "dnf-command(config-manager)" && \
dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
+ dnf --assumeyes upgrade
+
+# Mapnik Builder
+FROM base AS mapnik-builder
+
+## Arguments
+ARG centos_stream_version
+ARG mapnik_version
+
+## Install mapnik-builder dependencies
+RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
dnf --assumeyes install \
boost-devel \
cairo-devel \
@@ -71,20 +80,13 @@ RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:${map
cmake --install . --strip
# Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS builder
+FROM base AS builder
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install builder dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
automake \
boost-devel \
@@ -122,20 +124,13 @@ RUN export DESTDIR=/tmp/mod_tile && \
RUN make test
# Runner
-FROM quay.io/centos/centos:stream${centos_stream_version} AS runner
+FROM base AS runner
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost-regex \
cairo \
=====================================
docker/centos/stream/Dockerfile.mapnik-latest
=====================================
@@ -3,21 +3,30 @@
ARG centos_stream_version=9
ARG extra_repository=crb
-# Mapnik Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS mapnik-builder
+# Base
+FROM quay.io/centos/centos:stream${centos_stream_version} AS base
## Arguments
ARG centos_stream_version
ARG extra_repository
-## Install mapnik-builder dependencies
+## Install base dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
echo "keepcache=True" >> /etc/dnf/dnf.conf && \
dnf --assumeyes install "dnf-command(config-manager)" && \
dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
+ dnf --assumeyes upgrade
+
+# Mapnik Builder
+FROM base AS mapnik-builder
+
+## Arguments
+ARG centos_stream_version
+
+## Install mapnik-builder dependencies
+RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
dnf --assumeyes install \
boost-devel \
cairo-devel \
@@ -69,20 +78,13 @@ RUN --mount=type=cache,id=centos:stream${centos_stream_version}-mapnik-src:lates
cmake --install . --strip
# Builder
-FROM quay.io/centos/centos:stream${centos_stream_version} AS builder
+FROM base AS builder
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install builder dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost-devel \
cairo-devel \
@@ -131,20 +133,13 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM quay.io/centos/centos:stream${centos_stream_version} AS runner
+FROM base AS runner
## Arguments
ARG centos_stream_version
-ARG extra_repository
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=centos:stream${centos_stream_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
- dnf --assumeyes install "dnf-command(config-manager)" && \
- dnf config-manager --save --setopt=${extra_repository}.enabled=1 && \
- dnf --assumeyes install epel-release && \
- dnf --assumeyes upgrade && \
dnf --assumeyes install \
boost-regex \
cairo \
=====================================
docker/debian/Dockerfile
=====================================
@@ -5,8 +5,21 @@ ARG libiniparser_version=1
ARG libmapnik_version=3.1
ARG runner_additional_packages=libcurl4 libglib2.0
+# Base
+FROM debian:${debian_version} AS base
+
+## Arguments
+ARG debian_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
+ --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get --yes update && \
+ apt-get --yes upgrade
+
# Builder
-FROM debian:${debian_version} AS builder
+FROM base AS builder
## Arguments
ARG debian_version
@@ -15,8 +28,6 @@ ARG debian_version
RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install \
apache2 \
apache2-dev \
@@ -51,7 +62,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM debian:${debian_version} AS runner
+FROM base AS runner
## Arguments
ARG debian_version
@@ -63,8 +74,6 @@ ARG runner_additional_packages
RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install ${runner_additional_packages} \
apache2 \
libcairo2 \
=====================================
docker/debian/Dockerfile.autotools
=====================================
@@ -5,8 +5,21 @@ ARG libiniparser_version=1
ARG libmapnik_version=3.1
ARG runner_additional_packages=libcurl4 libglib2.0
+# Base
+FROM debian:${debian_version} AS base
+
+## Arguments
+ARG debian_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
+ --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get --yes update && \
+ apt-get --yes upgrade
+
# Builder
-FROM debian:${debian_version} AS builder
+FROM base AS builder
## Arguments
ARG debian_version
@@ -15,8 +28,6 @@ ARG debian_version
RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install \
apache2 \
apache2-dev \
@@ -42,7 +53,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
RUN make test
# Runner
-FROM debian:${debian_version} AS runner
+FROM base AS runner
## Arguments
ARG debian_version
@@ -54,8 +65,6 @@ ARG runner_additional_packages
RUN --mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=debian:${debian_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install ${runner_additional_packages} \
apache2 \
libcairo2 \
=====================================
docker/docker-compose.yml
=====================================
@@ -200,6 +200,12 @@ services:
<<: *build_defaults_fedora
args:
fedora_version: "41"
+ fedora-42:
+ <<: *service_defaults
+ build:
+ <<: *build_defaults_fedora
+ args:
+ fedora_version: "42"
fedora-rawhide:
<<: *service_defaults
build:
@@ -264,6 +270,7 @@ services:
build:
<<: *build_defaults_ubuntu
args:
+ libiniparser_version: 4
libmapnik_version: "4.0"
ubuntu_version: "devel"
ubuntu-devel-autotools:
@@ -271,6 +278,7 @@ services:
build:
<<: *build_defaults_ubuntu
args:
+ libiniparser_version: 4
libmapnik_version: "4.0"
ubuntu_version: "devel"
dockerfile: docker/ubuntu/Dockerfile.autotools
@@ -279,6 +287,7 @@ services:
build:
<<: *build_defaults_ubuntu
args:
+ libiniparser_version: 4
libmapnik_version: "4.0"
runner_additional_packages: >-
curl
=====================================
docker/fedora/Dockerfile
=====================================
@@ -1,17 +1,27 @@
# hadolint global ignore=DL3025,DL3040,DL3041,DL3059
# Arguments
-ARG fedora_version=40
+ARG fedora_version=42
-# Builder
-FROM fedora:${fedora_version} AS builder
+# Base
+FROM fedora:${fedora_version} AS base
## Arguments
ARG fedora_version
-## Install builder dependencies
+## Install base dependencies
RUN --mount=type=cache,sharing=locked,id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf \
echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
echo "keepcache=True" >> /etc/dnf/dnf.conf && \
+ dnf --assumeyes upgrade
+
+# Builder
+FROM base AS builder
+
+## Arguments
+ARG fedora_version
+
+## Install builder dependencies
+RUN --mount=type=cache,sharing=locked,id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf \
dnf --assumeyes install \
cairo-devel \
cmake \
@@ -45,15 +55,13 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM fedora:${fedora_version} AS runner
+FROM base AS runner
## Arguments
ARG fedora_version
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=fedora:${fedora_version}-/var/cache/dnf,target=/var/cache/dnf \
- echo "install_weak_deps=False" >> /etc/dnf/dnf.conf && \
- echo "keepcache=True" >> /etc/dnf/dnf.conf && \
dnf --assumeyes install \
cairo \
glib2 \
=====================================
docker/opensuse/Dockerfile
=====================================
@@ -6,8 +6,20 @@ ARG mapnik_version=4.0.3
ARG opensuse_release=leap
ARG opensuse_version=15
+# Base
+FROM opensuse/${opensuse_release}:${opensuse_version} AS base
+
+## Arguments
+ARG opensuse_release
+ARG opensuse_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \
+ zypper modifyrepo --all --keep-packages && \
+ zypper --non-interactive update
+
# Mapnik Builder
-FROM opensuse/${opensuse_release}:${opensuse_version} AS mapnik-builder
+FROM base AS mapnik-builder
## Arguments
ARG boost_version
@@ -18,8 +30,6 @@ ARG opensuse_version
## Install mapnik-builder dependencies
RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \
- zypper modifyrepo --all --keep-packages && \
- zypper --non-interactive update && \
zypper --non-interactive install \
cairo-devel \
cmake \
@@ -76,7 +86,7 @@ RUN --mount=type=cache,id=opensuse/${opensuse_release}:${opensuse_version}-mapni
cmake --install . --strip
# Builder
-FROM opensuse/${opensuse_release}:${opensuse_version} AS builder
+FROM base AS builder
## Arguments
ARG boost_version
@@ -85,8 +95,6 @@ ARG opensuse_version
## Install builder dependencies
RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \
- zypper modifyrepo --all --keep-packages && \
- zypper --non-interactive update && \
zypper --non-interactive install \
apache2-devel \
cairo-devel \
@@ -136,7 +144,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM opensuse/${opensuse_release}:${opensuse_version} AS runner
+FROM base AS runner
## Arguments
ARG boost_version
@@ -145,8 +153,6 @@ ARG opensuse_version
## Install runner dependencies
RUN --mount=type=cache,sharing=locked,id=opensuse/${opensuse_release}:${opensuse_version}-/var/cache/zypp,target=/var/cache/zypp \
- zypper modifyrepo --all --keep-packages && \
- zypper --non-interactive update && \
zypper --non-interactive install \
apache2 \
apache2-utils \
=====================================
docker/ubuntu/Dockerfile
=====================================
@@ -1,11 +1,25 @@
# hadolint global ignore=DL3008,DL3025,DL3059
# Arguments
+ARG libiniparser_version=1
ARG libmapnik_version=3.1
ARG runner_additional_packages
ARG ubuntu_version=24.04
+# Base
+FROM ubuntu:${ubuntu_version} AS base
+
+## Arguments
+ARG ubuntu_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
+ --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get --yes update && \
+ apt-get --yes upgrade
+
# Builder
-FROM ubuntu:${ubuntu_version} AS builder
+FROM base AS builder
## Arguments
ARG ubuntu_version
@@ -14,8 +28,6 @@ ARG ubuntu_version
RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install \
apache2 \
apache2-dev \
@@ -50,9 +62,10 @@ RUN export DESTDIR=/tmp/mod_tile && \
cmake --install . --strip
# Runner
-FROM ubuntu:${ubuntu_version} AS runner
+FROM base AS runner
## Arguments
+ARG libiniparser_version
ARG libmapnik_version
ARG runner_additional_packages
ARG ubuntu_version
@@ -61,14 +74,12 @@ ARG ubuntu_version
RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install ${runner_additional_packages} \
apache2 \
libcairo2 \
libcurl4 \
libglib2.0-0 \
- libiniparser1 \
+ libiniparser${libiniparser_version} \
libmapnik${libmapnik_version} \
libmemcached11 \
librados2
=====================================
docker/ubuntu/Dockerfile.autotools
=====================================
@@ -1,10 +1,24 @@
# hadolint global ignore=DL3008,DL3025,DL3059
# Arguments
+ARG libiniparser_version=1
ARG libmapnik_version=3.1
ARG ubuntu_version=24.04
+# Base
+FROM ubuntu:${ubuntu_version} AS base
+
+## Arguments
+ARG ubuntu_version
+
+## Install base dependencies
+RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
+ --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
+ export DEBIAN_FRONTEND=noninteractive && \
+ apt-get --yes update && \
+ apt-get --yes upgrade
+
# Builder
-FROM ubuntu:${ubuntu_version} AS builder
+FROM base AS builder
## Arguments
ARG ubuntu_version
@@ -13,8 +27,6 @@ ARG ubuntu_version
RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install \
apache2 \
apache2-dev \
@@ -40,9 +52,10 @@ RUN export DESTDIR=/tmp/mod_tile && \
RUN make test
# Runner
-FROM ubuntu:${ubuntu_version} AS runner
+FROM base AS runner
## Arguments
+ARG libiniparser_version
ARG libmapnik_version
ARG ubuntu_version
@@ -50,14 +63,12 @@ ARG ubuntu_version
RUN --mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/cache/apt,target=/var/cache/apt \
--mount=type=cache,sharing=locked,id=ubuntu:${ubuntu_version}-/var/lib/apt,target=/var/lib/apt \
export DEBIAN_FRONTEND=noninteractive && \
- apt-get --yes update && \
- apt-get --yes upgrade && \
apt-get --no-install-recommends --yes install \
apache2 \
libcairo2 \
libcurl4 \
libglib2.0-0 \
- libiniparser1 \
+ libiniparser${libiniparser_version} \
libmapnik${libmapnik_version} \
libmemcached11 \
librados2
=====================================
docs/build/building_on_fedora.md
=====================================
@@ -6,7 +6,7 @@ Please see our [Continuous Integration script](/.github/workflows/build-and-test
A Docker-based building & testing setup pipeline is also available [here](/docker) for your convenience.
-## Fedora 34/35/36/37/38/39/40/41
+## Fedora 34/35/36/37/38/39/40/41/42
```shell
#!/usr/bin/env bash
=====================================
docs/man/convert_meta.1
=====================================
@@ -1,4 +1,4 @@
-.TH CONVERT_META "1" "2024-03-16" "mod_tile v0.8.0"
+.TH CONVERT_META "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/openstreetmap-tiles-update-expire.1
=====================================
@@ -1,4 +1,4 @@
-.TH TILES-UPDATE-EXPIRE "1" "2024-03-16" "mod_tile v0.8.0"
+.TH TILES-UPDATE-EXPIRE "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/render_expired.1
=====================================
@@ -1,4 +1,4 @@
-.TH RENDER_EXPIRED "1" "2024-03-16" "mod_tile v0.8.0"
+.TH RENDER_EXPIRED "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/render_list.1
=====================================
@@ -1,4 +1,4 @@
-.TH RENDER_LIST "1" "2024-03-20" "mod_tile v0.8.0"
+.TH RENDER_LIST "1" "2024-03-20" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/render_old.1
=====================================
@@ -1,4 +1,4 @@
-.TH RENDER_OLD "1" "2024-03-16" "mod_tile v0.8.0"
+.TH RENDER_OLD "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/render_speedtest.1
=====================================
@@ -1,4 +1,4 @@
-.TH RENDER_SPEEDTEST "1" "2024-03-16" "mod_tile v0.8.0"
+.TH RENDER_SPEEDTEST "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/renderd.1
=====================================
@@ -1,4 +1,4 @@
-.TH RENDERD "1" "2024-03-16" "mod_tile v0.8.0"
+.TH RENDERD "1" "2024-03-16" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
docs/man/renderd.conf.5
=====================================
@@ -1,4 +1,4 @@
-.TH RENDERD.CONF 5 "2024-06-06" "mod_tile v0.8.0"
+.TH RENDERD.CONF 5 "2024-06-06" "mod_tile v0.8.1"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
=====================================
src/mod_tile.c
=====================================
@@ -1871,6 +1871,7 @@ static const char *_add_tile_config(cmd_parms *cmd,
int attribution_len = strnlen(attribution, PATH_MAX);
int baseuri_len = strnlen(baseuri, PATH_MAX);
+ int cors_len = strnlen(cors, PATH_MAX);
int hostnames_len = 1;
int server_alias_len = strnlen(server_alias, PATH_MAX);
int tile_dir_len = strnlen(tile_dir, PATH_MAX);
@@ -1887,6 +1888,11 @@ static const char *_add_tile_config(cmd_parms *cmd,
baseuri = apr_psprintf(cmd->pool, "%s/", baseuri);
}
+ // If cors is empty, set it to NULL
+ if (cors_len == 0) {
+ cors = NULL;
+ }
+
// If server_alias is set, increment hostnames_len
if (server_alias_len > 0) {
hostnames_len++;
@@ -1954,7 +1960,7 @@ static const char *_add_tile_config(cmd_parms *cmd,
static const char *add_tile_mime_config(cmd_parms *cmd, void *mconfig, const char *baseuri, const char *name, const char *fileExtension)
{
- char *cors = NULL;
+ char *cors = "";
char *mimeType = "image/png";
if (strcmp(fileExtension, "js") == 0) {
=====================================
tests/CMakeLists.txt
=====================================
@@ -888,6 +888,76 @@ foreach(STORAGE_BACKEND_INDEX RANGE ${STORAGE_BACKENDS_LENGTH})
services_started_${STORAGE_BACKEND}
)
+ # Generate URL path for tiles
+ set(TILE_URL_PATH "/tiles/${DEFAULT_MAP_NAME}/5/5/5.png")
+ # Generate tile URLs
+ set(HTTPD0_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}${TILE_URL_PATH}")
+ set(HTTPD1_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}${TILE_URL_PATH}")
+ add_test(NAME cors_empty_${STORAGE_BACKEND}
+ COMMAND ${BASH} -c "
+ RESPONSE_CODE_CMD=\"${CURL_CMD} --write-out %{http_code} --output /dev/null\"
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} ${HTTPD0_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} ${HTTPD1_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} --header \"Origin: example.com\" ${HTTPD0_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} --header \"Origin: example.com\" ${HTTPD1_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ "
+ WORKING_DIRECTORY tests
+ )
+ set_tests_properties(cors_empty_${STORAGE_BACKEND} PROPERTIES
+ FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+ )
+
+ # Generate URL path for tiles
+ set(TILE_URL_PATH "/good_add_tile_config/${TILE_ZXY}.png")
+ # Generate tile URLs
+ set(HTTPD0_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}${TILE_URL_PATH}")
+ set(HTTPD1_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}${TILE_URL_PATH}")
+ add_test(NAME cors_empty_${STORAGE_BACKEND}_add_tile_config
+ COMMAND ${BASH} -c "
+ RESPONSE_CODE_CMD=\"${CURL_CMD} --write-out %{http_code} --output /dev/null\"
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} ${HTTPD0_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} ${HTTPD1_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} --header \"Origin: example.com\" ${HTTPD0_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ RESPONSE_CODE=$(\${RESPONSE_CODE_CMD} --header \"Origin: example.com\" ${HTTPD1_URL})
+ echo \"Response code: '\${RESPONSE_CODE}'\"
+ if [ \"\${RESPONSE_CODE}\" != \"200\" ]; then
+ exit 1;
+ fi
+ "
+ WORKING_DIRECTORY tests
+ )
+ set_tests_properties(cors_empty_${STORAGE_BACKEND}_add_tile_config PROPERTIES
+ FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+ )
+
# Generate URL path for tiles
set(TILE_URL_PATH "/tiles/cors_all/${TILE_ZXY}.png")
# Generate tile URLs
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/0ba19f71b8575e69f445700015a1156f76de7dcd
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/0ba19f71b8575e69f445700015a1156f76de7dcd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250505/fefa7468/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list