From 9122681c6963483b43a067e61d8f04e6c2fd844b Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 7 Jan 2025 15:18:05 -0800 Subject: [PATCH 1/5] Set release date --- Changes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 56696518..057feeb7 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,4 @@ -## 1.12.0 +## 1.12.0 - 2025-01-07 * Fixed memory leaks in `MMDB_open()`. These could happen with invalid databases or in error situations such as failing to allocate memory. As From d29b1fe01e9bfc2310403d80621247694865a5e8 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 7 Jan 2025 15:18:28 -0800 Subject: [PATCH 2/5] Update copyright years --- NOTICE | 2 +- README.md | 2 +- doc/libmaxminddb.md | 2 +- doc/mmdblookup.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 73184121..c936aeaa 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright 2013-2024 MaxMind, Inc. +Copyright 2013-2025 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/README.md b/README.md index 5cbe5ac0..3256b75c 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ Use `make safedist` to check the resulting tarball. # Copyright and License -Copyright 2013-2024 MaxMind, Inc. +Copyright 2013-2025 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/doc/libmaxminddb.md b/doc/libmaxminddb.md index 5b251fcf..4f64ffcd 100644 --- a/doc/libmaxminddb.md +++ b/doc/libmaxminddb.md @@ -883,7 +883,7 @@ Rolsky (drolsky@maxmind.com). # COPYRIGHT AND LICENSE -Copyright 2013-2024 MaxMind, Inc. +Copyright 2013-2025 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/doc/mmdblookup.md b/doc/mmdblookup.md index 2db0eda4..f48446be 100644 --- a/doc/mmdblookup.md +++ b/doc/mmdblookup.md @@ -86,7 +86,7 @@ Rolsky (drolsky@maxmind.com). # COPYRIGHT AND LICENSE -Copyright 2013-2024 MaxMind, Inc. +Copyright 2013-2025 MaxMind, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From a2894be9d2515d6ed94b0caf4e3e9fa6fbf58110 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 7 Jan 2025 15:19:25 -0800 Subject: [PATCH 3/5] Bumped version to 1.12.0 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbf3062a..91852e7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9...3.30) project(maxminddb LANGUAGES C - VERSION 1.11.0 + VERSION 1.12.0 ) set(MAXMINDDB_SOVERSION 0.0.7) set(CMAKE_C_STANDARD 99) diff --git a/configure.ac b/configure.ac index 883f2f9a..388d3d59 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([libmaxminddb], [1.11.0], [support@maxmind.com]) +AC_INIT([libmaxminddb], [1.12.0], [support@maxmind.com]) AC_CONFIG_SRCDIR([include/maxminddb.h]) AC_CONFIG_HEADERS([config.h include/maxminddb_config.h]) From 97c286380f0e395fa4f68a5b39fc72ee4cb9e20f Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 8 Jan 2025 07:17:28 -0800 Subject: [PATCH 4/5] Include cmake_uninstall.cmake.in in dist Closes #367 --- Changes.md | 6 ++++++ Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index 057feeb7..ace517bd 100644 --- a/Changes.md +++ b/Changes.md @@ -1,3 +1,9 @@ +## 1.12.1 - 2025-01-08 + +* Added missing `cmake_uninstall.cmake.in` to the source distribution. This + was missing from 1.12.0, causing CMake builds to fail. Reported by Marcel + Raad. GitHub #367. + ## 1.12.0 - 2025-01-07 * Fixed memory leaks in `MMDB_open()`. These could happen with invalid diff --git a/Makefile.am b/Makefile.am index 57fb0eaf..21443ec7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ endif EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md \ CMakeLists.txt t/CMakeLists.txt bin/CMakeLists.txt \ - include/maxminddb_config.h.cmake.in + cmake_uninstall.cmake.in include/maxminddb_config.h.cmake.in dist-hook: dev-bin/make-man-pages.pl $(distdir) From 0ff5a5bfb3bc8f7da1e1d1a7c3398b9d3fcf7493 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Wed, 8 Jan 2025 07:17:37 -0800 Subject: [PATCH 5/5] Bumped version to 1.12.1 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91852e7f..0b47093c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.9...3.30) project(maxminddb LANGUAGES C - VERSION 1.12.0 + VERSION 1.12.1 ) set(MAXMINDDB_SOVERSION 0.0.7) set(CMAKE_C_STANDARD 99) diff --git a/configure.ac b/configure.ac index 388d3d59..772391ae 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([libmaxminddb], [1.12.0], [support@maxmind.com]) +AC_INIT([libmaxminddb], [1.12.1], [support@maxmind.com]) AC_CONFIG_SRCDIR([include/maxminddb.h]) AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])