Hello community, here is the log from the commit of package goaccess for openSUSE:Leap:15.2 checked in at 2020-03-24 19:05:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/goaccess (Old) and /work/SRC/openSUSE:Leap:15.2/.goaccess.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "goaccess" Tue Mar 24 19:05:32 2020 rev:3 rq:787734 version:1.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/goaccess/goaccess.changes 2020-01-15 15:05:47.681915916 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.goaccess.new.3160/goaccess.changes 2020-03-24 19:05:33.601514518 +0100 @@ -1,0 +2,12 @@ +Mon Mar 9 14:38:34 UTC 2020 - [email protected] + +- build with libmaxminddb [bsc#1156207] + +------------------------------------------------------------------- +Mon Aug 26 12:36:38 UTC 2019 - Hendrik Vogelsang <[email protected]> + +- Add bin2c.patch to fix + https://github.com/allinurl/goaccess/issues/1415 + which lead to garbage in HTML reports + +------------------------------------------------------------------- New: ---- bin2c.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goaccess.spec ++++++ --- /var/tmp/diff_new_pack.9yPCxV/_old 2020-03-24 19:05:33.917516697 +0100 +++ /var/tmp/diff_new_pack.9yPCxV/_new 2020-03-24 19:05:33.917516697 +0100 @@ -2,7 +2,7 @@ # # spec file for package goaccess # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -14,7 +14,7 @@ # 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/ # @@ -26,10 +26,11 @@ Group: Productivity/Networking/Web/Utilities URL: https://goaccess.io/ Source: http://tar.goaccess.io/goaccess-%{version}.tar.gz +Patch0: bin2c.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc -BuildRequires: libGeoIP-devel +BuildRequires: libmaxminddb-devel BuildRequires: make BuildRequires: ncurses-devel Recommends: %{name}-lang @@ -42,10 +43,11 @@ %prep %setup -q +%patch0 -p1 %build %configure \ - --enable-geoip=legacy \ + --enable-geoip \ --enable-utf8 make %{?_smp_mflags} ++++++ bin2c.patch ++++++ diff -Nur goaccess-1.3.orig/src/bin2c.c goaccess-1.3/src/bin2c.c --- goaccess-1.3.orig/src/bin2c.c 2018-11-23 03:00:08.000000000 +0100 +++ goaccess-1.3/src/bin2c.c 2019-08-26 14:18:22.550783529 +0200 @@ -9,10 +9,10 @@ * I have decided not to change the licence. */ +#include <assert.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <assert.h> +#include <string.h> #ifdef USE_BZ2 #include <bzlib.h> @@ -46,7 +46,6 @@ fseek (f_input, 0, SEEK_END); file_size = ftell (f_input); fseek (f_input, 0, SEEK_SET); - file_size++; if ((buf = malloc (file_size)) == NULL) { fprintf (stderr, "Unable to malloc bin2c.c buffer\n"); @@ -59,7 +58,7 @@ #ifdef USE_BZ2 // allocate for bz2. - bz2_size = ((file_size) * 1.01) + 600; // as per the documentation + bz2_size = (file_size + file_size / 100 + 1) + 600; // as per the documentation if ((bz2_buf = malloc (bz2_size)) == NULL) { fprintf (stderr, "Unable to malloc bin2c.c buffer\n");
