geoip2_c 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d4407340c5c98633cae71cbc6b2c69cfb85a315
-  data.tar.gz: 35e0cc0e59278f9d6ce2f5c8079dff2a5a443ed0
+SHA256:
+  metadata.gz: abed5426ff2b76c33f8fbfd79a591b86fe2dc5a6aeea1a73723e37763537271f
+  data.tar.gz: e77eb5aa947623d9be2fa2f2161081145d50e57f75f516cb775b0757965aff83
 SHA512:
-  metadata.gz: 03a92ddb4b9d5097ea58a4a734a2bd4a7dc578e2afb01ad735211a6f71eeb139d2ce7cfab3022c90bdd0fded7e79799a89ece649c9886d32cc58d43ebed9bec5
-  data.tar.gz: 92a70552ec7f8f3583e49574f88116a19f9575f6b2948889d2e0168097a71cfa9e9ee4bb6809abeb17bc5767b6108691fd3876040c778063f11c7d52b88847d2
+  metadata.gz: 36b58ccb36e05a271a2806ec0ab53f9a4445175cb24a39916f2e674b2373f0f82275946a327b925567e63de06c64ddfd462376a3dec056649c6559b95d50faa7
+  data.tar.gz: f3deafdd7c89751ee468d950506dee5395381ef810cbe7683d4043973e1a7ad547e24e04f61925a51ff99526d116908da790b708c41a5c1f8378b200f1f82608

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,33 @@
+name: ubuntu
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby:
+          - "3.2"
+          - "3.1"
+          - "3.0"
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: latest
+          bundler-cache: true
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y -qq build-essential automake autoconf libtool
+      - name: Build
+        run: bundle exec rake compile
+      - name: Run test
+        run: bundle exec rake test

data/.github/workflows/windows.yml

@@ -0,0 +1,52 @@
+name: windows
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby:
+          - "3.2"
+          - "3.1"
+        include:
+          - ruby: "3.0.3"
+            # On Ruby 3.0, we need to use fiddle 1.0.8 or later to retrieve correct
+            # error code. In addition, we have to specify the path of fiddle by RUBYLIB
+            # because RubyInstaller loads Ruby's bundled fiddle before initializing gem.
+            # See also:
+            # * https://github.com/ruby/fiddle/issues/72
+            # * https://bugs.ruby-lang.org/issues/17813
+            # * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
+            ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.3/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.1.0/lib
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install dependencies
+        run: |
+          ridk enable
+          pacman -Sy --noconfirm mingw-w64-x86_64-libmaxminddb
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: latest
+          bundler-cache: true
+      - name: Check Ruby version
+        run: |
+          ruby -v
+      - name: Add Fiddle 1.1.0
+        if: ${{ matrix.ruby == "3.0.3" }}
+        run: gem install fiddle --version 1.1.0
+      - name: Build
+        run: |
+          ridk enable
+          bundle exec rake compile
+      - name: Run test
+        run: |
+          ridk enable
+          bundle exec rake test

data/README.md

