luci-app-pbr-1.2.3: Two independent fixes to resolver_set and uplink_interface(6) handling

.github/eslint.config.mjs

@@ -0,0 +1,119 @@
+import { defineConfig, globalIgnores } from 'eslint/config';
+import globals from 'globals';
+import markdown from "@eslint/markdown";
+import json from '@eslint/json';
+import js from '@eslint/js';
+
+export default defineConfig([
+	globalIgnores([
+		'node_modules',
+	]),
+	// Markdown
+	{
+		files: ["**/*.md"],
+		plugins: {
+			markdown,
+		},
+		processor: "markdown/markdown",
+	},
+	// applies only to JavaScript blocks inside of Markdown files
+	{
+		files: ["**/*.md/*.js"],
+		rules: {
+			strict: "off",
+		},
+	},
+	// JSON files
+	{
+		files: ['**/*.json'],
+		ignores: ['package-lock.json'],
+		plugins: { json },
+		language: 'json/json',
+		extends: ['json/recommended'],
+		rules: {
+			'json/no-duplicate-keys': 'error',
+		},
+	},
+	// JavaScript files
+	{
+		files: ['**/*.js'],
+		language: '@/js',
+		plugins: { js },
+		extends: ['js/recommended'],
+		linterOptions: {
+			reportUnusedDisableDirectives: "off",
+		},
+		languageOptions: {
+			sourceType: 'script',
+			ecmaVersion: 2026,
+			globals: {
+				...globals.browser,
+				/* LuCI runtime / cbi exports */
+				_: 'readonly',
+				N_: 'readonly',
+				L: 'readonly',
+				E: 'readonly',
+				TR: 'readonly',
+				cbi_d: 'readonly',
+				cbi_strings: 'readonly',
+				cbi_d_add: 'readonly',
+				cbi_d_check: 'readonly',
+				cbi_d_checkvalue: 'readonly',
+				cbi_d_update: 'readonly',
+				cbi_init: 'readonly',
+				cbi_update_table: 'readonly',
+				cbi_validate_form: 'readonly',
+				cbi_validate_field: 'readonly',
+				cbi_validate_named_section_add: 'readonly',
+				cbi_validate_reset: 'readonly',
+				cbi_row_swap: 'readonly',
+				cbi_tag_last: 'readonly',
+				cbi_submit: 'readonly',
+				cbi_dropdown_init: 'readonly',
+				isElem: 'readonly',
+				toElem: 'readonly',
+				matchesElem: 'readonly',
+				findParent: 'readonly',
+				sfh: 'readonly',
+				renderBadge: 'readonly',
+				/* modules */
+				baseclass: 'readonly',
+				dom: 'readonly',
+				firewall: 'readonly',
+				fwtool: 'readonly',
+				form: 'readonly',
+				fs: 'readonly',
+				network: 'readonly',
+				nettools: 'readonly',
+				poll: 'readonly',
+				random: 'readonly',
+				request: 'readonly',
+				session: 'readonly',
+				rpc: 'readonly',
+				uci: 'readonly',
+				ui: 'readonly',
+				uqr: 'readonly',
+				validation: 'readonly',
+				view: 'readonly',
+				widgets: 'readonly',
+				/* dockerman */
+				dm2: 'readonly',
+				jsapi: 'readonly',
+			},
+			parserOptions: {
+				ecmaFeatures: {
+					globalReturn: true,
+				},
+			},
+		},
+		rules: {
+			'strict': 0,
+			'no-prototype-builtins': 0,
+			'no-empty': 0,
+			'no-undef': 'warn',
+			'no-unused-vars': ['off', { "caughtErrors": "none" }],
+			'no-regex-spaces': 0,
+			'no-control-regex': 0,
+		},
+	},
+]);

.github/workflows/eslint.yml

@@ -0,0 +1,47 @@
+name: "ESLint"
+
+on:
+  push:
+    branches: ["main"]
+    paths:
+      - '**/*.js'
+      - '**/*.json'
+      - '**/*.md'
+      - '.github/eslint.config.mjs'
+
+  pull_request:
+    branches: ["main"]
+    paths:
+      - '**/*.js'
+      - '**/*.json'
+      - '**/*.md'
+      - '.github/eslint.config.mjs'
+
+permissions: {}
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v6
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: latest
+
+      - name: Install ESLint
+        run: |
+          npm install --no-audit --no-fund --save-dev \
+            eslint@9 \
+            globals \
+            @eslint/json@latest \
+            @eslint/js@9 \
+            @eslint/markdown \
+            eslint-formatter-gha
+
+      - name: Run ESLint
+        run: npx eslint --config .github/eslint.config.mjs .

