diff --git a/.ansible/group_vars/all/work.yml b/.ansible/group_vars/all/work.yml index 85483406..d386e7cc 100644 --- a/.ansible/group_vars/all/work.yml +++ b/.ansible/group_vars/all/work.yml @@ -22,6 +22,7 @@ tools_enabled: - linkcheck - mdlint - mupdf-tools + - net-tools - phalcon-devtools - php-cs-fixer - phpcbf @@ -337,6 +338,12 @@ tools_available: all: type: apt package: mupdf-tools + net-tools: + disabled: [] + check: netstat --version | grep net-tools || (netstat --version; false) + all: + type: apt + package: net-tools phalcon-devtools: disabled: [5.2, 5.3, 5.4, 8.2] check: | diff --git a/CHANGELOG.md b/CHANGELOG.md index f0577015..025f61f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.149 + +### Added +- Added `net-tools` package + + ## Release 0.148 ### Added diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 4890d1f0..978d3786 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -242,6 +242,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -360,6 +361,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) phpcbf -------------------- RUN set -eux \ && PHPCBF_URL="https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar" \ @@ -523,6 +529,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -651,6 +658,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) phpcbf -------------------- RUN set -eux \ && phpcbf --version | grep -E 'version [0-9][.0-9]+' || (phpcbf --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 95e5daba..8f16a1cf 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -277,6 +277,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -395,6 +396,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) php-cs-fixer -------------------- RUN set -eux \ && PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \ @@ -596,6 +602,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -724,6 +731,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) php-cs-fixer -------------------- RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 996bbb97..6cac5c14 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -277,6 +277,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -418,6 +419,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) php-cs-fixer -------------------- RUN set -eux \ && PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar" \ @@ -619,6 +625,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -762,6 +769,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) php-cs-fixer -------------------- RUN set -eux \ && php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' || (php-cs-fixer --version; false) \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 97b50f2f..08c24e61 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -277,6 +277,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -434,6 +435,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -674,6 +680,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -827,6 +834,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index ec122afe..408c2cea 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -285,6 +285,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 6fd267a2..68c43aed 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -285,6 +285,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 40e9f10a..52ade592 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -285,6 +285,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 68fb9710..2a3f9846 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -285,6 +285,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 98f0bbbb..cc93a7e4 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -287,6 +287,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 3341f2c1..5486f8d9 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -287,6 +287,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 779705b7..4c7e5ef9 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -287,6 +287,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index 30f6b6c0..bdc45e05 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -287,6 +287,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ @@ -707,6 +713,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -860,6 +867,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (composer) phalcon-devtools -------------------- RUN set -eux \ && if find /usr/local/lib/php/extensions/ -name phalcon.so | grep phalcon; then \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index ddf05aa7..16fc8a52 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -287,6 +287,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -442,6 +443,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) phpcbf -------------------- RUN set -eux \ && PHPCBF_URL="https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar" \ @@ -660,6 +666,7 @@ RUN set -eux \ git \ jq \ mupdf-tools \ + net-tools \ openssh-client \ rsync \ shellcheck \ @@ -813,6 +820,11 @@ RUN set -eux \ \ && true +# -------------------- (apt) net-tools -------------------- +RUN set -eux \ + && netstat --version | grep net-tools || (netstat --version; false) \ + && true + # -------------------- (custom) phpcbf -------------------- RUN set -eux \ && phpcbf --version | grep -E 'version [0-9][.0-9]+' || (phpcbf --version; false) \ diff --git a/doc/available-tools.md b/doc/available-tools.md index b8508823..41d4acc1 100644 --- a/doc/available-tools.md +++ b/doc/available-tools.md @@ -390,6 +390,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools | [mdl][lnk_mdl] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [mdlint][lnk_mdlint] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [mupdf-tools][lnk_mupdf-tools] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| [net-tools][lnk_net-tools] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [**node**][lnk_**node**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [**npm**][lnk_**npm**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | [**nvm**][lnk_**nvm**] | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | @@ -442,6 +443,7 @@ Additionally to all of the `slim` tools shown above, the following PHP cli tools [lnk_mdl]: ../php_tools/mdl [lnk_mdlint]: ../php_tools/mdlint [lnk_mupdf-tools]: ../php_tools/mupdf-tools +[lnk_net-tools]: ../php_tools/net-tools [lnk_**node**]: https://nodejs.org/en/ [lnk_**npm**]: https://nodejs.org/en/knowledge/getting-started/npm/what-is-npm/ [lnk_**nvm**]: https://github.com/nvm-sh/nvm diff --git a/php_tools/net-tools/README.md b/php_tools/net-tools/README.md new file mode 100644 index 00000000..45aeafa6 --- /dev/null +++ b/php_tools/net-tools/README.md @@ -0,0 +1,7 @@ +# net-tools + +A collection of programs that form the base set of the NET-3 networking distribution for the Linux operating system. Includes: arp, hostname, ifconfig, netstat, rarp, route, plipconfig, slattach, mii-tool and iptunnel and ipmaddr. + +| Platform | Url | +|----------|------------------------------------------------------------------| +| Website | http://sourceforge.net/projects/net-tools/ | diff --git a/php_tools/net-tools/install.yml b/php_tools/net-tools/install.yml new file mode 100644 index 00000000..7f0d20ec --- /dev/null +++ b/php_tools/net-tools/install.yml @@ -0,0 +1,7 @@ +--- + +check: netstat --version | grep net-tools || (netstat --version; false) + +all: + type: apt + package: net-tools diff --git a/php_tools/net-tools/options.yml b/php_tools/net-tools/options.yml new file mode 100644 index 00000000..97e001b5 --- /dev/null +++ b/php_tools/net-tools/options.yml @@ -0,0 +1,11 @@ +--- + +# The name of the module +name: net-tools + +# Exclude module build/installation for the following PHP versions +exclude: [] + +# In order for this tool to build/install correctly, +# the following tools must have been installed first. +depends: []