Compare commits

..

No commits in common. 'c8' and 'c9' have entirely different histories.
c8 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/ipcalc-0.2.4.tar.gz
SOURCES/ipcalc-1.0.0.tar.gz

@ -1 +1 @@
6d6172868651a5b20762980c16e3cfa16f1bb8a7 SOURCES/ipcalc-0.2.4.tar.gz
1e31b5fac470f3aabd4d3b3b550a7a3efa01ef5b SOURCES/ipcalc-1.0.0.tar.gz

@ -1,26 +0,0 @@
From 2978e6afd68b1e028855e9166af6eff47eb60f41 Mon Sep 17 00:00:00 2001
From: Martin Sehnoutka <msehnout@redhat.com>
Date: Fri, 3 Aug 2018 10:48:12 +0200
Subject: [PATCH] fix segfault in env without libmaxmind.so
---
ipcalc-maxmind.c | 3 +++
1 file changed, 3 insertions(+)
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) {
--
2.17.1

@ -1,28 +0,0 @@
diff --git a/ipcalc.c b/ipcalc.c
index f2bc47a..04c9372 100644
--- a/ipcalc.c
+++ b/ipcalc.c
@@ -146,7 +146,12 @@ static struct in_addr calc_broadcast(struct in_addr addr, int prefix)
mask.s_addr = prefix2mask(prefix);
memset(&broadcast, 0, sizeof(broadcast));
- broadcast.s_addr = (addr.s_addr & mask.s_addr) | ~mask.s_addr;
+
+ /* if prefix is set to 31 return 255.255.255.255 (RFC3021) */
+ if (mask.s_addr == htonl(0xFFFFFFFE))
+ broadcast.s_addr = htonl(0xFFFFFFFF);
+ else
+ broadcast.s_addr = (addr.s_addr & mask.s_addr) | ~mask.s_addr;
return broadcast;
}
diff --git a/tests/192.168.1.5-31 b/tests/192.168.1.5-31
index fee8227..b720b56 100644
--- a/tests/192.168.1.5-31
+++ b/tests/192.168.1.5-31
@@ -1,4 +1,4 @@
NETMASK=255.255.255.254
PREFIX=31
-BROADCAST=192.168.1.5
+BROADCAST=255.255.255.255
NETWORK=192.168.1.4

@ -1,17 +1,12 @@
Name: ipcalc
Version: 0.2.4
Release: 4%{?dist}
Version: 1.0.0
Release: 5%{?dist}
Summary: IP network address calculator
# This is an updated version of ipcalc originally found
# in Fedora's initscripts at:
# https://fedorahosted.org/releases/i/n/initscripts/
License: GPLv2+
URL: https://gitlab.com/ipcalc/ipcalc
Source0: https://gitlab.com/ipcalc/ipcalc/-/archive/%{version}/%{name}-%{version}.tar.gz
Source0: https://gitlab.com/ipcalc/ipcalc/-/archive/%{version}/ipcalc-%{version}.tar.gz
BuildRequires: gcc, git, libmaxminddb-devel
BuildRequires: gcc, libmaxminddb-devel, meson, rubygem-ronn-ng
Recommends: libmaxminddb, geolite2-city, geolite2-country
# Explicitly conflict with older initscript packages that ship ipcalc
@ -19,8 +14,6 @@ Conflicts: initscripts < 9.63
# Obsolete ipcalculator
Obsoletes: ipcalculator < 0.41-20
Patch1: 0001-fix-segfault-in-env-without-libmaxmind.so.patch
Patch2: 0002-add-support-for-RFC3021.patch
%description
ipcalc provides a simple way to calculate IP information for a host
@ -30,20 +23,17 @@ parsing in scripts, generate random private addresses, resolve an IP address,
or check the validity of an address.
%prep
%autosetup -S git
%autosetup
%build
CFLAGS="${CFLAGS:-%optflags} $RPM_LD_FLAGS" \
USE_RUNTIME_LINKING=yes USE_GEOIP=no USE_MAXMIND=yes LIBPATH=%{_libdir} make %{?_smp_mflags}
%meson -Duse_maxminddb=enabled -Duse_runtime_linking=enabled
%meson_build
%install
mkdir -p %{buildroot}%{_bindir}
install -p -m 755 ipcalc %{buildroot}%{_bindir}/
mkdir -p -m 755 %{buildroot}%{_mandir}/man1
install -p -m 644 ipcalc.1 %{buildroot}%{_mandir}/man1
%meson_install
%check
make check
%meson_test
%files
@ -53,17 +43,60 @@ make check
%{_mandir}/man1/ipcalc.1*
%changelog
* Thu Oct 10 2019 Martin Osvald <mosvald@redhat.com> - 0.2.4-4
- Add support for RFC3021 (#1638834)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.0-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.0-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 23 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.0.0-2
- Rebuilt for ronn successor
* Sat Oct 03 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.0.0-1
- Updated to 1.0.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Apr 24 2020 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.4.1-1
- Updated to 0.4.1
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Aug 03 2018 Martin Sehnoutka <msehnout@redhat.com> - 0.2.4-3
- Fix segfault in the container environment
* Sat Dec 28 2019 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.4.0-1
- Updated to 0.4.0
* Thu Aug 02 2018 Martin Sehnoutka <msehnout@redhat.com> - 0.2.4-2
- Recommend databases
* Sat Nov 23 2019 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-1
- Updated to 0.3.0
* Tue Jul 24 2018 Martin Sehnoutka <msehnout@redhat.com> - 0.2.4-1
- Resolves: #1601400 with rebase to 0.2.4
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Feb 19 2019 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.5-2
- Re-added the geolite2-city, geolite2-country dependencies
* Mon Feb 18 2019 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.5-1
- Updated to 0.2.5
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Aug 09 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.4-2
- Fix crash when -g option is used
* Mon Jul 23 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.4-1
- New upstream release
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 31 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.2.3-1
- New upstream release
* Fri Feb 9 2018 Florian Weimer <fweimer@redhat.com> - 0.2.2-4
- Another attempt at injecting LDFLAGS

Loading…
Cancel
Save