.github/workflows/openwrt-release.yml

@@ -0,0 +1,212 @@
+permissions:
+  contents: write
+name: Build OpenWrt Package
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build for ${{ matrix.version }} / ${{ matrix.target }}
+    runs-on: ubuntu-latest
+    env:
+      REPO_APK_KEY: ${{ secrets.REPO_APK_KEY }}
+      PKG_NAME: ${{ github.event.repository.name }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - version: openwrt-24.10
+            target: x86_64
+            suffix: all
+          # - version: openwrt-24.10
+          #   target: aarch64_cortex-a53
+          # - version: openwrt-24.10
+          #   target: aarch64_generic
+          # - version: openwrt-24.10
+          #   target: arm_cortex-a7
+          # - version: openwrt-24.10
+          #   target: arm_cortex-a9
+          # - version: openwrt-24.10
+          #   target: mips_24kc
+          # - version: openwrt-24.10
+          #   target: mipsel_24kc
+          - version: openwrt-25.12
+            target: x86_64
+            suffix: noarch
+          # - version: openwrt-25.12
+          #   target: aarch64_cortex-a53
+          # - version: openwrt-25.12
+          #   target: aarch64_generic
+          # - version: openwrt-25.12
+          #   target: arm_cortex-a7
+          # - version: openwrt-25.12
+          #   target: arm_cortex-a9
+          # - version: openwrt-25.12
+          #   target: mips_24kc
+          # - version: openwrt-25.12
+          #   target: mipsel_24kc
+
+    steps:
+      - name: 🧾 Checkout repo
+        uses: actions/checkout@v5
+
+      - name: 🧰 Set up melmac feed structure
+        run: |
+          set -e
+          # Also add a shim so ../../luci.mk from package/feeds/melmac/<pkg> works:
+          mkdir -p package
+          printf 'include $(TOPDIR)/feeds/luci/luci.mk\n' > package/luci.mk
+
+          # LuCI-style layout so ../../luci.mk resolves from applications/<pkg>
+          mkdir -p feed/luci/applications/${PKG_NAME}
+
+          # Add shim luci/luci.mk pointing to the official LuCI feed
+          mkdir -p feed/luci
+          printf 'include $(TOPDIR)/feeds/luci/luci.mk\n' > feed/luci/luci.mk
+
+          # Copy the package sources into the feed subdir (exclude CI and feed itself)
+          rsync -av \
+            --exclude='.git' \
+            --exclude='feed' \
+            --exclude='.github' \
+            ./ feed/luci/applications/${PKG_NAME}/
+
+      - name: 🧮 Compute ARCH
+        run: |
+          # matrix.version is the release-line LABEL baked into artifact filenames
+          # (sync_repo.sh matches *_openwrt-25.12_*), NOT the SDK image tag. Pin the
+          # SDK to a specific STABLE point release so builds are reproducible and
+          # immune to <ver>-SNAPSHOT mirror churn (rotated/truncated tarballs ->
+          # sha256 mismatch). Bump these when a new point release ships.
+          case "${{ matrix.version }}" in
+            openwrt-25.12) SDK_VERSION="25.12.5" ;;
+            openwrt-24.10) SDK_VERSION="24.10.7" ;;
+            snapshots)     SDK_VERSION="SNAPSHOT" ;;
+            *)             SDK_VERSION="${{ matrix.version }}" ;;
+          esac
+          echo "ARCH=${{ matrix.target }}-${SDK_VERSION}" >> "$GITHUB_ENV"
+
+      - name: 🏗️ Build with OpenWrt SDK
+        uses: openwrt/gh-action-sdk@v8
+        env:
+          ARCH: ${{ env.ARCH }}
+          FEEDNAME: melmac
+          PACKAGES: ${{ env.PKG_NAME }}
+          INDEX: 0
+          FEED_DIR: ${{ github.workspace }}/feed
+          NO_SHFMT_CHECK: 1
+          NO_REFRESH_CHECK: 1
+          PRIVATE_KEY: ${{ secrets.REPO_APK_KEY }}
+
+      - name: 🔍 Debug build output
+        run: |
+          echo "=== Build directory structure ==="
+          find . -name "*.ipk" -type f 2>/dev/null || echo "No .ipk files found"
+          echo "=== bin directory structure ==="
+          ls -la bin/ 2>/dev/null || echo "No bin directory found"
+          if [ -d "bin/packages" ]; then
+            echo "=== packages directory structure ==="
+            find bin/packages/ -type f -name "*.ipk" 2>/dev/null || echo "No .ipk files in packages directory"
+            echo "=== Full packages directory tree ==="
+            ls -laR bin/packages/ 2>/dev/null || echo "No packages directory"
+          fi
+
+      - name: 🏷️ Rename APK with version and target
+        run: |
+          set -euo pipefail
+          PKG_VERSION=$(grep -E '^PKG_VERSION *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
+          PKG_RELEASE=$(grep -E '^PKG_RELEASE *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
+          for ext in ipk apk; do
+            # apk keeps OpenWrt's 'r' release prefix (…-r5.apk); opkg does not
+            case "$ext" in apk) REL="r${PKG_RELEASE}" ;; *) REL="${PKG_RELEASE}" ;; esac
+            for f in $(find bin/packages -type f -path "*/melmac/*.${ext}"); do
+              dir=$(dirname "$f")
+              if [ -n "${{ matrix.suffix }}" ]; then
+                mv -v "$f" "$dir/${PKG_NAME}-${PKG_VERSION}-${REL}_${{ matrix.version }}_${{ matrix.suffix }}.${ext}"
+              else
+                mv -v "$f" "$dir/${PKG_NAME}-${PKG_VERSION}-${REL}_${{ matrix.version }}_${{ matrix.target }}.${ext}"
+              fi
+            done
+          done
+
+      - name: 📦 Upload artifact for ${{ matrix.target }}
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ env.PKG_NAME }}-${{ matrix.target }}-${{ matrix.version }}
+          path: |
+            bin/packages/*/melmac/${{ env.PKG_NAME }}*.ipk
+            bin/packages/*/melmac/${{ env.PKG_NAME }}*.apk
+          #            bin/packages/*/melmac/Packages*
+          #            bin/packages/*/melmac/index.json
+          #            bin/packages/*/melmac/packages.adb
+          if-no-files-found: ignore
+
+  release:
+    name: Release ${{ github.repository }}
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 🧾 Checkout repo
+        uses: actions/checkout@v5
+
+      - name: 🔍 Extract version and release from Makefile
+        id: version
+        run: |
+          PKG_VERSION=$(grep -E '^PKG_VERSION *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
+          PKG_RELEASE=$(grep -E '^PKG_RELEASE *:?=' Makefile | head -n1 | cut -d= -f2 | tr -d '[:space:]')
+          COMBINED_VERSION="${PKG_VERSION}-${PKG_RELEASE}"
+          echo "📦 Version: $COMBINED_VERSION"
+          echo "version=$COMBINED_VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: ⬇️ Download all build artifacts
+        uses: actions/download-artifact@v8
+        with:
+          path: ./release-assets
+
+      - name: 🗃️ Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ steps.version.outputs.version }}
+          name: Build v${{ steps.version.outputs.version }}
+          files: |
+            ./release-assets/**/*.ipk
+            ./release-assets/**/*.apk
+          draft: false
+          prerelease: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: 🧹 Prune stale release assets
+        # Delete assets on the tag that THIS build did not produce, so an arch or
+        # release line you stopped building no longer lingers on the release (and
+        # no longer gets re-published by sync_repo.sh, which pulls from releases).
+        # Gated on a fully green build + a non-empty keep set so a transient arch
+        # failure or an empty build can never wipe a still-good binary.
+        if: needs.build.result == 'success'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG: v${{ steps.version.outputs.version }}
+        run: |
+          keep=$(find release-assets -type f \( -name '*.ipk' -o -name '*.apk' \) \
+            -exec basename {} \; | sort -u)
+          [ -n "$keep" ] || { echo "no packages built — skipping prune"; exit 0; }
+          gh release view "$TAG" --json assets --jq '.assets[].name' | while read -r a; do
+            case "$a" in *.ipk|*.apk) ;; *) continue ;; esac
+            printf '%s\n' "$keep" | grep -qxF -- "$a" || {
+              echo "pruning stale asset: $a"
+              gh release delete-asset "$TAG" "$a" --yes
+            }
+          done
+      - name: 🔔 Notify repo.mossdef.org
+        # Event-driven sync: ping the repo so it publishes this release immediately
+        # instead of waiting for its hourly poll. Non-fatal if the token is absent.
+        if: needs.build.result == 'success'
+        env:
+          GH_TOKEN: ${{ secrets.SYNC_DISPATCH_TOKEN }}
+        run: |
+          gh api -X POST /repos/mossdef-org/repo.mossdef.org/dispatches \
+            -f event_type=package-released \
+            || echo "dispatch failed — repo.mossdef.org still syncs on its hourly schedule"