Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Squashed 'src/deps/src/libmaxminddb/' changes from 7acfe43a72..24df335085

Browse source 
24df335085 Bumped version to 1.11.0
d8f073da2d Add generated to gitignore
db7a5e13e2 Update Changes.md
ee4449bb2e Merge pull request #354 from ankurvdev/ankurvdev-patch-1
8d3f4f4e03 Fix Build issues from using vcpkg port
a4fa79da16 Merge pull request #353 from maxmind/greg/cmake-man
6c82f58994 Generate and install man pages with CMake
5ef5d3eb38 Update copyright year
e0562d5eab Merge pull request #352 from maxmind/greg/fix-read-only-token
90cb8107ac Give CodeQL build write access on security-events
6b9d6bc5f5 Merge pull request #350 from maxmind/greg/release-1.10.0
008d6925aa Fix grammar

git-subtree-dir: src/deps/src/libmaxminddb
git-subtree-split: 24df335085318a26a5f3aafba12fec3cd322e570
This commit is contained in:
Théophile Diot 2024-08-30 11:10:46 +02:00
parent e66e2bb891
commit d4b681bb5a
9 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/codeql-analysis.yml vendored
View file

@ -13,6 +13,9 @@ jobs:
runs-on: ubuntu-latest
permissions:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v4

1
.gitignore vendored
View file

@ -18,6 +18,7 @@
/config.*
/configure
/depcomp
/generated
/include/maxminddb_config.h
/install-sh
/libmaxminddb-*

30
CMakeLists.txt
View file

@ -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)

10
Changes.md
View file

@ -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.

2
NOTICE
View file

@ -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.

2
README.md
View file

@ -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.

2
configure.ac
View file

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
AC_INIT([libmaxminddb], [1.10.0], [support@maxmind.com])
AC_INIT([libmaxminddb], [1.11.0], [support@maxmind.com])
AC_CONFIG_SRCDIR([include/maxminddb.h])
AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])

2
doc/libmaxminddb.md
View file

@ -883,7 +883,7 @@ Rolsky (drolsky@maxmind.com).
# 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.

2
doc/mmdblookup.md
View file

@ -86,7 +86,7 @@ Rolsky (drolsky@maxmind.com).
# 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.