summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Fix-configuration-to-point-to-installed-files.patch12
-rw-r--r--0002-Set-default-project-directory-to-package-provided-di.patch17
-rw-r--r--PKGBUILD8
4 files changed, 24 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bdbe5eb1bc93..cc56757c9246 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nominatim
pkgdesc = Geocoding tool using OpenStreetmap data
- pkgver = 4.0.1
+ pkgver = 4.1.0
pkgrel = 1
url = https://nominatim.org
install = nominatim.install
@@ -39,7 +39,7 @@ pkgbase = nominatim
optdepends = nominatim-data-postcodes-us: improve searches that involve a US postcode
optdepends = nominatim-data-tiger: improves searches that involve US house numbers
noextract = country_grid.sql.gz
- source = https://nominatim.org/release/Nominatim-4.0.1.tar.bz2
+ source = https://nominatim.org/release/Nominatim-4.1.0.tar.bz2
source = https://www.nominatim.org/data/country_grid.sql.gz
source = nominatim.sysusers
source = nominatim.tmpfiles
@@ -49,7 +49,7 @@ pkgbase = nominatim
source = php-fpm.conf
source = 0001-Fix-configuration-to-point-to-installed-files.patch
source = 0002-Set-default-project-directory-to-package-provided-di.patch
- sha256sums = 8f0c7ab93e6341713da40d034e689c4b9c3f257de485624abe4dc78b175267fc
+ sha256sums = a6bcc5925815be6d3238ba65a7f515ff79218c9e83a640697a4eaeae3ac392a4
sha256sums = fe66393aaf561749255cebf4c61d13a8425e326b8ce50409d88c4035165de049
sha256sums = 7f71b5217cbe0713fa5f8baa138348c9cd49f42c2b6025c059076042e0c04c6d
sha256sums = 50bf612ad951bcf3c1969aa79b0c7ab78745983720bc5f2deb37d1704c0e37d8
@@ -57,7 +57,7 @@ pkgbase = nominatim
sha256sums = ed00242d06d6a17297a30675befef110f354a6f4bd2804d58796d956a9ae54a2
sha256sums = 37c4b17463f8317d39bb741b07bbb693afc0bbf584eec590f89b849542b98b7d
sha256sums = c2d5391160704bc636fde73c0e92346529ae1698f1cc909a8341271e0e4967d4
- sha256sums = 2d6b5aced7a5a3fba2d3009f0806eb8a79677f9a62e9de90cd3c9cb4452746a3
- sha256sums = 7e931eb36bc77a754bf22fa34e8d3c589b14d3668f14b73cf59121be5026bf24
+ sha256sums = ed051533ad83fb93e458e31d4e116ad9717ff8d4edc7af0dec2b2a3bb61c7172
+ sha256sums = 4650a98992bb0371cffa740c9ffc3b92032346d0ae13fb78e34aeeb534ee5255
pkgname = nominatim
diff --git a/0001-Fix-configuration-to-point-to-installed-files.patch b/0001-Fix-configuration-to-point-to-installed-files.patch
index 5f23e807310d..6d27370aeb97 100644
--- a/0001-Fix-configuration-to-point-to-installed-files.patch
+++ b/0001-Fix-configuration-to-point-to-installed-files.patch
@@ -1,4 +1,4 @@
-From e8f961114f0f2ec70f647d409afc24a5f950bf4c Mon Sep 17 00:00:00 2001
+From 854b98268687883b4076ddacdab67625f57aca38 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Thu, 24 Jun 2021 15:56:34 +0200
Subject: [PATCH 1/2] Fix configuration to point to installed files
@@ -8,7 +8,7 @@ Subject: [PATCH 1/2] Fix configuration to point to installed files
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/settings/env.defaults b/settings/env.defaults
-index 00f5569a..a9fc3e60 100644
+index 3115f438..7fae17bf 100644
--- a/settings/env.defaults
+++ b/settings/env.defaults
@@ -10,13 +10,13 @@ NOMINATIM_DATABASE_DSN="pgsql:dbname=nominatim"
@@ -27,9 +27,9 @@ index 00f5569a..a9fc3e60 100644
# Tokenizer used for normalizing and parsing queries and names.
# The tokenizer is set up during import and cannot be changed afterwards
-@@ -77,7 +77,7 @@ NOMINATIM_HTTP_PROXY_PASSWORD=
- # When empty, osm2pgsql is expected to reside in the osm2pgsql directory in
- # the project directory.
+@@ -75,7 +75,7 @@ NOMINATIM_HTTP_PROXY_PASSWORD=
+
+ # Location of the osm2pgsql binary.
# EXPERT ONLY. You should usually use the supplied osm2pgsql.
-NOMINATIM_OSM2PGSQL_BINARY=
+NOMINATIM_OSM2PGSQL_BINARY="/usr/bin/osm2pgsql"
@@ -37,5 +37,5 @@ index 00f5569a..a9fc3e60 100644
# Directory where to find US Tiger data files to import.
# OBSOLETE: use `nominatim add-data --tiger-data <dir>` to explicitly state
--
-2.36.1
+2.37.1
diff --git a/0002-Set-default-project-directory-to-package-provided-di.patch b/0002-Set-default-project-directory-to-package-provided-di.patch
index e80b2dad33ff..394b9d847355 100644
--- a/0002-Set-default-project-directory-to-package-provided-di.patch
+++ b/0002-Set-default-project-directory-to-package-provided-di.patch
@@ -1,27 +1,28 @@
-From 62c2e1a8a78c25ac06c3f7b663c73e6b9cb0f4b6 Mon Sep 17 00:00:00 2001
+From d3c44ed4f48e1650caada7f67a2e9256495f149c Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Sun, 22 May 2022 10:50:31 +0200
Subject: [PATCH 2/2] Set default project directory to package-provided
directory
---
- nominatim/cli.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ nominatim/cli.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/nominatim/cli.py b/nominatim/cli.py
-index 6c01a68a..47a5ef3b 100644
+index 8c2136f4..4f686dcd 100644
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
-@@ -16,6 +16,8 @@ from nominatim.clicmd.args import NominatimArgs
+@@ -24,6 +24,9 @@ from nominatim.clicmd.args import NominatimArgs, Subcommand
LOG = logging.getLogger()
+# Patched in by nominatim AUR package
+DEFAULT_PROJECT_DIR = '/var/lib/nominatim/'
-
++
class CommandlineParser:
""" Wraps some of the common functions for parsing the command line
-@@ -40,8 +42,8 @@ class CommandlineParser:
+ and setting up subcommands.
+@@ -51,8 +54,8 @@ class CommandlineParser:
help='Print only error messages')
group.add_argument('-v', '--verbose', action='count', default=1,
help='Increase verboseness of output')
@@ -33,5 +34,5 @@ index 6c01a68a..47a5ef3b 100644
help='Number of parallel threads to use')
--
-2.36.1
+2.37.1
diff --git a/PKGBUILD b/PKGBUILD
index a513ffcaa3b8..33eb44586f4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname="nominatim"
pkgdesc="Geocoding tool using OpenStreetmap data"
url="https://nominatim.org"
-pkgver=4.0.1
+pkgver=4.1.0
pkgrel=1
arch=("x86_64")
@@ -65,7 +65,7 @@ source=(
"0001-Fix-configuration-to-point-to-installed-files.patch"
"0002-Set-default-project-directory-to-package-provided-di.patch"
)
-sha256sums=('8f0c7ab93e6341713da40d034e689c4b9c3f257de485624abe4dc78b175267fc'
+sha256sums=('a6bcc5925815be6d3238ba65a7f515ff79218c9e83a640697a4eaeae3ac392a4'
'fe66393aaf561749255cebf4c61d13a8425e326b8ce50409d88c4035165de049'
'7f71b5217cbe0713fa5f8baa138348c9cd49f42c2b6025c059076042e0c04c6d'
'50bf612ad951bcf3c1969aa79b0c7ab78745983720bc5f2deb37d1704c0e37d8'
@@ -73,8 +73,8 @@ sha256sums=('8f0c7ab93e6341713da40d034e689c4b9c3f257de485624abe4dc78b175267fc'
'ed00242d06d6a17297a30675befef110f354a6f4bd2804d58796d956a9ae54a2'
'37c4b17463f8317d39bb741b07bbb693afc0bbf584eec590f89b849542b98b7d'
'c2d5391160704bc636fde73c0e92346529ae1698f1cc909a8341271e0e4967d4'
- '2d6b5aced7a5a3fba2d3009f0806eb8a79677f9a62e9de90cd3c9cb4452746a3'
- '7e931eb36bc77a754bf22fa34e8d3c589b14d3668f14b73cf59121be5026bf24')
+ 'ed051533ad83fb93e458e31d4e116ad9717ff8d4edc7af0dec2b2a3bb61c7172'
+ '4650a98992bb0371cffa740c9ffc3b92032346d0ae13fb78e34aeeb534ee5255')
noextract=(
"country_grid.sql.gz"
)