diff --git a/.gitmodules b/.gitmodules index 491b9f9..83d6fce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,6 @@ [submodule "crudini"] path = crudini url = https://src.opensuse.org/pool/crudini.git -[submodule "ipcalc"] - path = ipcalc - url = https://src.opensuse.org/pool/ipcalc.git +[submodule "autoconf"] + path = autoconf + url = https://src.opensuse.org/SLFO-pool/autoconf.git diff --git a/autoconf b/autoconf new file mode 160000 index 0000000..0154270 --- /dev/null +++ b/autoconf @@ -0,0 +1 @@ +Subproject commit 015427056954e149061e5c176e72f6067ebe4fb010fb697aba7bcfbb0e6d5568 diff --git a/ipcalc b/ipcalc deleted file mode 160000 index 956ad4f..0000000 --- a/ipcalc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 956ad4f6576a30a5f6c3808e3f22c371f8ee0de266233b721091badbe40b35de diff --git a/ipcalc/ipcalc-1.0.3.tar.bz2 b/ipcalc/ipcalc-1.0.3.tar.bz2 new file mode 100644 index 0000000..efc0d42 --- /dev/null +++ b/ipcalc/ipcalc-1.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ed8f20819a5bdb089829fc62c9a2c685252759d5c3ec289492e6ef5762f4e3b +size 46303 diff --git a/ipcalc/ipcalc-disable-network-tests.patch b/ipcalc/ipcalc-disable-network-tests.patch new file mode 100644 index 0000000..f64e705 --- /dev/null +++ b/ipcalc/ipcalc-disable-network-tests.patch @@ -0,0 +1,50 @@ +Index: ipcalc-1.0.0/tests/meson.build +=================================================================== +--- ipcalc-1.0.0.orig/tests/meson.build ++++ ipcalc-1.0.0/tests/meson.build +@@ -64,14 +64,6 @@ test('RandomIPv6Explicit', + ipcalc.full_path() + ' -6 -r 24' + '|grep Address' + ] + ) +-test('HostnameIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -6 -o localhost', +- files('hostname-localhost-ipv6') +- ] +-) + test('HostnameIPv4Localhost', + testrunner, + args : [ +@@ -88,30 +80,6 @@ test('HostnameIPv4LocalhostJson', + files('hostname-localhost-ipv4-json') + ] + ) +-test('IPIPv6Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h ::1', +- files('ip-localhost-ipv6') +- ] +-) +-test('IPIPv4Localhost', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -h 127.0.0.1', +- files('ip-localhost-ipv4') +- ] +-) +-test('IPIPv4LocalhostJson', +- testrunner, +- args : [ +- '--test-outfile', +- ipcalc.full_path() + ' -j -h 127.0.0.1', +- files('ip-localhost-ipv4-json') +- ] +-) + # --class-prefix tests + test('AssignClassPrefix12', + testrunner, diff --git a/ipcalc/ipcalc.changes b/ipcalc/ipcalc.changes new file mode 100644 index 0000000..24808f9 --- /dev/null +++ b/ipcalc/ipcalc.changes @@ -0,0 +1,64 @@ +------------------------------------------------------------------- +Tue Jun 27 15:11:20 UTC 2023 - Dirk Müller + +- update to 1.0.3: + * When --no-decorate is given the default output will + * include no colors + * Correctly split networks with /31 + +------------------------------------------------------------------- +Mon Jan 2 20:43:13 UTC 2023 - Dirk Müller + +- update to 1.0.2: + * Fix ULA prefix generator to use only defined ULA range + * Corrected manpage generation + +------------------------------------------------------------------- +Sat Oct 16 15:16:34 UTC 2021 - Dirk Müller + +- update to 1.0.1: + - The application will now build even without ronn + - Improved JSON output on single host input + +------------------------------------------------------------------- +Sat Apr 3 20:54:10 UTC 2021 - Atri Bhattacharya + +- Update to version 1.0.0: + * Manpage was converted to markdown. +- Switch to using meson for building; BuildRequires: meson >= + 0.49. +- Addtional BuildRequires now needed: pkgconfig(libmaxminddb), + rubygem(ronn). +- Add ipcalc-disable-network-tests.patch: Disable tests requiring + network. +- Run tests as part of %check section. +- New upstream URL and Source URL. +- Drop patch patch-queue: no longer needed. + +------------------------------------------------------------------- +Tue Aug 4 10:07:35 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-clenaer + +------------------------------------------------------------------- +Sun Jun 26 22:24:37 UTC 2011 - lazy.kent@opensuse.org + +- refreshed patch to fix build in openSUSE >= 11.3 +- splitted off rpm changelog to changes +- corrected License tag +- added Authors +- formatted spec + +------------------------------------------------------------------- +Sun Nov 18 00:00:00 UTC 2007 - guru@unixtech.be + +- moved to openSUSE Build Service +- added minor patch + +------------------------------------------------------------------- +Sun Oct 22 00:00:00 UTC 2006 - guru@unixtech.be + +- new upstream version +- rewrote spec file + + diff --git a/ipcalc/ipcalc.spec b/ipcalc/ipcalc.spec new file mode 100644 index 0000000..34ff5e3 --- /dev/null +++ b/ipcalc/ipcalc.spec @@ -0,0 +1,61 @@ +# +# spec file for package ipcalc +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: ipcalc +Version: 1.0.3 +Release: 0 +Summary: IPv4/IPv6 tool assisting in network calculations on the command line +License: GPL-2.0-or-later +Group: Productivity/Networking/System +URL: https://gitlab.com/ipcalc/ipcalc +Source0: https://gitlab.com/ipcalc/ipcalc/-/archive/%{version}/%{name}-%{version}.tar.bz2 +# PATCH-FEATURE-OPENSUSE ipcalc-disable-network-tests.patch badshah400@gmail.com -- Disable tests requiring network +Patch0: ipcalc-disable-network-tests.patch +BuildRequires: meson >= 0.49 +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libmaxminddb) +Conflicts: netcalc + +%description +ipcalc is a modern tool to assist in network address calculations for IPv4 and +IPv6. It acts both as a tool to output human readable information about a +network or address, as well as a tool suitable to be used by scripts or other +programs. It supports printing a summary about the provided network address, +multiple command line options per information to be printed, transparent IPv6 +support, and in addition it will use libGeoIP if available to provide +geographic information. + +%prep +%autosetup -p1 + +%build +%meson +%meson_build + +%install +%meson_install + +%check +%meson_test + +%files +%doc README.md NEWS +%license COPYING +%{_bindir}/ipcalc + +%changelog