Hello community, here is the log from the commit of package geoipupdate for openSUSE:Leap:15.2 checked in at 2020-05-11 08:38:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/geoipupdate (Old) and /work/SRC/openSUSE:Leap:15.2/.geoipupdate.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geoipupdate" Mon May 11 08:38:47 2020 rev:13 rq:801354 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/geoipupdate/geoipupdate.changes 2020-04-20 12:55:48.872759162 +0200 +++ /work/SRC/openSUSE:Leap:15.2/.geoipupdate.new.2738/geoipupdate.changes 2020-05-11 08:38:58.242975419 +0200 @@ -1,0 +2,14 @@ +Thu May 07 08:06:55 UTC 2020 - Paolo Stivanin <[email protected]> + +- Update to version 4.3.0: + * Set release date + * Push multiple versions with different tags + * Use correct org name + * Add a less-strict .yamllintrc + * Test on go 1.14.x + * Shows location of GeoIP.conf when issue in file + * Remove extra space + * Fix typo in config file generation + * Make the edition IDs list format clearer + +------------------------------------------------------------------- Old: ---- geoipupdate-4.2.2.tar.gz New: ---- geoipupdate-4.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geoipupdate.spec ++++++ --- /var/tmp/diff_new_pack.ERYGmQ/_old 2020-05-11 08:38:58.762976545 +0200 +++ /var/tmp/diff_new_pack.ERYGmQ/_new 2020-05-11 08:38:58.766976553 +0200 @@ -18,7 +18,7 @@ # Common info Name: geoipupdate -Version: 4.2.2 +Version: 4.3.0 Release: 0 Summary: GeoIP update client code License: Apache-2.0 OR MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ERYGmQ/_old 2020-05-11 08:38:58.806976640 +0200 +++ /var/tmp/diff_new_pack.ERYGmQ/_new 2020-05-11 08:38:58.806976640 +0200 @@ -1,22 +1,21 @@ <services> - <service name="tar_scm" mode="disabled"> - <param name="scm">git</param> - <param name="url">git://github.com/maxmind/geoipupdate</param> - <param name="revision">v4.2.2</param> - <param name="exclude">.git</param> - <param name="versionformat">@PARENT_TAG@</param> - <param name="changesgenerate">enable</param> - <param name="versionrewrite-pattern">v(.*)</param> - </service> + <service name="tar_scm" mode="disabled"> + <param name="scm">git</param> + <param name="url">git://github.com/maxmind/geoipupdate</param> + <param name="revision">v4.3.0</param> + <param name="exclude">.git</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="changesgenerate">enable</param> + <param name="versionrewrite-pattern">v(.*)</param> + </service> - <service name="recompress" mode="disabled"> - <param name="file">*.tar</param> - <param name="compression">gz</param> - </service> + <service name="recompress" mode="disabled"> + <param name="file">*.tar</param> + <param name="compression">gz</param> + </service> - <service name="set_version" mode="disabled"> - </service> + <service name="set_version" mode="disabled"></service> - <service name="go_modules" mode="disabled"></service> + <service name="go_modules" mode="disabled"></service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ERYGmQ/_old 2020-05-11 08:38:58.826976683 +0200 +++ /var/tmp/diff_new_pack.ERYGmQ/_new 2020-05-11 08:38:58.826976683 +0200 @@ -1,10 +1,6 @@ <servicedata> -<service name="tar_scm"> - <param name="url">git://github.com/maxmind/geoiplookup.git</param> - <param name="changesrevision">b7d56e8cecca387a33a2d246897a737eefdee501</param></service><service name="tar_scm"> - <param name="url">git://github.com/maxmind/geoipupdate.git</param> - <param name="changesrevision">b7d56e8cecca387a33a2d246897a737eefdee501</param></service><service name="tar_scm"> - <param name="url">https://github.com/maxmind/geoipupdate</param> - <param name="changesrevision">b7d56e8cecca387a33a2d246897a737eefdee501</param></service><service name="tar_scm"> - <param name="url">git://github.com/maxmind/geoipupdate</param> - <param name="changesrevision">b7d56e8cecca387a33a2d246897a737eefdee501</param></service></servicedata> \ No newline at end of file + <service name="tar_scm"> + <param name="url">git://github.com/maxmind/geoipupdate</param> + <param name="changesrevision">09ac4548fd9311541cb0885e361eb57804b7b781</param> + </service> +</servicedata> ++++++ geoipupdate-4.2.2.tar.gz -> geoipupdate-4.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/.goreleaser-packages.yml new/geoipupdate-4.3.0/.goreleaser-packages.yml --- old/geoipupdate-4.2.2/.goreleaser-packages.yml 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/.goreleaser-packages.yml 2020-04-16 18:35:28.000000000 +0200 @@ -16,12 +16,16 @@ goarch: - '386' - 'amd64' + - 'arm' + - 'arm64' goos: - 'linux' hooks: post: 'make data BUILDDIR=. CONFFILE=/etc/GeoIP.conf DATADIR=/usr/share/GeoIP' ldflags: - '-s -w -X main.version={{.Version}} -X main.defaultConfigFile=/etc/GeoIP.conf -X main.defaultDatabaseDirectory=/usr/share/GeoIP' + env: + - CGO_ENABLED=0 checksum: name_template: 'checksums-dpkg-rpm.txt' nfpms: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/.goreleaser-windows.yml new/geoipupdate-4.3.0/.goreleaser-windows.yml --- old/geoipupdate-4.2.2/.goreleaser-windows.yml 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/.goreleaser-windows.yml 2020-04-16 18:35:28.000000000 +0200 @@ -21,6 +21,8 @@ - 'windows' hooks: post: 'make data OS=Windows_NT BUILDDIR=.' + env: + - CGO_ENABLED=0 checksum: name_template: 'checksums-windows.txt' release: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/.goreleaser.yml new/geoipupdate-4.3.0/.goreleaser.yml --- old/geoipupdate-4.2.2/.goreleaser.yml 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/.goreleaser.yml 2020-04-16 18:35:28.000000000 +0200 @@ -16,10 +16,23 @@ goarch: - '386' - 'amd64' + - 'arm' + - 'arm64' goos: - 'darwin' - 'linux' hooks: post: 'make data BUILDDIR=.' + env: + - CGO_ENABLED=0 +dockers: + - image_templates: + - "maxmindinc/geoipupdate:{{ .Tag }}" + - "maxmindinc/geoipupdate:v{{ .Major }}" + - "maxmindinc/geoipupdate:v{{ .Major }}.{{ .Minor }}" + - "maxmindinc/geoipupdate:latest" + dockerfile: docker/Dockerfile + extra_files: + - docker/entry.sh checksum: name_template: 'checksums-darwin-linux.txt' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/.travis.yml new/geoipupdate-4.3.0/.travis.yml --- old/geoipupdate-4.2.2/.travis.yml 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/.travis.yml 2020-04-16 18:35:28.000000000 +0200 @@ -10,6 +10,7 @@ - "1.11.x" - "1.12.x" - "1.13.x" + - "1.14.x" before_script: - | @@ -17,14 +18,14 @@ go get -t -u ./... fi - | - if [[ $TRAVIS_GO_VERSION == '1.13.x' && $TRAVIS_OS_NAME == 'linux' ]]; then + if [[ $TRAVIS_GO_VERSION == '1.14.x' && $TRAVIS_OS_NAME == 'linux' ]]; then curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin fi script: - go test -v -race ./... - | - if [[ $TRAVIS_GO_VERSION == '1.13.x' && $TRAVIS_OS_NAME == 'linux' ]]; then + if [[ $TRAVIS_GO_VERSION == '1.14.x' && $TRAVIS_OS_NAME == 'linux' ]]; then golangci-lint run fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/.yamllintrc new/geoipupdate-4.3.0/.yamllintrc --- old/geoipupdate-4.2.2/.yamllintrc 1970-01-01 01:00:00.000000000 +0100 +++ new/geoipupdate-4.3.0/.yamllintrc 2020-04-16 18:35:28.000000000 +0200 @@ -0,0 +1,8 @@ +extends: default + +rules: + braces: disable + brackets: disable + line-length: disable + colons: {max-spaces-before: 0, max-spaces-after: -1} + document-start: disable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/CHANGELOG.md new/geoipupdate-4.3.0/CHANGELOG.md --- old/geoipupdate-4.2.2/CHANGELOG.md 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/CHANGELOG.md 2020-04-16 18:35:28.000000000 +0200 @@ -1,5 +1,11 @@ # CHANGELOG +## 4.3.0 (2020-04-16) + +* First release to Docker Hub. Requested by Shun Yanaura. GitHub #24. +* The binary builds are now built with `CGO_ENABLED=0`. Request by CrazyMax. + GitHub #63. + ## 4.2.2 (2020-02-21) * Re-release for PPA. No other changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/README.md new/geoipupdate-4.3.0/README.md --- old/geoipupdate-4.2.2/README.md 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/README.md 2020-04-16 18:35:28.000000000 +0200 @@ -102,6 +102,10 @@ `\ProgramData\MaxMind/GeoIPUpdate\GeoIP.conf` on your system drive by default. +### Installing via Docker + +Please see our [Docker documentation](doc/docker.md). + ### Installation from source or Git You need the Go compiler (1.8+). You can get it at the [Go @@ -109,7 +113,7 @@ The easiest way is via `go get`: - $ go get -u github.com/maxmind/geoipupdate/v4/cmd/geoipupdate + $ env GO111MODULE=on go get -u github.com/maxmind/geoipupdate/v4/cmd/geoipupdate This installs `geoipupdate` to `$GOPATH/bin/geoipupdate`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/cmd/geoipupdate/main.go new/geoipupdate-4.3.0/cmd/geoipupdate/main.go --- old/geoipupdate-4.2.2/cmd/geoipupdate/main.go 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/cmd/geoipupdate/main.go 2020-04-16 18:35:28.000000000 +0200 @@ -40,8 +40,9 @@ config, err := geoipupdate.NewConfig(args.ConfigFile, defaultDatabaseDirectory, args.DatabaseDirectory, args.Verbose) if err != nil { - fatalLogger("error loading configuration file", err) + fatalLogger(fmt.Sprintf("error loading configuration file %s", args.ConfigFile), err) } + if config.Verbose { log.Printf("Using config file %s", args.ConfigFile) log.Printf("Using database directory %s", config.DatabaseDirectory) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/doc/GeoIP.conf.md new/geoipupdate-4.3.0/doc/GeoIP.conf.md --- old/geoipupdate-4.2.2/doc/GeoIP.conf.md 2020-02-21 21:14:17.000000000 +0100 +++ new/geoipupdate-4.3.0/doc/GeoIP.conf.md 2020-04-16 18:35:28.000000000 +0200 @@ -25,9 +25,10 @@ `EditionIDs` -: List of database edition IDs. Edition IDs may consist - of letters, digits, and dashes (e.g., "GeoIP2-City", "106"). Note: this - was formerly called `ProductIds`. +: List of space-separated database edition IDs. Edition IDs may consist + of letters, digits, and dashes. For example, `GeoIP2-City 106` would + download the GeoIP2 City database (`GeoIP2-City`) and the GeoIP Legacy + Country database (`106`). Note: this was formerly called `ProductIds`. ## Optional settings: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/doc/docker.md new/geoipupdate-4.3.0/doc/docker.md --- old/geoipupdate-4.2.2/doc/docker.md 1970-01-01 01:00:00.000000000 +0100 +++ new/geoipupdate-4.3.0/doc/docker.md 2020-04-16 18:35:28.000000000 +0200 @@ -0,0 +1,46 @@ +# Docker + +## Configuring + +The Docker image is configured by environment variables. The following +variables are required: + +* `GEOIPUPDATE_ACCOUNT_ID` - Your MaxMind account ID. +* `GEOIPUPDATE_LICENSE_KEY` - Your case-sensitive MaxMind license key. +* `GEOIPUPDATE_EDITION_IDS` - List of space-separated database edition IDs. + Edition IDs may consist of letters, digits, and dashes. For example, + `GeoIP2-City 106` would download the GeoIP2 City database + (`GeoIP2-City`) and the GeoIP Legacy Country database (`106`). + +The following are optional: + +* `GEOIPUPDATE_FREQUENCY` - The number of hours between `geoipupdate` runs. + If this is not set or is set to `0`, `geoipupdate` will run once and exit. +* `GEOIPUPDATE_HOST` - The host name of the server to use. The default is + `updates.maxmind.com`. +* `GEOIPUPDATE_PROXY` - The proxy host name or IP address. You may optionally + specify a port number, e.g., 127.0.0.1:8888. If no port number is specified, + 1080 will be used. +* `GEOIPUPDATE_PROXY_USER_PASSWORD` - The proxy user name and password, + separated by a colon. For instance, `username:password`. +* `GEOIPUPDATE_PRESERVE_FILE_TIMES` - Whether to preserve modification times + of files downloaded from the server. This option is either `0` or `1`. The + default is `0`. +* `GEOIPUPDATE_VERBOSE` - Enable verbose mode. Prints out the steps that + `geoipupdate` takes. + +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 +individually with the `-e` flag. + +## Running + +Run the latest image with: + +``` +docker run --env-file <file> -v <database directory>:/usr/share/GeoIP maxmindinc/geoipupdate +``` + +`<file>` should be the environment variable file with your configuration. +`<database directory>` should be the local directory that you want to download +the databases to. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/docker/Dockerfile new/geoipupdate-4.3.0/docker/Dockerfile --- old/geoipupdate-4.2.2/docker/Dockerfile 1970-01-01 01:00:00.000000000 +0100 +++ new/geoipupdate-4.3.0/docker/Dockerfile 2020-04-16 18:35:28.000000000 +0200 @@ -0,0 +1,8 @@ +FROM alpine:3.11.5 + +COPY geoipupdate /usr/bin/geoipupdate +COPY docker/entry.sh /usr/bin/entry.sh + +ENTRYPOINT ["/usr/bin/entry.sh"] + +VOLUME [ "/usr/share/GeoIP" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geoipupdate-4.2.2/docker/entry.sh new/geoipupdate-4.3.0/docker/entry.sh --- old/geoipupdate-4.2.2/docker/entry.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/geoipupdate-4.3.0/docker/entry.sh 2020-04-16 18:35:28.000000000 +0200 @@ -0,0 +1,53 @@ +#!/bin/sh + +set -e + +conf_file=/etc/GeoIP.conf +database_dir=/usr/share/GeoIP +flags= +frequency=$((GEOIPUPDATE_FREQUENCY * 60 * 60)) +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 +fi + +# Create configuration file +echo "# STATE: Creating configuration file at $conf_file" +cat <<EOF > "$conf_file" +AccountID $GEOIPUPDATE_ACCOUNT_ID +LicenseKey $GEOIPUPDATE_LICENSE_KEY +EditionIDs $GEOIPUPDATE_EDITION_IDS +EOF + +if [ ! -z "$GEOIPUPDATE_HOST" ]; then + echo "Host $GEOIPUPDATE_HOST" >> "$conf_file" +fi + +if [ ! -z "$GEOIPUPDATE_PROXY" ]; then + echo "Proxy $GEOIPUPDATE_PROXY" >> "$conf_file" +fi + +if [ ! -z "$GEOIPUPDATE_PROXY_USER_PASSWORD" ]; then + echo "ProxyUserPassword $GEOIPUPDATE_PROXY_USER_PASSWORD" >> "$conf_file" +fi + +if [ ! -z "$GEOIPUPDATE_PRESERVE_FILE_TIMES" ]; then + echo "PreserveFileTimes $GEOIPUPDATE_PRESERVE_FILE_TIMES" >> "$conf_file" +fi + +if [ "$GEOIPUPDATE_VERBOSE" ]; then + flags="-v" +fi + +cat "$conf_file" + +while true; do + echo "# STATE: Running geoipupdate" + /usr/bin/geoipupdate -d "$database_dir" -f "$conf_file" $flags + if [ "$frequency" -eq 0 ]; then + break + fi + + echo "# STATE: Sleeping for $GEOIPUPDATE_FREQUENCY hours" + sleep "$frequency" +done ++++++ vendor.tar.gz ++++++
