trafficshaper: remove test codes

Remove requirement test code as it is already supplied by package
dependencies
Depend on ip6tables to satisfy description claim

Signed-off-by: Andris PE <neandris@gmail.com>

.github/labeler.yml

@@ -0,0 +1,7 @@
+# branches
+"OpenWrt 23.05 (end of support)":
+- base-branch:
+  - "openwrt-23.05"
+"OpenWrt 24.10":
+- base-branch:
+  - "openwrt-24.10"

.github/workflows/labeler.yml

@@ -0,0 +1,20 @@
+name: 'Pull Request Labeler'
+on:
+  - pull_request_target
+
+permissions:
+  contents: read
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+
+    name: Pull Request Labeler
+    runs-on: ubuntu-slim
+    steps:
+      - uses: actions/labeler@v6
+        with:
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          sync-labels: true

.github/workflows/multi-arch-test-build.yml

@@ -8,6 +8,31 @@ jobs:
     name: Test Formalities
     uses: openwrt/actions-shared-workflows/.github/workflows/formal.yml@main
 
+  label_formality_status:
+    name: Add formality check labels
+    runs-on: ubuntu-slim
+    needs: formalities
+    if: always()
+    permissions:
+      pull-requests: write
+
+    steps:
+      - name: Add 'not following guidelines' label
+        if: needs.formalities.result == 'failure'
+        uses: buildsville/add-remove-label@v2.0.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "not following guidelines"
+          type: add
+
+      - name: Remove 'not following guidelines' label
+        if: needs.formalities.result == 'success'
+        uses: buildsville/add-remove-label@v2.0.1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: "not following guidelines"
+          type: remove
+
   build:
     name: Feeds Package Test Build
     needs: formalities

net/trafficshaper/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=trafficshaper
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Luiz Angelo Daros de Luca <luizluca@gmail.com>
 
 PKG_LICENSE:=GPL-2.0-or-later
@@ -19,7 +19,7 @@ define Package/trafficshaper
   SECTION:=net
   CATEGORY:=Network
   TITLE:=WAN traffic shaper based on LAN addresses
-  DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +kmod-sched-cake +iptables-mod-conntrack-extra
+  DEPENDS:=+tc +kmod-sched-core +kmod-sched-connmark +kmod-ifb +iptables +IPV6:ip6tables +kmod-sched-cake +iptables-mod-conntrack-extra
   PKGARCH:=all
 endef
 

net/trafficshaper/files/trafficshaper.init

@@ -47,9 +47,6 @@ IP6T="debug_exec ip6tables -w 5"
 #QDISC="cake autorate_ingress internet ethernet diffserv4 triple-isolate"
 QDISC="cake"
 
