corrected issue in --all-info

This commit is contained in:
Nikos Mavrogiannopoulos 2015-10-14 10:39:00 +02:00
parent 94eb53c477
commit 332725f9b7
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/ipcalc.c b/ipcalc.c
index 0fa9c24..1e503c3 100644
--- a/ipcalc.c
+++ b/ipcalc.c
@@ -1110,7 +1110,7 @@ int main(int argc, const char **argv)
if (hostname)
flags |= FLAG_RESOLVE_IP;
- if (geo_setup() == 0 && (flags & FLAG_SHOW_ALL_INFO))
+ if (geo_setup() == 0 && ((flags & FLAG_SHOW_ALL_INFO) == FLAG_SHOW_ALL_INFO))
flags |= FLAG_GET_GEOIP;
if (hostname && randomStr) {

View File

@ -1,6 +1,6 @@
Name: ipcalc
Version: 0.1.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: IP network address calculator
# This is an updated version of ipcalc originally found
@ -10,6 +10,7 @@ Summary: IP network address calculator
License: GPLv2+
URL: https://github.com/nmav/ipcalc
Source0: https://github.com/nmav/ipcalc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: ipcalc-0.1.4-all-info.patch
BuildRequires: GeoIP-devel
BuildRequires: popt-devel
@ -31,6 +32,8 @@ or check the validity of an address.
%prep
%setup -q
%patch0 -p1 -b .all-info
%build
CFLAGS="${CFLAGS:-%optflags}" LIBPATH=%{_libdir} make %{?_smp_mflags}
@ -51,6 +54,9 @@ make check
%{_mandir}/man1/ipcalc.1*
%changelog
* Wed Oct 14 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.1.4-2
- Corrected issue on --all-info
* Wed Oct 14 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.1.4-1
- New upstream release