@@ -5,15 +5,27 @@ This gem provides binding of [libmaxminddb](http://maxmind.github.io/libmaxmindd
 This binding does not traverse all elements in lookup result by default.
 So you can get the element you want fast such as city name, country name or etc.
 
-## Requirements
+## Supported Ruby versions
 
-* Ruby 2.3 or later
+See [workflows](https://github.com/fluent-plugins-nursery/geoip2_c/blob/master/.github/workflows/ubuntu.yml)
 
-NOTE:
+## Build requirements
 
-This library uses `Hash#dig` and `Array#dig`.
-If you want to use this library with Ruby2.1 or Ruby2.2, you can install a gem which adds support `#dig` method.
-But I don't want to add extra dependency to this library, so I decided not to add extra dependency to support old Ruby versions.
+Need ruby.h to build this extension, so you must install it before build this extension.
+
+Debian GNU Linux / Ubuntu:
+
+```
+$ sudo apt install -y build-essential automake autoconf libtool
+```
+
+CentOS:
+
+```
+$ sudo yum groupinstall -y "Development Tools"
+```
+
+**NOTE**: If you want to use libmaxminddb provided as a deb/rpm package, you can install libmaxminddb-dev or libmaxminddb-devel at your own risk.
 
 ## Installation
 
@@ -36,10 +48,10 @@ Or install it yourself as:
 ```ruby
 require "geoip2"
 
-db = GeoIP2::Databaes.new("/path/to/GeoLite2-City.mmdb")
+db = GeoIP2::Database.new("GeoLite2-City.mmdb")
 result = db.lookup("66.102.9.80")
-retult.get_value("city", "names", "en") # => "Mountain View"
-retult.dig("city", "names", "en")       # => "Mountain View"
+result.get_value("city", "names", "en") # => "Mountain View"
+result.dig("city", "names", "en")       # => "Mountain View"
 ```
 
 ## Development
@@ -50,7 +62,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/okkez/geoip2_c.
+Bug reports and pull requests are welcome on GitHub at https://github.com/fluent-plugins-nursery/geoip2_c.
 
 ## License
 

data/docker-compose.yml

@@ -1,5 +1,26 @@
-version: "2"
+version: "3"
 services:
+  test-ruby2.7:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.7
+    command: tail -f /dev/null
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
+  test-ruby2.6:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.6
+    command: tail -f /dev/null
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
+  test-ruby2.5:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile-ruby2.5
+    command: tail -f /dev/null
+    environment:
+      - BUNDLE_GEMFILE=Gemfile
   test-ruby2.4:
     build:
       context: .

data/dockerfiles/{Dockerfile-ruby2.3 → Dockerfile-ruby2.5}

@@ -1,4 +1,4 @@
-FROM ruby:2.3-alpine
+FROM ruby:2.5-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 

data/dockerfiles/{Dockerfile-ruby2.1 → Dockerfile-ruby2.6}

@@ -1,4 +1,4 @@
-FROM ruby:2.1-alpine
+FROM ruby:2.6-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 

data/dockerfiles/{Dockerfile-ruby2.2 → Dockerfile-ruby2.7}

@@ -1,4 +1,4 @@
-FROM ruby:2.2-alpine
+FROM ruby:2.7-alpine
 
 ENV BUNDLE_GEMFILE=$BUNDLE_GEMFILE
 

data/ext/geoip2/extconf.rb

@@ -5,12 +5,19 @@ libdir = RbConfig::CONFIG["libdir"]
 includedir = RbConfig::CONFIG["includedir"]
 
 maxminddb_dir = File.expand_path(File.join(__dir__, "libmaxminddb"))
+gem_root = File.expand_path('..', __dir__)
+
+if !File.directory?(maxminddb_dir) ||
+   # '.', '..', and possibly '.git' from a failed checkout:
+   Dir.entries(maxminddb_dir).size <= 3
+  Dir.chdir(gem_root) { system('git submodule update --init') } or fail 'Could not fetch maxminddb'
+end
 
 Dir.chdir(maxminddb_dir) do
-  system("./bootstrap")
-  system({ "CFLAGS" => "-fPIC" }, "./configure", "--disable-shared", "--disable-tests")
-  system("make", "clean")
-  system("make")
+  system("./bootstrap") or fail "Couldn't run maxminddb `bootstrap`"
+  system({ "CFLAGS" => "-fPIC" }, "./configure", "--disable-shared", "--disable-tests") or fail "Couldn't run maxminddb `configure`"
+  system("make", "clean") or fail "Couldn't run maxminddb `make clean`"
+  system("make") or fail "Couldn't run maxminddb `make`"
 end
 
 header_dirs = [includedir, "#{maxminddb_dir}/include"]

data/ext/geoip2/geoip2.c

@@ -15,10 +15,11 @@ static void mmdb_free(void *mmdb);
 static MMDB_lookup_result_s mmdb_lookup(MMDB_s *mmdb, const char *ip_str, bool cleanup);
 static VALUE mmdb_entry_data_decode(MMDB_entry_data_s *entry_data);
 static VALUE mmdb_guard_parse_entry_data_list(VALUE ptr);
-static MMDB_entry_data_list_s *mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, VALUE *obj);
+static MMDB_entry_data_list_s *mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, bool symbolize_keys, VALUE *obj);
 
 static VALUE rb_geoip2_db_alloc(VALUE klass);
-static VALUE rb_geoip2_db_initialize(VALUE self, VALUE path);
+static VALUE rb_geoip2_db_initialize(int argc, VALUE* argv, VALUE self);
+
 static VALUE rb_geoip2_db_close(VALUE self);
 static VALUE rb_geoip2_db_lookup(VALUE self, VALUE ip);
 
@@ -27,16 +28,23 @@ static VALUE rb_geoip2_lr_initialize(VALUE self);
 static VALUE rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self);
 static VALUE rb_geoip2_lr_to_h(VALUE self);
 
