<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1aabae58d4a59422aa093797d0f2fc1f38be37bb">https://github.com/macports/macports-ports/commit/1aabae58d4a59422aa093797d0f2fc1f38be37bb</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 1aabae58d4a mod_tile: update to 0.7.2
</span>1aabae58d4a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1aabae58d4a59422aa093797d0f2fc1f38be37bb
</span>Author: frankdean <frankdean@users.noreply.github.com>
AuthorDate: Sat Dec 28 14:46:10 2024 +0000
<span style='display:block; white-space:pre;color:#404040;'> mod_tile: update to 0.7.2
</span>---
gis/mod_tile/Portfile | 30 ++----
gis/mod_tile/files/configure-ac.diff | 45 +++-----
gis/mod_tile/files/makefile-am.diff | 34 ------
.../files/openstreetmap-tiles-update-expire.diff | 118 ++++++++++-----------
gis/mod_tile/files/osmosis-db_replag.diff | 55 +++++-----
gis/mod_tile/files/src-daemon-c.diff | 11 --
gis/mod_tile/files/src-mod_tile-c.diff | 15 ---
gis/mod_tile/files/src-render_submit_queue-c.diff | 10 --
8 files changed, 107 insertions(+), 211 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/Portfile b/gis/mod_tile/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73e3e01dfc2..e8d4c2b4398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mod_tile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,10 @@ PortGroup active_variants 1.1
</span> PortGroup boost 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup openstreetmap mod_tile 0.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup openstreetmap mod_tile 0.7.2 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span>
categories-append gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {@frankdean fdsd.co.uk:frank.dean} openmaintainer
license GPL-2+ Boost-1 BSD Permissive MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,16 +23,17 @@ long_description mod_tile is a system to serve raster tiles for example to us
</span> a high performance serving and can support several thousand requests \
per second.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e6c2224c6500f695e4a17addc7d05086ce5bebd5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d730ec04f9dc01ac7e4f863130480451be849b5d14a632225b23957fe5da0aef \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 182209
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 191b6eb0886efc0c7f3fb8b6170eb5d581dcc706 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7988335986d9dadc5275cd955c5af14d3648addb68b16866bb79f27aa76797e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1483176
</span>
# boost.version must follow that of the `mapnik` port.
boost.version 1.76
depends_build port:apache2 \
port:carto \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:iniparser
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:iniparser \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib port:curl \
port:freetype \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,12 +72,8 @@ startupitem.user ${renderd_user}
</span> startupitem.executable ${prefix}/bin/renderd -f -c ${prefix}/etc/renderd/renderd.conf
patchfiles configure-ac.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- makefile-am.diff \
</span> openstreetmap-tiles-update-expire.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- osmosis-db_replag.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src-daemon-c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src-mod_tile-c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src-render_submit_queue-c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osmosis-db_replag.diff
</span>
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -120,10 +115,6 @@ if {![variant_isset postgresql15] && ![variant_isset postgresql16]} {
</span> default_variants-append +postgresql16
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${worksrcpath}/renderd.conf ${worksrcpath}/renderd.conf.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
xinstall -m 0644 -W ${filespath} \
renderd.conf.dist \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -131,7 +122,7 @@ post-patch {
</span> ${worksrcpath}
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/renderd.conf.dist \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/osmosis-db_replag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/osmosis-db_replag
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,7 +178,6 @@ post-destroot {
</span> ${destroot}${docdir}/README_MacPorts.md
xinstall -m 0755 -d ${destroot}${prefix}/etc/renderd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/etc/renderd.conf.orig ${destroot}${prefix}/etc/renderd/renderd.conf.orig
</span> xinstall -o root -m 0644 ${worksrcpath}/renderd.conf.dist \
${destroot}${prefix}/etc/renderd/renderd.conf.dist
xinstall -m 0755 -d ${destroot}${prefix}/etc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,8 +196,8 @@ post-destroot {
</span> ${destroot}${prefix}/share/${name}
xinstall -m 0755 \
${filespath}/osm_setup_db.sh \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/openstreetmap-tiles-update-expire \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/osmosis-db_replag \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/openstreetmap-tiles-update-expire \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/osmosis-db_replag \
</span> ${destroot}${prefix}/share/${name}
xinstall -o ${renderd_user} -m 0755 -d ${destroot}${prefix}/var/run/${name}
xinstall -o ${renderd_user} -m 0755 -d ${destroot}${prefix}/var/lib/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/configure-ac.diff b/gis/mod_tile/files/configure-ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 957f5c6487f..981a84f591e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/configure-ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mod_tile/files/configure-ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2020-09-28 08:43:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2021-09-22 11:46:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,12 +15,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac~ 2024-06-21 02:56:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-12-26 16:58:22
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,11 +21,11 @@
</span> AC_PROG_CC_C99
<span style='display:block; white-space:pre;background:#ffe0e0;'>--dnl Find C++ compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$HAVE_CXX" = "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_MSG_ERROR([Could not find a c++ compiler]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Find C++ compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$HAVE_CXX" = "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_ERROR([Could not find a c++ compiler]);
</span> -fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl Find C++ compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl if test "$HAVE_CXX" = "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+dnl AC_MSG_ERROR([Could not find a c++ compiler]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl if test "$HAVE_CXX" = "no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl AC_MSG_ERROR([Could not find a c++ compiler]);
</span> +dnl fi
# Checks for libraries.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,9 +74,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([Could not find apxs on the path.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_SEARCH_LIBS([iniparser_load], [iniparser], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_CHECK_HEADERS([iniparser.h], [have_system_iniparser=yes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_SEARCH_LIBS([iniparser_load], [iniparser],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_HEADERS([iniparser/iniparser.h], [have_system_iniparser=yes])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_MSG_ERROR([Could not find iniparser library.])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$have_system_iniparser" = "xyes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(SYSTEM_LIBINIPARSER, 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/makefile-am.diff b/gis/mod_tile/files/makefile-am.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e2279e81421..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/makefile-am.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2021-09-21 15:53:08.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2021-09-21 20:37:24.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AUTOMAKE_OPTIONS = foreign
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !SYSTEM_LIBINIPARSER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SUBDIRS = iniparser3.0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_AMFLAGS = -I m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,11 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- renderd_CXXFLAGS = $(MAPNIK_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- renderd_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) -liniparser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !SYSTEM_LIBINIPARSER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- renderd_SOURCES += iniparser3.0b/libiniparser.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- renderd_LDADD += -Liniparser3.0b/.libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--renderd_DATA = renderd.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+renderd_DATA = renderd.conf.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- render_speedtest_SOURCES = src/speedtest.cpp src/protocol_helper.c src/render_submit_queue.c src/sys_utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- render_speedtest_LDADD = $(PTHREAD_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- render_list_SOURCES = src/render_list.c src/sys_utils.c src/protocol_helper.c src/render_submit_queue.c $(STORE_SOURCES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +30,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gen_tile_test_CFLAGS = -DMAIN_ALREADY_DEFINED $(PTHREAD_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gen_tile_test_CXXFLAGS = $(MAPNIK_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gen_tile_test_LDADD = $(PTHREAD_CFLAGS) $(MAPNIK_LDFLAGS) $(STORE_LDFLAGS) -liniparser
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if !SYSTEM_LIBINIPARSER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gen_tile_test_SOURCES += iniparser3.0b/libiniparser.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gen_tile_test_LDADD += -Liniparser3.0b/.libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLEANFILES=*.slo mod_tile.la stderr.out src/*.slo src/*.lo src/.libs/* src/*.la
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/openstreetmap-tiles-update-expire.diff b/gis/mod_tile/files/openstreetmap-tiles-update-expire.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6024c3d451d..1fcd6fff443 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/openstreetmap-tiles-update-expire.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mod_tile/files/openstreetmap-tiles-update-expire.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- openstreetmap-tiles-update-expire.orig 2022-01-10 19:07:49.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ openstreetmap-tiles-update-expire 2022-01-10 19:09:24.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,13 +4,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/openstreetmap-tiles-update-expire~ 2024-06-21 02:56:34
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/openstreetmap-tiles-update-expire 2024-12-26 18:32:44
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,13 +19,34 @@
</span>
#*************************************************************************
#*************************************************************************
-OSMOSIS_BIN=osmosis
-OSM2PGSQL_BIN=osm2pgsql
-OSM2PGSQL_OPTIONS=
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#OSM2PGSQL_OPTIONS="--flat-nodes /path/to/flatnodes --hstore"
</span> +PREFIX="${PREFIX:-/usr/local}"
+if [ -r ${PREFIX}/etc/mod_tile/osm-tiles-update.conf ]; then
+ source ${PREFIX}/etc/mod_tile/osm-tiles-update.conf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,18 +28,19 @@
</span> +OSM2PGSQL_CPUS="${OSM2PGSQL_CPUS:-4}"
+DBNAME="${GIS_DB:-gis}"
+OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script ${PREFIX}/share/openstreetmap-carto/openstreetmap-carto.lua --number-processes $OSM2PGSQL_CPUS -S ${PREFIX}/share/openstreetmap-carto/openstreetmap-carto.style -C $OSM2PGSQL_RAM"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #OSM2PGSQL_OPTIONS="--flat-nodes /path/to/flatnodes --hstore"
</span> +TRIM_BIN=${PREFIX}/share/trim_osc/trim_osc.py
+TRIM_OPTIONS="-d $DBNAME --user $ACCOUNT"
+TRIM_REGION_OPTIONS="${TRIM_REGION_OPTIONS:--p region.poly}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--BASE_DIR=/var/lib/mod_tile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BASE_DIR=/var/cache/renderd/tiles
</span> -LOG_DIR=/var/log/tiles/
+BASE_DIR=${PREFIX}/var/lib/mod_tile
+LOG_DIR=${PREFIX}/var/log/renderd
WORKOSM_DIR=$BASE_DIR/.osmosis
LOCK_FILE=/tmp/openstreetmap-update-expire-lock.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,14 +41,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,14 +57,26 @@
</span> OSMOSISLOG=$LOG_DIR/osmosis.log
PGSQLLOG=$LOG_DIR/osm2pgsql.log
EXPIRYLOG=$LOG_DIR/expiry.log
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,71 +67,68 @@
</span>
+cd "$BASE_DIR"
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- m_info()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "[`date +"%Y-%m-%d %H:%M:%S"`] $$ $1" >> "$RUNLOG"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,6 +108,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir $WORKOSM_DIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2> "$OSMOSISLOG"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_info() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "[$(date +"%Y-%m-%d %H:%M:%S")] $$ $1" >>"$RUNLOG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -85,6 +118,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir $WORKOSM_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $OSMOSIS_BIN --read-replication-interval-init workingDirectory=$WORKOSM_DIR 1>&2 2>"$OSMOSISLOG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wget "https://replicate-sequences.osm.mazdermind.de/?"$1"T00:00:00Z" -O $WORKOSM_DIR/state.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mv $WORKOSM_DIR/configuration.txt $WORKOSM_DIR/configuration_orig.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sed "s!baseUrl=http://planet.openstreetmap.org/replication/minute!baseUrl=https://planet.openstreetmap.org/replication/minute!" $WORKOSM_DIR/configuration_orig.txt > $WORKOSM_DIR/configuration.txt
</span> else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure the lockfile is removed when we exit and then claim it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make sure the lockfile is removed when we exit and then claim it
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -89,9 +123,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,9 +133,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ ! -r $WORKOSM_DIR/state.txt ];then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_error "The Osmosis replication system has not yet been initialised"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- seq=`cat $WORKOSM_DIR/state.txt | grep sequenceNumber | cut -d= -f2`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_ok "start import from seq-nr $seq, replag is `osmosis-db_replag -h`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_ok "start import from seq-nr $seq, replag is `${PREFIX}/share/mod_tile/osmosis-db_replag -h`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /bin/cp $WORKOSM_DIR/state.txt $WORKOSM_DIR/last.state.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ok "downloading diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,22 +137,56 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ! $OSMOSIS_BIN --read-replication-interval workingDirectory=$WORKOSM_DIR --simplify-change --write-xml-change $CHANGE_FILE 1>&2 2> "$OSMOSISLOG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_error "Osmosis error"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ ! -r $WORKOSM_DIR/state.txt ];then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_error "The Osmosis replication system has not yet been initialised"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [ -x "$TRIM_BIN" ] && [ -n "$TRIM_REGION_OPTIONS" ] ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_ok "filtering diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ! $TRIM_BIN $TRIM_OPTIONS $TRIM_REGION_OPTIONS -z $CHANGE_FILE $CHANGE_FILE 1>&2 2>> "$RUNLOG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_ok "Trim_osc error but continue anyway"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ seq=$(cat $WORKOSM_DIR/state.txt | grep sequenceNumber | cut -d= -f2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_ok "start import from seq-nr $seq, replag is $(osmosis-db_replag -h)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ok "start import from seq-nr $seq, replag is `${PREFIX}/share/mod_tile/osmosis-db_replag -h`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /bin/cp $WORKOSM_DIR/state.txt $WORKOSM_DIR/last.state.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ok "downloading diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,21 +148,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_error "Osmosis error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if [ -x "$TRIM_BIN" ] && [ -n "$TRIM_REGION_OPTIONS" ] ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ok "filtering diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ! $TRIM_BIN $TRIM_OPTIONS $TRIM_REGION_OPTIONS -z $CHANGE_FILE $CHANGE_FILE 1>&2 2>> "$RUNLOG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_ok "Trim_osc error but continue anyway"
</span> + fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ok "importing diff"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EXPIRY_METAZOOM=`expr $EXPIRY_MAXZOOM - 3`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ! $OSM2PGSQL_BIN -a --slim -e$EXPIRY_METAZOOM:$EXPIRY_METAZOOM $OSM2PGSQL_OPTIONS -o "$EXPIRY_FILE.$$" $CHANGE_FILE 1>&2 2> "$PGSQLLOG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ok "importing diff"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- EXPIRY_METAZOOM=$(expr $EXPIRY_MAXZOOM - 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ! $OSM2PGSQL_BIN -a --slim -e$EXPIRY_METAZOOM:$EXPIRY_METAZOOM $OSM2PGSQL_OPTIONS -o "$EXPIRY_FILE.$$" $CHANGE_FILE 1>&2 2>"$PGSQLLOG"; then
</span> +#------------------------------------------------------------------------------
+# Previously openstreetmap-tiles-update-expire tried to dirty layer
+# "$EXPIRY_MAXZOOM - 3" (which was 15) only. Instead we write all expired
+# tiles in range to the list (note the "-" rather than ":" in the "-e"
+# parameter).
+#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ! $OSM2PGSQL_BIN -a --slim -e$EXPIRY_MINZOOM-$EXPIRY_MAXZOOM $OSM2PGSQL_OPTIONS -o "$EXPIRY_FILE.$$" $CHANGE_FILE 1>&2 2> "$PGSQLLOG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_error "osm2pgsql error"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ! $OSM2PGSQL_BIN -a --slim -e$EXPIRY_MINZOOM-$EXPIRY_MAXZOOM $OSM2PGSQL_OPTIONS -o "$EXPIRY_FILE.$$" $CHANGE_FILE 1>&2 2> "$PGSQLLOG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_error "osm2pgsql error"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- freelock "$LOCK_FILE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- freelock "$LOCK_FILE"
</span> +#------------------------------------------------------------------------------
+# The lockfile is normally removed before we expire tiles because that is
+# something that can be done in parallel with further processing. In order to
+# avoid rework, if actually rerendering is done rather than just deleting or
+# dirtying, it makes sense to move it lower down.
+#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# m_ok "Import complete; removing lock file"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# freelock "$LOCK_FILE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# freelock "$LOCK_FILE"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ok "expiring tiles"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /run/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ok "expiring tiles"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /run/renderd.sock <"$EXPIRY_FILE.$$" 2>&1 | tail -8 >>"$EXPIRYLOG"; then
</span> +#------------------------------------------------------------------------------
+# When expiring tiles we need to define the style sheet if it's not "default".
+# In this case it's "ajt".
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,19 +138,18 @@
</span> +# delete >= $EXPIRY_DELETEFROM and <= $EXPIRY_MAXZOOM.
+# The default path to renderd.sock is fixed.
+#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM --tile-dir=${PREFIX}/var/lib/mod_tile -s ${PREFIX}/var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_info "Expiry failed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ! render_expired --map=ajt --min-zoom=$EXPIRY_MINZOOM --touch-from=$EXPIRY_TOUCHFROM --delete-from=$EXPIRY_DELETEFROM --max-zoom=$EXPIRY_MAXZOOM --tile-dir=${PREFIX}/var/lib/mod_tile -s ${PREFIX}/var/run/renderd/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_info "Expiry failed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm "$EXPIRY_FILE.$$"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rm "$EXPIRY_FILE.$$"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#------------------------------------------------------------------------------
+# Only remove the lock file after expiry (if system is slow we want to delay
+# the next import, not have multiple render_expired processes running)
+#------------------------------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ freelock "$LOCK_FILE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ freelock "$LOCK_FILE"
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ok "Done with import"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_ok "Done with import"
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/osmosis-db_replag.diff b/gis/mod_tile/files/osmosis-db_replag.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2966d8fe60f..d0ef2089ec4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/osmosis-db_replag.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mod_tile/files/osmosis-db_replag.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- osmosis-db_replag.orig 2021-08-25 14:21:18.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ osmosis-db_replag 2021-08-27 16:29:57.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,13 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #!/bin/bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--STATE=/var/lib/mod_tile/.osmosis/state.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- utils/osmosis-db_replag~ 2024-12-26 18:40:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ utils/osmosis-db_replag 2024-12-26 18:49:23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,15 +15,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with this program; If not, see http://www.gnu.org/licenses/.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-STATE=/var/cache/renderd/tiles/.osmosis/state.txt
</span> +STATE=@PREFIX@/var/lib/mod_tile/.osmosis/state.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>--rep=`cat ${STATE} |\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rep=$(cat ${STATE} |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- grep 'timestamp' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- awk '{split($0, a, "="); print a[2]}' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tr 'T' ' ' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xargs -I{} ${BINPATH}date --utc --date "{}" +%s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-is=$(date --utc +%s)
</span> +if [ ! -r "$STATE" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ echo "-1 seconds"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ echo "-1 seconds"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit 0
</span> +fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +if [[ "$OSTYPE" != "darwin"* ]]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rep=`cat ${STATE} |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- grep 'timestamp' |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- awk '{split($0, a, "="); print a[2]}' |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tr 'T' ' ' |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xargs -I{} ${BINPATH}date --utc --date "{}" +%s`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--is=`date --utc +%s`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is=`date --utc +%s`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rep=$(cat ${STATE} |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ grep 'timestamp' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ awk '{split($0, a, "="); print a[2]}' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tr 'T' ' ' |
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xargs -I{} ${BINPATH}date --utc --date "{}" +%s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ is=$(date --utc +%s)
</span> +else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rep=`cat ${STATE} |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ awk '/timestamp=/{d = substr($1, 11, 10);t = substr($1, 22, 10); z = substr($1, 32); if (z = "Z") {z = "UTC";}; print d " " t z;}' |\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xargs -I{} ${BINPATH}date -ju -f "%Y-%m-%d %H:%M:%S%Z" "{}" +%s`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is=`date -u +%s`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rep=$(cat ${STATE} |\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ awk '/timestamp=/{d = substr($1, 11, 10);t = substr($1, 22, 10); z = substr($1, 32); if (z = "Z") {z = "UTC";}; print d " " t z;}' |\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xargs -I{} ${BINPATH}date -ju -f "%Y-%m-%d %H:%M:%S%Z" "{}" +%s)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ is=$(date --utc +%s)
</span> +fi
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> lag=$(($is - $rep))
if [ "$1" = "-h" ]; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,4 +33,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $lag;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/src-daemon-c.diff b/gis/mod_tile/files/src-daemon-c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 270c21db015..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/src-daemon-c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/daemon.c.orig 2021-09-21 20:20:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/daemon.c 2021-09-21 20:20:34.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PIDFILE "/run/renderd/renderd.pid"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if SYSTEM_LIBINIPARSER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <iniparser.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iniparser/iniparser.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "iniparser3.0b/src/iniparser.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/src-mod_tile-c.diff b/gis/mod_tile/files/src-mod_tile-c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5d74c8530aa..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/src-mod_tile-c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mod_tile.c~ 2020-09-28 08:43:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mod_tile.c 2021-07-20 17:04:03.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -753,7 +753,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hashkey = (ip.s6_addr32[0] ^ ip.s6_addr32[1] ^ ip.s6_addr32[2] ^ ip.s6_addr32[3]) % DELAY_HASHTABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // hashkey = (ip.s6_addr32[0] ^ ip.s6_addr32[1] ^ ip.s6_addr32[2] ^ ip.s6_addr32[3]) % DELAY_HASHTABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // See https://github.com/openstreetmap/mod_tile/commit/8307d19ab7040691b1fd243052b6668a14f4df1f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // and https://github.com/openstreetmap/mod_tile/issues/114
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // https://github.com/openstreetmap/mod_tile/issues/106
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hashkey = (*((uint32_t *)(&ip.s6_addr[0])) ^ *((uint32_t *)(&ip.s6_addr[4])) ^ *((uint32_t *)(&ip.s6_addr[8])) ^ *((uint32_t *)(&ip.s6_addr[12]))) % DELAY_HASHTABLE_SIZE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If a delaypool fillup is ongoing, just skip accounting to not block on a lock */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (delayp->locked) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mod_tile/files/src-render_submit_queue-c.diff b/gis/mod_tile/files/src-render_submit_queue-c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 585a5d110a4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mod_tile/files/src-render_submit_queue-c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/render_submit_queue.c~ 2020-09-28 08:43:13.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/render_submit_queue.c 2021-07-20 17:02:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <errno.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "render_submit_queue.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "sys_utils.h"
</span></pre><pre style='margin:0'>
</pre>