From 12acfab029d3a5ecf86c2a6fb11e919291b7d792 Mon Sep 17 00:00:00 2001 From: David Guglielmi Date: Sun, 15 Jan 2023 21:52:02 +0100 Subject: [PATCH] net-misc/ipcalc-ng: bump to 1.0.2, remove old --- net-misc/ipcalc-ng/Manifest | 8 +- ...pcalc-ng-1.0.2-remove-man-generation.patch | 21 ++ net-misc/ipcalc-ng/files/ipcalc.1 | 233 ++++++++++++++++++ net-misc/ipcalc-ng/ipcalc-ng-1.0.0.ebuild | 36 --- ...ng-1.0.1.ebuild => ipcalc-ng-1.0.2.ebuild} | 15 +- 5 files changed, 269 insertions(+), 44 deletions(-) create mode 100644 net-misc/ipcalc-ng/files/ipcalc-ng-1.0.2-remove-man-generation.patch create mode 100644 net-misc/ipcalc-ng/files/ipcalc.1 delete mode 100644 net-misc/ipcalc-ng/ipcalc-ng-1.0.0.ebuild rename net-misc/ipcalc-ng/{ipcalc-ng-1.0.1.ebuild => ipcalc-ng-1.0.2.ebuild} (80%) diff --git a/net-misc/ipcalc-ng/Manifest b/net-misc/ipcalc-ng/Manifest index 24d3acc..0123fb7 100644 --- a/net-misc/ipcalc-ng/Manifest +++ b/net-misc/ipcalc-ng/Manifest @@ -1,4 +1,4 @@ -DIST ipcalc-ng-1.0.0.tar.bz2 45243 BLAKE2B 676a8e5c2b7174d6db6aa4689834d12622d6d2ad986e0636065a8e0b05d0166b8bca1986b1d7d29f4bc9581c40431adedf3e8ec7dc3231ba9b27447b0efab45c SHA512 b5a19b78a4c71580dfb7151a6f18f87a419606ec1553f865dfd11506eb6f3aa3ec88a7db2b47ffbd1ccb04926183aca2b3f08527b6ba30d21326a1a4f54415c0 -DIST ipcalc-ng-1.0.1.tar.bz2 45389 BLAKE2B a2e93c3c8e8c2fa5764ae7722c2370a8e565419bb4958b30d81963f2e8168f81fafe4a6d6b43087b06c4753e3d615a99b81717cae51a3488ed98dc54841656dd SHA512 0ea3e36a6345ba61c11f9bae75494262b1cb74a7b6b5440fd946b02b617af68fbc8829077e98f7b4be89c942567ecb0649da239ff880dcb27e50a68aad93c0f3 -EBUILD ipcalc-ng-1.0.0.ebuild 752 BLAKE2B 027bf1c6b4b5295f90da8225b36f9546304d125f8c6d8a9a1e1d7bdce71e47fd9805836f981a2113bbad3a4c8ff925e8013b86311531cdf49d3c54f5675e756f SHA512 f2e67a98634c00d02a1212b00fa74aad7df96c133f930fded591ad90c363f469e912af62b24c1f19000b8afe06e01e8b554616e1ab95697267f22013fb288806 -EBUILD ipcalc-ng-1.0.1.ebuild 754 BLAKE2B 3f800cf96816adcbc6c8cc02815401774739db045b6931368afb4e49839cf0e63b14f82f9b781520a422ec44859e52eeaba3a240ea2c0e6eb5c8591c5e7c666f SHA512 1306d75ec4d34dcf6874809f04ef12018fb6f89894712ca06d43d784e85988a26cf8a4466830059dde48fd679155c3da850608cb2c3caf6e0527c5874ecf0c13 +AUX ipcalc-ng-1.0.2-remove-man-generation.patch 515 BLAKE2B d026da6b64f620e6f603316320d38adf4d58c8c3a74f314edcaf21bba034c237a8f388fa58fa5523bb0f454d1aa8e9961cd7b3944696c3be13f4267d81edce4b SHA512 7433af0a59c4bfb9767ec7c3ecd78ce7a1725ce4028c58476b486a54171e5ce65f68d806fb60915cd18240f0afb808b4a93dbe96a22440213b19ee165fc2ddf8 +AUX ipcalc.1 8549 BLAKE2B 2124309a52cb268e00987da60072281b21f1ffc64652d5511304f4e2a889c9273120eaf9b6c0404f6be1a9c580d8de1d9abf43858bbb85821d8e4873f135fee1 SHA512 07bdf65cdeb0954ab3ecc477cb41c760384856ca4c988e5f712f2bc9eb70eadd7cbb31c4fa74eaff95b9f2feab1b4d96e6e8fa68b9375803212f070f11037143 +DIST ipcalc-ng-1.0.2.tar.bz2 45745 BLAKE2B 56b4b6b9e273efebd5f56bee228b18d82d4e1a20dff30d9f8a01ed3ac159da6290026858b92b7e844641f14d229c9cde957abf63984bc49852483cd0731ff3be SHA512 1f11d78d3dcaee5974918778dac554e5449abd7163b3d28db499a2a7fc29adb5e11439f2427afe5cd79c60861e368e74d57058ebe026ca3f0736cbb95993a981 +EBUILD ipcalc-ng-1.0.2.ebuild 853 BLAKE2B 428a24d09227da305666cf172c49bfac88379c3c82050cf09192beabf712741f7f8f51829befdd726767f3f9446a4f4090938b920caa762c6545822a224ed7fd SHA512 d4ab65967e44f7b2a5ddcc63a18e58d99b72f9ac2f0d958eef746b979aa212ccf3a3eb258cf7d2b62e95fe3e4e24e8f116a7b3589d3626bd4605aa3d6e7d5645 diff --git a/net-misc/ipcalc-ng/files/ipcalc-ng-1.0.2-remove-man-generation.patch b/net-misc/ipcalc-ng/files/ipcalc-ng-1.0.2-remove-man-generation.patch new file mode 100644 index 0000000..b380847 --- /dev/null +++ b/net-misc/ipcalc-ng/files/ipcalc-ng-1.0.2-remove-man-generation.patch @@ -0,0 +1,21 @@ +diff -dNur a/meson.build b/meson.build +--- a/meson.build 2022-11-26 16:07:41.000000000 +0100 ++++ b/meson.build 2023-01-15 21:49:11.248789797 +0100 +@@ -72,17 +72,4 @@ + 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 --git a/net-misc/ipcalc-ng/files/ipcalc.1 b/net-misc/ipcalc-ng/files/ipcalc.1 new file mode 100644 index 0000000..cfb675c --- /dev/null +++ b/net-misc/ipcalc-ng/files/ipcalc.1 @@ -0,0 +1,233 @@ +.\" generated with Ronn/v0.7.3 +.\" http://github.com/rtomayko/ronn/tree/0.7.3 +. +.TH "IPCALC" "1" "January 2023" "" "" +. +.SH "NAME" +\fBipcalc\fR \- Perform simple operations on IP addresses and networks +. +.SH "SYNOPSIS" +\fBipcalc\fR [OPTION]\.\.\. \fIIP address\fR[/prefix] [netmask] +. +.SH "Description" +\fBipcalc\fR provides a simple way to calculate IP information for a host or network\. Depending on the options specified, it may be used to provide IP network information in human readable format, in a format suitable for parsing in scripts, generate random private addresses, resolve an IP address, or check the validity of an address\. +. +.P +By default or when the \fB\-\-info\fR or \fB\-\-all\-info\fR parameters are specified the information provided is free form and human readable\. Otherwise the output is JSON formatted when \fB\-j\fR is specified, or when specific options are given (e\.g\., \fB\-\-prefix\fR) the output is in the \fBVAR=VALUE\fR format\. +. +.P +The various options specify what information \fBipcalc\fR should display on standard output\. Multiple options may be specified\. It is required to specify an IP address; several operations require a netmask or a CIDR prefix as well\. +. +.SH "Options" +. +.IP "\(bu" 4 +\fB\-c\fR, \fB\-\-check\fR Validate the IP address under the specified family\. +. +.IP "\(bu" 4 +\fB\-i\fR, \fB\-\-info\fR Display generic information on the provided network in human readable format\. This is the default option if no other options are provided\. +. +.IP "\(bu" 4 +\fB\-\-all\-info\fR Display verbose information on the provided network and addresses in human readable format\. That includes GeoIP information\. +. +.IP "\(bu" 4 +\fB\-S\fR, \fB\-\-split\fR Split the provided network using the specified prefix or netmask\. That is, split up the network into smaller chunks of a specified prefix\. When combined with no\-decorate mode (\fB\-\-no\-decorate\fR), the split networks will be printed in raw form\. Example "ipcalc \-S 26 192\.168\.1\.0/24"\. +. +.IP "\(bu" 4 +\fB\-d\fR, \fB\-\-deaggregate\fR Deaggregates the provided address range\. That is, print the networks that cover the range\. The range is given using the \'\-\' separator, e\.g\., "192\.168\.1\.3\-192\.168\.1\.23"\. When combined with no\-decorate mode (\fB\-\-no\-decorate\fR), the networks are printed in raw form\. +. +.IP "\(bu" 4 +\fB\-r\fR, \fB\-\-random\-private\fR Generate a random private address using the supplied prefix or mask\. By default it displays output in human readable format, but may be combined with other options (e\.g\., \fB\-\-network\fR) to display specific information in \fBVAR=VALUE\fR format\. +. +.IP "\(bu" 4 +\fB\-h\fR, \fB\-\-hostname\fR Display the hostname for the given IP address\. The variable exposed is HOSTNAME\. +. +.IP "\(bu" 4 +\fB\-o\fR, \fB\-\-lookup\-host\fR Display the IP address for the given hostname\. The variable exposed is ADDRESS\. +. +.IP "\(bu" 4 +\fB\-4\fR, \fB\-\-ipv4\fR Explicitly specify the IPv4 address family\. +. +.IP "\(bu" 4 +\fB\-6\fR, \fB\-\-ipv6\fR Explicitly specify the IPv6 address family\. +. +.IP "\(bu" 4 +\fB\-b\fR, \fB\-\-broadcast\fR Display the broadcast address for the given IP address and netmask\. The variable exposed is BROADCAST (if available)\. +. +.IP "\(bu" 4 +\fB\-a\fR, \fB\-\-address\fR Display the IP address for the given input\. The variable exposed is ADDRESS (if available)\. +. +.IP "\(bu" 4 +\fB\-g\fR, \fB\-\-geoinfo\fR Display geographic information for the given IP address\. This option requires libGeoIP/libmaxminddb to be available\. The variables exposed are COUNTRYCODE, COUNTRY, CITY and COORDINATES (when available)\. +. +.IP "\(bu" 4 +\fB\-m\fR, \fB\-\-netmask\fR Calculate the netmask for the given IP address\. If no mask or prefix is provided, in IPv6 a 128\-bit mask is assumed, while in IPv4 it assumes that the IP address is in a complete class A, B, or C network\. Note, however, that many networks no longer use the default netmasks in IPv4\. The variable exposed is NETMASK\. +. +.IP "\(bu" 4 +\fB\-p\fR, \fB\-\-prefix\fR Show the prefix for the given mask/IP address\. The variable exposed is PREFIX\. +. +.IP "\(bu" 4 +\fB\-\-class\-prefix\fR Assign the netmask of the provided IPv4 address based on the address class\. This was the default in previous versions of this software\. +. +.IP "\(bu" 4 +\fB\-n\fR, \fB\-\-network\fR Display the network address for the given IP address and netmask\. The variable exposed is NETWORK\. +. +.IP "\(bu" 4 +\fB\-\-reverse\-dns\fR Display the reverse DNS for the given IP address and netmask\. The variable exposed is REVERSEDNS\. +. +.IP "\(bu" 4 +\fB\-\-minaddr\fR Display the minimum host address in the provided network\. The variable exposed is MINADDR\. +. +.IP "\(bu" 4 +\fB\-\-maxaddr\fR Display the maximum host address in the provided network\. The variable exposed is MAXADDR\. +. +.IP "\(bu" 4 +\fB\-\-addresses\fR Display the number of host addresses in the provided network\. The variable exposed is ADDRESSES\. +. +.IP "\(bu" 4 +\fB\-\-addrspace\fR Display address space allocation information for the provided network\. The variable exposed is ADDRSPACE\. +. +.IP "\(bu" 4 +\fB\-\-no\-decorate\fR Print only the requested information\. That when combined with split networks option, will only print the networks without any additions for readability\. +. +.IP "\(bu" 4 +\fB\-j\fR, \fB\-\-json\fR When used with \-i or \-S, print the info as a JSON object instead of the usual output format\. +. +.IP "\(bu" 4 +\fB\-s\fR, \fB\-\-silent\fR Don\'t ever display error messages\. +. +.IP "" 0 +. +.SH "Examples" +. +.SS "Display all information of an IPv4" +. +.nf + +$ 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 +. +.fi +. +.SS "Display information in key\-value format" +. +.nf + +$ 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" +. +.fi +. +.SS "Display all information of an IPv6" +. +.nf + +$ 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 +. +.fi +. +.SS "Display JSON output" +. +.nf + +$ 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" +} +. +.fi +. +.SS "Lookup of a hostname" +. +.nf + +$ ipcalc \-\-lookup\-host localhost \-\-no\-decorate +::1 +. +.fi +. +.SS "IPv4 lookup of a hostname" +. +.nf + +$ ipcalc \-\-lookup\-host localhost \-\-no\-decorate \-4 +127\.0\.0\.1 +. +.fi +. +.SS "Reverse lookup of a hostname" +. +.nf + +$ ipcalc \-h 127\.0\.0\.1 \-\-no\-decorate +localhost +. +.fi +. +.SH "Authors" +. +.IP "\(bu" 4 +Nikos Mavrogiannopoulos \fIn\.mavrogiannopoulos@gmail\.com\fR +. +.IP "\(bu" 4 +Erik Troan \fIewt@redhat\.com\fR +. +.IP "\(bu" 4 +Preston Brown \fIpbrown@redhat\.com\fR +. +.IP "\(bu" 4 +David Cantrell \fIdcantrell@redhat\.com\fR +. +.IP "" 0 +. +.SH "Reporting Bugs" +Report bugs at https://gitlab\.com/ipcalc/ipcalc/issues +. +.SH "Copyright" +Copyright © 1997\-2020 Red Hat, Inc\. This is free software; see the source for copying conditions\. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE\. diff --git a/net-misc/ipcalc-ng/ipcalc-ng-1.0.0.ebuild b/net-misc/ipcalc-ng/ipcalc-ng-1.0.0.ebuild deleted file mode 100644 index 3135bf6..0000000 --- a/net-misc/ipcalc-ng/ipcalc-ng-1.0.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils meson vcs-snapshot - -MY_PN=${PN%%-ng} - -DESCRIPTION="an IPv4/IPv6 ipcalc tool" -HOMEPAGE="https://gitlab.com/ipcalc/ipcalc" -SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="geoip +geoip2" - -BDEPEND="app-text/ronn" - -DEPEND=" - geoip? ( dev-libs/geoip ) - geoip2? ( dev-libs/libmaxminddb:= )" - -RDEPEND="!!net-misc/ipcalc" - -REQUIRED_USE="?? ( geoip geoip2 )" - -src_configure() { - local emesonargs=( - $(meson_feature geoip use_geoip) - $(meson_feature geoip2 use_maxminddb) - -Duse_runtime_linking=disabled - ) - meson_src_configure -} diff --git a/net-misc/ipcalc-ng/ipcalc-ng-1.0.1.ebuild b/net-misc/ipcalc-ng/ipcalc-ng-1.0.2.ebuild similarity index 80% rename from net-misc/ipcalc-ng/ipcalc-ng-1.0.1.ebuild rename to net-misc/ipcalc-ng/ipcalc-ng-1.0.2.ebuild index c4b0bc1..f301b3f 100644 --- a/net-misc/ipcalc-ng/ipcalc-ng-1.0.1.ebuild +++ b/net-misc/ipcalc-ng/ipcalc-ng-1.0.2.ebuild @@ -1,9 +1,9 @@ # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit eutils meson vcs-snapshot +inherit meson vcs-snapshot MY_PN=${PN%%-ng} @@ -16,8 +16,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="geoip +geoip2" -BDEPEND="app-text/ronn" - DEPEND=" geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )" @@ -26,6 +24,10 @@ RDEPEND="!!net-misc/ipcalc" REQUIRED_USE="?? ( geoip geoip2 )" +PATCHES=( + "${FILESDIR}"/${P}-remove-man-generation.patch +) + src_configure() { local emesonargs=( $(meson_feature geoip use_geoip) @@ -34,3 +36,8 @@ src_configure() { ) meson_src_configure } + +src_install() { + meson_src_install + doman "${FILESDIR}"/${MY_PN}.1 +}