From 5e23bb1588baa0341dfcb9a8cd7536d2351f2fa7 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 4 Apr 2024 04:49:17 -0600 Subject: [PATCH 01/18] fix: Add changelog that seems to have gotten lost so it's possible to build deb packages --- dist/debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 dist/debian/changelog diff --git a/dist/debian/changelog b/dist/debian/changelog new file mode 100644 index 00000000..dbb385d6 --- /dev/null +++ b/dist/debian/changelog @@ -0,0 +1,5 @@ +underpass (0.3) distro; urgency=low + + * local package. + + -- Rob Savoye (Rollinsville, CO) Thu, 04 Apr 2024 04:20:00 +0100 From 3cc7208edeaf921258e63b676e76d18b584aec0f Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 4 Apr 2024 05:01:02 -0600 Subject: [PATCH 02/18] fix: Fix building deb packages --- Makefile.am | 28 +++++++++++----------------- dist/debian/deb.am | 6 ++++-- dist/debian/rules | 2 +- src/validate/Makefile.am | 10 +++++----- 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/Makefile.am b/Makefile.am index ca221ca4..9c3947f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,8 +31,7 @@ DISTCLEANFILES = docs/html docs/latex .lastmod MAINTAINERCLEANFILES = revno.h .lastmod ETCDIR = $(subst lib,etc,$(pkglibdir)) -SUBDIRS = \ - src/validate +SUBDIRS = src/validate lib_LTLIBRARIES = libunderpass.la instdir = /tmp @@ -50,8 +49,7 @@ BOOST_LIBS = $(BOOST_DATE_TIME_LIB) \ $(BOOST_TIMER_LIB) \ $(BOOST_PYTHON_LIB) -SQL_FILES = \ - setup/db/underpass.sql +SQL_FILES = setup/db/underpass.sql libunderpass_la_SOURCES = \ src/utils/log.cc src/utils/log.hh \ @@ -71,8 +69,7 @@ libunderpass_la_SOURCES = \ src/utils/geoutil.cc src/utils/geoutil.hh \ src/utils/geo.cc src/utils/geo.hh \ src/utils/yaml.hh src/utils/yaml.cc \ - src/data/pq.hh src/data/pq.cc \ - setup/db/setupdb.sh + src/data/pq.hh src/data/pq.cc if JEMALLOC libunderpass_la_LDFLAGS = -avoid-version -ljemalloc @@ -109,15 +106,15 @@ AM_CPPFLAGS = \ # clutter to the output. This should only be enabled when doing performance tuning. -DTIMING_DEBUG -pkgdata_DATA = $(SQL_FILES) setup/db/setupdb.sh $(PYTHON_UTILS) +pkgdata_DATA = $(SQL_FILES) $(PYTHON_UTILS) EXTRA_DIST = \ $(SQL_FILES) \ $(PYTHON_UTILS) \ + setup/service/underpass.service \ + setup/db/setupdb.sh \ src/testsuite \ - config/priority.geojson \ - config/replicator/planetreplicator.yaml \ - doc \ + docs \ dist/debian \ dist/redhat \ utils @@ -154,13 +151,10 @@ endif install-data-hook: $(MKDIR_P) $(DESTDIR)$(ETCDIR) - cp -rvp $(srcdir)/config/priority.geojson $(DESTDIR)$(ETCDIR)/ - cp -rvp $(srcdir)/config/replicator $(DESTDIR)$(ETCDIR)/ - cp -rvp $(srcdir)/config/stats $(DESTDIR)$(ETCDIR)/ - cp -rvp $(srcdir)/config/default.yaml $(DESTDIR)$(ETCDIR)/ - cp -rvp $(srcdir)/setup/service $(DESTDIR)/$(pkglibdir) - $(MKDIR_P) $(DESTDIR)$(pkglibdir)/../system - cp -rvp $(srcdir)/setup/service/underpass.service $(DESTDIR)$(pkglibdir)/../system/ + @rsync -avr $(srcdir)/config $(DESTDIR)$(ETCDIR)/ + @rsync -avr $(srcdir)/setup $(DESTDIR)/$(pkglibdir) + @$(MKDIR_P) $(DESTDIR)$(pkglibdir)/../system + cp -rvu $(srcdir)/setup/service/underpass.service $(DESTDIR)$(pkglibdir)/../system/ dist-hook: apidoc $(MKDIR_P) $(DESTDIR)/$(docdir) diff --git a/dist/debian/deb.am b/dist/debian/deb.am index c40f8686..c52221d0 100644 --- a/dist/debian/deb.am +++ b/dist/debian/deb.am @@ -34,7 +34,9 @@ DEB_BUILD_OPTIONS ?= $(shell echo $DEB_BUILD_OPTIONS) # the file editing to be done snapshot-deb: mv $(distdir) $(PACKAGE)-$(NOW) - cd $(PACKAGE)-$(NOW) ; \ - dpkg-buildpackage -rfakeroot -d -b + cd $(PACKAGE)-$(NOW) ; \ + $(LN_S) dist/debian .; \ + $(LN_S) $(srcdir)/config .; \ + dpkg-buildpackage -rfakeroot -d -b -krob@senecass.com .PHONY : deb snapshot-deb diff --git a/dist/debian/rules b/dist/debian/rules index ae2ee862..a259e3a2 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -29,7 +29,7 @@ configure: config-stamp config-stamp: dh_testdir @printf "\n == CONFIGURE ==\n\n" - dh_auto_configure -- CXXFLAGS="-std=c++17 -g -O0" CXX="ccache g++" LDFLAGS="-lbz2" + dh_auto_configure -- CXXFLAGS="-std=c++17 -g" CXX="ccache g++" LDFLAGS="-lbz2" touch $@ build: build-stamp diff --git a/src/validate/Makefile.am b/src/validate/Makefile.am index 42229a27..c593637c 100644 --- a/src/validate/Makefile.am +++ b/src/validate/Makefile.am @@ -51,8 +51,8 @@ AM_CPPFLAGS = \ -DETCDIR=\"$(ETCDIR)\" \ -DBOOST_LOCALE_HIDE_AUTO_PTR -install-data-hook: - $(MKDIR_P) $(DESTDIR)/$(pkglibdir) - cp -vp .libs/libunderpass.so $(DESTDIR)/$(pkglibdir) - $(MKDIR_P) $(DESTDIR)/$(pkglibdir)/config/validate - cp -rvp $(top_srcdir)/config/validate/*.yaml $(DESTDIR)/$(pkglibdir)/config/validate +# install-data-hook: +# $(MKDIR_P) $(DESTDIR)/$(pkglibdir) +# cp -vp .libs/libunderpass.so $(DESTDIR)/$(pkglibdir) +# $(MKDIR_P) $(DESTDIR)/$(pkglibdir)/config/validate +# cp -rvp $(top_srcdir)/config/validate/*.yaml $(DESTDIR)/$(pkglibdir)/config/validate From 30ec01618c86eb212d27320b42c87081d0ab855d Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 23 Apr 2024 13:37:01 -0600 Subject: [PATCH 03/18] fix: shell commands need a continuation character --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9c3947f5..67f91639 100644 --- a/Makefile.am +++ b/Makefile.am @@ -324,7 +324,7 @@ revno.h: echo "#define BRANCH_NICK \"$${nick}\"" >> revno.h; \ echo "#define COMMIT_ID \"$${comm_id}\"" >> revno.h; \ echo "#define VERSION \"$(VERSION)\"" >> revno.h; \ - touch .lastmod; + touch .lastmod;; \ fi .configline: revno.h From 4ae230cfacfbe604de6ce3661ffd99e54afb7f5b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 23 Apr 2024 14:01:49 -0600 Subject: [PATCH 04/18] fix: Remove extra semi-colon --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 67f91639..a1c51560 100644 --- a/Makefile.am +++ b/Makefile.am @@ -324,7 +324,7 @@ revno.h: echo "#define BRANCH_NICK \"$${nick}\"" >> revno.h; \ echo "#define COMMIT_ID \"$${comm_id}\"" >> revno.h; \ echo "#define VERSION \"$(VERSION)\"" >> revno.h; \ - touch .lastmod;; \ + touch .lastmod; \ fi .configline: revno.h From 0305182380613ab1aaab9903298eff2031952036 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Apr 2024 16:18:38 -0600 Subject: [PATCH 05/18] fix: Fix declaring the config data structure --- dist/debian/postinst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dist/debian/postinst b/dist/debian/postinst index 9a6e1133..df504276 100755 --- a/dist/debian/postinst +++ b/dist/debian/postinst @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (c) 2020, 2021, 2023 Humanitarian OpenStreetMap Team +# Copyright (c) 2020, 2021, 2023, 2024 Humanitarian OpenStreetMap Team # # This file is part of Underpass. # @@ -33,7 +33,12 @@ prompt() { eval $1 echo "Database configuration for ${config['title']} " - echo "# Database configuration for ${config['title']}" >> /etc/default/underpass + if test -w /etc/default/underpass; then + echo "# Database configuration for ${config['title']}" >> /etc/default/underpass + else + echo "ERROR: You don't have write permission to /etc/default/underpass" + exit + fi for i in ${!config[@]}; do if test x"$i" == x"title" -o x"$i" == x"prefix"; then @@ -85,8 +90,8 @@ if [ "$1" = "configure" ]; then touch /etc/default/underpass fi - prompt "$(declare -p config)" - + declare -A config + # For the Galaxy OSM Stats database config['title']="Underpass" config['prefix']="UNDERPASS" From 8d035a7d1c531fa1536a9e1873fcd491b0cd057b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Apr 2024 16:19:15 -0600 Subject: [PATCH 06/18] fix: Improve the Depends list --- dist/debian/control | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 8814d707..0cd382bf 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -57,16 +57,13 @@ Build-Depends: dpkg-dev (>= 1.13.19), Package: underpass Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libboost-filesystem-dev (>= 1.69), - libboost-program-options-dev (>= 1.69), - libboost-locale-dev (>= 1.69), - libboost-iostreams-dev (>= 1.69), - libgdal28 | libgdal26, - libxml++2.6-dev | libxml++3.0-dev, - libpqxx-7.6, - bzip2, - openssl, - postgis + libboost-all-dev (>= 1.69), + libxml++2.6 | libxml++2.6-2v5 | libxml++3.0, + libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, + libpqxx-7.6, + bzip2, + openssl, + postgis Description: A daemon for processing OSM replication files. # Package: underpass-dbg From 8f31e51f1dc869a946a60382a25eca50fec2e0dd Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 29 Apr 2024 12:12:44 -0600 Subject: [PATCH 07/18] fix: Drop libpqxx-7.6 as a Depends --- dist/debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 8814d707..9849db31 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -52,18 +52,18 @@ Build-Depends: dpkg-dev (>= 1.13.19), openssl, libpqxx-7.6, libxml++2.6-dev | libxml++-3.0, - libpython3-dev + libpython3-dev, + doxygen Package: underpass Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libboost-filesystem-dev (>= 1.69), - libboost-program-options-dev (>= 1.69), - libboost-locale-dev (>= 1.69), - libboost-iostreams-dev (>= 1.69), - libgdal28 | libgdal26, + libboost-filesystem (>= 1.69), + libboost-program-options (>= 1.69), + libboost-locale (>= 1.69), + libboost-iostreams (>= 1.69), + libgdal (>= 4.0), libxml++2.6-dev | libxml++3.0-dev, - libpqxx-7.6, bzip2, openssl, postgis From 8f08482ef619edaa04bd41dffe04c09f49f890e2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 29 Apr 2024 12:26:28 -0600 Subject: [PATCH 08/18] fix: Add suppotr to not sign packages when testing deb building --- dist/debian/deb.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/debian/deb.am b/dist/debian/deb.am index c52221d0..e9142b5f 100644 --- a/dist/debian/deb.am +++ b/dist/debian/deb.am @@ -37,6 +37,8 @@ snapshot-deb: cd $(PACKAGE)-$(NOW) ; \ $(LN_S) dist/debian .; \ $(LN_S) $(srcdir)/config .; \ - dpkg-buildpackage -rfakeroot -d -b -krob@senecass.com + dpkg-buildpackage -rfakeroot -d -b -kfoo@bar.com + # Uncomment this to build package without signing it. + # dpkg-buildpackage -rfakeroot -d -b -kfoo@bar.com -uc -us .PHONY : deb snapshot-deb From b3ab7a60ea8ac5d26183fc237c1070b170694cdf Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 30 Apr 2024 10:40:30 -0600 Subject: [PATCH 09/18] fix: Build unsigned deb packages till HOT has a global signing key --- dist/debian/deb.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dist/debian/deb.am b/dist/debian/deb.am index e9142b5f..ec4d3d9c 100644 --- a/dist/debian/deb.am +++ b/dist/debian/deb.am @@ -37,8 +37,6 @@ snapshot-deb: cd $(PACKAGE)-$(NOW) ; \ $(LN_S) dist/debian .; \ $(LN_S) $(srcdir)/config .; \ - dpkg-buildpackage -rfakeroot -d -b -kfoo@bar.com - # Uncomment this to build package without signing it. - # dpkg-buildpackage -rfakeroot -d -b -kfoo@bar.com -uc -us + dpkg-buildpackage -rfakeroot -d -b -uc -us .PHONY : deb snapshot-deb From 4adac99da9c1813327320021b3fb60c0775dffed Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 30 Apr 2024 10:41:31 -0600 Subject: [PATCH 10/18] fix: Display an error if trying to install deb package and aren't root --- dist/debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/debian/postinst b/dist/debian/postinst index df504276..3062ade5 100755 --- a/dist/debian/postinst +++ b/dist/debian/postinst @@ -36,7 +36,7 @@ prompt() if test -w /etc/default/underpass; then echo "# Database configuration for ${config['title']}" >> /etc/default/underpass else - echo "ERROR: You don't have write permission to /etc/default/underpass" + echo "ERROR: You don't have write permission to /etc/default/underpass! use sudo" exit fi From 95d62ef374cc6725c3c3b6f08e9a086b56ac165d Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 30 Apr 2024 10:42:05 -0600 Subject: [PATCH 11/18] fix: Adjust build and install dependencies to work across Debian and Ubuntu --- dist/debian/control | 47 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 80e3c7f9..26669ff4 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -28,19 +28,8 @@ Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.0), autoconf, automake, libtool, autotools-dev, + libboost1.74-all-dev, libwebkit2gtk-4.0-dev, - libboost-dev (>= 1.69), - libboost-filesystem-dev (>= 1.69), - libboost-date-time-dev (>= 1.69), - libboost-iostreams-dev (>= 1.69), - libboost-thread-dev (>= 1.69), - libboost-locale-dev (>= 1.69), - libboost-log-dev (>= 1.69), - libboost-system-dev (>= 1.69), - libboost-timer-dev (>= 1.69), - libboost-chrono-dev (>= 1.69), - libboost-serialization-dev (>= 1.69), - libboost-python-dev (>= 1.69), libglibmm-2.4-dev | libglibmm-2.6-dev, libgdal-dev (>= 3.0), libgumbo-dev, @@ -50,32 +39,36 @@ Build-Depends: dpkg-dev (>= 1.13.19), libjemalloc-dev, bzip2, openssl, - libpqxx-7.6, - libxml++2.6-dev | libxml++-3.0, + libpqxx-7.6 | libpqxx-dev, + libxml++2.6-dev | libxml++-3.0-dev, libpython3-dev, doxygen Package: underpass Architecture: any +Description: A daemon for processing OSM replication files. Depends: ${shlibs:Depends}, ${misc:Depends}, - libboost-filesystem (>= 1.69), - libboost-program-options (>= 1.69), - libboost-locale (>= 1.69), - libboost-iostreams (>= 1.69), - libgdal (>= 4.0), + libboost-filesystem1.74.0 | libboost-filesystem1.81.0 | libboost-filesystem1.83.0, + libboost-program-options1.74.0 | libboost-program-options1.81.0 | libboost-program-options1.83.0, + libboost-locale1.74.0 | libboost-locale1.81.0 | libboost-locale1.83.0, + libboost-iostreams1.74.0 | libboost-iostreams1.81.0 | libboost-iostreams1.83.0, + libboost-date-time1.74.0 | libboost-date-time1.81.0 | libboost-date-time1.83.0, + libboost-locale1.74.0 | libboost-locale1.81.0 | libboost-locale1.83.0, + libboost-serialization1.74.0 | libboost-serialization1.81.0 | libboost-serialization1.83.0, + libboost-timer1.74.0 | libboost-timer1.81.0 | libboost-timer1.83.0, + libboost-system1.74.0 | libboost-system1.81.0 | libboost-system1.83.0, + libboost-log1.74.0 | libboost-log1.81.0 | libboost-log1.83.0, libxml++2.6-dev | libxml++3.0-dev, bzip2, openssl, + postgis, + libxml++2.6 | libxml++2.6-2v5 | libxml++3.0, + libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, + libpqxx-7.6 | libpqxx-7.8t64, + bzip2, + openssl, postgis - libboost-all-dev (>= 1.69), - libxml++2.6 | libxml++2.6-2v5 | libxml++3.0, - libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, - libpqxx-7.6, - bzip2, - openssl, - postgis -Description: A daemon for processing OSM replication files. # Package: underpass-dbg # Architecture: any From a68ce390b41af2f5f9619e29275508939a73e837 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 2 May 2024 18:31:49 -0600 Subject: [PATCH 12/18] fix: Don't build doxygen docs for a deb package --- Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index a1c51560..61698834 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,12 +114,10 @@ EXTRA_DIST = \ setup/service/underpass.service \ setup/db/setupdb.sh \ src/testsuite \ - docs \ dist/debian \ dist/redhat \ utils - DEJATOOL = libunderpass if ENABLE_PYTHON @@ -127,8 +125,8 @@ EXT := $(shell python3-config --extension-suffix) DIR := $(shell python3-config --configdir) noinst_LTLIBRARIES = underpass.la underpass_la_SOURCES = src/wrappers/python.cc $(libunderpass_la_SOURCES) -underpass_la_LDFADD = $(BOOST_LIBS) libunderpass.la src/validate/libunderpass.la -underpass_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /usr/lib64/ src/validate/libunderpass.la $(BOOST_LIBS) +underpass_la_LIBADD = $(BOOST_LIBS) libunderpass.la src/validate/libunderpass.la +underpass_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /usr/lib64/ src/validate/libunderpass.la -static $(BOOST_LIBS) PY_OBJECTS = $(libunderpass_la_OBJECTS:.lo=.o) # /usr/lib/python3.9/lib-dynload/underpass.cpython-39-x86_64-linux-gnu.so install-python: underpass.la @@ -156,8 +154,9 @@ install-data-hook: @$(MKDIR_P) $(DESTDIR)$(pkglibdir)/../system cp -rvu $(srcdir)/setup/service/underpass.service $(DESTDIR)$(pkglibdir)/../system/ -dist-hook: apidoc +dist-hook: $(MKDIR_P) $(DESTDIR)/$(docdir) + (cd docs && $(DOXYGEN)) cp -rvp docs/html $(DESTDIR)/$(docdir) if ENABLE_PCH From 46d83339069db38f4b59fd3fe4bcd53f306aebcf Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 2 May 2024 18:32:46 -0600 Subject: [PATCH 13/18] fix: Build unsigned deb package --- dist/debian/deb.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/debian/deb.am b/dist/debian/deb.am index c52221d0..ec4d3d9c 100644 --- a/dist/debian/deb.am +++ b/dist/debian/deb.am @@ -37,6 +37,6 @@ snapshot-deb: cd $(PACKAGE)-$(NOW) ; \ $(LN_S) dist/debian .; \ $(LN_S) $(srcdir)/config .; \ - dpkg-buildpackage -rfakeroot -d -b -krob@senecass.com + dpkg-buildpackage -rfakeroot -d -b -uc -us .PHONY : deb snapshot-deb From b93dca832eb5abafdb68456a9617e4d69f8717c0 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 2 May 2024 18:33:31 -0600 Subject: [PATCH 14/18] fix: Genersate shared libraries dependencies --- dist/debian/rules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dist/debian/rules b/dist/debian/rules index a259e3a2..9c79be27 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -36,7 +36,7 @@ build: build-stamp build-stamp: configure dh_testdir @printf "\n == BUILD ==\n\n" - dh_auto_build -- CXXFLAGS="-std=c++17 -g -O0" + dh_auto_build -- CXXFLAGS="-std=c++17 -g" touch $@ clean: @@ -49,7 +49,9 @@ clean: install: build dh_testdir dh_testroot - dh_installdirs + dh_installdirs + dh_installchangelogs -XChangeLog + dh_installdocs @printf "\n == INSTALL ==\n\n" dh_auto_install --destdir=debian/underpass dh_systemd_enable @@ -63,6 +65,9 @@ binary binary-arch: install dh_testdir dh_testroot dh_installdirs + dh_compress + dh_makeshlibs + dh_shlibdeps dh_installdeb dh_installdebconf dh_installchangelogs -XChangeLog From 7bcd4325ccecdb311fb9f977948efcc028431c0e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 2 May 2024 18:34:23 -0600 Subject: [PATCH 15/18] fix: Adjust runtime library dependencies to be portable --- dist/debian/control | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dist/debian/control b/dist/debian/control index 0cd382bf..90e0533f 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -28,43 +28,41 @@ Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.0), autoconf, automake, libtool, autotools-dev, + libboost1.74-all-dev, libwebkit2gtk-4.0-dev, - libboost-dev (>= 1.69), - libboost-filesystem-dev (>= 1.69), - libboost-date-time-dev (>= 1.69), - libboost-iostreams-dev (>= 1.69), - libboost-thread-dev (>= 1.69), - libboost-locale-dev (>= 1.69), - libboost-log-dev (>= 1.69), - libboost-system-dev (>= 1.69), - libboost-timer-dev (>= 1.69), - libboost-chrono-dev (>= 1.69), - libboost-serialization-dev (>= 1.69), - libboost-python-dev (>= 1.69), libglibmm-2.4-dev | libglibmm-2.6-dev, libgdal-dev (>= 3.0), libgumbo-dev, libexpat1-dev, libosmium2-dev, - jemalloc, libjemalloc-dev, bzip2, openssl, - libpqxx-7.6, - libxml++2.6-dev | libxml++-3.0, - libpython3-dev + libpqxx-7.6 | libpqxx-dev, + libxml++2.6-dev | libxml++-3.0-dev, + libpython3-dev, + doxygen Package: underpass Architecture: any +Description: A daemon for processing OSM replication files. Depends: ${shlibs:Depends}, ${misc:Depends}, - libboost-all-dev (>= 1.69), - libxml++2.6 | libxml++2.6-2v5 | libxml++3.0, - libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, - libpqxx-7.6, + libboost-filesystem1.74.0, + libboost-program-options1.74.0, + libboost-locale1.74.0, + libboost-iostreams1.74.0, + libboost-date-time1.74.0, + libboost-locale1.74.0, + libboost-serialization1.74.0, + libboost-timer1.74.0, + libboost-system1.74.0, + libboost-log1.74.0, + libxml++2.6-2v5, bzip2, openssl, - postgis -Description: A daemon for processing OSM replication files. + postgis, + libgdal26 | libgdal28 | libgdal31 | libgdal32 | libgdal33, + libpqxx-6.4 | libpqxx-7.8t64 # Package: underpass-dbg # Architecture: any From 0ca455e6fcc644c1da69dd163f44b754909c38d6 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 7 May 2024 10:13:24 -0600 Subject: [PATCH 16/18] fix: Fix test in postinst for writing the config file --- dist/debian/postinst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/debian/postinst b/dist/debian/postinst index 3062ade5..717d19f9 100755 --- a/dist/debian/postinst +++ b/dist/debian/postinst @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash # # Copyright (c) 2020, 2021, 2023, 2024 Humanitarian OpenStreetMap Team # @@ -33,7 +33,7 @@ prompt() { eval $1 echo "Database configuration for ${config['title']} " - if test -w /etc/default/underpass; then + if test -w /etc/default/; then echo "# Database configuration for ${config['title']}" >> /etc/default/underpass else echo "ERROR: You don't have write permission to /etc/default/underpass! use sudo" From 3a9882ec2bb8464c4910e290d1a6b98ad31b0e90 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 7 May 2024 12:10:23 -0600 Subject: [PATCH 17/18] fix: Use libbz2-dev, and not bzip2 for BuildDepends --- dist/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/debian/control b/dist/debian/control index 90e0533f..8abe9ac4 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -36,7 +36,7 @@ Build-Depends: dpkg-dev (>= 1.13.19), libexpat1-dev, libosmium2-dev, libjemalloc-dev, - bzip2, + libbz2-dev, openssl, libpqxx-7.6 | libpqxx-dev, libxml++2.6-dev | libxml++-3.0-dev, From 38d32c228de9d8d252c017e738d02f800ce0d339 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 8 May 2024 16:19:44 -0600 Subject: [PATCH 18/18] fix: Add libjemallo2 and libgumbo1 to Depends --- dist/debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/debian/control b/dist/debian/control index 8abe9ac4..64e22c18 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -58,6 +58,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libboost-system1.74.0, libboost-log1.74.0, libxml++2.6-2v5, + libjemalloc2, + libgumbo1, bzip2, openssl, postgis,