Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package geoipupdate for openSUSE:Factory
checked in at 2021-11-09 23:54:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geoipupdate (Old)
and /work/SRC/openSUSE:Factory/.geoipupdate.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geoipupdate"
Tue Nov 9 23:54:44 2021 rev:18 rq:930210 version:4.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/geoipupdate/geoipupdate.changes 2021-09-21
21:14:08.274706166 +0200
+++ /work/SRC/openSUSE:Factory/.geoipupdate.new.1890/geoipupdate.changes
2021-11-09 23:55:10.603969938 +0100
@@ -1,0 +2,7 @@
+Mon Nov 08 15:51:20 UTC 2021 - i...@paolostivanin.com
+
+- Update to version 4.8.0:
+ * The Docker container now supports the following new environment
+variables: GEOIPUPDATE_CONF_FILE and GEOIPUPDATE_DB_DIR
+
+-------------------------------------------------------------------
Old:
----
geoipupdate-4.7.1.tar.gz
New:
----
geoipupdate-4.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geoipupdate.spec ++++++
--- /var/tmp/diff_new_pack.atr3hF/_old 2021-11-09 23:55:11.507970399 +0100
+++ /var/tmp/diff_new_pack.atr3hF/_new 2021-11-09 23:55:11.511970400 +0100
@@ -18,7 +18,7 @@
# Common info
Name: geoipupdate
-Version: 4.7.1
+Version: 4.8.0
Release: 0
Summary: GeoIP update client code
License: Apache-2.0 OR MIT
@@ -54,6 +54,7 @@
Script for updating data in GeoIP Legacy format.
+
# Preparation step (unpackung and patching if necessary)
%prep
%setup -q -a1
++++++ _service ++++++
--- /var/tmp/diff_new_pack.atr3hF/_old 2021-11-09 23:55:11.547970419 +0100
+++ /var/tmp/diff_new_pack.atr3hF/_new 2021-11-09 23:55:11.547970419 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">git://github.com/maxmind/geoipupdate</param>
- <param name="revision">v4.7.1</param>
+ <param name="revision">v4.8.0</param>
<param name="exclude">.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.atr3hF/_old 2021-11-09 23:55:11.563970427 +0100
+++ /var/tmp/diff_new_pack.atr3hF/_new 2021-11-09 23:55:11.563970427 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/maxmind/geoipupdate</param>
- <param
name="changesrevision">8bb6d26f0b015d27a3470bfe1171c6c68ff4b106</param>
+ <param
name="changesrevision">4bf61478cbaf0c0286e7c2f71d0b0f2d473a5ba8</param>
</service>
</servicedata>
\ No newline at end of file
++++++ geoipupdate-4.7.1.tar.gz -> geoipupdate-4.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/.gitignore
new/geoipupdate-4.8.0/.gitignore
--- old/geoipupdate-4.7.1/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/geoipupdate-4.8.0/.gitignore 2021-06-28 16:11:50.000000000 +0200
@@ -0,0 +1,5 @@
+*.swp
+/build
+/cmd/geoipupdate/geoipupdate
+/vendor
+.idea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/CHANGELOG.md
new/geoipupdate-4.8.0/CHANGELOG.md
--- old/geoipupdate-4.7.1/CHANGELOG.md 2021-04-19 20:20:49.000000000 +0200
+++ new/geoipupdate-4.8.0/CHANGELOG.md 2021-06-28 16:11:50.000000000 +0200
@@ -1,5 +1,17 @@
# CHANGELOG
+## 4.8.0
+
+* The Docker container now supports the following new environment
+ variables:
+
+ * `GEOIPUPDATE_CONF_FILE` - The path where the configuration file will
+ be written. The default is `/etc/GeoIP.conf`.
+ * `GEOIPUPDATE_DB_DIR` - The directory where geoipupdate will download
+ the databases. The default is `/usr/share/GeoIP`.
+
+ Pull request by Maxence POULAIN. GitHub #143.
+
## 4.7.1 (2021-04-19)
* The Alpine version used for the Docker image now tracks the `alpine:3`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/_layouts/default.html
new/geoipupdate-4.8.0/_layouts/default.html
--- old/geoipupdate-4.7.1/_layouts/default.html 2021-04-19 20:20:49.000000000
+0200
+++ new/geoipupdate-4.8.0/_layouts/default.html 2021-06-28 16:11:50.000000000
+0200
@@ -6,7 +6,7 @@
<meta name="description" content="">
<meta name="author" content="MaxMind, Inc.">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link
href="//mm-staticassets.storage.googleapis.com/gh-pages-theme/maxmind.css"
rel="stylesheet">
+ <link href="https://static-gh.maxmind.com/maxmind.css"; rel="stylesheet">
<link href="//dev.maxmind.com/css/dev.maxmind.com.css" rel="stylesheet">
<link href="//dev.maxmind.com/css/highlight-github.css" rel="stylesheet" >
<link rel="shortcut icon" href="//dev.maxmind.com/static/favicon.ico">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/doc/docker.md
new/geoipupdate-4.8.0/doc/docker.md
--- old/geoipupdate-4.7.1/doc/docker.md 2021-04-19 20:20:49.000000000 +0200
+++ new/geoipupdate-4.8.0/doc/docker.md 2021-06-28 16:11:50.000000000 +0200
@@ -2,7 +2,7 @@
## Image information
-The image is available on [Docker
Hub](https://hub.docker.com/r/maxmindinc/geoipupdate).
+The image is available on [Docker
Hub](https://hub.docker.com/r/maxmindinc/geoipupdate).
The source code is available on
[GitHub](https://github.com/maxmind/geoipupdate).
## Configuring
@@ -33,6 +33,10 @@
default is `0`.
* `GEOIPUPDATE_VERBOSE` - Enable verbose mode. Prints out the steps that
`geoipupdate` takes. Set to **anything** (e.g., `1`) to enable.
+* `GEOIPUPDATE_CONF_FILE` - The path where the configuration file will be
+ written. The default is `/etc/GeoIP.conf`.
+* `GEOIPUPDATE_DB_DIR` - The directory where geoipupdate will download the
+ databases. The default is `/usr/share/GeoIP`.
The environment variables can be placed in a file with one per line and
passed in with the `--env-file` flag. Alternatively, you may pass them in
@@ -44,7 +48,7 @@
Run the latest image with:
-```
+```sh
docker run --env-file <file> -v <database directory>:/usr/share/GeoIP
maxmindinc/geoipupdate
```
@@ -56,7 +60,7 @@
Run the latest image with:
-```
+```yaml
version: '3'
services:
geoipupdate:
@@ -82,8 +86,8 @@
```
Note - When using docker-compose, you need to either:
- - set `GEOIPUPDATE_FREQUENCY` equal to something greater than 0
- or
- - set `restart: on-failure`
+
+* set `GEOIPUPDATE_FREQUENCY` equal to something greater than 0 or
+* set `restart: on-failure`
If you don't, the container will continuously restart.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/docker/entry.sh
new/geoipupdate-4.8.0/docker/entry.sh
--- old/geoipupdate-4.7.1/docker/entry.sh 2021-04-19 20:20:49.000000000
+0200
+++ new/geoipupdate-4.8.0/docker/entry.sh 2021-06-28 16:11:50.000000000
+0200
@@ -18,6 +18,15 @@
database_dir=/usr/share/GeoIP
flags=
frequency=$((GEOIPUPDATE_FREQUENCY * 60 * 60))
+
+if ! [ -z "$GEOIPUPDATE_CONF_FILE" ]; then
+ conf_file=$GEOIPUPDATE_CONF_FILE
+fi
+
+if ! [ -z "$GEOIPUPDATE_DB_DIR" ]; then
+ database_dir=$GEOIPUPDATE_DB_DIR
+fi
+
if [ -z "$GEOIPUPDATE_ACCOUNT_ID" ] || [ -z "$GEOIPUPDATE_LICENSE_KEY" ] || [
-z "$GEOIPUPDATE_EDITION_IDS" ]; then
echo "ERROR: You must set the environment variables
GEOIPUPDATE_ACCOUNT_ID, GEOIPUPDATE_LICENSE_KEY, and GEOIPUPDATE_EDITION_IDS!"
exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/go.mod new/geoipupdate-4.8.0/go.mod
--- old/geoipupdate-4.7.1/go.mod 2021-04-19 20:20:49.000000000 +0200
+++ new/geoipupdate-4.8.0/go.mod 2021-06-28 16:11:50.000000000 +0200
@@ -4,7 +4,7 @@
require (
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/gofrs/flock v0.8.0
+ github.com/gofrs/flock v0.8.1
github.com/kr/text v0.2.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e //
indirect
github.com/pkg/errors v0.9.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/geoipupdate-4.7.1/go.sum new/geoipupdate-4.8.0/go.sum
--- old/geoipupdate-4.7.1/go.sum 2021-04-19 20:20:49.000000000 +0200
+++ new/geoipupdate-4.8.0/go.sum 2021-06-28 16:11:50.000000000 +0200
@@ -2,8 +2,8 @@
github.com/davecgh/go-spew v1.1.0/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1
h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=
-github.com/gofrs/flock v0.8.0/go.mod
h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
+github.com/gofrs/flock v0.8.1/go.mod
h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod
h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/geoipupdate/vendor.tar.gz
/work/SRC/openSUSE:Factory/.geoipupdate.new.1890/vendor.tar.gz differ: char
139, line 1
