Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ipcalc for openSUSE:Factory checked in at 2023-01-30 17:11:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipcalc (Old) and /work/SRC/openSUSE:Factory/.ipcalc.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipcalc" Mon Jan 30 17:11:32 2023 rev:7 rq:1062041 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ipcalc/ipcalc.changes 2021-10-29 22:35:36.907713438 +0200 +++ /work/SRC/openSUSE:Factory/.ipcalc.new.32243/ipcalc.changes 2023-01-30 17:23:18.996518614 +0100 @@ -1,0 +2,7 @@ +Mon Jan 2 20:43:13 UTC 2023 - Dirk Müller <dmuel...@suse.com> + +- update to 1.0.2: + * Fix ULA prefix generator to use only defined ULA range + * Corrected manpage generation + +------------------------------------------------------------------- Old: ---- ipcalc-1.0.1.tar.bz2 New: ---- ipcalc-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipcalc.spec ++++++ --- /var/tmp/diff_new_pack.npsGWb/_old 2023-01-30 17:23:19.392520743 +0100 +++ /var/tmp/diff_new_pack.npsGWb/_new 2023-01-30 17:23:19.396520765 +0100 @@ -1,7 +1,7 @@ # # spec file for package ipcalc # -# Copyright (c) 2021 SUSE LLC +# 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 @@ -17,7 +17,7 @@ Name: ipcalc -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: IPv4/IPv6 tool assisting in network calculations on the command line License: GPL-2.0-or-later ++++++ ipcalc-1.0.1.tar.bz2 -> ipcalc-1.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/.gitlab-ci.yml new/ipcalc-1.0.2/.gitlab-ci.yml --- old/ipcalc-1.0.1/.gitlab-ci.yml 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/.gitlab-ci.yml 2022-11-26 16:07:41.000000000 +0100 @@ -72,6 +72,8 @@ - ninja -C build - ninja -C build test - ninja -C build coverage-html && mv build/meson-logs/coveragereport public + + tags: - shared except: @@ -86,8 +88,10 @@ - ninja -C build - ninja -C build test - ninja -C build coverage-html && mv build/meson-logs/coveragereport public + - tests/run-coverage.sh tags: - shared + coverage: '/coverage lines: \d+\.\d+/' artifacts: when: on_success paths: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/NEWS new/ipcalc-1.0.2/NEWS --- old/ipcalc-1.0.1/NEWS 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/NEWS 2022-11-26 16:07:41.000000000 +0100 @@ -1,3 +1,8 @@ +* Version 1.0.2 (released 2022-11-26) +- Fix ULA prefix generator to use only defined ULA range +- Corrected manpage generation + + * Version 1.0.1 (released 2021-06-06) - The application will now build even without ronn - Improved JSON output on single host input diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/ipcalc.1.md new/ipcalc-1.0.2/ipcalc.1.md --- old/ipcalc-1.0.1/ipcalc.1.md 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/ipcalc.1.md 2022-11-26 16:07:41.000000000 +0100 @@ -137,103 +137,93 @@ ## Examples ### Display all information of an IPv4 -``` -$ ipcalc --all-info 193.92.150.2/24 -Address: 193.92.150.2 -Network: 193.92.150.0/24 -Netmask: 255.255.255.0 = 24 -Broadcast: 193.92.150.255 -Reverse DNS: 150.92.193.in-addr.arpa. - -Address space: Internet -Address class: Class C -HostMin: 193.92.150.1 -HostMax: 193.92.150.254 -Hosts/Net: 254 - -Country code: GR -Country: Greece -``` + + $ ipcalc --all-info 193.92.150.2/24 + Address: 193.92.150.2 + Network: 193.92.150.0/24 + Netmask: 255.255.255.0 = 24 + Broadcast: 193.92.150.255 + Reverse DNS: 150.92.193.in-addr.arpa. + + Address space: Internet + Address class: Class C + HostMin: 193.92.150.1 + HostMax: 193.92.150.254 + Hosts/Net: 254 + + Country code: GR + Country: Greece ### Display information in key-value format -``` -$ ipcalc -pnmb --minaddr --maxaddr --geoinfo --addrspace 193.92.150.2/255.255.255.224 -NETMASK=255.255.255.224 -PREFIX=27 -BROADCAST=193.92.150.31 -NETWORK=193.92.150.0 -MINADDR=193.92.150.1 -MAXADDR=193.92.150.30 -ADDRSPACE="Internet" -COUNTRY="Greece" -``` + + $ ipcalc -pnmb --minaddr --maxaddr --geoinfo --addrspace 193.92.150.2/255.255.255.224 + NETMASK=255.255.255.224 + PREFIX=27 + BROADCAST=193.92.150.31 + NETWORK=193.92.150.0 + MINADDR=193.92.150.1 + MAXADDR=193.92.150.30 + ADDRSPACE="Internet" + COUNTRY="Greece" ### Display all information of an IPv6 -``` -$ ipcalc --all-info 2a03:2880:20:4f06:face:b00c:0:14/64 -Full Address: 2a03:2880:0020:4f06:face:b00c:0000:0014 -Address: 2a03:2880:20:4f06:face:b00c:0:14 -Full Network: 2a03:2880:0020:4f06:0000:0000:0000:0000/64 -Network: 2a03:2880:20:4f06::/64 -Netmask: ffff:ffff:ffff:ffff:: = 64 -Reverse DNS: 6.0.f.4.0.2.0.0.0.8.8.2.3.0.a.2.ip6.arpa. - -Address space: Global Unicast -HostMin: 2a03:2880:20:4f06:: -HostMax: 2a03:2880:20:4f06:ffff:ffff:ffff:ffff -Hosts/Net: 2^(64) = 18446744073709551616 - -Country code: IE -Country: Ireland -``` + + $ ipcalc --all-info 2a03:2880:20:4f06:face:b00c:0:14/64 + Full Address: 2a03:2880:0020:4f06:face:b00c:0000:0014 + Address: 2a03:2880:20:4f06:face:b00c:0:14 + Full Network: 2a03:2880:0020:4f06:0000:0000:0000:0000/64 + Network: 2a03:2880:20:4f06::/64 + Netmask: ffff:ffff:ffff:ffff:: = 64 + Reverse DNS: 6.0.f.4.0.2.0.0.0.8.8.2.3.0.a.2.ip6.arpa. + + Address space: Global Unicast + HostMin: 2a03:2880:20:4f06:: + HostMax: 2a03:2880:20:4f06:ffff:ffff:ffff:ffff + Hosts/Net: 2^(64) = 18446744073709551616 + + Country code: IE + Country: Ireland ### Display JSON output -``` -$ ipcalc --all-info -j 2a03:2880:20:4f06:face:b00c:0:14/64 -{ - "FULLADDRESS":"2a03:2880:0020:4f06:face:b00c:0000:0014", - "ADDRESS":"2a03:2880:20:4f06:face:b00c:0:14", - "FULLNETWORK":"2a03:2880:0020:4f06:0000:0000:0000:0000", - "NETWORK":"2a03:2880:20:4f06::", - "NETMASK":"ffff:ffff:ffff:ffff::", - "PREFIX":"64", - "REVERSEDNS":"6.0.f.4.0.2.0.0.0.8.8.2.3.0.a.2.ip6.arpa.", - "ADDRSPACE":"Global Unicast", - "MINADDR":"2a03:2880:20:4f06::", - "MAXADDR":"2a03:2880:20:4f06:ffff:ffff:ffff:ffff", - "ADDRESSES":"18446744073709551616", - "COUNTRYCODE":"IE", - "COUNTRY":"Ireland", - "COORDINATES":"53.000000,-8.000000" -} -``` + $ ipcalc --all-info -j 2a03:2880:20:4f06:face:b00c:0:14/64 + { + "FULLADDRESS":"2a03:2880:0020:4f06:face:b00c:0000:0014", + "ADDRESS":"2a03:2880:20:4f06:face:b00c:0:14", + "FULLNETWORK":"2a03:2880:0020:4f06:0000:0000:0000:0000", + "NETWORK":"2a03:2880:20:4f06::", + "NETMASK":"ffff:ffff:ffff:ffff::", + "PREFIX":"64", + "REVERSEDNS":"6.0.f.4.0.2.0.0.0.8.8.2.3.0.a.2.ip6.arpa.", + "ADDRSPACE":"Global Unicast", + "MINADDR":"2a03:2880:20:4f06::", + "MAXADDR":"2a03:2880:20:4f06:ffff:ffff:ffff:ffff", + "ADDRESSES":"18446744073709551616", + "COUNTRYCODE":"IE", + "COUNTRY":"Ireland", + "COORDINATES":"53.000000,-8.000000" + } ### Lookup of a hostname -``` -$ ipcalc --lookup-host localhost --no-decorate -::1 -``` + + $ ipcalc --lookup-host localhost --no-decorate + ::1 ### IPv4 lookup of a hostname -``` -$ ipcalc --lookup-host localhost --no-decorate -4 -127.0.0.1 -``` + + $ ipcalc --lookup-host localhost --no-decorate -4 + 127.0.0.1 ### Reverse lookup of a hostname -``` -$ ipcalc -h 127.0.0.1 --no-decorate -localhost -``` + + $ ipcalc -h 127.0.0.1 --no-decorate + localhost ## Authors -``` - Nikos Mavrogiannopoulos <n...@redhat.com> - Erik Troan <e...@redhat.com> - Preston Brown <pbr...@redhat.com> - David Cantrell <dcantr...@redhat.com> -``` +* Nikos Mavrogiannopoulos <n.mavrogiannopou...@gmail.com> +* Erik Troan <e...@redhat.com> +* Preston Brown <pbr...@redhat.com> +* David Cantrell <dcantr...@redhat.com> ## Reporting Bugs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/ipcalc.c new/ipcalc-1.0.2/ipcalc.c --- old/ipcalc-1.0.1/ipcalc.c 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/ipcalc.c 2022-11-26 16:07:41.000000000 +0100 @@ -1023,8 +1023,7 @@ if (flags & FLAG_IPV6) { struct in6_addr net; - net.s6_addr[0] = 0xfc; - net.s6_addr[0] |= ts.tv_nsec & 1; + net.s6_addr[0] = 0xfd; if (randomize(&net.s6_addr[1], 15) < 0) return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/meson.build new/ipcalc-1.0.2/meson.build --- old/ipcalc-1.0.1/meson.build 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/meson.build 2022-11-26 16:07:41.000000000 +0100 @@ -1,6 +1,6 @@ project('ipcalc', 'c', license : 'GPLv2', - version : '1.0.1' + version : '1.0.2' ) src = [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/netsplit.c new/ipcalc-1.0.2/netsplit.c --- old/ipcalc-1.0.1/netsplit.c 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/netsplit.c 2022-11-26 16:07:41.000000000 +0100 @@ -184,8 +184,7 @@ memset(&ediff, 0, sizeof(ediff)); for (i = 0; i < 16; i++) { - if (splitmask.s6_addr) - sdiff.s6_addr[i] = 0xff - splitmask.s6_addr[i]; + sdiff.s6_addr[i] = 0xff - splitmask.s6_addr[i]; end.s6_addr[i] = net.s6_addr[i] + sdiff.s6_addr[i]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/tests/meson.build new/ipcalc-1.0.2/tests/meson.build --- old/ipcalc-1.0.1/tests/meson.build 2021-06-06 20:56:02.000000000 +0200 +++ new/ipcalc-1.0.2/tests/meson.build 2022-11-26 16:07:41.000000000 +0100 @@ -57,6 +57,13 @@ ipcalc.full_path() + ' -r 112' + '|grep Address' ] ) +test('RandomIPv6PrefixIsValidULA', + testrunner, + args : [ + '--test-success', + ipcalc.full_path() + ' -6 -r 48 -a' + '|grep ^ADDRESS=fd' + ] +) test('RandomIPv6Explicit', testrunner, args : [ @@ -761,7 +768,7 @@ testrunner, args : [ '--test-equal', - ipcalc.full_path() + ' -S 29 192.168.5.0/24 | grep ^Network | wc -l', + ipcalc.full_path() + ' -S 29 192.168.5.0/24 | grep ^Network | wc -l | tr -d [:space:]', ipcalc.full_path() + ' -S 29 192.168.5.0/24 | grep ^Total | cut -d: -f 2 | tr -d [:space:]' ] ) @@ -769,7 +776,7 @@ testrunner, args : [ '--test-equal', - ipcalc.full_path() + ' -S 120 fcfa:b4ca:f1d8:125b:dc00::/112 | grep ^Network | wc -l', + ipcalc.full_path() + ' -S 120 fcfa:b4ca:f1d8:125b:dc00::/112 | grep ^Network | wc -l | tr -d [:space:]', ipcalc.full_path() + ' -S 120 fcfa:b4ca:f1d8:125b:dc00::/112 | grep ^Total|cut -d: -f 2 | tr -d [:space:]' ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.1/tests/run-coverage.sh new/ipcalc-1.0.2/tests/run-coverage.sh --- old/ipcalc-1.0.1/tests/run-coverage.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/ipcalc-1.0.2/tests/run-coverage.sh 2022-11-26 16:07:41.000000000 +0100 @@ -0,0 +1,4 @@ +#! /bin/sh + +cat public/index.html|grep headerCovTableEntry|grep "%"|head -1|sed 's/^.*>\([0-9\.\ %]*\)<.*$/coverage lines: \1/' +