Hello community,

here is the log from the commit of package geoipupdate for openSUSE:Leap:15.2 
checked in at 2020-03-26 05:41:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/geoipupdate (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.geoipupdate.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "geoipupdate"

Thu Mar 26 05:41:35 2020 rev:10 rq:788145 version:4.2.2

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/geoipupdate/geoipupdate.changes        
2020-01-15 15:00:04.321736451 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.geoipupdate.new.3160/geoipupdate.changes      
2020-03-26 05:41:55.115295571 +0100
@@ -1,0 +2,130 @@
+Fri Mar 13 10:40:08 UTC 2020 - pgaj...@suse.com
+
+- introduce geoipupdate-legacy script [bsc#1156194]
+- added sources
+  + geoipupdate-legacy
+
+-------------------------------------------------------------------
+Wed Mar 04 07:24:45 UTC 2020 - i...@paolostivanin.com
+
+- Update to version 4.2.2:
+  * Prepare for 4.2.2
+  * Use go get on 1.10
+  * Only use debug.ReadBuildInfo on 1.12+
+  * Update changelog
+  * Set required Go version to 1.10
+  * Test back to Go 1.10
+  * Do not unnecessarily use errors.Is
+  * Add changelog for #76
+  * Update for GoReleaser nfpm section change
+  * Bump copyright year
+
+- Add disable-pandoc.patch
+
+-------------------------------------------------------------------
+Wed Mar 04 07:23:56 UTC 2020 - i...@paolostivanin.com
+
+- Update to version 4.2.2:
+  * Prepare for 4.2.2
+  * Use go get on 1.10
+  * Only use debug.ReadBuildInfo on 1.12+
+  * Update changelog
+  * Set required Go version to 1.10
+  * Test back to Go 1.10
+  * Do not unnecessarily use errors.Is
+  * Add changelog for #76
+  * Update for GoReleaser nfpm section change
+  * Bump copyright year
+
+-------------------------------------------------------------------
+Tue Mar 03 15:31:26 UTC 2020 - i...@paolostivanin.com
+
+- Update to version 4.2.2:
+  * Prepare for 4.2.2
+  * Use go get on 1.10
+  * Only use debug.ReadBuildInfo on 1.12+
+  * Update changelog
+  * Set required Go version to 1.10
+  * Test back to Go 1.10
+  * Do not unnecessarily use errors.Is
+  * Add changelog for #76
+  * Update for GoReleaser nfpm section change
+  * Bump copyright year
+
+-------------------------------------------------------------------
+Tue Mar  3 13:47:31 UTC 2020 - Paolo Stivanin <i...@paolostivanin.com>
+
+- Update to 4.2.2
+  A lot of changes since last release. Please have a look at
+  https://github.com/maxmind/geoipupdate/releases for more info
+
+-------------------------------------------------------------------
+Thu Jun 20 05:35:01 UTC 2019 - Wolfgang Rosenauer <w...@rosenauer.org>
+
+- added systemd timer for weekly updates
+  (needs to be enabled by admin)
+
+-------------------------------------------------------------------
+Wed Jun 19 10:34:53 UTC 2019 - Johannes Weberhofer <jweberho...@weberhofer.at>
+
+- Fixed build
+
+- Update to version 3.1.1
+
+  * This version now allows parsing of license keys longer than 12
+    characters.
+
+- Update to version 3.1.0
+
+  * This version restores the ability to use the `AccountID` / `UserId`
+    999999 along with an all-zero license key when downloading free
+    databases. However, the use of this combination is not recommended
+    and may break in future versions.
+  * When printing verbose output, only the first four character of the
+    `LicenseKey` will now be displayed.
+
+- Update to version 3.0.1
+
+  * When there were no updates available, 3.0.0 incorrectly returned an
+    exit code of 1 instead of 0. This release reverts to the pre-3.0.0
+    behavior, returning an exit code of 0 in this case.
+
+- Update to version 3.0.0
+
+  * BREAKING CHANGE: When downloading the free databases without a
+    MaxMind account, you must either not have `AccountID`, `UserId`,
+    or `LicenseKey` set in your configuration file or they must be set
+    to the zero values previously recommended in our documentation. Any
+    other value will cause an authorization error.
+  * BREAKING CHANGE: The configuration options `Protocol`,
+    `SkipPeerVerification`, and `SkipHostnameVerification` are no longer
+    supported. If they are present in the configuration file, they will
+    be ignored. HTTPS with peer and hostname verification will be used
+    on all requests.
+  * BREAKING CHANGE: The configuration file must have the `AccountID`
+    or the deprecated `UserId` when downloading a paid database.
+    Previously, when downloading the GeoIP Legacy Country database, you
+    were able to only provide the `LicenseKey`.
+  * IMPORTANT: `geoipupdate-pureperl.pl` has been removed and will no
+    longer be distributed with `geoipupdate`. This Perl script had known
+    issues and did not have feature parity with the C implementation. If
+    you were using the Perl version, we recommend that you switch to the
+    C version. If you are not able to do this, you may continue using the
+    Perl version distributed with 2.5.0.
+  * This program no longer uses the following endpoints:
+    `/app/update_getipaddr`, `/app/update`, and `/app/update_secure`.
+    `/geoip/databases/{edition_id}/update` is now used instead.
+  * Fixed issue in `gu_strnlen()` dereferencing a pointer before checking
+    that it was in array bounds. Issue found by fcntl.
+  * We now update the default GeoIP.conf during installation so that
+    directory paths match build parameters. Previously this config always
+    said the data directory was under /usr/local/share which was not always
+    accurate.
+  * Improve the error checking and display the underlying reason for the
+    error when possible. Reported by Jonathan Kosgei. GitHub #82.
+  * Document that the `LockFile` is not removed from the filesystem after
+    a successful exit from the program. GitHub issue #79.
+  * Make default configuration directory agree with default installation
+    directory.
+
+-------------------------------------------------------------------

Old:
----
  geoipupdate-2.5.0.tar.gz

New:
----
  _service
  _servicedata
  disable-pandoc.patch
  geoipupdate-4.2.2.tar.gz
  geoipupdate-legacy
  geoipupdate.service
  geoipupdate.timer
  vendor.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ geoipupdate.spec ++++++
--- /var/tmp/diff_new_pack.sbDoTP/_old  2020-03-26 05:41:55.807295930 +0100
+++ /var/tmp/diff_new_pack.sbDoTP/_new  2020-03-26 05:41:55.815295934 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package geoipupdate
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,53 +12,102 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+# Common info
 Name:           geoipupdate
-Version:        2.5.0
+Version:        4.2.2
 Release:        0
 Summary:        GeoIP update client code
-License:        GPL-2.0
-Group:          Productivity/Networking/System
-Url:            https://www.maxmind.com
-Source0:        
https://github.com/maxmind/geoipupdate/releases/download/v%{version}/%{name}-%{version}.tar.gz
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(zlib)
-Conflicts:      GeoIP < 1.6.0
+License:        GPL-2.0-only
+Group:          Productivity/Networking/Other
+URL:            https://github.com/maxmind/geoipupdate
+Source0:        %{name}-%{version}.tar.gz
+Source1:        vendor.tar.gz
+Source2:        geoipupdate.timer
+Source3:        geoipupdate.service
+Source4:        geoipupdate-legacy
+Patch0:         disable-pandoc.patch
+%if 0%{?suse_version} >= 1500
+# Build-time parameters
+BuildRequires:  go >= 1.10
+# Manpage
+BuildRequires:  perl%{?suse_version:-base}
+%endif
 
 %description
-The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP
-Legacy binary databases. Currently the program only supports Linux and
-other Unix- like systems.
+The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP Legacy
+binary databases. Currently the program only supports Linux and other
+Unix-like systems.
+
+%package legacy
+Summary:        GeoIP Lagacy Format Updater
+Group:          Productivity/Networking/Other
+Requires:       geoipupdate
+Requires:       geolite2legacy
 
+%description legacy
+Script for updating data in GeoIP Legacy format.
+
+# Preparation step (unpackung and patching if necessary)
 %prep
-%setup -q
+%setup -q -a1
+%patch0 -p1
 
 %build
-%configure \
-  --datadir=%{_localstatedir}/lib
-make %{?_smp_mflags}
+%if 0%{?suse_version} >= 1500
+export GOCACHE=$(pwd -P)/.gocache
+export GOTRACEBACK=crash
+export GOFLAGS='-a -mod=vendor -buildmode=pie -gcflags=all=-dwarf=false 
-ldflags=all=-s -ldflags=all=-w'
+%make_build \
+  CONFFILE=%{_sysconfdir}/GeoIP.conf \
+  DATADIR=%{_localstatedir}/lib/GeoIP \
+  VERSION=%{version}
+%endif
 
 %install
-%make_install
-install -d %{buildroot}%{_localstatedir}/lib/GeoIP
-install -D -p -m 0644 conf/GeoIP.conf.default \
-  %{buildroot}%{_sysconfdir}/GeoIP.conf.default
-rm -rf %{buildroot}%{_datadir}/doc/geoipupdate
-
-%check
-make check
+%if 0%{?suse_version} >= 1500
+install -D -m0644 %{SOURCE2}              
%{buildroot}%{_unitdir}/geoipupdate.timer
+install -D -m0644 %{SOURCE3}              
%{buildroot}%{_unitdir}/geoipupdate.service
+install -D -m0755 build/geoipupdate       %{buildroot}%{_bindir}/geoipupdate
+%endif
+install -D -m0755 %{SOURCE4}              
%{buildroot}%{_bindir}/geoipupdate-legacy
+install -D -m0644 conf/GeoIP.conf.default %{buildroot}%{_sysconfdir}/GeoIP.conf
+install -d -m0755 %{buildroot}%{_localstatedir}/lib/GeoIP
+sed -ri \
+ -e 's|YOUR_ACCOUNT_ID_HERE|999999|' \
+ -e 's|YOUR_LICENSE_KEY_HERE|000000000000|' \
+ -e '/^(#\s*)?DatabaseDirectory/ 
s|^(#\s*)?(\w+\s*).+$|\2%{_localstatedir}/lib/GeoIP|' \
+ %{buildroot}%{_sysconfdir}/GeoIP.conf
+
+%if 0%{?suse_version} >= 1500
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+
+%preun
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+%endif
 
 %files
-%doc README.md ChangeLog.md LICENSE
+%license LICENSE-*
 %config(noreplace) %{_sysconfdir}/GeoIP.conf
-%config %{_sysconfdir}/GeoIP.conf.default
 %dir %{_localstatedir}/lib/GeoIP
+%if 0%{?suse_version} >= 1500
+%doc README.md build/geoipupdate.md build/GeoIP.conf.md
 %{_bindir}/geoipupdate
-%{_mandir}/man1/geoipupdate.1%{ext_man}
-%{_mandir}/man5/GeoIP.conf.5%{ext_man}
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.timer
+%endif
+
+%files legacy
+%{_bindir}/geoipupdate-legacy
 
 %changelog

++++++ _service ++++++
<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="recompress" mode="disabled">
    <param name="file">*.tar</param>
    <param name="compression">gz</param>
  </service>

  <service name="set_version" mode="disabled">
  </service>

  <service name="go_modules" mode="disabled"></service>
</services>

++++++ _servicedata ++++++
<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>++++++
 disable-pandoc.patch ++++++
--- a/Makefile.orig     2020-03-04 10:14:17.209181344 +0100
+++ b/Makefile  2020-03-04 10:14:37.189282590 +0100
@@ -33,9 +33,7 @@
 data: \
        $(BUILDDIR)/GeoIP.conf \
        $(BUILDDIR)/GeoIP.conf.md \
-       $(BUILDDIR)/geoipupdate.md \
-       $(BUILDDIR)/GeoIP.conf.5 \
-       $(BUILDDIR)/geoipupdate.1
+       $(BUILDDIR)/geoipupdate.md
 
 $(BUILDDIR):
        mkdir -p $(BUILDDIR)
@@ -53,11 +51,6 @@
 $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdate.md
        sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 
's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
 
-$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md  $(BUILDDIR)/geoipupdate.md
-       dev-bin/make-man-pages.pl "$(BUILDDIR)"
-
-$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5
-
 clean:
        rm -rf $(BUILDDIR)/GeoIP.conf \
                   $(BUILDDIR)/GeoIP.conf.md \
++++++ geoipupdate-2.5.0.tar.gz -> geoipupdate-4.2.2.tar.gz ++++++
++++ 50893 lines of diff (skipped)

++++++ geoipupdate-legacy ++++++
#!/bin/bash
geoip_conf='/etc/GeoIP.conf'

function conf_value()
{
  key=$1
  value=$(grep $key $geoip_conf | sed -e 's:#.*::' -e "s:$key::")
  if [ -z $value ]; then
    echo $key not configured in $geoip_conf
    exit 1
  fi
  echo $value
}

function download_geodata_csv()
{
  csv_product=$1
  echo ">>> Downloading $csv_product.zip"
  curl 
"https://download.maxmind.com/app/geoip_download?edition_id=$csv_product&license_key=$license_key&suffix=zip";
 \
       -o $database_directory/$csv_product.zip
}

function geolite_to_legacy()
{
  csv_product=$1
  echo ">>> Converting $csv_product.zip to legacy format"
  if ! which geolite2legacy >/dev/null 2>&1; then
    echo 'geolite2legacy program required'
    return
  fi

  pushd $database_directory
  if [ ! -f $csv_product.zip ]; then
    echo $database_directory/$csv_product.zip not found
    return
  fi

  geolite2legacy -i $csv_product.zip
  geolite2legacy -i $csv_product.zip -6
  popd
}

license_key=$(conf_value 'LicenseKey')
database_directory=$(conf_value 'DatabaseDirectory')

download_geodata_csv GeoLite2-ASN-CSV
geolite_to_legacy    GeoLite2-ASN-CSV
download_geodata_csv GeoLite2-City-CSV
geolite_to_legacy    GeoLite2-City-CSV
download_geodata_csv GeoLite2-Country-CSV
geolite_to_legacy    GeoLite2-Country-CSV

++++++ geoipupdate.service ++++++
[Unit]
Description=Update GeoIP databases
Documentation=man:geoipupdate(1) man:GeoIP.conf(5)

[Service]
Type=oneshot
WorkingDirectory=/var/lib/GeoIP

ExecStart=/usr/bin/geoipupdate
++++++ geoipupdate.timer ++++++
[Unit]
Description=Weekly update of GeoLite2 databases
Documentation=man:geoipupdate(1) man:GeoIP.conf(5)

[Timer]
OnUnitInactiveSec=1w
OnStartupSec=1h
AccuracySec=1h

[Install]
WantedBy=timers.target


Reply via email to