diff --git a/.gitignore b/.gitignore index ae75135..f655b65 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ipcalc-0.2.2.tar.gz /ipcalc-0.2.3.tar.gz /ipcalc-0.2.4.tar.gz +/ipcalc-0.2.5.tar.gz diff --git a/ipcalc-0.2.4-fix-segfault.patch b/ipcalc-0.2.4-fix-segfault.patch deleted file mode 100644 index b63aa03..0000000 --- a/ipcalc-0.2.4-fix-segfault.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/ipcalc-maxmind.c b/ipcalc-maxmind.c -index bb4f495..6f0033b 100644 ---- a/ipcalc-maxmind.c -+++ b/ipcalc-maxmind.c -@@ -113,6 +113,9 @@ void geo_ip_lookup(const char *ip, char **country, char **ccode, char **city, ch - int gai_error, mmdb_error, status, coordinates=0; - double latitude, longitude; - -+ if (geo_setup() != 0) -+ return; -+ - /* Open the system maxmind database with countries */ - status = pMMDB_open(MAXMINDDB_LOCATION_COUNTRY, MMDB_MODE_MMAP, &mmdb); - if (MMDB_SUCCESS == status) { diff --git a/ipcalc.spec b/ipcalc.spec index 7785035..956ede5 100644 --- a/ipcalc.spec +++ b/ipcalc.spec @@ -1,8 +1,7 @@ Name: ipcalc -Version: 0.2.4 -Release: 4%{?dist} +Version: 0.2.5 +Release: 1%{?dist} Summary: IP network address calculator -Patch1: ipcalc-0.2.4-fix-segfault.patch # This is an updated version of ipcalc originally found # in Fedora's initscripts at: @@ -10,7 +9,7 @@ Patch1: ipcalc-0.2.4-fix-segfault.patch License: GPLv2+ URL: https://gitlab.com/ipcalc/ipcalc -Source0: https://github.com/nmav/ipcalc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://gitlab.com/ipcalc/ipcalc/-/archive/%{version}/ipcalc-%{version}.tar.gz BuildRequires: gcc, libmaxminddb-devel Recommends: libmaxminddb @@ -52,6 +51,9 @@ make check %{_mandir}/man1/ipcalc.1* %changelog +* Mon Feb 18 2019 Nikos Mavrogiannopoulos - 0.2.5-1 +- Updated to 0.2.5 + * Fri Feb 01 2019 Fedora Release Engineering - 0.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b3264c2..a865284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ipcalc-0.2.4.tar.gz) = aa39ee0b8e431471cddd44097fd67e0c9f54fd61548f5989a7624ad7c2ed26d92230415adbbf8936db207bf100c68b8c3dc65e1b69d57eb87e78a8f65bd3031e +SHA512 (ipcalc-0.2.5.tar.gz) = c49fe63e3aa58f75a3cd8c02c424da853af1442659e92aafd069d7ea808fd545523c3b39b42a03096e4c065b08a306026e870e78ffd1cd47522e4d6cb1935b55