+typedef struct {
+  struct MMDB_entry_data_list_s* data_list;
+  bool symbolize_keys;
+} ParseRequest;
+
 static const rb_data_type_t rb_mmdb_type = {
   "geoip2/mmdb", {
     0, mmdb_free, 0,
-  }, NULL, NULL
+  }, NULL, NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static const rb_data_type_t rb_lookup_result_type = {
   "geoip2/lookup_result", {
-    0, 0, 0,
-  }, NULL, NULL
+    0, RUBY_DEFAULT_FREE, 0,
+  }, NULL, NULL,
+  RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
@@ -155,19 +163,36 @@ mmdb_entry_data_decode(MMDB_entry_data_s *entry_data)
   }
 }
 
+static VALUE
+mmdb_entry_data_decode_key(MMDB_entry_data_s *entry_data, bool symbolize_strings)
+{
+  if (entry_data->type != MMDB_DATA_TYPE_UTF8_STRING) {
+    rb_raise(rb_eGeoIP2Error, "Unexpected key type: %d", entry_data->type);
+  }
+  if (symbolize_strings) {
+    return ID2SYM(rb_intern3(entry_data->utf8_string,
+                             entry_data->data_size,
+                             rb_utf8_encoding()));
+  } else {
+    return rb_enc_str_new(entry_data->utf8_string,
+                          entry_data->data_size,
+                          rb_utf8_encoding());
+  }
+}
+
 static VALUE
 mmdb_guard_parse_entry_data_list(VALUE ptr)
 {
-  MMDB_entry_data_list_s *data_list =
-    (struct MMDB_entry_data_list_s *)ptr;
+  MMDB_entry_data_list_s *data_list = ((ParseRequest *)ptr)->data_list;
+  bool symbolize_keys = ((ParseRequest *)ptr)->symbolize_keys;
   VALUE obj;
 
-  mmdb_parse_entry_data_list(data_list, &obj);
+  mmdb_parse_entry_data_list(data_list, symbolize_keys, &obj);
   return obj;
 }
 
 static MMDB_entry_data_list_s *
-mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, VALUE *obj)
+mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, bool symbolize_keys, VALUE *obj)
 {
   switch (data_list->entry_data.type) {
   case MMDB_DATA_TYPE_MAP:
@@ -177,9 +202,9 @@ mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, VALUE *obj)
       for (data_list = data_list->next; data_size && data_list; data_size--) {
         VALUE key;
         VALUE val;
-        key = mmdb_entry_data_decode(&data_list->entry_data);
+        key = mmdb_entry_data_decode_key(&data_list->entry_data, symbolize_keys);
         data_list = data_list->next;
-        data_list = mmdb_parse_entry_data_list(data_list, &val);
+        data_list = mmdb_parse_entry_data_list(data_list, symbolize_keys, &val);
         rb_hash_aset(hash, key, val);
       }
       *obj = hash;
@@ -191,7 +216,7 @@ mmdb_parse_entry_data_list(MMDB_entry_data_list_s *data_list, VALUE *obj)
       VALUE array = rb_ary_new();
       for (data_list = data_list->next; data_size && data_list; data_size--) {
         VALUE val;
-        data_list = mmdb_parse_entry_data_list(data_list, &val);
+        data_list = mmdb_parse_entry_data_list(data_list, symbolize_keys, &val);
         rb_ary_push(array, val);
       }
       *obj = array;
@@ -231,7 +256,7 @@ rb_geoip2_db_alloc(VALUE klass)
 }
 
 static VALUE
-rb_geoip2_db_initialize(VALUE self, VALUE path)
+rb_geoip2_db_open_mmdb(VALUE self, VALUE path)
 {
   char *db_path;
   MMDB_s *mmdb;
@@ -286,6 +311,9 @@ rb_geoip2_db_lookup(VALUE self, VALUE ip)
   result_ptr->found_entry = result.found_entry;
   result_ptr->entry = result.entry;
   result_ptr->netmask = result.netmask;
+
+  rb_iv_set(obj, "@symbolize_keys", rb_iv_get(self, "@symbolize_keys"));
+
   return obj;
 }
 
@@ -380,8 +408,9 @@ rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
     VALUE array = rb_ary_new();
     VALUE hash;
     VALUE val;
+    bool symbolize_keys = RTEST(rb_iv_get(self, "@symbolize_keys"));
     for (int j = 0; path[j] != NULL; j++) {
-      rb_ary_push(array, rb_str_new_cstr(path[j]));
+      rb_ary_push(array, symbolize_keys ? ID2SYM(rb_intern(path[j])) : rb_str_new_cstr(path[j]));
     }
     hash = rb_funcall(self, rb_intern("to_h"), 0);
     val = rb_apply(hash, rb_intern("dig"), array);
