diff --git a/lang/luajit2/Makefile b/lang/luajit2/Makefile index 756381374..219736d96 100644 --- a/lang/luajit2/Makefile +++ b/lang/luajit2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luajit2 -PKG_VERSION:=2.1-20231006 +PKG_VERSION:=2.1-20231117 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/openresty/luajit2/archive/refs/tags/v$(PKG_VERSION).tar.gz? -PKG_HASH:=41530b3f00d3f284e771cfd09add2a0c672f1214f8780644ca9261da9e4d9310 +PKG_HASH:=cc92968c57c00303eb9eaebf65cc8b29a0f851670f16bb514896ab5057ae381f PKG_MAINTAINER:=Javier Marcet PKG_LICENSE:=MIT diff --git a/libs/libnpupnp/Makefile b/libs/libnpupnp/Makefile index b10cb578b..f4ce5117c 100644 --- a/libs/libnpupnp/Makefile +++ b/libs/libnpupnp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnpupnp -PKG_VERSION:=5.1.1 +PKG_VERSION:=5.1.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=a3eeff98b94366232b558798b75f751c808bb5d5fdac6bbc4d11487c9737a1e4 +PKG_HASH:=c1be8b2f654ef520791fbfaf13006fdd84522e6480a3126006e40caceea23552 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/libs/libupnpp/Makefile b/libs/libupnpp/Makefile index 133cc215a..1d76e8116 100644 --- a/libs/libupnpp/Makefile +++ b/libs/libupnpp/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnpp -PKG_VERSION:=0.24.0 +PKG_VERSION:=0.24.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=dc11e4cfe9f13b2de5e15a6e9f3ceaff3a8db17996d4dbe4e4f87987e3ecfc0f +PKG_HASH:=f09d5162f237bcb971ef4bbd45de9e93a073d96555cd691374eb1a3f338b2d0b PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/multimedia/yt-dlp/Makefile b/multimedia/yt-dlp/Makefile index 7ec127416..145a0d37e 100644 --- a/multimedia/yt-dlp/Makefile +++ b/multimedia/yt-dlp/Makefile @@ -1,11 +1,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yt-dlp -PKG_VERSION:=2023.3.4 -PKG_RELEASE:=2 +PKG_VERSION:=2023.11.16 +PKG_RELEASE:=1 PYPI_NAME:=yt-dlp -PKG_HASH:=265d5da97a76c15d7d9a4088a67b78acd5dcf6f8cfd8257c52f581ff996ff515 +PKG_HASH:=f0ccdaf12e08b15902601a4671c7ab12906d7b11de3ae75fa6506811c24ec5da PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=Unlicense diff --git a/net/adblock-fast/Makefile b/net/adblock-fast/Makefile index 51824a331..39800026b 100644 --- a/net/adblock-fast/Makefile +++ b/net/adblock-fast/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adblock-fast PKG_VERSION:=1.0.1 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/adblock-fast/files/etc/init.d/adblock-fast b/net/adblock-fast/files/etc/init.d/adblock-fast index ea7b3416c..4837b7a33 100755 --- a/net/adblock-fast/files/etc/init.d/adblock-fast +++ b/net/adblock-fast/files/etc/init.d/adblock-fast @@ -1764,7 +1764,7 @@ adb_pause() { local validation_result="$3" adb_stop 'on_pause' '' "$validation_result" output "Sleeping for $timeout seconds... " - if is_number "$timeout" && sleep "$timeout"; then + if is_integer "$timeout" && sleep "$timeout"; then output_okn else output_failn @@ -1779,8 +1779,8 @@ boot() { config_load "$packageName" config_get procd_boot_delay 'config' 'procd_boot_delay' '0' # shellcheck disable=SC2154 - { is_integer "$procd_boot_delay" && sleep "$procd_boot_delay" || true; } && \ - rc_procd start_service 'on_boot' && service_started 'on_boot' & + { is_integer "$procd_boot_delay" && sleep "$procd_boot_delay"; \ + rc_procd start_service 'on_boot' && service_started 'on_boot'; } & } check() { load_validate_config 'config' adb_check "'$*'"; } check_lists() { load_validate_config 'config' adb_check_lists "'$*'"; } diff --git a/net/aria2/Makefile b/net/aria2/Makefile index af441bf52..6aee1cc9c 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aria2 -PKG_VERSION:=1.36.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.37.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/ -PKG_HASH:=58d1e7608c12404f0229a3d9a4953d0d00c18040504498b483305bcb3de907a5 +PKG_HASH:=60a420ad7085eb616cb6e2bdf0a7206d68ff3d37fb5a956dc44242eb2f79b66b PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=gc-sections lto diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 61ceef863..607152a1c 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=41 +PKG_RELEASE:=42 PKG_LICENSE:=GPL-2.0 diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh b/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh index 499f27203..0d474051e 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh @@ -11,9 +11,10 @@ ENDPOINT="route53.amazonaws.com" RECORD_TTL=300 RECORD_NAME="${lookup_host}." +RECORD_VALUE="${__IP}" [ ${use_ipv6} -eq 0 ] && RECORD_TYPE="A" [ ${use_ipv6} -eq 1 ] && RECORD_TYPE="AAAA" -RECORD_VALUE="${LOCAL_IP}" + HOSTED_ZONE_ID="${domain}" API_PATH="/2013-04-01/hostedzone/${HOSTED_ZONE_ID}/rrset/" diff --git a/net/dhtd/Makefile b/net/dhtd/Makefile index 8cc8b22d5..390ca0253 100644 --- a/net/dhtd/Makefile +++ b/net/dhtd/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dhtd -PKG_VERSION:=0.2.4 +PKG_VERSION:=0.2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mwarning/dhtd/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=0f35cd0016689682b277f9769ec1e95c3c1321479cedc9727abc0bc91a0427d5 +PKG_HASH:=0e239c969400537fda549b74f0555bddc2f1fe4ab3c00abe539970dfefab6599 PKG_MAINTAINER:=Moritz Warning PKG_LICENSE:=MIT diff --git a/net/dnsproxy/Makefile b/net/dnsproxy/Makefile index 5e92052a4..1a8a6441d 100644 --- a/net/dnsproxy/Makefile +++ b/net/dnsproxy/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsproxy -PKG_VERSION:=0.59.0 +PKG_VERSION:=0.59.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=fe94a1113d9edd60bdad6075068c38cdfec2449a3e0d5a158ded53444aa2aae0 +PKG_HASH:=151616e2562b9bc8de85725293b264e7769d84fe1cd462e74be6fdc8505b0cbb PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=Apache-2.0 diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 3037bd5a2..69b6bbe87 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=https-dns-proxy PKG_VERSION:=2023-10-25 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy/ diff --git a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy index 672e837c7..c9e38cca9 100755 --- a/net/https-dns-proxy/files/etc/init.d/https-dns-proxy +++ b/net/https-dns-proxy/files/etc/init.d/https-dns-proxy @@ -134,7 +134,7 @@ boot() { ubus -t 30 wait_for network.interface 2>/dev/null on_boot_trigger=1 rc_procd start_service 'on_boot' && service_started 'on_boot' - is_resolver_working || rc_procd stop_service 'on_boot' && service_stopped 'on_boot' + is_resolver_working || { rc_procd stop_service 'on_boot' && service_stopped 'on_boot'; } } start_instance() { diff --git a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch index 72d3dc5df..8f3b9dfa2 100644 --- a/net/https-dns-proxy/patches/020-src-options.c-add-version.patch +++ b/net/https-dns-proxy/patches/020-src-options.c-add-version.patch @@ -5,7 +5,7 @@ return SW_VERSION; #else - return "2023.10.10-atLeast"; // update date sometimes, like 1-2 times a year -+ return "2023-10-25-3"; // update date sometimes, like 1-2 times a year ++ return "2023-10-25-4"; // update date sometimes, like 1-2 times a year #endif } diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 877e5c3cc..15fdedcab 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan -PKG_VERSION:=5.9.11 -PKG_RELEASE:=3 +PKG_VERSION:=5.9.12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ -PKG_HASH:=ddf53f1f26ad26979d5f55e8da95bd389552f5de3682e35593f9a70b2584ed2d +PKG_HASH:=5e6018b07cbe9f72c044c129955a13be3e2f799ceb53f53a4459da6a922b95e5 PKG_LICENSE:=GPL-2.0-or-later PKG_MAINTAINER:=Philip Prindeville , Noel Kuntze PKG_CPE_ID:=cpe:/a:strongswan:strongswan diff --git a/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch b/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch index 4323cd563..91e6afbe2 100644 --- a/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch +++ b/net/strongswan/patches/0900-src-Patch-for-building-with-musl-on-openwrt-taken-ve.patch @@ -48,7 +48,7 @@ Subject: [PATCH 900/904] src: Patch for building with musl on openwrt (taken #include --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h -@@ -120,6 +120,7 @@ +@@ -121,6 +121,7 @@ #include "utils/leak_detective.h" #include "plugins/plugin_loader.h" #include "settings/settings.h" diff --git a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch index ded7b21a4..b81138c56 100644 --- a/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch +++ b/net/strongswan/patches/0904-gmpdh-Plugin-that-implements-gmp-DH-functions-in-an-.patch @@ -26,7 +26,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an ARG_DISBL_SET([curve25519], [disable Curve25519 Diffie-Hellman plugin.]) ARG_DISBL_SET([hmac], [disable HMAC crypto implementation plugin.]) ARG_DISBL_SET([kdf], [disable KDF (prf+) implementation plugin.]) -@@ -1565,6 +1566,7 @@ ADD_PLUGIN([pkcs8], [s ch +@@ -1574,6 +1575,7 @@ ADD_PLUGIN([pkcs8], [s ch ADD_PLUGIN([af-alg], [s charon pki scripts medsrv attest nm cmd aikgen]) ADD_PLUGIN([fips-prf], [s charon nm cmd]) ADD_PLUGIN([gmp], [s charon pki scripts manager medsrv attest nm cmd aikgen fuzz]) @@ -34,7 +34,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an ADD_PLUGIN([curve25519], [s charon pki scripts nm cmd]) ADD_PLUGIN([agent], [s charon nm cmd]) ADD_PLUGIN([keychain], [s charon cmd]) -@@ -1706,6 +1708,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x +@@ -1716,6 +1718,7 @@ AM_CONDITIONAL(USE_SHA3, test x$sha3 = x AM_CONDITIONAL(USE_MGF1, test x$mgf1 = xtrue) AM_CONDITIONAL(USE_FIPS_PRF, test x$fips_prf = xtrue) AM_CONDITIONAL(USE_GMP, test x$gmp = xtrue) @@ -42,7 +42,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an AM_CONDITIONAL(USE_CURVE25519, test x$curve25519 = xtrue) AM_CONDITIONAL(USE_RDRAND, test x$rdrand = xtrue) AM_CONDITIONAL(USE_AESNI, test x$aesni = xtrue) -@@ -1983,6 +1986,7 @@ AC_CONFIG_FILES([ +@@ -1996,6 +1999,7 @@ AC_CONFIG_FILES([ src/libstrongswan/plugins/mgf1/Makefile src/libstrongswan/plugins/fips_prf/Makefile src/libstrongswan/plugins/gmp/Makefile @@ -52,7 +52,7 @@ Subject: [PATCH 904/904] gmpdh: Plugin that implements gmp DH functions in an src/libstrongswan/plugins/aesni/Makefile --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am -@@ -353,6 +353,13 @@ if MONOLITHIC +@@ -357,6 +357,13 @@ if MONOLITHIC endif endif diff --git a/net/travelmate/Makefile b/net/travelmate/Makefile index 45b9ceb31..ef0bf2779 100644 --- a/net/travelmate/Makefile +++ b/net/travelmate/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=travelmate PKG_VERSION:=2.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Dirk Brenken diff --git a/net/travelmate/files/hreward.login b/net/travelmate/files/hreward.login new file mode 100755 index 000000000..01342a151 --- /dev/null +++ b/net/travelmate/files/hreward.login @@ -0,0 +1,77 @@ +#!/bin/sh +# captive portal auto-login script for H-Reward Hotelss +# This is free software, licensed under the GNU General Public License v3. + +# set (s)hellcheck exceptions +# shellcheck disable=1091,2039,3040 +# +# +# Username and password can be passed to the script, to get fast wifi +# If not provided, the option with the slower wifi will be selected + + +. "/lib/functions.sh" + + +export LC_ALL=C +export PATH="/usr/sbin:/usr/bin:/sbin:/bin" + + +# From https://stackoverflow.com/a/17336953/819367 converted to sh +rawurlencode() { + string="$1" + strlen=${#string} + encoded="" + pos=0 + c="" + o="" + + while [ $pos -lt $strlen ]; do + c=$(expr substr "$string" $((pos + 1)) 1) + case "$c" in + [-_.~a-zA-Z0-9] ) o="${c}" ;; + * ) o=$(printf '%%%02x' "'$c") + esac + encoded="${encoded}${o}" + pos=$((pos + 1)) + done + + echo "${encoded}" +} + +user=$(rawurlencode "${1}") +password=$(rawurlencode "${2}") + +successUrl="https://hrewards.com/en" +trm_useragent="$(uci_get travelmate global trm_useragent "Mozilla/5.0 (Linux x86_64; rv:90.0) Gecko/20100101 Firefox/90.0")" +trm_maxwait="$(uci_get travelmate global trm_maxwait "30")" + +set -e + + +session_key="$(curl -sL --user-agent "${trm_useragent}" \ + --connect-timeout $((trm_maxwait / 6)) \ + "http://nossl.com/?cmd=redirect&arubalp=12345" \ + | awk -F 'name="session_key" value="' 'NF>1{split($2,a,"\""); print a[1]; exit}')" + +if [ -n "$user" ] && [ -n "$password" ]; then + response="$(curl -sL --user-agent "${trm_useragent}" \ + --connect-timeout $((trm_maxwait / 6)) \ + -w %{url_effective} \ + -o /dev/null \ + --header "Content-Type:application/x-www-form-urlencoded" \ + --data "session_key=${session_key}&accept_terms=1&email=${user}&password=${password}&password_reset_form_email=&password_update_form_password=&password_update_form_password_repeat=&room_number=&last_name=&voucher=" \ + "https://cp.deutschehospitality.com/aruba/login?lang=en")" +else + response="$(curl -sL --user-agent "${trm_useragent}" \ + --connect-timeout $((trm_maxwait / 6)) \ + -w %{url_effective} \ + -o /dev/null \ + --header "Content-Type:application/x-www-form-urlencoded" \ + --data "session_key=${session_key}&email=&password=&accept_terms=1&password_reset_form_email=&password_update_form_password=&password_update_form_password_repeat=&room_number=&last_name=&voucher=" \ + "https://cp.deutschehospitality.com/aruba/skip-registration?lang=en")" +fi + +if [ "$response" != "$successUrl" ]; then + exit 255 +fi diff --git a/net/v2ray-core/Makefile b/net/v2ray-core/Makefile index 68fbd4083..21737dd37 100644 --- a/net/v2ray-core/Makefile +++ b/net/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.11.0 +PKG_VERSION:=5.12.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=c25490d6b0600cd316409f112d39e10f5d7c66bb89f18dafcd3a95d26f889bc2 +PKG_HASH:=fa1845d42b46c6b5046a8f95d49cc7a9175e40efc5c13b95174b4c556567aca1 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/net/v2ray-geodata/Makefile b/net/v2ray-geodata/Makefile index 89e737b55..b61769c56 100644 --- a/net/v2ray-geodata/Makefile +++ b/net/v2ray-geodata/Makefile @@ -12,31 +12,31 @@ PKG_MAINTAINER:=Tianling Shen include $(INCLUDE_DIR)/package.mk -GEOIP_VER:=202310120354 +GEOIP_VER:=202311160040 GEOIP_FILE:=geoip.dat.$(GEOIP_VER) define Download/geoip URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/ URL_FILE:=geoip.dat FILE:=$(GEOIP_FILE) - HASH:=7107cfe4e211d4df5234d0d2b1c47bdcd19f6602c2b7969f3a5e12f7cf48692e + HASH:=fe44648629b12e4818eae1a9f703e83f02261e7dcc91b06edf531f343bf16170 endef -GEOSITE_VER:=20231015073627 +GEOSITE_VER:=20231118232758 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER) define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/ URL_FILE:=dlc.dat FILE:=$(GEOSITE_FILE) - HASH:=2042c47d520634236fbf238a4168196bea64a2d61ca5e6cbab9fd0ac37c7e659 + HASH:=91844afa5918b0465b2ffaaf9ee35d09bffd0a2b47b669afdf77ff576262b048 endef -GEOSITE_IRAN_VER:=202310160024 +GEOSITE_IRAN_VER:=202311130025 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/ URL_FILE:=iran.dat FILE:=$(GEOSITE_IRAN_FILE) - HASH:=70db057c5c1d07de251c4543e6c20ff0a352c95977e120d1522a7f826ff08cf2 + HASH:=286b48d780010349ce759daba30a05e550ea7e3f45082026d2e5f53803223f90 endef define Package/v2ray-geodata/template diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index 971a8a78d..fb0f89a23 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-core -PKG_VERSION:=1.8.4 +PKG_VERSION:=1.8.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=89f73107abba9bd438111edfe921603ddb3c2b631b2716fbdc6be78552f0d322 +PKG_HASH:=d828296c9f29f9e59a61ab73d44f072ab2a30fe979679e39aea43b33ddb7d6bf PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/sound/upmpdcli/Makefile b/sound/upmpdcli/Makefile index e45dcb049..b46318513 100644 --- a/sound/upmpdcli/Makefile +++ b/sound/upmpdcli/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=upmpdcli -PKG_VERSION:=1.8.4 +PKG_VERSION:=1.8.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads -PKG_HASH:=91f40093d7465eb26edbc08cb93fbdd277ea83b8dbb753491c53497a4644ee87 +PKG_HASH:=55e3d27bea5bef4560f319137f1a5c7d08abbba5a9aae90ee3240903fdb8c3e4 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1-or-later diff --git a/sound/upmpdcli/patches/010-gcc13.patch b/sound/upmpdcli/patches/010-gcc13.patch deleted file mode 100644 index 63e397982..000000000 --- a/sound/upmpdcli/patches/010-gcc13.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/upmpdutils.hxx -+++ b/src/upmpdutils.hxx -@@ -17,6 +17,7 @@ - #ifndef _UPMPDUTILS_H_X_INCLUDED_ - #define _UPMPDUTILS_H_X_INCLUDED_ - -+#include - #include - #include - #include diff --git a/utils/mc/Makefile b/utils/mc/Makefile index 28dbad66f..8ff5a85df 100644 --- a/utils/mc/Makefile +++ b/utils/mc/Makefile @@ -6,15 +6,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mc -PKG_VERSION:=4.8.27 -PKG_RELEASE:=3 +PKG_VERSION:=4.8.30 +PKG_RELEASE:=1 PKG_MAINTAINER:= PKG_LICENSE:=GPL-3.0-or-later PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://ftp.midnight-commander.org/ -PKG_HASH:=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4 +PKG_HASH:=5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf gettext-version PKG_BUILD_DEPENDS:=MC_VFS:libtirpc @@ -57,7 +57,6 @@ CONFIGURE_ARGS += \ --enable-silent-rules \ --disable-tests \ --disable-doxygen-doc \ - --with-homedir=/etc/mc \ --with-screen=ncurses \ --without-x \ @@ -99,7 +98,7 @@ define Package/mc/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mc $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/mc $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.charsets $(1)/etc/mc - $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.ext $(1)/etc/mc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.ext.ini $(1)/etc/mc $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/mc.default.keymap $(1)/etc/mc/mc.keymap $(INSTALL_DATA) $(PKG_BUILD_DIR)/misc/filehighlight.ini $(1)/etc/mc $(INSTALL_DIR) $(1)/usr/share/mc/help diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch index bc7ddee5f..64f3fdba9 100644 --- a/utils/mc/patches/010-subshell.patch +++ b/utils/mc/patches/010-subshell.patch @@ -1,6 +1,6 @@ --- a/src/subshell/common.c +++ b/src/subshell/common.c -@@ -1140,7 +1140,7 @@ init_subshell_precmd (char *precmd, size +@@ -1143,7 +1143,7 @@ init_subshell_precmd (char *precmd, size "else " "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; " "fi; " diff --git a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch index bf6853a71..1d122f678 100644 --- a/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch +++ b/utils/mc/patches/020-fix-mouse-handling-newer-terminfo.patch @@ -1,6 +1,6 @@ --- a/lib/tty/tty.c +++ b/lib/tty/tty.c -@@ -402,7 +402,7 @@ tty_init_xterm_support (gboolean is_xter +@@ -407,7 +407,7 @@ tty_init_xterm_support (gboolean is_xter if (xmouse_seq != NULL) { if (strcmp (xmouse_seq, ESC_STR "[<") == 0) diff --git a/utils/mc/patches/030-mc-mksh-subshell-v2.patch b/utils/mc/patches/030-mc-mksh-subshell-v2.patch index 0191be0e6..37274c14c 100644 --- a/utils/mc/patches/030-mc-mksh-subshell-v2.patch +++ b/utils/mc/patches/030-mc-mksh-subshell-v2.patch @@ -1,6 +1,6 @@ --- a/lib/shell.c +++ b/lib/shell.c -@@ -68,6 +68,8 @@ mc_shell_get_installed_in_system (void) +@@ -70,6 +70,8 @@ mc_shell_get_installed_in_system (void) mc_shell->path = g_strdup ("/bin/bash"); else if (access ("/bin/ash", X_OK) == 0) mc_shell->path = g_strdup ("/bin/ash"); @@ -9,7 +9,7 @@ else if (access ("/bin/dash", X_OK) == 0) mc_shell->path = g_strdup ("/bin/dash"); else if (access ("/bin/busybox", X_OK) == 0) -@@ -149,6 +151,12 @@ mc_shell_recognize_real_path (mc_shell_t +@@ -151,6 +153,12 @@ mc_shell_recognize_real_path (mc_shell_t mc_shell->type = SHELL_ZSH; mc_shell->name = "zsh"; } @@ -34,7 +34,7 @@ SHELL_FISH --- a/src/subshell/common.c +++ b/src/subshell/common.c -@@ -378,6 +378,11 @@ init_subshell_child (const char *pty_nam +@@ -380,6 +380,11 @@ init_subshell_child (const char *pty_nam } break; @@ -46,7 +46,7 @@ /* TODO: Find a way to pass initfile to TCSH and FISH */ case SHELL_TCSH: case SHELL_FISH: -@@ -427,6 +432,7 @@ init_subshell_child (const char *pty_nam +@@ -429,6 +434,7 @@ init_subshell_child (const char *pty_nam case SHELL_ASH_BUSYBOX: case SHELL_DASH: @@ -54,7 +54,7 @@ case SHELL_TCSH: case SHELL_FISH: execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL); -@@ -1091,6 +1097,10 @@ init_subshell_precmd (char *precmd, size +@@ -1094,6 +1100,10 @@ init_subshell_precmd (char *precmd, size "PS1='\\u@\\h:\\w\\$ '\n", command_buffer_pipe[WRITE], command_buffer_pipe[WRITE], subshell_pipe[WRITE]); break; diff --git a/utils/yq/Makefile b/utils/yq/Makefile index 6400b4807..ac72cca04 100644 --- a/utils/yq/Makefile +++ b/utils/yq/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yq -PKG_VERSION:=4.35.2 +PKG_VERSION:=4.40.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8b17d710c56f764e9beff06d7a7b1c77d87c4ba4219ce4ce67e7ee29670f4f13 +PKG_HASH:=238b695d372753a32bc0b8500a7ca99f98cf98d7855c3e84d6984a2b035b6268 PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MIT