From b25da4bc1c3c778a3f3c847c0ba647239e33cc23 Mon Sep 17 00:00:00 2001 From: Muhammad Alfi Syahrin Date: Sat, 8 Jun 2024 20:22:06 +0700 Subject: [PATCH 1/2] routino: Update to 3.4.1 **Summary** - Full changelog can be found [here](http://routino.org/svn/trunk/doc/NEWS.txt) - Add `homepage` key to `package.yml` (Part of getsolus/packages#411) - Add monitoring.yml --- packages/r/routino/abi_libs | 9 +++++ packages/r/routino/abi_symbols | 22 ++++++++++++ packages/r/routino/abi_used_libs | 1 - packages/r/routino/abi_used_symbols | 30 ++++++++-------- packages/r/routino/files/0001-Fix-paths.patch | 34 ++++++------------- packages/r/routino/monitoring.yml | 6 ++++ packages/r/routino/package.yml | 7 ++-- packages/r/routino/pspec_x86_64.xml | 19 ++++++----- 8 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 packages/r/routino/monitoring.yml diff --git a/packages/r/routino/abi_libs b/packages/r/routino/abi_libs index 434b5b20d47..327839babed 100644 --- a/packages/r/routino/abi_libs +++ b/packages/r/routino/abi_libs @@ -1,2 +1,11 @@ +filedumper +filedumper-slim +filedumperx libroutino-slim.so.0 libroutino.so.0 +planetsplitter +planetsplitter-slim +router +router+lib +router+lib-slim +router-slim diff --git a/packages/r/routino/abi_symbols b/packages/r/routino/abi_symbols index b105f4d67f6..25a75c17d30 100644 --- a/packages/r/routino/abi_symbols +++ b/packages/r/routino/abi_symbols @@ -1,3 +1,9 @@ +filedumper:stderr +filedumper:stdout +filedumper-slim:stderr +filedumper-slim:stdout +filedumperx:stderr +filedumperx:stdout libroutino-slim.so.0:Routino_APIVersion libroutino-slim.so.0:Routino_CalculateRoute libroutino-slim.so.0:Routino_Check_API_Version @@ -40,3 +46,19 @@ libroutino.so.0:Routino_UnloadDatabase libroutino.so.0:Routino_ValidateProfile libroutino.so.0:Routino_Version libroutino.so.0:Routino_errno +planetsplitter:stderr +planetsplitter:stdout +planetsplitter-slim:stderr +planetsplitter-slim:stdout +router:stderr +router:stdout +router+lib:Routino_APIVersion +router+lib:Routino_Version +router+lib:Routino_errno +router+lib:stderr +router+lib-slim:Routino_APIVersion +router+lib-slim:Routino_Version +router+lib-slim:Routino_errno +router+lib-slim:stderr +router-slim:stderr +router-slim:stdout diff --git a/packages/r/routino/abi_used_libs b/packages/r/routino/abi_used_libs index 51d7b8ece5d..c9337c6158d 100644 --- a/packages/r/routino/abi_used_libs +++ b/packages/r/routino/abi_used_libs @@ -1,5 +1,4 @@ libbz2.so.1.0 libc.so.6 libm.so.6 -libpthread.so.0 libz.so.1 diff --git a/packages/r/routino/abi_used_symbols b/packages/r/routino/abi_used_symbols index 008fcaa0d8f..7c455667b94 100644 --- a/packages/r/routino/abi_used_symbols +++ b/packages/r/routino/abi_used_symbols @@ -3,11 +3,13 @@ libbz2.so.1.0:BZ2_bzDecompressEnd libbz2.so.1.0:BZ2_bzDecompressInit libc.so.6:__ctype_b_loc libc.so.6:__ctype_tolower_loc +libc.so.6:__errno_location libc.so.6:__isoc99_sscanf libc.so.6:__libc_start_main libc.so.6:__stack_chk_fail libc.so.6:access libc.so.6:calloc +libc.so.6:close libc.so.6:exit libc.so.6:fclose libc.so.6:fflush @@ -20,18 +22,30 @@ libc.so.6:fstat64 libc.so.6:fwrite libc.so.6:gettimeofday libc.so.6:gmtime +libc.so.6:lseek64 libc.so.6:malloc libc.so.6:memcpy libc.so.6:memmove libc.so.6:memset libc.so.6:mmap64 libc.so.6:munmap +libc.so.6:open64 libc.so.6:pipe +libc.so.6:pread64 libc.so.6:printf +libc.so.6:pthread_cond_signal +libc.so.6:pthread_cond_wait +libc.so.6:pthread_create +libc.so.6:pthread_join +libc.so.6:pthread_mutex_lock +libc.so.6:pthread_mutex_unlock libc.so.6:putchar libc.so.6:puts +libc.so.6:pwrite64 +libc.so.6:read libc.so.6:realloc libc.so.6:rename +libc.so.6:sigaction libc.so.6:sigemptyset libc.so.6:snprintf libc.so.6:sprintf @@ -54,25 +68,11 @@ libc.so.6:unlink libc.so.6:vfprintf libc.so.6:vsnprintf libc.so.6:vsprintf +libc.so.6:write libm.so.6:asin libm.so.6:atan2 libm.so.6:cos libm.so.6:sin -libpthread.so.0:__errno_location -libpthread.so.0:close -libpthread.so.0:lseek64 -libpthread.so.0:open64 -libpthread.so.0:pread64 -libpthread.so.0:pthread_cond_signal -libpthread.so.0:pthread_cond_wait -libpthread.so.0:pthread_create -libpthread.so.0:pthread_join -libpthread.so.0:pthread_mutex_lock -libpthread.so.0:pthread_mutex_unlock -libpthread.so.0:pwrite64 -libpthread.so.0:read -libpthread.so.0:sigaction -libpthread.so.0:write libz.so.1:inflate libz.so.1:inflateEnd libz.so.1:inflateInit2_ diff --git a/packages/r/routino/files/0001-Fix-paths.patch b/packages/r/routino/files/0001-Fix-paths.patch index 486997bd58d..5458ff4360a 100644 --- a/packages/r/routino/files/0001-Fix-paths.patch +++ b/packages/r/routino/files/0001-Fix-paths.patch @@ -1,31 +1,22 @@ -From b816ac120cbb428cfa48a15793b4c5c5d4fc2cfd Mon Sep 17 00:00:00 2001 -From: Philipp Trulson -Date: Tue, 23 May 2017 12:33:12 +0200 -Subject: [PATCH] Fix paths - ---- - Makefile.conf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - diff --git a/Makefile.conf b/Makefile.conf -index a1cfb24..d50b8be 100644 +index 55d81c5..4df4869 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -45,11 +45,11 @@ endif # Installation locations (edit if required) ifneq ($(HOST),MINGW) --prefix=/usr/local -+prefix=/usr - bindir=$(prefix)/bin - incdir=$(prefix)/include - libdir=$(prefix)/lib --docdir=$(prefix)/doc/routino -+docdir=$(prefix)/share/doc/routino - datadir=$(prefix)/share/routino +- prefix=/usr/local ++ prefix=/usr + bindir=$(prefix)/bin + incdir=$(prefix)/include + libdir=$(prefix)/lib +- docdir=$(prefix)/doc/routino ++ docdir=$(prefix)/share/doc/routino + datadir=$(prefix)/share/routino else - prefix="c:/Program Files/Routino" -@@ -118,7 +118,7 @@ LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION) + prefix="c:/Program Files/Routino" +@@ -155,7 +155,7 @@ ifeq ($(HOST),UNIX) endif # Put the current directory in the shared library path for the router using libroutino @@ -34,6 +25,3 @@ index a1cfb24..d50b8be 100644 # Required for multi-threaded support (comment these two lines out if not required) --- -2.13.0 - diff --git a/packages/r/routino/monitoring.yml b/packages/r/routino/monitoring.yml new file mode 100644 index 00000000000..daf085e75fa --- /dev/null +++ b/packages/r/routino/monitoring.yml @@ -0,0 +1,6 @@ +releases: + id: 4206 + rss: https://www.routino.org/download/rss.xml +# No known CPE, checked 2024-06-08 +security: + cpe: ~ diff --git a/packages/r/routino/package.yml b/packages/r/routino/package.yml index 578144cb332..a0ce3b9a7d2 100644 --- a/packages/r/routino/package.yml +++ b/packages/r/routino/package.yml @@ -1,8 +1,9 @@ name : routino -version : 3.2 -release : 2 +version : 3.4.1 +release : 3 source : - - https://www.routino.org/download/routino-3.2.tgz : e2a431eaffbafab630835966d342e4ae25d5edb94c8ed419200e1ffb50bc7552 + - https://www.routino.org/download/routino-3.4.1.tgz : 0baa8d2a58d1755d0fae86e04b17eb64b8191fe3e5f247292a64dbf3718b852b +homepage : https://www.routino.org/ license : AGPL-3.0-or-later component : system.utils summary : Routino is an application for finding a route between two points diff --git a/packages/r/routino/pspec_x86_64.xml b/packages/r/routino/pspec_x86_64.xml index ae145b84a74..2af3591a1d7 100644 --- a/packages/r/routino/pspec_x86_64.xml +++ b/packages/r/routino/pspec_x86_64.xml @@ -1,16 +1,17 @@ routino + https://www.routino.org/ - Joshua Strobl - joshua@getsol.us + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com AGPL-3.0-or-later system.utils Routino is an application for finding a route between two points Routino is a command-line application for finding a route between two points using the dataset of topographical information collected by OpenStreetMap. - https://getsol.us/sources/README.Solus + https://sources.getsol.us/README.Solus routino @@ -74,7 +75,7 @@ programming.devel - routino + routino /usr/include/routino.h @@ -83,12 +84,12 @@ - - 2021-06-30 - 3.2 + + 2024-06-08 + 3.4.1 Packaging update - Joshua Strobl - joshua@getsol.us + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com \ No newline at end of file From 8895c3a1e17ddb93fcd039171b4ec9f57b93925f Mon Sep 17 00:00:00 2001 From: Muhammad Alfi Syahrin Date: Sat, 8 Jun 2024 20:23:41 +0700 Subject: [PATCH 2/2] qmapshack: Rebuild against routino and add monitoring.yml --- packages/q/qmapshack/monitoring.yml | 6 ++++++ packages/q/qmapshack/package.yml | 2 +- packages/q/qmapshack/pspec_x86_64.xml | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 packages/q/qmapshack/monitoring.yml diff --git a/packages/q/qmapshack/monitoring.yml b/packages/q/qmapshack/monitoring.yml new file mode 100644 index 00000000000..67bd1671361 --- /dev/null +++ b/packages/q/qmapshack/monitoring.yml @@ -0,0 +1,6 @@ +releases: + id: 11702 + rss: https://github.com/Maproom/qmapshack/tags.atom +# No known CPE, checked 2024-06-08 +security: + cpe: ~ diff --git a/packages/q/qmapshack/package.yml b/packages/q/qmapshack/package.yml index e0b539509db..5851cce51be 100644 --- a/packages/q/qmapshack/package.yml +++ b/packages/q/qmapshack/package.yml @@ -1,6 +1,6 @@ name : qmapshack version : 1.17.1 -release : 14 +release : 15 source : - https://github.com/Maproom/qmapshack/archive/refs/tags/V_1.17.1.tar.gz : 39c704087c3e93da31216a740b494c14502b4c0e692a941a7ee4d2d520570d74 homepage : https://github.com/Maproom/qmapshack diff --git a/packages/q/qmapshack/pspec_x86_64.xml b/packages/q/qmapshack/pspec_x86_64.xml index 67d5516972c..17fa167dfc4 100644 --- a/packages/q/qmapshack/pspec_x86_64.xml +++ b/packages/q/qmapshack/pspec_x86_64.xml @@ -87,8 +87,8 @@ - - 2024-02-13 + + 2024-06-08 1.17.1 Packaging update Muhammad Alfi Syahrin