diff --git a/CMakeLists.txt b/CMakeLists.txt index 53955fb9..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.12.2 + VERSION 1.13.1 ) set(MAXMINDDB_SOVERSION 0.0.7) set(CMAKE_C_STANDARD 99) diff --git a/Changes.md b/Changes.md index 73bbe9fe..97d11180 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,8 @@ -## 1.13.0 +## 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 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.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`) 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/configure.ac b/configure.ac index dd06df1e..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.12.2], [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]) diff --git a/dev-bin/ppa-release.sh b/dev-bin/ppa-release.sh index c36a93a3..f868d6a7 100755 --- a/dev-bin/ppa-release.sh +++ b/dev-bin/ppa-release.sh @@ -4,16 +4,22 @@ set -e set -x set -u -DISTS=( groovy focal bionic xenial trusty ) +DISTS=( questing noble jammy ) -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]}" +DATE="${BASH_REMATCH[2]}" + +if [[ "$DATE" != "$(date +"%Y-%m-%d")" ]]; then + echo "$DATE is not today!" + exit 1 +fi + +git push RESULTS=/tmp/build-libmaxminddb-results/ SRCDIR="$RESULTS/libmaxminddb" @@ -51,3 +57,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 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 <