Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ipcalc for openSUSE:Factory checked in at 2021-10-29 22:34:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ipcalc (Old) and /work/SRC/openSUSE:Factory/.ipcalc.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipcalc" Fri Oct 29 22:34:31 2021 rev:6 rq:928128 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ipcalc/ipcalc.changes 2021-05-10 15:41:26.569071515 +0200 +++ /work/SRC/openSUSE:Factory/.ipcalc.new.1890/ipcalc.changes 2021-10-29 22:35:36.907713438 +0200 @@ -1,0 +2,7 @@ +Sat Oct 16 15:16:34 UTC 2021 - Dirk M??ller <[email protected]> + +- update to 1.0.1: + - The application will now build even without ronn + - Improved JSON output on single host input + +------------------------------------------------------------------- Old: ---- ipcalc-1.0.0.tar.bz2 New: ---- ipcalc-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipcalc.spec ++++++ --- /var/tmp/diff_new_pack.n3aTg9/_old 2021-10-29 22:35:37.267713574 +0200 +++ /var/tmp/diff_new_pack.n3aTg9/_new 2021-10-29 22:35:37.267713574 +0200 @@ -17,7 +17,7 @@ Name: ipcalc -Version: 1.0.0 +Version: 1.0.1 Release: 0 Summary: IPv4/IPv6 tool assisting in network calculations on the command line License: GPL-2.0-or-later ++++++ ipcalc-1.0.0.tar.bz2 -> ipcalc-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/.editorconfig new/ipcalc-1.0.1/.editorconfig --- old/ipcalc-1.0.0/.editorconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/ipcalc-1.0.1/.editorconfig 2021-06-06 20:56:02.000000000 +0200 @@ -0,0 +1,8 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf + +[*.{c,h,sh}] +indent_style = tab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/.gitlab-ci.yml new/ipcalc-1.0.1/.gitlab-ci.yml --- old/ipcalc-1.0.0/.gitlab-ci.yml 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/.gitlab-ci.yml 2021-06-06 20:56:02.000000000 +0200 @@ -5,6 +5,7 @@ .fedora.latest.template: &fedora_template image: fedora:latest before_script: +#in F34 rubygem-ronn got replaced by rubygem-ronn-ng - dnf install -y GeoIP-devel libmaxminddb-devel make meson ninja-build gcc libasan geolite2-{city,country} rubygem-ronn fedora.nogeo: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/NEWS new/ipcalc-1.0.1/NEWS --- old/ipcalc-1.0.0/NEWS 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/NEWS 2021-06-06 20:56:02.000000000 +0200 @@ -1,3 +1,8 @@ +* Version 1.0.1 (released 2021-06-06) +- The application will now build even without ronn +- Improved JSON output on single host input + + * Version 1.0.0 (released 2020-10-03) - Manpage was converted to markdown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/ipcalc-maxmind.c new/ipcalc-1.0.1/ipcalc-maxmind.c --- old/ipcalc-1.0.0/ipcalc-maxmind.c 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/ipcalc-maxmind.c 2021-06-06 20:56:02.000000000 +0200 @@ -130,7 +130,7 @@ MMDB_s mmdb; MMDB_entry_data_s entry_data; int gai_error, mmdb_error, status, coordinates=0; - double latitude, longitude; + double latitude = 0, longitude = 0; if (geo_setup() != 0) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/ipcalc.c new/ipcalc-1.0.1/ipcalc.c --- old/ipcalc-1.0.0/ipcalc.c 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/ipcalc.c 2021-06-06 20:56:02.000000000 +0200 @@ -560,12 +560,10 @@ char *ipv4_prefix_to_hosts(char *hosts, unsigned hosts_size, unsigned prefix) { - unsigned tmp; - if (prefix >= 31) { snprintf(hosts, hosts_size, "%s", p2_table(32 - prefix)); } else { - tmp = (1 << (32 - prefix)) - 2; + unsigned tmp = (1 << (32 - prefix)) - 2; snprintf(hosts, hosts_size, "%u", tmp); } return hosts; @@ -1067,11 +1065,11 @@ static int str_to_prefix(unsigned *flags, const char *prefixStr, unsigned fix) { - int prefix = -1, r; + int prefix = -1; if (!((*flags) & FLAG_IPV6) && strchr(prefixStr, '.')) { /* prefix is 255.x.x.x */ prefix = ipv4_mask_to_int(prefixStr); } else { - r = safe_atoi(prefixStr, &prefix); + int r = safe_atoi(prefixStr, &prefix); if (r != 0) { return -1; } @@ -1140,7 +1138,7 @@ fprintf(stderr, " the supplied prefix or mask.\n"); fprintf(stderr, " -S, --split=PREFIX Split the provided network using the\n"); fprintf(stderr, " provided prefix/netmask\n"); - fprintf(stderr, " -d, --deagrregate=IP1-IP2 Deaggregate the provided address range\n"); + fprintf(stderr, " -d, --deaggregate=IP1-IP2 Deaggregate the provided address range\n"); fprintf(stderr, " -i, --info Print information on the provided IP address\n"); fprintf(stderr, " (default)\n"); fprintf(stderr, " --all-info Print verbose information on the provided IP\n"); @@ -1389,12 +1387,11 @@ int prefix = -1, splitPrefix = -1; ip_info_st info; int r = 0; - int c; unsigned jsonchain = JSON_FIRST; enum app_t app = 0; while (1) { - c = getopt_long(argc, argv, "S:cr:i46abho:gmnpjsvd:", long_options, NULL); + int c = getopt_long(argc, argv, "S:cr:i46abho:gmnpjsvd:", long_options, NULL); if (c == -1) break; @@ -1735,7 +1732,10 @@ default_printf(&jsonchain, "Address:\t", ADDRESS_NAME, "%s", info.ip); } - if (!single_host) { + if (single_host && info.hostname) + default_printf(&jsonchain, "Hostname:\t", HOSTNAME_NAME, "%s", info.hostname); + + if (!single_host || (flags & FLAG_JSON)) { if (! (flags & FLAG_JSON)) { if (info.expanded_network) { default_printf(&jsonchain, "Full Network:\t", FULL_NETWORK_NAME, "%s/%u", info.expanded_network, info.prefix); @@ -1760,7 +1760,7 @@ if ((flags & FLAG_SHOW_ALL_INFO) && info.reverse_dns) default_printf(&jsonchain, "Reverse DNS:\t", REVERSEDNS_NAME, "%s", info.reverse_dns); - if (!single_host) { + if (!single_host || (flags & FLAG_JSON)) { output_separate(&jsonchain); if (info.type) @@ -1781,8 +1781,6 @@ default_printf(&jsonchain, "Hosts/Net:\t", ADDRESSES_NAME, "%s", info.hosts); } else { - if (info.hostname) - default_printf(&jsonchain, "Hostname:\t", HOSTNAME_NAME, "%s", info.hostname); if (info.type) dist_printf(&jsonchain, "Address space:\t", ADDRSPACE_NAME, "%s", info.type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/ipcalc.h new/ipcalc-1.0.1/ipcalc.h --- old/ipcalc-1.0.0/ipcalc.h 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/ipcalc.h 2021-06-06 20:56:02.000000000 +0200 @@ -20,6 +20,8 @@ #ifndef _IPCALC_H #define _IPCALC_H +#include <stdarg.h> /* for va_list */ + #if defined(USE_GEOIP) void geo_ip_lookup(const char *ip, char **country, char **ccode, char **city, char **coord); int geo_setup(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/meson.build new/ipcalc-1.0.1/meson.build --- old/ipcalc-1.0.0/meson.build 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/meson.build 2021-06-06 20:56:02.000000000 +0200 @@ -1,6 +1,6 @@ project('ipcalc', 'c', license : 'GPLv2', - version : '1.0.0' + version : '1.0.1' ) src = [ @@ -72,16 +72,17 @@ install : true ) -ronn = find_program('ronn', required: true) - -ipcalc_1 = custom_target( - 'ipcalc.1', - output : 'ipcalc.1', - input : 'ipcalc.1.md', - command : [ronn, '--pipe', '-r', '@INPUT@'], - capture: true, - install_dir: join_paths(get_option('mandir'), 'man1'), - install: true -) +ronn = find_program('ronn', required: false) +if ronn.found() + ipcalc_1 = custom_target( + 'ipcalc.1', + output : 'ipcalc.1', + input : 'ipcalc.1.md', + command : [ronn, '--pipe', '-r', '@INPUT@'], + capture: true, + install_dir: join_paths(get_option('mandir'), 'man1'), + install: true + ) +endif subdir('tests') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/tests/hostname-localhost-ipv4-json new/ipcalc-1.0.1/tests/hostname-localhost-ipv4-json --- old/ipcalc-1.0.0/tests/hostname-localhost-ipv4-json 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/tests/hostname-localhost-ipv4-json 2021-06-06 20:56:02.000000000 +0200 @@ -1,4 +1,11 @@ { "ADDRESS":"127.0.0.1", - "ADDRSPACE":"Loopback" + "NETWORK":"127.0.0.1", + "NETMASK":"255.255.255.255", + "PREFIX":"32", + "BROADCAST":"127.0.0.1", + "ADDRSPACE":"Loopback", + "MINADDR":"127.0.0.1", + "MAXADDR":"127.0.0.1", + "ADDRESSES":"1" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ipcalc-1.0.0/tests/ip-localhost-ipv4-json new/ipcalc-1.0.1/tests/ip-localhost-ipv4-json --- old/ipcalc-1.0.0/tests/ip-localhost-ipv4-json 2020-10-03 13:53:46.000000000 +0200 +++ new/ipcalc-1.0.1/tests/ip-localhost-ipv4-json 2021-06-06 20:56:02.000000000 +0200 @@ -1,5 +1,12 @@ { "ADDRESS":"127.0.0.1", "HOSTNAME":"localhost", - "ADDRSPACE":"Loopback" + "NETWORK":"127.0.0.1", + "NETMASK":"255.255.255.255", + "PREFIX":"32", + "BROADCAST":"127.0.0.1", + "ADDRSPACE":"Loopback", + "MINADDR":"127.0.0.1", + "MAXADDR":"127.0.0.1", + "ADDRESSES":"1" }
