geoip2_c 0.3.0 → 0.3.1

data/ext/geoip2/libmaxminddb/common.mk

@@ -0,0 +1,7 @@
+if DEBUG
+AM_CFLAGS=-O0 -g -Wall -Wextra
+else
+AM_CFLAGS=-O2 -g
+endif
+
+AM_CPPFLAGS = -I$(top_srcdir)/include

data/ext/geoip2/libmaxminddb/configure.ac

@@ -0,0 +1,132 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.63])
+AC_INIT([libmaxminddb], [1.2.1], [support@maxmind.com])
+AC_CONFIG_SRCDIR([include/maxminddb.h])
+AC_CONFIG_HEADERS([config.h include/maxminddb_config.h])
+
+PKG_PROG_PKG_CONFIG
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], [${libdir}/pkgconfig])])
+AC_CONFIG_FILES([src/libmaxminddb.pc])
+
+LT_INIT
+AM_INIT_AUTOMAKE(foreign m4_esyscmd([case `automake --version | head -n 1` in
+                                     *1.14*) echo subdir-objects;;
+                                     *1.11*);;
+                                     *) echo serial-tests;;
+                                     esac]))
+AC_PROG_LIBTOOL
+# Checks for programs.
+AC_PROG_CC_C99
+
+# Copied from http://stackoverflow.com/a/10682813/9832 and tweaked for C (as
+# opposed to C++)
+#
+# AX_CHECK_CFLAGS(ADDITIONAL-CFLAGS, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+#
+# checks whether the $(CC) compiler accepts the ADDITIONAL-CFLAGS
+# if so, they are added to the CXXFLAGS
+AC_DEFUN([AX_CHECK_CFLAGS],
+[
+  AC_MSG_CHECKING([whether compiler accepts "$1"])
+  cat > conftest.c << EOF
+  int main(){
+    return 0;
+  }
+EOF
+  if $CC $CFLAGS -o conftest.o conftest.c [$1] > /dev/null 2>&1
+  then
+    AC_MSG_RESULT([yes])
+    CFLAGS="${CFLAGS} [$1]"
+    [$2]
+  else
+    AC_MSG_RESULT([no])
+   [$3]
+  fi
+])dnl AX_CHECK_CFLAGS
+
+AX_CHECK_CFLAGS([-fms-extensions])
+
+# We will add this back for non-debug builds in the common.mk file
+CFLAGS=`echo ${CFLAGS} | sed 's/-O2//'`
+CXXFLAGS=`echo ${CXXFLAGS} | sed 's/-O2//'`
+
+# autoconf insists on giving us gnu99 if it's available
+CC=`echo ${CC} | sed 's/-std=gnu99/-std=c99/'`
+
+AC_C_RESTRICT
+
+AC_CHECK_HEADERS([arpa/inet.h assert.h fcntl.h inttypes.h libgen.h math.h netdb.h netinet/in.h stdarg.h stdbool.h stdint.h stdio.h stdlib.h string.h sys/mman.h sys/socket.h sys/stat.h sys/time.h sys/types.h unistd.h])
+
+# configure generates an invalid config for MinGW because of the type checks
+# so we only run them on non MinGW-Systems. For MinGW we also need to link
+# against ws2_32.
+AC_CANONICAL_HOST
+case $host_os in
+        mingw*)
+                LDFLAGS="-lws2_32"
+        ;;
+        *)
+                AC_TYPE_OFF_T
+                AC_TYPE_SIZE_T
+                AC_TYPE_SSIZE_T
+                AC_TYPE_UINT8_T
+                AC_TYPE_UINT32_T
+                AC_TYPE_UINT64_T
+        ;;
+esac
+
+
+# This check is backwards in order to make life easier for people writing
+# extensions in other languages that link to this library. If they want to
+# simply assume that they are using a newish compiler, they don't need to
+# check for this type nor do they need to define anything on the CLI. They'll
+# just get code that assumes this type exists.
+AC_CHECK_TYPE(
+        [unsigned __int128],
+        [AC_DEFINE([MMDB_UINT128_IS_BYTE_ARRAY], [0], [Missing the unsigned __int128 type])],
+        [AC_CHECK_TYPE(
+                [unsigned int __attribute__((mode(TI)))],
+                [AC_DEFINE([MMDB_UINT128_IS_BYTE_ARRAY], [0], [Missing the unsigned __int128 type])
+                 AC_DEFINE([MMDB_UINT128_USING_MODE], [1], [int128 types are available with __attribute__((mode(TI)))])],
+                [AC_DEFINE([MMDB_UINT128_IS_BYTE_ARRAY], [1], [Missing the unsigned __int128 type])])])
+
+AC_CHECK_TYPES([boolean])
+
+AC_CHECK_FUNC(
+        [open_memstream],
+        [AC_DEFINE([HAVE_OPEN_MEMSTREAM], [1], [Has an open_memstream() function])])
+
+AC_C_BIGENDIAN(
+        [AC_DEFINE([MMDB_LITTLE_ENDIAN], [0], [System is big-endian])],
+        [AC_DEFINE([MMDB_LITTLE_ENDIAN], [1], [System is little-endian])])
+
+AC_FUNC_MALLOC
+AC_FUNC_MMAP
+
+AC_SEARCH_LIBS([fabs], [m])
+AC_SEARCH_LIBS([fabsf], [m])
+AC_SEARCH_LIBS([getaddrinfo], [socket])
+
+AC_ARG_ENABLE(
+        [debug],
+        [  --enable-debug    Turn on debugging],
+        [case "${enableval}" in
+          yes) debug=true ;;
+          no)  debug=false ;;
+          *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+        esac],[debug=false])
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+
+AC_ARG_ENABLE([tests],
+        AS_HELP_STRING([--enable-tests], [Compilation of tests code]),
+        [enable_tests=${enableval}],
+        [enable_tests=yes])
+AM_CONDITIONAL([TESTS], [test "${enable_tests}" = "yes"])
+
+AC_CONFIG_FILES([Makefile
+                 src/Makefile
+                 bin/Makefile
+                 t/Makefile])
+AC_OUTPUT

