diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 8aad4f9ee..744ce331d 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postfix PKG_VERSION:=3.5.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/mail/postfix/files/postfix.init b/mail/postfix/files/postfix.init index 27b79aae3..161c37187 100644 --- a/mail/postfix/files/postfix.init +++ b/mail/postfix/files/postfix.init @@ -3,12 +3,11 @@ START=72 STOP=50 -EXTRA_COMMANDS="status abort flush postinst" -EXTRA_HELP=" status Display the service status - abort Stop the service abruptly. Running processes are signaled to stop immediately - flush Force delivery: attempt to deliver every message in the deferred mail queue - postinst Force running a script that checks for users, group, configuration, permissions, etc" +extra_command "status" "Display the service status" +extra_command "abort" "Stop the service abruptly. Running processes are signaled to stop immediately" +extra_command "flush" "Force delivery: attempt to deliver every message in the deferred mail queue" +extra_command "postinst" "Force running a script that checks for users, group, configuration, permissions, etc" postinst() { if [ -z "$(postconf -nh myhostname)" ]; then diff --git a/net/apfree-wifidog/Makefile b/net/apfree-wifidog/Makefile index f4f4b8783..31334fb8e 100644 --- a/net/apfree-wifidog/Makefile +++ b/net/apfree-wifidog/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apfree-wifidog PKG_VERSION:=4.08.1771 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/liudf0716/apfree_wifidog.git diff --git a/net/apfree-wifidog/files/wifidogx.init b/net/apfree-wifidog/files/wifidogx.init index 6a205941e..a7f85dd61 100644 --- a/net/apfree-wifidog/files/wifidogx.init +++ b/net/apfree-wifidog/files/wifidogx.init @@ -9,8 +9,7 @@ USE_PROCD=1 PROG=/usr/bin/wifidogx CONFIGFILE=/tmp/wifidogx.conf -EXTRA_COMMANDS="status" -EXTRA_HELP=" status Print the status of the service" +extra_command "status" "Print the status of the service" PX5G_BIN="/usr/sbin/px5g" OPENSSL_BIN="/usr/bin/openssl" diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index e230c0235..d7ad1dce8 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnunet PKG_VERSION:=0.13.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gnunet PKG_HASH:=318e06c4134d1a8ce3b4385d82b11316eaaeb9a4dbc5d4b646453dfc53199296 diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init index 90971d8eb..155ca53ca 100755 --- a/net/gnunet/files/gnunet.init +++ b/net/gnunet/files/gnunet.init @@ -9,7 +9,8 @@ PROG=/usr/lib/gnunet/libexec/gnunet-service-arm GNUNET_HOME=/var/run/gnunet # LOGFILE=$GNUNET_HOME/gnunet.log CONFIGFILE=$GNUNET_HOME/gnunet.conf -EXTRA_COMMANDS="restart_transport" + +extra_command "restart_transport" "Restart transport" prepare_config() { local had_exit_service=0; diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index bc1e8cb6f..9faf70e53 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy PKG_VERSION:=2.2.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.2/src diff --git a/net/haproxy/files/haproxy.init b/net/haproxy/files/haproxy.init index de5695204..01d80d781 100644 --- a/net/haproxy/files/haproxy.init +++ b/net/haproxy/files/haproxy.init @@ -6,8 +6,6 @@ STOP=80 USE_PROCD=1 -EXTRA_COMMANDS="check" - HAPROXY_BIN="/usr/sbin/haproxy" HAPROXY_CONFIG="/etc/haproxy.cfg" @@ -20,6 +18,7 @@ start_service() { procd_close_instance } +extra_command "check" "Check haproxy config" check() { $HAPROXY_BIN -c -q -V -f $HAPROXY_CONFIG } diff --git a/net/nginx/Makefile b/net/nginx/Makefile index 0ad0d1488..d8e0c60a6 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx PKG_VERSION:=1.19.2 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://nginx.org/download/ diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init index 56d1a000c..bedde754a 100644 --- a/net/nginx/files/nginx.init +++ b/net/nginx/files/nginx.init @@ -64,11 +64,8 @@ reload_service() { } +extra_command "relog" "Reopen log files (without reloading)" relog() { [ -d /var/log/nginx ] || mkdir -p /var/log/nginx procd_send_signal nginx '*' USR1 } - - -EXTRA_COMMANDS="relog" -EXTRA_HELP=" relog Reopen log files (without reloading)" diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 8a9f6c0e5..8e9bbf298 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -17,7 +17,7 @@ include ./openvswitch.mk # PKG_NAME:=openvswitch PKG_VERSION:=$(ovs_version) -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ PKG_HASH:=4171e52a8c0ffe160c1daa6687219d902a2a6969b296d223d8dac980ab99a260 diff --git a/net/openvswitch/files/openvswitch.init b/net/openvswitch/files/openvswitch.init index a4cde9d1f..10cbfdffb 100755 --- a/net/openvswitch/files/openvswitch.init +++ b/net/openvswitch/files/openvswitch.init @@ -8,7 +8,7 @@ START=15 ovs_ctl="/usr/share/openvswitch/scripts/ovs-ctl"; [ -x "$ovs_ctl" ] || ovs_ctl=: ovn_ctl="/usr/share/ovn/scripts/ovn-ctl"; [ -x "$ovn_ctl" ] || ovn_ctl=: -EXTRA_COMMANDS=status +extra_command "status" "Get status information" start() { ovs_action start "$@" diff --git a/net/radicale/Makefile b/net/radicale/Makefile index 5422fa7c6..0e8003a8d 100644 --- a/net/radicale/Makefile +++ b/net/radicale/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radicale PKG_VERSION:=1.1.6 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PYPI_NAME:=Radicale PKG_HASH:=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b diff --git a/net/radicale/files/radicale.init b/net/radicale/files/radicale.init index bb40941bb..2bde8b280 100755 --- a/net/radicale/files/radicale.init +++ b/net/radicale/files/radicale.init @@ -4,8 +4,7 @@ START=80 STOP=10 -EXTRA_COMMANDS="export_storage" -EXTRA_HELP=" export_storage +extra_command "export_storage" " - export the storage into the specified folder - can be directly used with the default storage backend of Radicale 2.x.x." diff --git a/net/seafile-server/Makefile b/net/seafile-server/Makefile index c34a2f2d4..4668f6767 100644 --- a/net/seafile-server/Makefile +++ b/net/seafile-server/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=seafile-server PKG_VERSION:=7.1.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/haiwen/seafile-server/tar.gz/v$(PKG_VERSION)-server? diff --git a/net/seafile-server/files/seafile-server.init b/net/seafile-server/files/seafile-server.init index db9369bff..401390c9b 100644 --- a/net/seafile-server/files/seafile-server.init +++ b/net/seafile-server/files/seafile-server.init @@ -2,7 +2,8 @@ START=99 STOP=01 -EXTRA_COMMANDS="generate_uci_conf" + +extra_command "generate_uci_conf" "Generate uci config" TOPDIR=/usr/share/seafile INSTALLPATH=$TOPDIR/seafile-server diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index 35a9f0f25..aaa9753b4 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.8.4 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index ba2a597e8..0c04998ec 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -10,12 +10,11 @@ USE_PROCD=1 LC_ALL=C # shellcheck disable=SC2034 -EXTRA_COMMANDS='check dl killcache sizes show version' -# shellcheck disable=SC2034 -EXTRA_HELP=' check Checks if specified domain is found in current block-list - dl Force-downloads all enabled block-list - sizes Displays the file-sizes of enabled block-lists - show Shows the service last-run status' +extra_command "check" "Checks if specified domain is found in current block-list" +extra_command "dl" "Force-downloads all enabled block-list" +extra_command "sizes" "Displays the file-sizes of enabled block-listo" +extra_command "show" "Shows the service last-run status" +extra_command "version" "Show version" readonly packageName='simple-adblock' readonly serviceName="$packageName $PKG_VERSION" diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 6eb8230a5..4f8307188 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt PKG_VERSION:=1.0.79 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)? diff --git a/net/tgt/files/tgt.init b/net/tgt/files/tgt.init index 04ee4931d..594cdf819 100755 --- a/net/tgt/files/tgt.init +++ b/net/tgt/files/tgt.init @@ -2,8 +2,7 @@ START=91 STOP=10 -EXTRA_COMMANDS="show" -EXTRA_HELP=" show Show current configuration of tgtd" +extra_command "show" "Show current configuration of tgtd" NAME=tgt PROG=/usr/sbin/tgtd diff --git a/net/tinc/Makefile b/net/tinc/Makefile index ec5a27b60..c8949b4d1 100644 --- a/net/tinc/Makefile +++ b/net/tinc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinc PKG_VERSION:=1.0.36 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.tinc-vpn.org/packages diff --git a/net/tinc/files/tinc.init b/net/tinc/files/tinc.init index e49b35877..351accfd6 100644 --- a/net/tinc/files/tinc.init +++ b/net/tinc/files/tinc.init @@ -10,7 +10,8 @@ START=42 SERVICE_USE_PID=1 BIN=/usr/sbin/tincd -EXTRA_COMMANDS="up down" +extra_command "up" " Setting instance up" +extra_command "down" " Setting instance down" LIST_SEP=" " diff --git a/net/vpn-policy-routing/Makefile b/net/vpn-policy-routing/Makefile index 5ae1077f1..b94c8e7b2 100644 --- a/net/vpn-policy-routing/Makefile +++ b/net/vpn-policy-routing/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpn-policy-routing PKG_VERSION:=0.2.1 -PKG_RELEASE:=13 +PKG_RELEASE:=14 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin diff --git a/net/vpn-policy-routing/files/vpn-policy-routing.init b/net/vpn-policy-routing/files/vpn-policy-routing.init index 3d7851c07..4600b580a 100755 --- a/net/vpn-policy-routing/files/vpn-policy-routing.init +++ b/net/vpn-policy-routing/files/vpn-policy-routing.init @@ -15,8 +15,7 @@ readonly _ERROR_='\033[0;31mERROR\033[0m' readonly _WARNING_='\033[0;33mWARNING\033[0m' readonly readmeURL="https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md" -export EXTRA_COMMANDS='support' -export EXTRA_HELP=" support Generates output required to troubleshoot routing issues +extra_command "support" "Generates output required to troubleshoot routing issues Use '-d' option for more detailed output Use '-p' option to automatically upload data under VPR paste.ee account WARNING: while paste.ee uploads are unlisted, they are still publicly available diff --git a/net/vpnbypass/Makefile b/net/vpnbypass/Makefile index 41a8c99a2..618ca6a6d 100644 --- a/net/vpnbypass/Makefile +++ b/net/vpnbypass/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vpnbypass PKG_VERSION:=1.3.1 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin diff --git a/net/vpnbypass/files/vpnbypass.init b/net/vpnbypass/files/vpnbypass.init index c64654a8a..241f5543b 100644 --- a/net/vpnbypass/files/vpnbypass.init +++ b/net/vpnbypass/files/vpnbypass.init @@ -9,7 +9,7 @@ START=94 USE_PROCD=1 # shellcheck disable=SC2034 -EXTRA_COMMANDS='version' +extra_command "version" "Print version information" version() { echo "$PKG_VERSION"; } readonly __ERROR__='\033[0;31mERROR\033[0m' diff --git a/net/wifidog/Makefile b/net/wifidog/Makefile index 47367e474..07cdbfd7d 100644 --- a/net/wifidog/Makefile +++ b/net/wifidog/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wifidog PKG_VERSION:=1.3.0 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/wifidog/wifidog-gateway diff --git a/net/wifidog/files/wifidog.init b/net/wifidog/files/wifidog.init index 3078a001a..4d864a0a8 100644 --- a/net/wifidog/files/wifidog.init +++ b/net/wifidog/files/wifidog.init @@ -4,8 +4,7 @@ START=65 USE_PROCD=1 -EXTRA_COMMANDS="status" -EXTRA_HELP=" status Print the status of the service" +extra_command "status" "Print the status of the service" start_service() { procd_open_instance diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile index fe072902e..f33d4e835 100644 --- a/utils/docker-ce/Makefile +++ b/utils/docker-ce/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=docker-ce PKG_VERSION:=19.03.13 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE diff --git a/utils/docker-ce/files/dockerd.init b/utils/docker-ce/files/dockerd.init index 25f0bd510..7d27f7625 100644 --- a/utils/docker-ce/files/dockerd.init +++ b/utils/docker-ce/files/dockerd.init @@ -3,10 +3,8 @@ USE_PROCD=1 START=25 -EXTRA_COMMANDS="uciadd ucidel" -EXTRA_HELP="\ - uciadd Add default bridge configuration to network and firewall uci config - ucidel Delete default bridge configuration from network and firewall uci config" +extra_command "uciadd" "Add default bridge configuration to network and firewall uci config" +extra_command "ucidel" "Delete default bridge configuration from network and firewall uci config" DOCKERD_CONF="/tmp/dockerd/daemon.json"