-REQ_MODULES="sch_htb sch_cake act_connmark act_mirred em_u32"
-REQ_CMDS="ip tc iptables"
-
 preinit(){
 	[ "$LOGLEVEL" -ge 1 ] && e() { msg ERROR "$@"; } || e() { true; }
 	[ "$LOGLEVEL" -ge 2 ] && v() { msg INFO "$@"; } || v() { true; }
@@ -59,15 +56,6 @@ preinit(){
 }
 
 requires() {
-	for module in $REQ_MODULES; do
-		[ -d /sys/module/$module ] || insert_modules "$module" ||
-			die 2 "cannot load $module. Please install kmod-$module"
-	done
-	for cmd in $REQ_CMDS; do
-		command -v $cmd &>/dev/null ||
-			die 2 "cannot find command $cmd. Please install $cmd"
-	done
-
 	if ! command -v ip6tables &>/dev/null; then
 		v "Disabling IPv6 as ip6tables was not found"
 		IP6T=true

utils/triggerhappy/Makefile

@@ -1,58 +0,0 @@
-#
-# Copyright (C) 2014-2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=triggerhappy
-PKG_VERSION:=0.5.0
-PKG_RELEASE:=2
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/wertarbyte/$(PKG_NAME)/archive/release/$(PKG_VERSION)/
-PKG_HASH:=af0fc196202f2d35153be401769a9ad9107b5b6387146cfa8895ae9cafad631c
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/triggerhappy
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=handle input events and run configured programs
-  URL:=http://github.com/wertarbyte/triggerhappy
-endef
-
-define Package/triggerhappy/description
-	triggerhappy - handle input events and run configured programs
-	The daemon thd can handle hotplugged input devices and is configured through
-	simple configuration files in /etc/triggerhappy/triggers.d/.
-endef
-
-MAKE_FLAGS += \
-	thd th-cmd \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(1)
-
-define Package/triggerhappy/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/triggerhappy
-	$(INSTALL_DIR) $(1)/etc/triggerhappy/triggers.d/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/input/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/thd $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/th-cmd $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/triggerhappy.init $(1)/etc/init.d/triggerhappy
-	$(INSTALL_BIN) ./files/triggerhappy.hotplug $(1)/etc/hotplug.d/input/10-triggerhappy
-	$(INSTALL_BIN) ./files/triggerhappy-example.conf $(1)/etc/triggerhappy/triggers.d/example.conf
-endef
-
-$(eval $(call BuildPackage,triggerhappy))

utils/triggerhappy/files/triggerhappy-example.conf

@@ -1,14 +0,0 @@
-# This is an example configuration for the triggerhappy daemon (thd)
-# please note that every file to be processed must end in ".conf"
-#
-# To view a list of supported event codes, use "thd --listevents" or
-# "thd --dump /dev/input/event*"
-#
-# Format:
-# <eventcode> <value> <command>
-#
-# values for key events are 1 (pressed), 0 (released) or 2 (held)
-#
-## control an mpd instance
-# KEY_NEXTSONG		1	/usr/bin/mpc next
-# KEY_PREVSONG		1	/usr/bin/mpc prev

utils/triggerhappy/files/triggerhappy.hotplug

@@ -1,15 +0,0 @@
-#!/bin/sh
-THD_SOCKET=/tmp/triggerhappy.socket
-[ -S "$THD_SOCKET" ] || exit
-
-case "$ACTION" in
-	add)
-		DEVICE="/dev/$DEVNAME"
-		[ -c "$DEVICE" ] || exit
-		# offer device to triggerhappy daemon
-		/usr/sbin/th-cmd --socket "$THD_SOCKET" --add "$DEVICE"
-	;;
-        remove)
-		# nothing to do
-	;;
-esac

utils/triggerhappy/files/triggerhappy.init

@@ -1,10 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=93
-
-start() {
-	/usr/sbin/thd --socket /tmp/triggerhappy.socket --triggers /etc/triggerhappy/triggers.d/ --daemon /dev/input/event*
-}
-
-stop() {
-	/usr/sbin/th-cmd --socket /tmp/triggerhappy.socket --quit
-}

utils/ykclient/Makefile

@@ -1,47 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ykclient
-PKG_VERSION:=2.15
-PKG_RELEASE:=3
-
-PKG_SOURCE:=ykclient-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://developers.yubico.com/yubico-c-client/Releases/
-PKG_HASH:=f461cdefe7955d58bbd09d0eb7a15b36cb3576b88adbd68008f40ea978ea5016
-
-PKG_MAINTAINER:=Stuart B. Wilkins <stuwilkins@mac.com>
-PKG_LICENSE_FILES:=COPYING
-PKG_LICENSE:=BSD-2-Clause
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ykclient
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=The Yubico yubikey c client library
-  URL:=https://developers.yubico.com/yubico-c-client/
-  DEPENDS:=+curl
-endef
-
-define Package/ykclient/description
-	YubiKey C Client Library (libykclient)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/ykclient*.h $(STAGING_DIR)/usr/include
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libykclient.so* $(STAGING_DIR)/usr/lib
-endef
-
-CONFIGURE_ARGS += \
-	--enable-shared \
-	--disable-static
-
-define Package/ykclient/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/.libs/ykclient $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libykclient.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,ykclient))