From c72d249bf123d3ee18f7fff17b82ff03bb2a5cbd Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:29:47 -0800 Subject: [PATCH 1/9] Set release date and bump copyright year --- Changes.md | 2 +- NOTICE | 2 +- README.md | 2 +- doc/libmaxminddb.md | 2 +- doc/mmdblookup.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Changes.md b/Changes.md index 73bbe9fe..c20403e4 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,4 @@ -## 1.13.0 +## 1.13.0 - 2026-02-24 - `MMDB_get_entry_data_list()` now validates that the claimed array/map size is plausible given the remaining bytes in the data section. A crafted database diff --git a/NOTICE b/NOTICE index c936aeaa..df16197d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright 2013-2025 MaxMind, Inc. +Copyright 2013-2026 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 46a08013..8377e7ab 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ Use `make safedist` to check the resulting tarball. # Copyright and License -Copyright 2013-2025 MaxMind, Inc. +Copyright 2013-2026 MaxMind, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the diff --git a/doc/libmaxminddb.md b/doc/libmaxminddb.md index 511008be..ef416715 100644 --- a/doc/libmaxminddb.md +++ b/doc/libmaxminddb.md @@ -896,7 +896,7 @@ This library was written by Boris Zentner (bzentner@maxmind.com) and Dave Rolsky # COPYRIGHT AND LICENSE -Copyright 2013-2025 MaxMind, Inc. +Copyright 2013-2026 MaxMind, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the diff --git a/doc/mmdblookup.md b/doc/mmdblookup.md index 81c0ee00..7c3ad8d4 100644 --- a/doc/mmdblookup.md +++ b/doc/mmdblookup.md @@ -86,7 +86,7 @@ This utility was written by Boris Zentner (bzentner@maxmind.com) and Dave Rolsky # COPYRIGHT AND LICENSE -Copyright 2013-2025 MaxMind, Inc. +Copyright 2013-2026 MaxMind, Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the From c282562b88c48c814c61b4040a15c9f9dfbccd48 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:36:07 -0800 Subject: [PATCH 2/9] Remove File::Slurp dependency from release scripts Replace File::Slurp-based version extraction with bash regex (grep + BASH_REMATCH) in release.sh and ppa-release.sh. Keep perl -pi -e for portable in-place substitution. Co-Authored-By: Claude Opus 4.6 --- dev-bin/ppa-release.sh | 14 ++++++-------- dev-bin/release.sh | 17 +++++++---------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dev-bin/ppa-release.sh b/dev-bin/ppa-release.sh index c36a93a3..c9031d7d 100755 --- a/dev-bin/ppa-release.sh +++ b/dev-bin/ppa-release.sh @@ -6,14 +6,12 @@ set -u DISTS=( groovy focal bionic xenial trusty ) -VERSION=$(perl -MFile::Slurp::Tiny=read_file -MDateTime <now->ymd eq \$2; -say \$1; -EOF -) +changelog_header=$(head -n 3 Changes.md) +if [[ ! $changelog_header =~ ^##\ ([0-9]+\.[0-9]+\.[0-9]+)\ -\ ([0-9]{4}-[0-9]{2}-[0-9]{2}) ]]; then + echo "Could not find version in Changes.md!" + exit 1 +fi +VERSION="${BASH_REMATCH[1]}" RESULTS=/tmp/build-libmaxminddb-results/ SRCDIR="$RESULTS/libmaxminddb" diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 7ed5d9ea..4e949c49 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -81,17 +81,14 @@ if [ -n "$(git status --porcelain)" ]; then exit 1 fi -old_version=$( - perl -MFile::Slurp=read_file < Date: Tue, 24 Feb 2026 14:36:39 -0800 Subject: [PATCH 3/9] Bumped version to 1.13.0 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53955fb9..65c0a9cd 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.2 + VERSION 1.13.0 ) set(MAXMINDDB_SOVERSION 0.0.7) set(CMAKE_C_STANDARD 99) diff --git a/configure.ac b/configure.ac index dd06df1e..09288c5f 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.2], [support@maxmind.com]) +AC_INIT([libmaxminddb], [1.13.0], [support@maxmind.com]) AC_CONFIG_SRCDIR([include/maxminddb.h]) AC_CONFIG_HEADERS([config.h include/maxminddb_config.h]) From a8dfee2664913f05184150ec023f0bd0372d7773 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:42:23 -0800 Subject: [PATCH 4/9] Update list of required deps --- README.dev.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.dev.md b/README.dev.md index 235eda36..b7bc07d0 100644 --- a/README.dev.md +++ b/README.dev.md @@ -48,9 +48,8 @@ version updated promptly for some reason. # Prerequisites for releasing -- Required packages (Ubuntu Artful): vim git-core dput build-essential autoconf - automake libtool git-buildpackage libfile-slurp-perl pandoc dirmngr - libfile-slurp-tiny-perl libdatetime-perl debhelper dh-autoreconf +- Required packages (Ubuntu 25.10): vim git-core dput build-essential autoconf + automake libtool git-buildpackage lowdown dirmngr debhelper dh-autoreconf libipc-run3-perl libtest-output-perl devscripts - Install [gh](https://github.com/cli/cli/releases). - GitHub ssh key (e.g. in `~/.ssh/id_rsa`) From 9f1b931fc8db149d7db7c0ac56735867960cdb5c Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:44:25 -0800 Subject: [PATCH 5/9] Update PPA release script from ubuntu-ppa --- dev-bin/ppa-release.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dev-bin/ppa-release.sh b/dev-bin/ppa-release.sh index c9031d7d..60d2bd9f 100755 --- a/dev-bin/ppa-release.sh +++ b/dev-bin/ppa-release.sh @@ -4,7 +4,7 @@ set -e set -x set -u -DISTS=( groovy focal bionic xenial trusty ) +DISTS=( questing noble jammy ) changelog_header=$(head -n 3 Changes.md) if [[ ! $changelog_header =~ ^##\ ([0-9]+\.[0-9]+\.[0-9]+)\ -\ ([0-9]{4}-[0-9]{2}-[0-9]{2}) ]]; then @@ -13,6 +13,8 @@ if [[ ! $changelog_header =~ ^##\ ([0-9]+\.[0-9]+\.[0-9]+)\ -\ ([0-9]{4}-[0-9]{2 fi VERSION="${BASH_REMATCH[1]}" +git push + RESULTS=/tmp/build-libmaxminddb-results/ SRCDIR="$RESULTS/libmaxminddb" @@ -49,3 +51,7 @@ dch -v "$VERSION-0+maxmind1" -D "${DISTS[0]}" -u low "New upstream release." git add debian/changelog git commit -m "Update debian/changelog for $VERSION" git push + +popd + +git pull From f1ace8520b02608f48242b9d4bb92fe4f5b81b6a Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:51:03 -0800 Subject: [PATCH 6/9] Update MaxMind-DB submodule to main The submodule was pointing to commit 29cab1f on a feature branch that has since been squash-merged and deleted, making it unreachable from any remote ref. This caused git-buildpackage to fail when creating the orig tarball since a fresh clone cannot fetch that commit. Point to current main (327e23a) which includes the equivalent squash-merged content. Co-Authored-By: Claude Opus 4.6 --- t/maxmind-db | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/maxmind-db b/t/maxmind-db index 29cab1fe..327e23aa 160000 --- a/t/maxmind-db +++ b/t/maxmind-db @@ -1 +1 @@ -Subproject commit 29cab1feb43abacb7f33c14db1052f99882fb7c6 +Subproject commit 327e23aaccd3873c7d92fd9a6076694c48d877cd From b5809f9b9dea1a597a16b1b96215033c46dd67dc Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:53:09 -0800 Subject: [PATCH 7/9] Prepare for 1.13.1 --- Changes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changes.md b/Changes.md index c20403e4..97d11180 100644 --- a/Changes.md +++ b/Changes.md @@ -1,3 +1,7 @@ +## 1.13.1 - 2026-02-24 + +- Re-release for Ubuntu PPA. No code changes. + ## 1.13.0 - 2026-02-24 - `MMDB_get_entry_data_list()` now validates that the claimed array/map size is From de43d4f767f22ea4027892a01d5aec89687757da Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 14:53:21 -0800 Subject: [PATCH 8/9] Bumped version to 1.13.1 --- CMakeLists.txt | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65c0a9cd..8eff066a 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.13.0 + VERSION 1.13.1 ) set(MAXMINDDB_SOVERSION 0.0.7) set(CMAKE_C_STANDARD 99) diff --git a/configure.ac b/configure.ac index 09288c5f..54b5ecd9 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.13.0], [support@maxmind.com]) +AC_INIT([libmaxminddb], [1.13.1], [support@maxmind.com]) AC_CONFIG_SRCDIR([include/maxminddb.h]) AC_CONFIG_HEADERS([config.h include/maxminddb_config.h]) From 955731db2060be97832d791bb4f2f4010e29e9a5 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 24 Feb 2026 15:04:44 -0800 Subject: [PATCH 9/9] Restore release date check in ppa-release.sh Co-Authored-By: Claude Opus 4.6 --- dev-bin/ppa-release.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-bin/ppa-release.sh b/dev-bin/ppa-release.sh index 60d2bd9f..f868d6a7 100755 --- a/dev-bin/ppa-release.sh +++ b/dev-bin/ppa-release.sh @@ -12,6 +12,12 @@ if [[ ! $changelog_header =~ ^##\ ([0-9]+\.[0-9]+\.[0-9]+)\ -\ ([0-9]{4}-[0-9]{2 exit 1 fi VERSION="${BASH_REMATCH[1]}" +DATE="${BASH_REMATCH[2]}" + +if [[ "$DATE" != "$(date +"%Y-%m-%d")" ]]; then + echo "$DATE is not today!" + exit 1 +fi git push