data/ext/geoip2/libmaxminddb/dev-bin/make-man-pages.pl

@@ -0,0 +1,76 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+use autodie qw( :all );
+
+use FindBin qw( $Bin );
+
+use File::Path qw( mkpath );
+use File::Slurp qw( edit_file read_file write_file );
+use File::Temp qw( tempdir );
+use File::Which qw( which );
+
+sub main {
+    my $target = shift || "$Bin/..";
+
+    my $pandoc = which('pandoc')
+        or die
+        "\n  You must install pandoc in order to generate the man pages.\n\n";
+
+    _make_man( $target, 'libmaxminddb', 3 );
+    _make_lib_man_links($target);
+
+    _make_man( $target, 'mmdblookup', 1 );
+}
+
+sub _make_man {
+    my $target  = shift;
+    my $name    = shift;
+    my $section = shift;
+
+    my $man_dir = "$target/man/man$section";
+    mkpath($man_dir);
+
+    my $tempdir = tempdir( CLEANUP => 1 );
+
+    my $markdown = <<"EOF";
+% $name($section)
+
+EOF
+    $markdown .= read_file("$Bin/../doc/$name.md");
+
+    my $tempfile = "$tempdir/$name.$section.md";
+    write_file( $tempfile, $markdown );
+
+    my $man_file = "$man_dir/$name.$section";
+    system( qw( pandoc -s -t man ), $tempfile, '-o', $man_file );
+
+    _fix_indentation($man_file);
+}
+
+sub _make_lib_man_links {
+    my $target = shift;
+
+    my $header = read_file("$Bin/../include/maxminddb.h");
+    for my $proto ( $header =~ /^ +extern.+?(\w+)\(/gsm ) {
+        open my $fh, '>', "$target/man/man3/$proto.3";
+        print {$fh} ".so man3/libmaxminddb.3\n";
+        close $fh;
+    }
+}
+
+# AFAICT there's no way to control the indentation depth for code blocks with
+# Pandoc.
+sub _fix_indentation {
+    my $file = shift;
+
+    edit_file(
+        sub {
+            s/^\.IP\n\.nf/.IP "" 4\n.nf/gm;
+        },
+        $file
+    );
+}
+
+main(shift);

data/ext/geoip2/libmaxminddb/dev-bin/ppa-release.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e
+set -x
+set -u
+
+DISTS=( wily trusty precise )
+
+VERSION=$(perl -MFile::Slurp::Tiny=read_file -MDateTime <<EOF
+use v5.16;
+my \$log = read_file(q{Changes.md});
+\$log =~ /^## (\d+\.\d+\.\d+) - (\d{4}-\d{2}-\d{2})/;
+die 'Release time is not today!' unless DateTime->now->ymd eq \$2;
+say \$1;
+EOF
+)
+
+RESULTS=/tmp/build-libmaxminddb-results/
+SRCDIR="$RESULTS/libmaxminddb"
+
+mkdir -p "$SRCDIR"
+
+# gbp does weird things without a pristine checkout
+git clone git@github.com:maxmind/libmaxminddb.git -b ubuntu-ppa $SRCDIR
+
+pushd "$SRCDIR"
+git merge "$VERSION"
+
+for dist in "${DISTS[@]}"; do
+    git clean -xfd
+    git reset HEAD --hard
+
+    dch -v "$VERSION-0+maxmind1~$dist" -D "$dist" -u low "New upstream release."
+    gbp buildpackage -S --git-ignore-new
+done
+
+read -e -p "Release to PPA? (y/n)" SHOULD_RELEASE
+
+if [ "$SHOULD_RELEASE" != "y" ]; then
+    echo "Aborting"
+    exit 1
+fi
+
+dput ppa:maxmind/ppa ../*source.changes
+
+popd
+
+git add debian/changelog
+git commit -m "Update debian/changelog for $VERSION"
+git push

data/ext/geoip2/libmaxminddb/dev-bin/regen-prototypes.pl

@@ -0,0 +1,136 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use FindBin qw( $Bin );
+
+use File::Basename qw( basename dirname );
+use File::Slurp qw( read_file write_file );
+use List::MoreUtils qw( uniq );
+
+sub main {
+    _regen_prototypes(
+        "$Bin/../src/maxminddb.c",
+        "$Bin/../include/maxminddb.h"
+    );
+
+    _regen_prototypes(
+        "$Bin/../bin/mmdblookup.c",
+    );
+
+    _regen_prototypes(
+        "$Bin/../t/maxminddb_test_helper.c",
+        "$Bin/../t/maxminddb_test_helper.h",
+    );
+}
+
+sub _regen_prototypes {
+    my $c_file = shift;
+    my $h_file = shift;
+
+    my $c_code      = read_file($c_file);
+    my $h_code      = $h_file ? read_file($h_file) : q{};
+    my $orig_c_code = $c_code;
+    my $orig_h_code = $h_code;
+
+    my $script_name = basename($0);
+    my $dir         = basename($Bin);
+
+    my $indent_off = '/* *INDENT-OFF* */';
+    my $indent_on  = '/* *INDENT-ON* */';
+    my $prototypes_start
+        = "/* --prototypes automatically generated by $dir/$script_name - don't remove this comment */";
+    my $prototypes_end
+        = q{/* --prototypes end - don't remove this comment-- */};
+
+    ( my $prototypes_start_re = $prototypes_start ) =~ s/ \n /\n */g;
+    ( my $prototypes_end_re   = $prototypes_end ) =~ s/\n/\n */g;
+
+    for my $content ( $c_code, $h_code ) {
+        $content =~ s{
+                    [ ]*
+                    \Q$indent_off\E
+                    \n
+                    [ ]*
+                    \Q$prototypes_start\E
+                    .+?
+                    [ ]*
+                    \Q$prototypes_end\E
+                    \n
+                    [ ]*
+                    \Q$indent_on\E
+                    \n
+            }{__PROTOTYPES__}sx;
+    }
+
+    my @prototypes = parse_prototypes($c_code);
+
+    if ($h_file) {
+        my $external_prototypes = join q{}, map {
+            my $p = 'extern ' . $_->{prototype};
+            $p =~ s/^/    /;                # first line
+            $p =~ s/\n/\n           /gm;    # the rest
+            $p . ";\n"
+            }
+            grep { $_->{external} } @prototypes;
+        $h_code
+            =~ s/__PROTOTYPES__/    $indent_off\n    $prototypes_start\n$external_prototypes    $prototypes_end\n    $indent_on\n/;
+        $h_code =~ s{\n *(/\* \*INDENT)}{\n    $1}g;
+    }
+
+    my $internal_prototypes = join q{}, uniq
+        map { $_->{prototype} . ";\n" } grep { !$_->{external} } @prototypes;
+    $c_code
+        =~ s/__PROTOTYPES__/$indent_off\n$prototypes_start\n$internal_prototypes$prototypes_end\n$indent_on\n/;
+
+    write_file( $c_file, $c_code ) if $c_code ne $orig_c_code;
+    write_file( $h_file, $h_code ) if $h_file && $h_code ne $orig_h_code;
+}
+
+my $return_type_re = qr/(?:\w+\s+)+?\**?/;
+my $signature_re   = qr/\([^\(\)]+?\)/;
+
+# Shamelessly stolen from Inline::C::ParseRegExp
+my $sp = qr{[ \t]|\n(?![ \t]*\n)};
+
+my $re_type = qr {
+                     (?: (?: const $sp*)? \w+ $sp* )+? # words
+                     (?: (?: const $sp*)? \*  $sp* )*  # stars
+                     (?: const $sp*)? # optional const
+             }x;
+
+my $re_identifier = qr{ \w+ $sp* }x;
+
+my $re_args = qr/\(.*?\)/s;
+
+# and again from Inline::C::ParseRegExp
+my $re_signature = qr/^($re_type ($re_identifier) $re_args) (?>[\ \t\n]*?{)/x;
+
+{
+    my %skip = map { $_ => 1 } qw( memmem );
+
+    sub parse_prototypes {
+        my $c_code = shift;
+
+        my @protos;
+
+        for my $chunk ( $c_code =~ /^(\w+.+?[;{])/gsm ) {
+            my ( $prototype, $name ) = $chunk =~ /^$re_signature/ms
+                or next;
+
+            next if $prototype =~ /^(?:DEBUG_FUNC|NO_PROTO)/;
+
+            push @protos,
+                {
+                name      => $name,
+                prototype => $prototype,
+                external  => $prototype =~ /^LOCAL/ ? 0 : 1,
+                };
+        }
+
+        return grep { !$skip{ $_->{name} } } @protos;
+    }
+}
+
+main();

data/ext/geoip2/libmaxminddb/dev-bin/regen-win32-test-projs.pl

@@ -0,0 +1,54 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use FindBin qw( $Bin );
+
+use Data::UUID;
+use File::Slurp qw( read_file write_file );
+use Path::Iterator::Rule;
+
+sub main {
+    my $rule = Path::Iterator::Rule->new;
+    $rule->file->name(qr/_t.c$/);
+
+    my $ug = Data::UUID->new;
+
+    my $template = read_file("$Bin/../projects/test.vcxproj.template");
+
+    my @names;
+    for my $file ( $rule->all("$Bin/../t/") ) {
+        my ($name) = $file =~ /(\w*)_t.c$/;
+
+        next unless $name;
+        next if $name eq 'threads';
+
+        push @names, $name;
+
+        my $project = $template;
+
+        $project =~ s/%TESTNAME%/$name/g;
+
+        my $uuid = $ug->to_string( $ug->create );
+        $project =~ s/%UUID%/$uuid/g;
+
+        write_file( "$Bin/../projects/VS12-tests/$name.vcxproj", $project );
+    }
+
+    _modify_yml(@names);
+}
+
+sub _modify_yml {
+    my @names = @_;
+
+    my $exe_block = join "\n",
+        map { "  - .\\projects\\VS12\\Debug\\test_${_}.exe" } @names;
+
+    my $file   = "$Bin/../appveyor.yml";
+    my $config = read_file($file);
+    $config =~ s/(#EXES).*?(#ENDEXES)/$1\n$exe_block\n  $2/s;
+    write_file( $file, $config );
+}
+
+main();

data/ext/geoip2/libmaxminddb/dev-bin/release.sh

@@ -0,0 +1,106 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+changelog=$(cat Changes.md)
+
+regex='## ([0-9]+\.[0-9]+\.[0-9]+) - ([0-9]{4}-[0-9]{2}-[0-9]{2})
+
+((.|
+)*)
+'
+
+if [[ ! $changelog =~ $regex ]]; then
+      echo "Could not find date line in change log!"
+      exit 1
+fi
+
+version="${BASH_REMATCH[1]}"
+date="${BASH_REMATCH[2]}"
+notes="$(echo "${BASH_REMATCH[3]}" | sed -n -e '/^## [0-9]\+\.[0-9]\+\.[0-9]\+/,$!p')"
+
+dist="libmaxminddb-$version.tar.gz"
+
+if [[ "$date" !=  $(date +"%Y-%m-%d") ]]; then
+    echo "$date is not today!"
+    exit 1
+fi
+
+if [ -n "$(git status --porcelain)" ]; then
+    echo ". is not clean." >&2
+    exit 1
+fi
+
+old_version=$(perl -MFile::Slurp=read_file <<EOF
+use v5.16;
+my \$conf = read_file(q{configure.ac});
+\$conf =~ /AC_INIT.+\[(\d+\.\d+\.\d+)\]/;
+say \$1;
+EOF
+)
+
+perl -MFile::Slurp=edit_file -e \
+    "edit_file { s/\Q$old_version/$version/g } \$_ for qw( configure.ac include/maxminddb.h )"
+
+if [ -n "$(git status --porcelain)" ]; then
+    git add configure.ac include/maxminddb.h
+    git commit -m "Bumped version to $version"
+fi
+
+if [ ! -d .gh-pages ]; then
+    echo "Checking out gh-pages in .gh-pages"
+    git clone -b gh-pages git@github.com:maxmind/libmaxminddb.git .gh-pages
+    pushd .gh-pages
+else
+    echo "Updating .gh-pages"
+    pushd .gh-pages
+    git pull
+fi
+
+if [ -n "$(git status --porcelain)" ]; then
+    echo ".gh-pages is not clean" >&2
+    exit 1
+fi
+
+index=index.md
+cat <<EOF > $index
+---
+layout: default
+title: libmaxminddb - a library for working with MaxMind DB files
+version: $version
+---
+EOF
+
+cat ../doc/libmaxminddb.md >> $index
+
+mmdblookup=mmdblookup.md
+cat <<EOF > $mmdblookup
+---
+layout: default
+title: mmdblookup - a utility to look up an IP address in a MaxMind DB file
+version: $version
+---
+EOF
+
+cat ../doc/mmdblookup.md >> $mmdblookup
+
+git commit -m "Updated for $version" -a
+
+read -p "Push to origin? (y/n) " should_push
+
+if [ "$should_push" != "y" ]; then
+    echo "Aborting"
+    exit 1
+fi
+
+git push
+
+popd
+
+git push
+
+message="$version
+
+$notes"
+
+hub release create -a "$dist" -m "$message" "$version"

data/ext/geoip2/libmaxminddb/dev-bin/uncrustify-all.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+uncrustify="uncrustify -c .uncrustify.cfg --replace --no-backup"
+
+# We indent each thing twice because uncrustify is not idempotent - in some
+# cases it will flip-flop between two indentation styles.
+for dir in bin include src t; do
+    c_files=`find $dir -maxdepth 1 -name '*.c'`
+    if [ "$c_files" != "" ]; then
+        $uncrustify $dir/*.c;
+        $uncrustify $dir/*.c;
+    fi
+    
+    h_files=`find $dir -maxdepth 1 -name '*.h'`
+    if [ "$h_files" != "" ]; then
+        $uncrustify $dir/*.h;
+        $uncrustify $dir/*.h;
+    fi
+done
+
+./dev-bin/regen-prototypes.pl

data/ext/geoip2/libmaxminddb/dev-bin/valgrind-all.pl

@@ -0,0 +1,46 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use File::Basename qw( basename );
+use FindBin qw( $Bin );
+use IPC::Run3;
+
+my $top_dir = "$Bin/..";
+
+my $output;
+
+my @tests = glob "$top_dir/t/.libs/lt-*_t";
+
+my @mmdblookup = (
+    "$top_dir/bin/mmdblookup",
+    '--file', "$top_dir/maxmind-db/test-data/MaxMind-DB-test-decoder.mmdb",
+    '--ip',
+);
+
+# We want IPv4 and IPv6 addresses - one of each that exists in the db and one
+# that doesn't
+my @ips = ( '1.1.1.1', '10.0.0.0', 'abcd::', '0900::' );
+
+my @cmds = (
+    ( map { [ @mmdblookup, $_ ] } @ips ),
+    ( map { [$_] } @tests ),
+);
+
+for my $cmd (@cmds) {
+    my $output;
+    run3(
+        [ qw( valgrind --leak-check=full -- ), @{$cmd} ],
+        \undef,
+        \$output,
+        \$output,
+    );
+
+    $output =~ s/^(?!=).*\n//mg;
+
+    my $marker = '-' x 60;
+    print $marker, "\n", ( join q{ }, basename( shift @{$cmd} ), @{$cmd} ),
+        "\n", $marker, "\n", $output,
+        "\n\n";
+}