Merge branch 'openwrt:master' into master
This commit is contained in:
commit
24d6460cb6
20 changed files with 591 additions and 421 deletions
9
.github/workflows/multi-arch-test-build.yml
vendored
9
.github/workflows/multi-arch-test-build.yml
vendored
|
@ -101,17 +101,20 @@ jobs:
|
|||
echo "$EOF" >> $GITHUB_ENV
|
||||
|
||||
- name: Build
|
||||
uses: openwrt/gh-action-sdk@v5
|
||||
uses: openwrt/gh-action-sdk@v7
|
||||
env:
|
||||
ARCH: ${{ matrix.arch }}-${{ env.BRANCH }}
|
||||
FEEDNAME: packages_ci
|
||||
INDEX: 1
|
||||
KEY_BUILD: ${{ env.KEY_BUILD }}
|
||||
V: s
|
||||
|
||||
- name: Move created packages to project dir
|
||||
if: always()
|
||||
run: cp bin/packages/${{ matrix.arch }}/packages_ci/* . || true
|
||||
|
||||
- name: Collect metadata
|
||||
if: always()
|
||||
run: |
|
||||
MERGE_ID=$(git rev-parse --short HEAD)
|
||||
echo "MERGE_ID=$MERGE_ID" >> $GITHUB_ENV
|
||||
|
@ -122,6 +125,7 @@ jobs:
|
|||
echo "ARCHIVE_NAME=${{matrix.arch}}-PR$PRNUMBER-$MERGE_ID" >> $GITHUB_ENV
|
||||
|
||||
- name: Generate metadata
|
||||
if: always()
|
||||
run: |
|
||||
cat << _EOF_ > PKG-INFO
|
||||
Metadata-Version: 2.1
|
||||
|
@ -148,6 +152,7 @@ jobs:
|
|||
cat PKG-INFO
|
||||
|
||||
- name: Store packages
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{env.ARCHIVE_NAME}}-packages
|
||||
|
@ -158,6 +163,7 @@ jobs:
|
|||
PKG-INFO
|
||||
|
||||
- name: Store logs
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: ${{env.ARCHIVE_NAME}}-logs
|
||||
|
@ -166,6 +172,7 @@ jobs:
|
|||
PKG-INFO
|
||||
|
||||
- name: Remove logs
|
||||
if: always()
|
||||
run: sudo rm -rf logs/ || true
|
||||
|
||||
- name: Check if any packages were built
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=lua-eco
|
||||
PKG_VERSION:=3.0.1
|
||||
PKG_VERSION:=3.0.2
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
|
||||
PKG_HASH:=96f008932e319739df2fe99dc1cba7e9a1a389015a4b96ad0f63d95bb6422b09
|
||||
PKG_HASH:=fd99d0671701c0972ef3a9cb84231cd31b6290c447e1d6b91a230c502e441016
|
||||
|
||||
PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=icu4c
|
||||
MAJOR_VERSION:=73
|
||||
MINOR_VERSION:=2
|
||||
MAJOR_VERSION:=74
|
||||
MINOR_VERSION:=1
|
||||
PKG_VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION)
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(MAJOR_VERSION)_$(MINOR_VERSION)-src.tgz
|
||||
PKG_SOURCE_URL:=https://github.com/unicode-org/icu/releases/download/release-$(MAJOR_VERSION)-$(MINOR_VERSION)
|
||||
PKG_HASH:=818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
|
||||
PKG_HASH:=86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0
|
||||
|
||||
PKG_LICENSE:=ICU
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libdaq3
|
||||
PKG_VERSION:=3.0.12
|
||||
PKG_VERSION:=3.0.13
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
|
||||
|
@ -17,7 +17,7 @@ PKG_LICENSE:=GPL-2.0-only
|
|||
|
||||
PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=dedfdb88de151d61009bdb365322853687b1add4adec248952d2a93b70f584af
|
||||
PKG_HASH:=3a48b934bc45a1fe44b3887185d33a76a042c1d10aa177e3e7c417d83da67213
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION)
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
# Copyright 2023 Stan Grishin (stangri@melmac.ca)
|
||||
# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca)
|
||||
# TLD optimization written by Dirk Brenken (dev@brenken.org)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=adblock-fast
|
||||
PKG_VERSION:=1.0.0
|
||||
PKG_RELEASE:=7
|
||||
PKG_VERSION:=1.0.1
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,51 +1,14 @@
|
|||
#!/bin/sh
|
||||
# Copyright 2023 MOSSDeF, Stan Grishin (stangri@melmac.ca)
|
||||
# shellcheck disable=SC1091,SC2015,SC3037,SC3043,SC2317,SC3060
|
||||
# shellcheck disable=SC2015,SC3043,SC3060
|
||||
|
||||
readonly packageName='adblock-fast'
|
||||
readonly _OK_='\033[0;32m\xe2\x9c\x93\033[0m'
|
||||
readonly _FAIL_='\033[0;31m\xe2\x9c\x97\033[0m'
|
||||
readonly __OK__='\033[0;32m[\xe2\x9c\x93]\033[0m'
|
||||
readonly __FAIL__='\033[0;31m[\xe2\x9c\x97]\033[0m'
|
||||
readonly _ERROR_='\033[0;31mERROR\033[0m'
|
||||
readonly _WARNING_='\033[0;33mWARNING\033[0m'
|
||||
output() {
|
||||
# Can take a single parameter (text) to be output at any verbosity
|
||||
# Or target verbosity level and text to be output at specifc verbosity
|
||||
local msg memmsg logmsg
|
||||
local sharedMemoryOutput="/dev/shm/$packageName-output"
|
||||
verbosity="${verbosity:-2}"
|
||||
if [ "$#" -ne 1 ]; then
|
||||
if [ $((verbosity & $1)) -gt 0 ] || [ "$verbosity" = "$1" ]; then
|
||||
shift
|
||||
else
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
[ -t 1 ] && printf "%b" "$1"
|
||||
msg="$1";
|
||||
if [ "$(printf "%b" "$msg" | wc -l)" -gt 0 ]; then
|
||||
[ -s "$sharedMemoryOutput" ] && memmsg="$(cat "$sharedMemoryOutput")"
|
||||
logmsg="$(printf "%b" "${memmsg}${msg}" | sed 's/\x1b\[[0-9;]*m//g')"
|
||||
logger -t "${packageName:-service}" "$(printf "%b" "$logmsg")"
|
||||
rm -f "$sharedMemoryOutput"
|
||||
else
|
||||
printf "%b" "$msg" >> "$sharedMemoryOutput"
|
||||
fi
|
||||
}
|
||||
output_ok() { output 1 "$_OK_"; output 2 "$__OK__\\n"; }
|
||||
output_okn() { output 1 "$_OK_\\n"; output 2 "$__OK__\\n"; }
|
||||
output_fail() { output 1 "$_FAIL_"; output 2 "$__FAIL__\\n"; }
|
||||
output_failn() { output 1 "$_FAIL_\\n"; output 2 "$__FAIL__\\n"; }
|
||||
is_present() { command -v "$1" >/dev/null 2>&1; }
|
||||
get_url_filesize() {
|
||||
local url="$1" size size_command
|
||||
[ -n "$1" ] || return 0
|
||||
is_present 'curl' || return 0
|
||||
size_command='curl --silent --insecure --fail --head --request GET'
|
||||
size="$($size_command "$url" | grep -Po '^[cC]ontent-[lL]ength: \K\w+')"
|
||||
echo -en "$size"
|
||||
}
|
||||
readonly adbFunctionsFile='/etc/init.d/adblock-fast'
|
||||
if [ -s "$adbFunctionsFile" ]; then
|
||||
# shellcheck source=../../etc/init.d/adblock-fast
|
||||
. "$adbFunctionsFile"
|
||||
else
|
||||
printf "%b: adblock-fast init.d file (%s) not found! \n" '\033[0;31mERROR\033[0m' "$adbFunctionsFile"
|
||||
fi
|
||||
|
||||
# Transition from simple-adblock
|
||||
_enable_url() {
|
||||
|
|
|
@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=banip
|
||||
PKG_VERSION:=0.9.2
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
|
||||
|
||||
|
|
|
@ -674,8 +674,8 @@ f_down() {
|
|||
|
||||
# restore local backups
|
||||
#
|
||||
if { [ "${ban_action}" != "reload" ] || [ "${feed_url}" = "local" ] || [ -n "${ban_etagparm}" ]; } && [ "${feed%v*}" != "allowlist" ] && [ "${feed%v*}" != "blocklist" ]; then
|
||||
if [ -n "${ban_etagparm}" ] && [ "${ban_action}" = "reload" ] && [ "${feed_url}" != "local" ]; then
|
||||
if [ "${feed%v*}" != "blocklist" ]; then
|
||||
if [ -n "${ban_etagparm}" ] && [ "${ban_action}" = "reload" ] && [ "${feed_url}" != "local" ] && [ "${feed%v*}" != "allowlist" ]; then
|
||||
etag_rc="0"
|
||||
if [ "${feed%v*}" = "country" ]; then
|
||||
for country in ${ban_country}; do
|
||||
|
@ -697,16 +697,21 @@ f_down() {
|
|||
fi
|
||||
fi
|
||||
if [ "${etag_rc}" = "0" ] || [ "${ban_action}" != "reload" ] || [ "${feed_url}" = "local" ]; then
|
||||
f_restore "${feed}" "${feed_url}" "${tmp_load}" "${etag_rc}"
|
||||
if [ "${feed%v*}" = "allowlist" ] && [ ! -f "${tmp_allow}" ]; then
|
||||
f_restore "allowlist" "-" "${tmp_allow}" "${etag_rc}"
|
||||
else
|
||||
f_restore "${feed}" "${feed_url}" "${tmp_load}" "${etag_rc}"
|
||||
fi
|
||||
restore_rc="${?}"
|
||||
feed_rc="${restore_rc}"
|
||||
fi
|
||||
fi
|
||||
|
||||
# prepare local allowlist
|
||||
# prepare local/remote allowlist
|
||||
#
|
||||
if [ "${feed%v*}" = "allowlist" ] && [ ! -f "${tmp_allow}" ]; then
|
||||
"${ban_catcmd}" "${ban_allowlist}" 2>/dev/null >"${tmp_allow}"
|
||||
feed_rc="${?}"
|
||||
for feed_url in ${ban_allowurl}; do
|
||||
feed_log="$("${ban_fetchcmd}" ${ban_fetchparm} "${tmp_load}" "${feed_url}" 2>&1)"
|
||||
feed_rc="${?}"
|
||||
|
@ -714,8 +719,15 @@ f_down() {
|
|||
"${ban_catcmd}" "${tmp_load}" 2>/dev/null >>"${tmp_allow}"
|
||||
else
|
||||
f_log "info" "download for feed '${feed%v*}' failed (rc: ${feed_rc:-"-"}/log: ${feed_log})"
|
||||
break
|
||||
fi
|
||||
done
|
||||
if [ "${feed_rc}" = "0" ]; then
|
||||
f_backup "allowlist" "${tmp_allow}"
|
||||
elif [ -z "${restore_rc}" ] && [ "${feed_rc}" != "0" ]; then
|
||||
f_restore "allowlist" "-" "${tmp_allow}" "${feed_rc}"
|
||||
fi
|
||||
feed_rc="${?}"
|
||||
fi
|
||||
|
||||
# handle local feeds
|
||||
|
@ -980,7 +992,11 @@ f_down() {
|
|||
# load generated nft file in banIP table
|
||||
#
|
||||
if [ "${feed_rc}" = "0" ]; then
|
||||
cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_split}" 2>/dev/null)"
|
||||
if [ "${feed%v*}" = "allowlist" ]; then
|
||||
cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_allow}" 2>/dev/null)"
|
||||
else
|
||||
cnt_dl="$("${ban_awkcmd}" 'END{printf "%d",NR}' "${tmp_split}" 2>/dev/null)"
|
||||
fi
|
||||
if [ "${cnt_dl:-"0"}" -gt "0" ] || [ "${feed_url}" = "local" ] || [ "${feed%v*}" = "allowlist" ] || [ "${feed%v*}" = "blocklist" ]; then
|
||||
feed_log="$("${ban_nftcmd}" -f "${tmp_nft}" 2>&1)"
|
||||
feed_rc="${?}"
|
||||
|
@ -1098,7 +1114,7 @@ f_genstatus() {
|
|||
cnt_elements="$((cnt_elements + $("${ban_nftcmd}" -j list set inet banIP "${object}" 2>/dev/null | "${ban_jsoncmd}" -qe '@.nftables[*].set.elem[*]' | wc -l 2>/dev/null)))"
|
||||
done
|
||||
fi
|
||||
runtime="action: ${ban_action:-"-"}, fetch: ${ban_fetchcmd##*/}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")"
|
||||
runtime="action: ${ban_action:-"-"}, log: ${ban_logreadcmd##*/}, fetch: ${ban_fetchcmd##*/}, duration: ${duration:-"-"}, date: $(date "+%Y-%m-%d %H:%M:%S")"
|
||||
fi
|
||||
[ -s "${ban_customfeedfile}" ] && custom_feed="1"
|
||||
[ "${ban_splitsize:-"0"}" -gt "0" ] && split="1"
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=croc
|
||||
PKG_VERSION:=9.6.5
|
||||
PKG_VERSION:=9.6.6
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/schollz/croc/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_HASH:=2d3ba7bae3c49e3870e2f8523c6be00e92fe6e46828269a8cea34d4034102cad
|
||||
PKG_HASH:=9dd954e0068df2be416c71161665bfc283f150d30ba0bf96cee723701e93616f
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=iperf
|
||||
PKG_VERSION:=3.15
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://downloads.es.net/pub/iperf
|
||||
|
@ -46,6 +46,7 @@ $(call Package/iperf3/default)
|
|||
TITLE+= with iperf_auth support
|
||||
VARIANT:=ssl
|
||||
DEPENDS:=+libopenssl
|
||||
CONFLICTS:=iperf3
|
||||
endef
|
||||
|
||||
define Package/libiperf3
|
||||
|
|
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||
PKG_NAME:=quassel-irssi
|
||||
PKG_SOURCE_DATE:=2017-11-30
|
||||
PKG_SOURCE_VERSION:=079be662dde374a383646256108a4974c2bc7796
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/phhusson/quassel-irssi/tar.gz/$(PKG_SOURCE_VERSION)?
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
From 61aaa345d3924905aa26023b351fb9502a74de63 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Marangi <ansuelsmth@gmail.com>
|
||||
Date: Sun, 5 Nov 2023 20:50:31 +0100
|
||||
Subject: [PATCH 2/2] Fix compilation error with new version of irssi
|
||||
|
||||
Fix compilation error with new version of irssi that changed some
|
||||
functions names.
|
||||
|
||||
Caused by https://github.com/irssi/irssi/pull/1246
|
||||
|
||||
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
|
||||
---
|
||||
core/quassel-net.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/core/quassel-net.c
|
||||
+++ b/core/quassel-net.c
|
||||
@@ -105,8 +105,8 @@ static void sig_connected(Quassel_SERVER
|
||||
}
|
||||
|
||||
r->readtag =
|
||||
- g_input_add(net_sendbuffer_handle(r->handle),
|
||||
- G_INPUT_READ,
|
||||
+ i_input_add(net_sendbuffer_handle(r->handle),
|
||||
+ I_INPUT_READ,
|
||||
(GInputFunction) quassel_parse_incoming, r);
|
||||
|
||||
quassel_init_packet(net_sendbuffer_handle(r->handle), r->ssl);
|
||||
@@ -166,8 +166,8 @@ static void quassel_net_final_setup(SERV
|
||||
server->handle->handle = handle;
|
||||
|
||||
server->readtag =
|
||||
- g_input_add(handle,
|
||||
- G_INPUT_READ,
|
||||
+ i_input_add(handle,
|
||||
+ I_INPUT_READ,
|
||||
(GInputFunction) quassel_parse_incoming, server);
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ static void quassel_net_ssl_callback(SER
|
||||
if (error & 1) {
|
||||
if (server->connect_tag != -1)
|
||||
g_source_remove(server->connect_tag);
|
||||
- server->connect_tag = g_input_add(handle, error == 1 ? G_INPUT_READ : G_INPUT_WRITE,
|
||||
+ server->connect_tag = i_input_add(handle, error == 1 ? I_INPUT_READ : I_INPUT_WRITE,
|
||||
(GInputFunction)
|
||||
quassel_net_ssl_callback,
|
||||
server);
|
|
@ -6,12 +6,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=snort3
|
||||
PKG_VERSION:=3.1.73.0
|
||||
PKG_VERSION:=3.1.74.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
|
||||
PKG_HASH:=d04edf07e9b695fb22de73f0987537d35b4c8466119940e39a056d1a13888b27
|
||||
PKG_HASH:=4a4529e74bc202303c0330ae8b2317f0bef3ac92ae7216df8cfedfce24ddd129
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
|
|
|
@ -8,17 +8,19 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=sstp-client
|
||||
PKG_VERSION:=1.0.15
|
||||
PKG_VERSION:=1.0.19
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION)
|
||||
PKG_HASH:=8484aa51fbfbe418a0ebad58ad20a8ee1c46ed71f800be18bcd23b42e6baad64
|
||||
PKG_SOURCE_URL:=https://gitlab.com/sstp-project/sstp-client/-/archive/1.0.19/
|
||||
PKG_HASH:=e2652365f69f5037102e78f4e115ff764a390b27bb3fd513a8a50b10a61bb613
|
||||
|
||||
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/sstp-client
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/src/sstp-client.c
|
||||
+++ b/src/sstp-client.c
|
||||
@@ -542,6 +542,7 @@ static status_t sstp_init_ssl(sstp_clien
|
||||
@@ -546,6 +546,7 @@ static status_t sstp_init_ssl(sstp_clien
|
||||
int retval = SSTP_FAIL;
|
||||
int status = 0;
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
/* Initialize the OpenSSL library */
|
||||
status = SSL_library_init();
|
||||
if (status != 1)
|
||||
@@ -555,6 +556,9 @@ static status_t sstp_init_ssl(sstp_clien
|
||||
@@ -575,6 +576,9 @@ static status_t sstp_init_ssl(sstp_clien
|
||||
|
||||
/* Create a new crypto context */
|
||||
client->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
|
||||
|
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=nano
|
||||
PKG_VERSION:=7.2
|
||||
PKG_RELEASE:=2
|
||||
PKG_RELEASE:=3
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@GNU/nano
|
||||
|
@ -140,6 +140,7 @@ define Package/nano-full/install
|
|||
$(INSTALL_DIR) $(1)/etc $(1)/usr/share/nano
|
||||
$(INSTALL_DATA) ./files/nanorc $(1)/etc/nanorc
|
||||
$(INSTALL_DATA) ./files/uci.nanorc $(1)/usr/share/nano
|
||||
$(INSTALL_DATA) ./files/ucode.nanorc $(1)/usr/share/nano
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/share/nano/* $(1)/usr/share/nano
|
||||
endef
|
||||
|
||||
|
|
51
utils/nano/files/ucode.nanorc
Normal file
51
utils/nano/files/ucode.nanorc
Normal file
|
@ -0,0 +1,51 @@
|
|||
## Syntax highlighting for OpenWrt ucode scripts.
|
||||
|
||||
syntax ucode "/ucode/|\.u[ct]$"
|
||||
header "^#!.*\<ucode\>"
|
||||
comment "//"
|
||||
|
||||
# Declarations
|
||||
color green "\<(let|const|function|this)\>"
|
||||
|
||||
# Arrow functions
|
||||
color green "(\<\w+\>|\([[:alnum:][:space:]_,.]*\))[[:space:]]*=>"
|
||||
|
||||
# Flow control and keywords
|
||||
color brightyellow "\<(while|if|else|elif|switch|case|default|for|in|endif|endfor|endwhile|endfunction)\>"
|
||||
color brightyellow "\<(export|import|try|catch|delete)\>"
|
||||
|
||||
# Exit points
|
||||
color magenta "\<(break|continue|return)\>"
|
||||
|
||||
# Numeric literals
|
||||
color cyan "\<([0-9]+\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\>"
|
||||
color cyan "\<0[xX][[:xdigit:]]+(\.[[:xdigit:]]+)?\>"
|
||||
color cyan "\<(0[oO][0-7]+|0[bB][01]+|[0-9]+)\>"
|
||||
|
||||
# Special values
|
||||
color cyan "\<(true|false|null|NaN|Infinity)\>"
|
||||
|
||||
# Strings
|
||||
color brightmagenta ""([^"\{%#}]|\\.|\{[^"\{%#]|[%#}][^"\}]|[{%#}]\\.)*[{%#}]?""
|
||||
color brightmagenta "'([^'\{%#}]|\\.|\{[^'\{%#]|[%#}][^'\}]|[{%#}]\\.)*[{%#}]?'"
|
||||
color brightmagenta "`([^`\{%#}]|\\.|\{[^`\{%#]|[%#}][^`\}]|[{%#}]\\.)*[{%#}]?`"
|
||||
|
||||
# Template string expressions
|
||||
color normal start="\$\{" end="}"
|
||||
|
||||
# Comments
|
||||
color brightblue "(^|[[:blank:]])//.*"
|
||||
color brightblue start="(^|[[:space:]])/\*" end="\*/"
|
||||
color brightblue start="\{#" end="#\}"
|
||||
|
||||
# Trailing whitespace.
|
||||
color ,green "[[:space:]]+$"
|
||||
|
||||
# Text outside template directives
|
||||
color slate start="[}%#]\}" end="\{[{%#]"
|
||||
color slate start="^#!" end="\{[{%#]"
|
||||
color slate "^([^{%#}]|\{[^{%#]|[%#}][^}])+\{[{%#]"
|
||||
|
||||
# Template tags
|
||||
color white "\{[{%][+-]?|-?[%}]\}"
|
||||
color brightblue "\{#[+-]?|-?#\}"
|
|
@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=tang
|
||||
PKG_VERSION:=14
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
|
||||
PKG_HASH:=04263ed1cc98d60cab29fe47f908921b7b1aa4d6da5f9de2fcbe543773b75886
|
||||
|
||||
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
|
||||
PKG_MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
||||
|
|
|
@ -8,6 +8,7 @@ start_service() {
|
|||
if [ -z "${KEYS}" ] || [ "${KEYS}" = "0" ]; then # if db is empty generate new key pair
|
||||
mkdir -p /usr/share/tang/db
|
||||
/usr/sbin/tangd-keygen /usr/share/tang/db
|
||||
chown -R tang /usr/share/tang/db
|
||||
fi
|
||||
|
||||
config_load "tang"
|
||||
|
|
Loading…
Reference in a new issue