@@ -393,6 +422,19 @@ rb_geoip2_lr_get_value(int argc, VALUE *argv, VALUE self)
   return mmdb_entry_data_decode(&entry_data);
 }
 
+static VALUE
+rb_geoip2_lr_netmask(VALUE self)
+{
+  MMDB_lookup_result_s *result = NULL;
+
+  TypedData_Get_Struct(self,
+                       struct MMDB_lookup_result_s,
+                       &rb_lookup_result_type,
+                       result);
+
+  return UINT2NUM(result->netmask);
+}
+
 static VALUE
 rb_geoip2_lr_to_h(VALUE self)
 {
@@ -419,7 +461,9 @@ rb_geoip2_lr_to_h(VALUE self)
     rb_raise(rb_eGeoIP2Error, "%s", MMDB_strerror(status));
   }
 
-  hash = rb_protect(mmdb_guard_parse_entry_data_list, (VALUE)entry_data_list, &exception);
+  ParseRequest parse_request = { entry_data_list, RTEST(rb_iv_get(self, "@symbolize_keys")) };
+
+  hash = rb_protect(mmdb_guard_parse_entry_data_list, (VALUE)&parse_request, &exception);
   MMDB_free_entry_data_list(entry_data_list);
 
   if (exception != 0) {
@@ -435,17 +479,18 @@ void
 Init_geoip2(void)
 {
   rb_mGeoIP2 = rb_define_module("GeoIP2");
-  rb_cGeoIP2Database = rb_define_class_under(rb_mGeoIP2, "Database", rb_cData);
-  rb_cGeoIP2LookupResult = rb_define_class_under(rb_mGeoIP2, "LookupResult", rb_cData);
+  rb_cGeoIP2Database = rb_define_class_under(rb_mGeoIP2, "Database", rb_cObject);
+  rb_cGeoIP2LookupResult = rb_define_class_under(rb_mGeoIP2, "LookupResult", rb_cObject);
   rb_eGeoIP2Error = rb_define_class_under(rb_mGeoIP2, "Error", rb_eStandardError);
 
   rb_define_alloc_func(rb_cGeoIP2Database, rb_geoip2_db_alloc);
-  rb_define_method(rb_cGeoIP2Database, "initialize", rb_geoip2_db_initialize, 1);
+  rb_define_method(rb_cGeoIP2Database, "open_mmdb", rb_geoip2_db_open_mmdb, 1);
   rb_define_method(rb_cGeoIP2Database, "close", rb_geoip2_db_close, 0);
   rb_define_method(rb_cGeoIP2Database, "lookup", rb_geoip2_db_lookup, 1);
 
   rb_define_alloc_func(rb_cGeoIP2LookupResult, rb_geoip2_lr_alloc);
   rb_define_method(rb_cGeoIP2LookupResult, "initialize", rb_geoip2_lr_initialize, 0);
   rb_define_method(rb_cGeoIP2LookupResult, "get_value", rb_geoip2_lr_get_value, -1);
+  rb_define_method(rb_cGeoIP2LookupResult, "netmask", rb_geoip2_lr_netmask, 0);
   rb_define_method(rb_cGeoIP2LookupResult, "to_h", rb_geoip2_lr_to_h, 0);
 }

data/ext/geoip2/libmaxminddb/.gitignore

@@ -2,6 +2,7 @@
 *.lo
 *.o
 *.so
+*.swp
 */.deps
 */.libs
 *~
@@ -24,9 +25,11 @@
 /man
 /missing
 /src/libmaxminddb.pc
+/src/test-data-pool
 /t/*.log
 /t/*.trs
 /t/*_t
+/t/*-t
 /test-driver
 Makefile
 Makefile.in

data/ext/geoip2/libmaxminddb/.travis.yml

@@ -15,18 +15,40 @@ addons:
 language: c
 matrix:
   include:
+    # Why do we have -Wno-unused-parameter? Because libtap has unused
+    # parameters unfortunately.
+    #
+    # Why -Wno-unused-command-line-argument? Because Clang on OSX does not like
+    # -pthread to be given during linking (while gcc says it should be). We
+    # could alternatively work around this via conditionals in automake, but
+    # that seems uglier. Note we specify this for gcc on OSX as well as gcc
+    # there is a frontend for Clang.
     - os: linux
       compiler: gcc
       env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter"
     - os: osx
       compiler: gcc
-      env: MMCFLAGS="-std=c99 -Wall -Wextra -Wno-unused-parameter"
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument"
     - os: linux
       compiler: clang
       env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter"
     - os: osx
       compiler: clang
-      env: MMCFLAGS="-std=c99 -Wall -Wextra -Wno-unused-parameter"
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument"
+    # The same, but POSIX.1-2001. We default to POSIX.1-2008 but want to remain
+    # compatible with POSIX.1-2001.
+    - os: linux
+      compiler: gcc
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -D_POSIX_C_SOURCE=200112L"
+    - os: osx
+      compiler: gcc
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument -D_POSIX_C_SOURCE=200112L"
+    - os: linux
+      compiler: clang
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -D_POSIX_C_SOURCE=200112L"
+    - os: osx
+      compiler: clang
+      env: MMCFLAGS="-std=c99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-unused-command-line-argument -D_POSIX_C_SOURCE=200112L"
 env:
   global:
     - secure: a2pXNVW/lGrMdJTal+pzH0J5N69RdBErwe2dHU2xDnOeNcDYmiSxmU4Fw52KPYXFzdlR9GuEyZtHtesRQthSHpylcIvfJJCih7EvwbNQ5pfplpT5ri2PKPFWB11ebr6vG23Ucgc5lrqHdgIgv+QtqVmW1IDf0hq62itMpu4MwcQ=

data/ext/geoip2/libmaxminddb/Changes.md

@@ -1,3 +1,42 @@
+## 1.3.2 - 2018-01-17
+
+* Allocate memory for `MMDB_entry_data_list_s` structs in separate chunks
+  rather than one large chunk. This simplifies accessing memory in
+  `MMDB_get_entry_data_list()` and increases performance. It builds on the
+  changes in 1.3.0 and 1.3.1.
+* We no longer export `data_pool_*` symbols. These are internal functions
+  but we were previously exporting them. Pull request by Faidon Liambotis.
+  GitHub #162.
+* Build with POSIX.1-2008 by default if the system supports it. This allows
+  use of `open()` with `O_CLOEXEC`. We retain support for systems that
+  provide only POSIX.1-2001.
+* Open the database with the `O_CLOEXEC` flag if the system provides it.
+  This avoids cases where we could leak fds when called in multi-threaded
+  programs that `fork()` and `exec()`. Original report and PR by Brandon L
+  Black.
+* Added a test to ensure we export only intended symbols (e.g. MMDB_*).
+
+
+## 1.3.1 - 2017-11-24
+
+* Fix build problems related to `rpl_malloc()`. Pull request by Rainer
+  Gerhards. GitHub #152.
+* Fix a race to set and read data in a field on the `MMDB_s` struct
+  (`ipv4_start_node`). GitHub #153.
+* Fix cases of invalid memory access when using
+  `MMDB_get_entry_data_list()`. This was introduced in 1.3.0 and occurred
+  when performing large lookups. GitHub #153.
+
+
+## 1.3.0 - 2017-11-10
+
+* Perform fewer memory allocations in `MMDB_get_entry_data_list()`. This
+  significantly improves its performance. GitHub #147.
+* Fix `mmdblookup`'s build epoch reporting on some systems. Big endian
+  systems with a 32-bit `time_t` no longer show a database build date of
+  1970-01-01 00:00:00. Pull request by Rainer Jung. GitHub #143.
+
+
 ## 1.2.1 - 2017-05-15
 
 * Use autoconf to check the system's endianness rather than trying to do this

data/ext/geoip2/libmaxminddb/README.dev.md

@@ -4,23 +4,14 @@ We release by uploading the tarball to GitHub, uploading Ubuntu PPAs, and by
 updating the Homebrew recipe for this library.
 
 ## Creating the release tarball
+You may want to refer to the section about prerequisites.
 
+* Check whether there are any open issues to fix while you're doing this.
 * Update `Changes.md` to include specify the new version, today's date, and
-  list relevant changes.
-* Run `./dev-bin/make-release.sh` to update various files in the distro, our
-  GitHub pages, creates and pushes a tag, etc.
-* Run `make safedist` in the checkout directory to create a tarball.
-
-## GitHub
-
-* Go to https://github.com/maxmind/libmaxminddb/releases
-* GitHub will already have a release for the tag you just created.
-* Click on the new tag new.
-* Click on "Edit tag".
-* Give the release a title summarizing the changes.
-* Paste in the changes from the `Changes.md` file as the body.
-* Attach the release tarball you just created.
-* Click "Update release"
+  list relevant changes. Commit this.
+* Run `./dev-bin/release.sh` to update various files in the distro, our
+  GitHub pages, and creates a GitHub release with the tarball.
+* Check the release looks good on both GitHub and launchpad.net.
 
 ## PPA
 
@@ -33,26 +24,46 @@ The PPA release script is at `dev-bin/ppa-release.sh`. Running it should
 guide you though the release, although it may require some changes to run on
 configurations different than Greg's machine.
 
-Pre-script PPA release process:
+Check whether any new Ubuntu versions need to be listed in this script
+before running it.
 
-1. git co ubuntu-ppa
-2. git merge `<TAG>`
-3. dch -i
-  * Add new entry for wily (or whatever the most recent Ubuntu release
-    is. Follow existing PPA versioning style.
-4. git commit to add the debian changelog
-5. gbp buildpackage -S
-6. dput ppa:maxmind/ppa ../libmaxminddb_`<TAG>`-`<DEB VERSION>`_source.changes
-7. git push
-
-If 5 was successful, modify debian/changelog and repeat 5 & 6 for trusty and
-precise. Note that you can skip step #4 for subsequent uploads by adding
-`--git-ignore-new` when you call `gbp`.
+You should run it from `master`.
 
 ## Homebrew
 
-* Go to https://github.com/Homebrew/homebrew/blob/master/Library/Formula/libmaxminddb.rb
+* Go to https://github.com/Homebrew/homebrew-core/edit/master/Formula/libmaxminddb.rb
 * Edit the file to update the url and sha256. You can get the sha256 for the
   tarball with the `sha256sum` command line utility.
 * Make a commit with the summary `libmaxminddb <VERSION>`
 * Submit a PR with the changes you just made.
+
+# 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
+  libipc-run3-perl libtest-output-perl devscripts
+* Install [hub](https://github.com/github/hub/releases). (Using `./install`
+  from the tarball is fine)
+* GitHub ssh key (e.g. in `~/.ssh/id_rsa`)
+* Git config (e.g. `~/.gitconfig`)
+* Import your GPG secret key (or create one if you don't have a suitable
+  one)
+  * `gpg --import /path/to/key`
+  * `gpg --edit-key KEYID` and trust it ultimately
+  * Ensure it shows with `gpg --list-secret-keys`
+* You need to be invited to the launchpad.net MaxMind organization on your
+  launchpad.net account.
+* You need your GPG key listed on your launchpad.net account
+  * You can add it in the web interface. It wants the output of
+    `gpg --fingerprint`.
+  * Part of the instructions involve having your key published on the
+    Ubuntu keyserver:
+    `gpg --keyserver keyserver.ubuntu.com --send-keys KEYID`
+  * You'll get an email with an encrypted payload that you need to decrypt
+    and follow the link to confirm it.
+* Ensure `dch` knows your name and email. Refer to its man page for how to
+  tell it this. One way is to set the `DEBFULLNAME` and `DEBEMAIL`
+  environment variables. These should match your GPG key's name and email
+  exactly. This is what gets used in the Debian changelog as well as
+  defines what GPG key to use.

data/ext/geoip2/libmaxminddb/README.md

@@ -20,7 +20,7 @@ This library is licensed under the Apache License, Version 2.
 ## From a Tarball
 
 This code is known to work with GCC 4.4+ and clang 3.2+. It should also work
-on other compilers that supports C99, POSIX 2011.11, and the `-fms-extensions
+on other compilers that supports C99, POSIX.1-2001, and the `-fms-extensions
 flag` (or equivalent). The latter is needed to allow an anonymous union in a
 structure.
 
@@ -76,8 +76,8 @@ APT sources, run:
 
 Then install the packages by running:
 
-    $ sudo aptitude update
-    $ sudo aptitude install libmaxminddb0 libmaxminddb-dev mmdb-bin
+    $ sudo apt update
+    $ sudo apt install libmaxminddb0 libmaxminddb-dev mmdb-bin
 
 ## On OS X via Homebrew
 

data/ext/geoip2/libmaxminddb/bin/Makefile.am

@@ -3,3 +3,8 @@ include $(top_srcdir)/common.mk
 AM_LDFLAGS = $(top_builddir)/src/libmaxminddb.la
 
 bin_PROGRAMS = mmdblookup
+
+if !WINDOWS
+AM_CPPFLAGS += -pthread
+AM_LDFLAGS += -pthread
+endif