diff --git a/lang/python/python-ble2mqtt/Makefile b/lang/python/python-ble2mqtt/Makefile index 9fff9beba..7cd5c7eaa 100644 --- a/lang/python/python-ble2mqtt/Makefile +++ b/lang/python/python-ble2mqtt/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-ble2mqtt PKG_VERSION:=0.1.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=ble2mqtt PKG_HASH:=0015cae0c36badb48cbd4a1c8b1a8029e45ab0891a95363fe00624c2629b4510 @@ -27,7 +27,7 @@ define Package/python3-ble2mqtt SUBMENU:=Python TITLE:=Bluetooth to MQTT bridge URL:=https://github.com/devbis/ble2mqtt/ - DEPENDS:=+python3-light +python3-aio-mqtt-mod +python3-asyncio +python3-bleak +python3-logging + DEPENDS:=+python3-light +python3-aio-mqtt-mod +python3-asyncio +python3-bleak +python3-logging +python3-uuid endef define Package/python3-ble2mqtt/description @@ -35,6 +35,11 @@ define Package/python3-ble2mqtt/description devices to your smart home endef +define Py3Package/python3-ble2mqtt/install + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/ble2mqtt.init $(1)/etc/init.d/ble2mqtt +endef + $(eval $(call Py3Package,python3-ble2mqtt)) $(eval $(call BuildPackage,python3-ble2mqtt)) $(eval $(call BuildPackage,python3-ble2mqtt-src)) diff --git a/lang/python/python-ble2mqtt/files/ble2mqtt.init b/lang/python/python-ble2mqtt/files/ble2mqtt.init new file mode 100755 index 000000000..e3651c0af --- /dev/null +++ b/lang/python/python-ble2mqtt/files/ble2mqtt.init @@ -0,0 +1,15 @@ +#!/bin/sh /etc/rc.common + +START=98 +USE_PROCD=1 + +start_service() +{ + procd_open_instance + + procd_set_param env BLE2MQTT_CONFIG=/etc/ble2mqtt.json + procd_set_param command /usr/bin/ble2mqtt + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance +} diff --git a/lang/python/python-bleak/Makefile b/lang/python/python-bleak/Makefile index b97d65065..696b0b4bc 100644 --- a/lang/python/python-bleak/Makefile +++ b/lang/python/python-bleak/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-bleak -PKG_VERSION:=0.20.0 +PKG_VERSION:=0.20.1 PKG_RELEASE:=1 PYPI_NAME:=bleak -PKG_HASH:=7f6fe69454ad5d4c0ab05ae4a9aa1aabd6926d7128eab2fac4ef8a58a72999ee +PKG_HASH:=db599f5f100e252e9cdd4020c8657daca0371a3c697e87432abc702f3774cb4c PKG_MAINTAINER:=Quintin Hill PKG_LICENSE:=MIT diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index db163c67f..d274e21e6 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2006-2016 OpenWrt.org -# Copyright (C) 2017-2022 Luiz Angelo Daros de Luca +# Copyright (C) 2017-2023 Luiz Angelo Daros de Luca # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby -PKG_VERSION:=3.1.3 +PKG_VERSION:=3.2.2 PKG_RELEASE:=1 # First two numbes @@ -19,7 +19,7 @@ PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://cache.ruby-lang.org/pub/ruby/$(PKG_ABI_VERSION)/ -PKG_HASH:=4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a +PKG_HASH:=4b352d0f7ec384e332e3e44cdbfdcd5ff2d594af3c8296b5636c710975149e23 PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYING @@ -51,6 +51,8 @@ HOST_CONFIGURE_ARGS += \ # --with-out-ext \ # --with-ext=thread,stringio \ +HOST_BUILD_DEPENDS:=yaml/host + CONFIGURE_ARGS += \ --enable-shared \ --enable-static \ @@ -388,6 +390,7 @@ endef define Package/ruby-erb/files /usr/lib/ruby/$(PKG_ABI_VERSION)/erb.rb /usr/lib/ruby/$(PKG_ABI_VERSION)/erb/* +/usr/lib/ruby/$(PKG_ABI_VERSION)/*/erb/*.so /usr/lib/ruby/gems/$(PKG_ABI_VERSION)/gems/erb-* /usr/lib/ruby/gems/$(PKG_ABI_VERSION)/specifications/default/erb-*.gemspec endef @@ -536,6 +539,10 @@ define Package/ruby-minitest/files-excluded /usr/lib/ruby/gems/$(PKG_ABI_VERSION)/gems/minitest-*/*.txt endef +define Package/ruby-mjit/files +/usr/lib/ruby/$(PKG_ABI_VERSION)/ruby_vm/mjit/ +endef + define Package/ruby-mkmf/files /usr/lib/ruby/$(PKG_ABI_VERSION)/mkmf.rb endef @@ -883,6 +890,12 @@ define Package/ruby-strscan/files /usr/lib/ruby/gems/$(PKG_ABI_VERSION)/specifications/default/strscan-*.gemspec endef +define Package/ruby-syntax_suggest/files +/usr/lib/ruby/$(PKG_ABI_VERSION)/syntax_suggest.rb +/usr/lib/ruby/$(PKG_ABI_VERSION)/syntax_suggest/ +/usr/lib/ruby/gems/$(PKG_ABI_VERSION)/specifications/default/syntax_suggest-*.gemspec +endef + define Package/ruby-syslog/files /usr/lib/ruby/$(PKG_ABI_VERSION)/*/syslog.so /usr/lib/ruby/$(PKG_ABI_VERSION)/syslog/logger.rb @@ -1055,13 +1068,13 @@ $(eval $(call RubyBuildPackage,abbrev,Calculates the set of unambiguous abbrevia $(eval $(call RubyBuildPackage,base64,Encode and decode base64,)) $(eval $(call RubyBuildPackage,benchmark,Performance benchmarking library,)) $(eval $(call RubyBuildPackage,bigdecimal,Arbitrary-precision decimal floating-point library,)) -$(eval $(call RubyBuildPackage,bundler,Manage dependencies,+ruby-erb +ruby-irb +ruby-open-uri +ruby-readline +ruby-yaml)) +$(eval $(call RubyBuildPackage,bundler,Manage dependencies,+ruby-erb +ruby-irb +ruby-logger +ruby-open-uri +ruby-readline +ruby-yaml)) $(eval $(call RubyBuildPackage,cgi,CGI support toolkit,+ruby-pstore +ruby-securerandom +ruby-shellwords +ruby-stringio +ruby-tempfile)) $(eval $(call RubyBuildPackage,continuation,Similar to C setjmp/longjmp with extra states,)) $(eval $(call RubyBuildPackage,coverage,Coverage measurement,)) $(eval $(call RubyBuildPackage,csv,CSV Reading and Writing,+ruby-date +ruby-english +ruby-forwardable +ruby-stringio +ruby-strscan)) $(eval $(call RubyBuildPackage,date,Comparable module for handling dates,)) -$(eval $(call RubyBuildPackage,debug,generic command line interface for ruby-debug,+ruby-base64 +ruby-did-you-mean +ruby-irb +ruby-mkmf +ruby-objspace +ruby-readline)) +$(eval $(call RubyBuildPackage,debug,generic command line interface for ruby-debug,+ruby-base64 +ruby-irb +ruby-mkmf +ruby-objspace +ruby-readline)) $(eval $(call RubyBuildPackage,delegate,lib to delegate method calls to an object,)) $(eval $(call RubyBuildPackage,did-you-mean,did you mean? experience,+ruby-rbconfig)) $(eval $(call RubyBuildPackage,digest,Digest Library,+RUBY_DIGEST_USE_OPENSSL:libopenssl)) @@ -1078,7 +1091,7 @@ $(eval $(call RubyBuildPackage,fiddle,Libffi wrapper for Ruby,+libffi)) $(eval $(call RubyBuildPackage,fileutils,File utility methods for copying moving removing etc,+ruby-enc +ruby-etc +ruby-rbconfig +ruby-socket)) $(eval $(call RubyBuildPackage,find,top-down traversal of a set of file paths,+ruby-enc)) $(eval $(call RubyBuildPackage,forwardable,delegation of methods to a object,)) -$(eval $(call RubyBuildPackage,gems,gems packet management,+ruby-json +ruby-net-http +ruby-open3 +ruby-pathname +ruby-pp +ruby-psych +ruby-rake)) +$(eval $(call RubyBuildPackage,gems,gems packet management,+ruby-json +ruby-net-http +ruby-open3 +ruby-pathname +ruby-psych +ruby-rake)) $(eval $(call RubyBuildPackage,getoptlong,implementation of getoptLong,)) $(eval $(call RubyBuildPackage,io-console,Console interface,)) $(eval $(call RubyBuildPackage,io-nonblock,Non-blocking mode with IO class,)) @@ -1086,15 +1099,16 @@ $(eval $(call RubyBuildPackage,io-wait,Waits until IO is readable or writable wi $(eval $(call RubyBuildPackage,ipaddr,Set of methods to manipulate an IP address,+ruby-socket)) $(eval $(call RubyBuildPackage,irb,(interactive shell),+ruby-gems +ruby-reline +ruby-ripper)) $(eval $(call RubyBuildPackage,json,JSON Implementation for Ruby,+ruby-date +ruby-ostruct)) -$(eval $(call RubyBuildPackage,logger,logger and syslog library,+ruby-monitor)) +$(eval $(call RubyBuildPackage,logger,logger and syslog library,+ruby-monitor +ruby-rbconfig)) $(eval $(call RubyBuildPackage,matrix,implementation of Matrix and Vector classes,)) $(eval $(call RubyBuildPackage,minitest,Gem minitest,+ruby-gems +ruby-mutex_m)) +$(eval $(call RubyBuildPackage,mjit,Method Based Just-in-Time Compiler,+ruby-fiddle)) $(eval $(call RubyBuildPackage,mkmf,makefile library,+ruby-shellwords +ruby-tmpdir)) $(eval $(call RubyBuildPackage,monitor,Object or module methods are executed with mutual exclusion,)) $(eval $(call RubyBuildPackage,mutex_m,extend objects to be handled like a Mutex,)) $(eval $(call RubyBuildPackage,net-ftp,FTP lib,+ruby-monitor +ruby-net-protocol +ruby-openssl +ruby-time)) -$(eval $(call RubyBuildPackage,net-http,HTTP lib,+ruby-cgi +ruby-net-protocol +ruby-uri +ruby-zlib)) -$(eval $(call RubyBuildPackage,net-imap,IMAP lib,+ruby-monitor +ruby-net-protocol +ruby-openssl +ruby-strscan)) +$(eval $(call RubyBuildPackage,net-http,HTTP lib,+ruby-cgi +ruby-net-protocol +ruby-resolv +ruby-strscan +ruby-uri +ruby-zlib)) +$(eval $(call RubyBuildPackage,net-imap,IMAP lib,+ruby-json +ruby-monitor +ruby-net-protocol +ruby-openssl +ruby-strscan)) $(eval $(call RubyBuildPackage,net-pop,POP3 lib,+ruby-net-protocol +ruby-openssl)) $(eval $(call RubyBuildPackage,net-protocol,Abstract for net-* clients,+ruby-socket +ruby-timeout)) $(eval $(call RubyBuildPackage,net-smtp,SMTP lib,+ruby-net-protocol +ruby-openssl)) @@ -1104,22 +1118,22 @@ $(eval $(call RubyBuildPackage,observer,Observer design pattern,)) $(eval $(call RubyBuildPackage,open-uri,Wrapper for Net::HTTP Net::HTTPS and Net::,+ruby-net-ftp +ruby-net-http)) $(eval $(call RubyBuildPackage,open3,popen with stderr,)) $(eval $(call RubyBuildPackage,openssl,SSL TLS and general purpose cryptography,+ruby-digest +ruby-enc +ruby-io-nonblock +ruby-ipaddr +libopenssl)) -$(eval $(call RubyBuildPackage,optparse,command-line option analysis,+ruby-shellwords +ruby-time +ruby-uri)) +$(eval $(call RubyBuildPackage,optparse,command-line option analysis,+ruby-enc-extra +ruby-pp +ruby-shellwords +ruby-time +ruby-uri)) $(eval $(call RubyBuildPackage,ostruct,build custom data structures,)) -$(eval $(call RubyBuildPackage,pathname,Pathname lib,+ruby-find)) +$(eval $(call RubyBuildPackage,pathname,Pathname lib,+ruby-fileutils +ruby-find)) $(eval $(call RubyBuildPackage,powerassert,Gem power_assert,+ruby-irb)) $(eval $(call RubyBuildPackage,pp,Pretty print objects,+ruby-etc +ruby-io-console +ruby-prettyprint)) $(eval $(call RubyBuildPackage,prettyprint,PrettyPrint library,)) $(eval $(call RubyBuildPackage,prime,Prime numbers and factorization library,+ruby-forwardable +ruby-singleton)) $(eval $(call RubyBuildPackage,pstore,file based persistence,+ruby-digest +ruby-enc)) -$(eval $(call RubyBuildPackage,psych,YAML parser and emitter,+ruby-bigdecimal +ruby-date +ruby-enc +ruby-forwardable +ruby-stringio +ruby-strscan +libyaml)) +$(eval $(call RubyBuildPackage,psych,YAML parser and emitter,+ruby-bigdecimal +ruby-date +ruby-enc +ruby-forwardable +ruby-stringio +libyaml)) $(eval $(call RubyBuildPackage,pty,Creates and manages pseudo terminals,)) $(eval $(call RubyBuildPackage,racc,LALR parser generator,+ruby-forwardable +ruby-optparse +ruby-rbconfig +ruby-stringio)) $(eval $(call RubyBuildPackage,rake,Rake (make replacement),+ruby-fileutils +ruby-monitor +ruby-optparse +ruby-ostruct +ruby-set +ruby-singleton)) $(eval $(call RubyBuildPackage,random_formatter,Formats generated random numbers in many manners,)) $(eval $(call RubyBuildPackage,rbconfig,RbConfig,)) $(eval $(call RubyBuildPackage,rbs,RBS provides syntax and semantics definition for the Ruby Signature language,+ruby-logger +ruby-mkmf +ruby-rdoc)) -$(eval $(call RubyBuildPackage,rdoc,RDoc produces HTML and command-line documentation for Ruby projects,+ruby-abbrev +ruby-did-you-mean +ruby-erb +ruby-racc +ruby-ripper +ruby-yaml)) +$(eval $(call RubyBuildPackage,rdoc,RDoc produces HTML and command-line documentation for Ruby projects,+ruby-did-you-mean +ruby-erb +ruby-racc +ruby-ripper +ruby-yaml)) $(eval $(call RubyBuildPackage,readline-ext,support for native GNU readline,+libncurses +libreadline)) $(eval $(call RubyBuildPackage,readline,loads readline-ext(native) or reline(ruby),+ruby-reline)) $(eval $(call RubyBuildPackage,reline,alternative to readline-ext in pure ruby,+ruby-fiddle +ruby-forwardable +ruby-io-console +ruby-tempfile +ruby-timeout)) @@ -1137,6 +1151,7 @@ $(eval $(call RubyBuildPackage,singleton,Singleton pattern,)) $(eval $(call RubyBuildPackage,socket,socket support,+ruby-io-wait)) $(eval $(call RubyBuildPackage,stringio,Pseudo `IO` class from/to `String`,)) $(eval $(call RubyBuildPackage,strscan,Lexical scanning operations on a String,)) +$(eval $(call RubyBuildPackage,syntax_suggest,Find missing end syntax errors,+ruby-optparse +ruby-pathname +ruby-ripper +ruby-stringio +ruby-timeout +ruby-tmpdir)) $(eval $(call RubyBuildPackage,syslog,Syslog Lib,+ruby-logger)) $(eval $(call RubyBuildPackage,tempfile,Manages temporary files,+ruby-delegate +ruby-tmpdir)) $(eval $(call RubyBuildPackage,testunit,Gem test-unit,+ruby-csv +ruby-debug +ruby-erb +ruby-powerassert +ruby-rexml +ruby-yaml)) diff --git a/lang/ruby/patches/001-fix-build-with-libressl-3.5.patch b/lang/ruby/patches/001-fix-build-with-libressl-3.5.patch deleted file mode 100644 index 0462556da..000000000 --- a/lang/ruby/patches/001-fix-build-with-libressl-3.5.patch +++ /dev/null @@ -1,20 +0,0 @@ -From e25fb0d0d86da5a9398ebdc9216b2ea89f80fa3d Mon Sep 17 00:00:00 2001 -From: Jeremy Evans -Date: Fri, 25 Mar 2022 13:11:31 -0700 -Subject: [PATCH] Fix build with LibreSSL 3.5 - ---- - ext/openssl/ossl_pkey.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/ext/openssl/ossl_pkey.c -+++ b/ext/openssl/ossl_pkey.c -@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, V - } - } - else { --#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) -+#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 5, 0) - if (!PEM_write_bio_PrivateKey_traditional(bio, pkey, enc, NULL, 0, - ossl_pem_passwd_cb, - (void *)pass)) { diff --git a/lang/ruby/patches/002-fix-operator-precedence.patch b/lang/ruby/patches/002-fix-operator-precedence.patch deleted file mode 100644 index 7c8b008da..000000000 --- a/lang/ruby/patches/002-fix-operator-precedence.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b02815271fcc295cb8b07ef740684b88a10f2760 Mon Sep 17 00:00:00 2001 -From: Jeremy Evans -Date: Fri, 25 Mar 2022 13:39:45 -0700 -Subject: [PATCH] Fix operator precedence in OSSL_OPENSSL_PREREQ and - OSSL_LIBRESSL_PREREQ - ---- - ext/openssl/ossl.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/ext/openssl/ossl.h -+++ b/ext/openssl/ossl.h -@@ -43,13 +43,13 @@ - #ifndef LIBRESSL_VERSION_NUMBER - # define OSSL_IS_LIBRESSL 0 - # define OSSL_OPENSSL_PREREQ(maj, min, pat) \ -- (OPENSSL_VERSION_NUMBER >= (maj << 28) | (min << 20) | (pat << 12)) -+ (OPENSSL_VERSION_NUMBER >= ((maj << 28) | (min << 20) | (pat << 12))) - # define OSSL_LIBRESSL_PREREQ(maj, min, pat) 0 - #else - # define OSSL_IS_LIBRESSL 1 - # define OSSL_OPENSSL_PREREQ(maj, min, pat) 0 - # define OSSL_LIBRESSL_PREREQ(maj, min, pat) \ -- (LIBRESSL_VERSION_NUMBER >= (maj << 28) | (min << 20) | (pat << 12)) -+ (LIBRESSL_VERSION_NUMBER >= ((maj << 28) | (min << 20) | (pat << 12))) - #endif - - #if !defined(OPENSSL_NO_ENGINE) && !OSSL_OPENSSL_PREREQ(3, 0, 0) diff --git a/lang/ruby/ruby_find_pkgsdeps b/lang/ruby/ruby_find_pkgsdeps index 0d97b3be5..f8965a638 100644 --- a/lang/ruby/ruby_find_pkgsdeps +++ b/lang/ruby/ruby_find_pkgsdeps @@ -6,6 +6,8 @@ # Must run inside a openwrt with all *ruby* packages installed # +require "rbconfig" + RUBY_SIMPLE_VERSION = RUBY_VERSION.split(".")[0..1].join(".") failed = false @@ -23,6 +25,8 @@ packages.each do files=`opkg files "#{pkg}" | sed -e 1d`.split("\n") package_files[pkg]=files if files end +# Fake enc/utf_16 to dummy enc: +package_files["ruby-enc"]+=[RbConfig::CONFIG["rubylibdir"] + "/enc/utf_16.rb" ] require_regex=/^require ["']([^"']+)["'].*/ require_regex_ignore=/^require ([a-zA-Z\$]|["']$|.*\/$)/ @@ -181,7 +185,7 @@ end # For optional require or for breaking cycle dependencies weak_dependency=Hash.new { |h,k| h[k]=[] } weak_dependency.merge!({ -"ruby-irb" =>%w{ruby-rdoc ruby-readline}, # irb/cmd/help.rb +"ruby-irb" =>%w{ruby-rdoc ruby-readline ruby-debug}, # irb/cmd/help.rb irb/cmd/debug.rb,3.2/irb/cmd/debug.rb "ruby-gems" =>%w{ruby-bundler ruby-rdoc}, # rubygems.rb rubygems/server.rb "ruby-racc" =>%w{ruby-gems}, # /usr/bin/racc* "ruby-rake" =>%w{ruby-gems}, # /usr/bin/rake diff --git a/libs/yaml/Makefile b/libs/yaml/Makefile index fcf06a501..fd2f28a23 100644 --- a/libs/yaml/Makefile +++ b/libs/yaml/Makefile @@ -24,6 +24,7 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/libyaml SUBMENU:=Languages @@ -50,3 +51,4 @@ define Package/libyaml/install endef $(eval $(call BuildPackage,libyaml)) +$(eval $(call HostBuild)) diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index ff4770909..d5343edbd 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna -PKG_VERSION:=1.3.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.3.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/minidlna -PKG_HASH:=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 +PKG_HASH:=222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0 PKG_MAINTAINER:= PKG_LICENSE:=GPL-2.0-or-later BSD-3-Clause diff --git a/multimedia/minidlna/patches/000-100-backport-libid3tag-libavformat-detection.patch b/multimedia/minidlna/patches/000-100-backport-libid3tag-libavformat-detection.patch deleted file mode 100644 index 0a0619ff5..000000000 --- a/multimedia/minidlna/patches/000-100-backport-libid3tag-libavformat-detection.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8d8d04785bdc8d743d8a1fcfadd1285d86670b1e -From: Justin Maggard -Date: Wed, 9 Feb 2022 18:32:19 -0800 -Subject: [PATCH] build: Fix configure error on some platforms - -Fixes libid3tag and libavformat detection errors. ---- - configure.ac | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -414,7 +414,10 @@ for dir in "" /usr/local $SEARCH_DIR; do - AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) - break - done --test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) -+if test x"$ac_cv_lib_id3tag__lz___id3_file_open" != x"yes" && -+ test x"$ac_cv_lib_id3tag__lz_id3_file_open" != x"yes"; then -+ AC_MSG_ERROR([Could not find libid3tag]) -+fi - AC_SUBST(LIBID3TAG_LIBS) - - LDFLAGS_SAVE="$LDFLAGS" -@@ -441,7 +444,8 @@ for dir in "" /usr/local $SEARCH_DIR; do - break - done - if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && -- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then -+ test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes" && -+ test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz_avformat_open_input" != x"yes"; then - AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) - fi - AC_SUBST(LIBAVFORMAT_LIBS) diff --git a/multimedia/minidlna/patches/001-dont-build-po-files.patch b/multimedia/minidlna/patches/001-dont-build-po-files.patch index a69d83ed1..85698c0fd 100644 --- a/multimedia/minidlna/patches/001-dont-build-po-files.patch +++ b/multimedia/minidlna/patches/001-dont-build-po-files.patch @@ -11,7 +11,7 @@ check_PROGRAMS = testupnpdescgen --- a/configure.ac +++ b/configure.ac -@@ -662,6 +662,5 @@ case "$target_os" in +@@ -670,6 +670,5 @@ case "$target_os" in esac diff --git a/multimedia/minidlna/patches/005-added-support-RMVB.patch b/multimedia/minidlna/patches/005-added-support-RMVB.patch deleted file mode 100644 index ddf354f2d..000000000 --- a/multimedia/minidlna/patches/005-added-support-RMVB.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e4a045e92b864dc148ca46be94668c5b67132405 Mon Sep 17 00:00:00 2001 -From: VergLsm -Date: Fri, 31 Jan 2020 10:01:12 +0000 -Subject: [PATCH] Added support RMVB. - ---- - metadata.c | 4 ++++ - upnpglobalvars.h | 3 ++- - utils.c | 3 +++ - 3 files changed, 9 insertions(+), 1 deletion(-) - ---- a/metadata.c -+++ b/metadata.c -@@ -862,6 +862,10 @@ GetVideoMetadata(const char *path, const - xasprintf(&m.mime, "video/x-matroska"); - else if( strcmp(ctx->iformat->name, "flv") == 0 ) - xasprintf(&m.mime, "video/x-flv"); -+ else if( strcmp(ctx->iformat->name, "rm") == 0 ) -+ xasprintf(&m.mime, "video/x-pn-realvideo"); -+ else if( strcmp(ctx->iformat->name, "rmvb") == 0 ) -+ xasprintf(&m.mime, "video/x-pn-realvideo"); - if( m.mime ) - goto video_no_dlna; - ---- a/upnpglobalvars.h -+++ b/upnpglobalvars.h -@@ -172,7 +172,8 @@ - "http-get:*:audio/x-wav:*," \ - "http-get:*:audio/x-flac:*," \ - "http-get:*:audio/x-dsd:*," \ -- "http-get:*:application/ogg:*" -+ "http-get:*:application/ogg:*,"\ -+ "http-get:*:video/x-pn-realvideo:*" - - #define DLNA_FLAG_DLNA_V1_5 0x00100000 - #define DLNA_FLAG_HTTP_STALLING 0x00200000 ---- a/utils.c -+++ b/utils.c -@@ -377,6 +377,8 @@ mime_to_ext(const char * mime) - return "3gp"; - else if( strncmp(mime+6, "x-tivo-mpeg", 11) == 0 ) - return "TiVo"; -+ else if( strcmp(mime+6, "x-pn-realvideo") == 0 ) -+ return "rm"; - break; - case 'i': - if( strcmp(mime+6, "jpeg") == 0 ) -@@ -401,6 +403,7 @@ is_video(const char * file) - ends_with(file, ".m2t") || ends_with(file, ".mkv") || - ends_with(file, ".vob") || ends_with(file, ".ts") || - ends_with(file, ".flv") || ends_with(file, ".xvid") || -+ ends_with(file, ".rm") || ends_with(file, ".rmvb") || - #ifdef TIVO_SUPPORT - ends_with(file, ".TiVo") || - #endif diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 0f1238a43..dd5b41ad9 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.58.0 +PKG_VERSION:=3.1.59.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=c2b37899db42e2db9a05089abbe0ba48633c6c48496d2c64565500b4f9061d78 +PKG_HASH:=b4cfbce5b36ca546aac55a2545468a143643867ad9bc8560fe364eb9e10c074b PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only diff --git a/net/sscep/Makefile b/net/sscep/Makefile new file mode 100755 index 000000000..bc94b6ac0 --- /dev/null +++ b/net/sscep/Makefile @@ -0,0 +1,46 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=sscep +PKG_VERSION:=0.10.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/certnanny/sscep/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=489cc8e093986776eb3f15082bf766778f707176f3cd604bf0ef1008da06b8e5 + +PKG_MAINTAINER:=John Marrett +PKG_LICENSE:=BSD-3-Clause OpenSSL +PKG_LICENSE_FILES:=COPYING + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/sscep + SECTION:=net + CATEGORY:=Network + DEPENDS:=+libopenssl +openssl-util + TITLE:=A Simple SCEP (Simple Certificate Enrollment Protocol) client + URL:=https://github.com/certnanny/sscep/ +endef + +define Package/sscep/description + sscep is a simple SCEP client published by the CertNanny project. + + It is used to retrieve CA certificates and enroll devices with a + compatible SCEP server. +endef + +define Package/sscep/conffiles +/etc/sscep.conf +endef + +define Package/sscep/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_CONF) $(PKG_BUILD_DIR)/sscep.conf $(1)/etc/ + + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/sscep $(1)/usr/bin/sscep + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mkrequest $(1)/usr/bin/mkrequest +endef + +$(eval $(call BuildPackage,sscep)) diff --git a/net/sscep/test.sh b/net/sscep/test.sh new file mode 100644 index 000000000..da49bf550 --- /dev/null +++ b/net/sscep/test.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +sscep | grep -q "$PKG_VERSION" diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init index 3af15f19e..f32ca21c4 100644 --- a/net/strongswan/files/swanctl.init +++ b/net/strongswan/files/swanctl.init @@ -378,6 +378,41 @@ config_transport() { config_child "$1" "transport" } +config_pool() { + local conf="$1" + local addrs + local dns + local nbns + local dhcp + local netmask + local server + local subnet + local split_include + local split_exclude + + config_get addrs "$1" addrs + config_list_foreach "$1" dns append_var dns "," + config_list_foreach "$1" nbns append_var nbns "," + config_list_foreach "$1" dhcp append_var dhcp "," + config_list_foreach "$1" netmask append_var netmask "," + config_list_foreach "$1" server append_var server "," + config_list_foreach "$1" subnet append_var subnet "," + config_list_foreach "$1" split_include append_var split_include "," + config_list_foreach "$1" split_exclude append_var split_exclude "," + + swanctl_xappend1 "$conf {" + [ -n "$addrs" ] && swanctl_xappend2 "addrs = $addrs" + [ -n "$dns" ] && swanctl_xappend2 "dns = $dns" + [ -n "$nbns" ] && swanctl_xappend2 "nbns = $nbns" + [ -n "$dhcp" ] && swanctl_xappend2 "dhcp = $dhcp" + [ -n "$netmask" ] && swanctl_xappend2 "netmask = $netmask" + [ -n "$server" ] && swanctl_xappend2 "server = $server" + [ -n "$subnet" ] && swanctl_xappend2 "subnet = $subnet" + [ -n "$split_include" ] && swanctl_xappend2 "split_include = $split_include" + [ -n "$split_exclude" ] && swanctl_xappend2 "split_exclude = $split_exclude" + swanctl_xappend1 "}" +} + config_connection() { local config_name="$1" @@ -399,6 +434,8 @@ config_connection() { local local_key local ca_cert local rekeytime + local remote_ca_certs + local pools config_get_bool enabled "$1" enabled 0 [ $enabled -eq 0 ] && return @@ -422,6 +459,8 @@ config_connection() { config_get overtime "$1" overtime config_list_foreach "$1" local_sourceip append_var local_sourceip "," + config_list_foreach "$1" remote_ca_certs append_var remote_ca_certs "," + config_list_foreach "$1" pools append_var pools "," case "$fragmentation" in 0) @@ -479,6 +518,7 @@ config_connection() { [ -n "$local_sourceip" ] && swanctl_xappend2 "vips = $local_sourceip" [ -n "$fragmentation" ] && swanctl_xappend2 "fragmentation = $fragmentation" + [ -n "$pools" ] && swanctl_xappend2 "pools = $pools" swanctl_xappend2 "local {" swanctl_xappend3 "auth = $auth_method" @@ -491,6 +531,7 @@ config_connection() { swanctl_xappend2 "remote {" swanctl_xappend3 "auth = $auth_method" [ -n "$remote_identifier" ] && swanctl_xappend3 "id = \"$remote_identifier\"" + [ -n "$remote_ca_certs" ] && swanctl_xappend3 "cacerts = \"$remote_ca_certs\"" swanctl_xappend2 "}" swanctl_xappend2 "children {" @@ -561,6 +602,10 @@ config_connection() { fatal "AuthenticationMode $auth_mode not supported" fi + swanctl_xappend0 "pools {" + config_list_foreach "$1" pools config_pool + swanctl_xappend0 "}" + swanctl_xappend0 "" }