Merge commit 'b16fd26f878a733bf969b1b4b31b8b646454f72d' into dev

bunkerity · Aug 22, 2024 · 0e854ca · 0e854ca
2 parents 0a945cc + b16fd26
commit 0e854ca
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 8 deletions.
diff --git a/src/deps/src/libmaxminddb/.github/workflows/codeql-analysis.yml b/src/deps/src/libmaxminddb/.github/workflows/codeql-analysis.yml
@@ -13,6 +13,9 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    permissions:
+      security-events: write
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

diff --git a/src/deps/src/libmaxminddb/.gitignore b/src/deps/src/libmaxminddb/.gitignore
@@ -18,6 +18,7 @@
 /config.*
 /configure
 /depcomp
+/generated
 /include/maxminddb_config.h
 /install-sh
 /libmaxminddb-*

diff --git a/src/deps/src/libmaxminddb/CMakeLists.txt b/src/deps/src/libmaxminddb/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9)
 
 project(maxminddb
   LANGUAGES C
-  VERSION 1.10.0
+  VERSION 1.11.0
 )
 set(MAXMINDDB_SOVERSION 0.0.7)
 set(CMAKE_C_STANDARD 99)
@@ -83,7 +83,6 @@ target_include_directories(maxminddb PUBLIC
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/generated/>
   $<INSTALL_INTERFACE:include>
-  $<INSTALL_INTERFACE:generated>
 )
 
 set(MAXMINDB_HEADERS
@@ -107,6 +106,33 @@ if (MAXMINDDB_BUILD_BINARIES)
   add_subdirectory(bin)
 endif()
 
+# Check if man pages exist, if not, generate them
+if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/man")
+    find_program(PERL perl)
+    if(PERL)
+        message(STATUS "Generating man pages")
+        execute_process(
+            COMMAND ${PERL} ${CMAKE_CURRENT_SOURCE_DIR}/dev-bin/make-man-pages.pl
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+    else()
+        message(WARNING "Perl not found. Unable to generate man pages.")
+    endif()
+endif()
+
+# Install man pages if they exist
+if(MAXMINDDB_INSTALL AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/man")
+    install(
+        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/man1
+        DESTINATION ${CMAKE_INSTALL_MANDIR}
+    )
+
+    install(
+        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/man3
+        DESTINATION ${CMAKE_INSTALL_MANDIR}
+    )
+endif()
+
 if (BUILD_TESTING)
   enable_testing()
   add_subdirectory(t)

diff --git a/src/deps/src/libmaxminddb/Changes.md b/src/deps/src/libmaxminddb/Changes.md
@@ -1,3 +1,11 @@
+## 1.11.0 - 2024-08-21
+
+* When building with CMake, the man pages will now be generated and
+  installed. Requested by Thomas Klausner. GitHub #351.
+* Removed unnecessary `$<INSTALL_INTERFACE:generated>` directory from
+  `target_include_directories` in the CMake build configuration. This is
+  a private build directory. Pull request by Ankur Verma. GitHub #354.
+
 ## 1.10.0 - 2024-06-10
 
 * When building with CMake, it is now possible to disable the building
@@ -6,7 +14,7 @@
   option. Pull request by Seena Fallah. GitHub #342.
 * CMake now makes greater use of GNUInstallDirs. Pull request by Maximilian
   Downey Twiss. GitHub #346.
-* The reader can now lookup records on a database with a search tree
+* The reader can now look up records on a database with a search tree
   that is greater than 4 gigabytes without sometimes returning erroneous
   results due to an integer overflow.
 

diff --git a/src/deps/src/libmaxminddb/NOTICE b/src/deps/src/libmaxminddb/NOTICE
@@ -1,4 +1,4 @@
-Copyright 2013-2023 MaxMind, Inc.
+Copyright 2013-2024 MaxMind, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/src/deps/src/libmaxminddb/README.md b/src/deps/src/libmaxminddb/README.md
@@ -126,7 +126,7 @@ Use `make safedist` to check the resulting tarball.
 
 # Copyright and License
 
-Copyright 2013-2023 MaxMind, Inc.
+Copyright 2013-2024 MaxMind, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/src/deps/src/libmaxminddb/configure.ac b/src/deps/src/libmaxminddb/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([libmaxminddb], [1.10.0], [[email protected]])
+AC_INIT([libmaxminddb], [1.11.0], [[email protected]])
 AC_CONFIG_SRCDIR([include/maxminddb.h])
 AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
 

diff --git a/src/deps/src/libmaxminddb/doc/libmaxminddb.md b/src/deps/src/libmaxminddb/doc/libmaxminddb.md
@@ -883,7 +883,7 @@ Rolsky ([email protected]).
 
 # COPYRIGHT AND LICENSE
 
-Copyright 2013-2023 MaxMind, Inc.
+Copyright 2013-2024 MaxMind, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/src/deps/src/libmaxminddb/doc/mmdblookup.md b/src/deps/src/libmaxminddb/doc/mmdblookup.md
@@ -86,7 +86,7 @@ Rolsky ([email protected]).
 
 # COPYRIGHT AND LICENSE
 
-Copyright 2013-2023 MaxMind, Inc.
+Copyright 2013-2024 MaxMind, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.