diff --git a/lang/perl/Config.in b/lang/perl/Config.in index 65a3a47d7..e64d95a32 100644 --- a/lang/perl/Config.in +++ b/lang/perl/Config.in @@ -3,7 +3,7 @@ menu "Configuration" config PERL_THREADS bool "Enable threading support" - default y if (mips || mipsel || i386 || i686 || x86_64 || armeb || arm) + default y if (mips || mipsel || i386 || i686 || x86_64 || armeb || arm || aarch64) default n config PERL_TESTS diff --git a/lang/php8-pecl-dio/Makefile b/lang/php8-pecl-dio/Makefile index e4cdce489..068966196 100644 --- a/lang/php8-pecl-dio/Makefile +++ b/lang/php8-pecl-dio/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=dio PECL_LONGNAME:=Direct I/O functions PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=062777e948dece374c2d7d9e92106c87d18c11128d2179b50dedb43175c4bd6e PKG_NAME:=php8-pecl-$(PECL_NAME) diff --git a/lang/php8-pecl-http/Makefile b/lang/php8-pecl-http/Makefile index 21f758b55..1a6543cac 100644 --- a/lang/php8-pecl-http/Makefile +++ b/lang/php8-pecl-http/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=pecl_http PECL_LONGNAME:=Extended HTTP Support PKG_VERSION:=4.2.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=fa2ab558fc8f0928a10f35c0f566f7c4a1d32e727bd3a96579e4c28482ee9d6a PKG_NAME:=php8-pecl-http diff --git a/lang/php8-pecl-imagick/Makefile b/lang/php8-pecl-imagick/Makefile index 3b9df4cd2..d3b39b395 100644 --- a/lang/php8-pecl-imagick/Makefile +++ b/lang/php8-pecl-imagick/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=imagick PECL_LONGNAME:=Image Processing (ImageMagick binding) PKG_VERSION:=3.7.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e PKG_NAME:=php8-pecl-imagick diff --git a/lang/php8-pecl-krb5/Makefile b/lang/php8-pecl-krb5/Makefile index a3318571a..f058d4f4b 100644 --- a/lang/php8-pecl-krb5/Makefile +++ b/lang/php8-pecl-krb5/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=krb5 PECL_LONGNAME:=Bindings for the Kerberos library PKG_VERSION:=1.1.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=8aba35bb9f2892be9092e8717d3e13604a817cdfb478dbc3855a226abc6c5979 PKG_NAME:=php8-pecl-krb5 diff --git a/lang/php8-pecl-mcrypt/Makefile b/lang/php8-pecl-mcrypt/Makefile index 02e78402f..7e275eca0 100644 --- a/lang/php8-pecl-mcrypt/Makefile +++ b/lang/php8-pecl-mcrypt/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=mcrypt PECL_LONGNAME:=Bindings for the libmcrypt library -PKG_VERSION:=1.0.4 +PKG_VERSION:=1.0.5 PKG_RELEASE:=1 -PKG_HASH:=98153e78958d7a48dcd0dcfe1fc3c16ec987121a0cb2d7c273d280ee7e4ea00d +PKG_HASH:=c9f51e211640a15d2a983f5d80e26660656351651d6f682d657bdf1cfa07d8a3 PKG_NAME:=php8-pecl-mcrypt PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz diff --git a/lang/php8-pecl-raphf/Makefile b/lang/php8-pecl-raphf/Makefile index 67d35c4ca..378928561 100644 --- a/lang/php8-pecl-raphf/Makefile +++ b/lang/php8-pecl-raphf/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=raphf PECL_LONGNAME:=Resource and persistent handles factory PKG_VERSION:=2.0.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=da3566db17422e5ef08b7ff144162952aabc14cb22407cc6b1d2a2d095812bd0 PKG_NAME:=php8-pecl-raphf diff --git a/lang/php8-pecl-redis/Makefile b/lang/php8-pecl-redis/Makefile index 8135ac06b..5fe724ddf 100644 --- a/lang/php8-pecl-redis/Makefile +++ b/lang/php8-pecl-redis/Makefile @@ -9,7 +9,7 @@ PECL_NAME:=redis PECL_LONGNAME:=PHP extension for interfacing with Redis PKG_VERSION:=5.3.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_HASH:=b958166ccda4f40bd17c6998f9e2239021ae644467cd8ad5c15def420aad65b0 PKG_NAME:=php8-pecl-redis diff --git a/lang/php8-pecl-xdebug/Makefile b/lang/php8-pecl-xdebug/Makefile index 9a08e31ab..322558840 100644 --- a/lang/php8-pecl-xdebug/Makefile +++ b/lang/php8-pecl-xdebug/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PECL_NAME:=xdebug PECL_LONGNAME:=Xdebug extension -PKG_VERSION:=3.1.6 +PKG_VERSION:=3.2.0 PKG_RELEASE:=1 -PKG_HASH:=554eca0b4d5b7b93cb2258fab0b0bd84cc8721e74322a2255c14e137cbcad5d2 +PKG_HASH:=7769b20eecdadf5fbe9f582512c10b394fb575b6f7a8c3a3a82db6883e0032b7 PKG_NAME:=php8-pecl-xdebug PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz diff --git a/lang/php8/Makefile b/lang/php8/Makefile index e9d00c72a..b13773216 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.1.13 +PKG_VERSION:=8.2.0 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ PKG_CPE_ID:=cpe:/a:php:php PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_HASH:=b15ef0ccdd6760825604b3c4e3e73558dcf87c75ef1d68ef4289d8fd261ac856 +PKG_HASH:=6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943 PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 diff --git a/lang/php8/files/php8-fpm-www.conf b/lang/php8/files/php8-fpm-www.conf index c98bbf877..4ccbca7dc 100644 --- a/lang/php8/files/php8-fpm-www.conf +++ b/lang/php8/files/php8-fpm-www.conf @@ -1,10 +1,11 @@ ; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the +; the variable $pool can be used in any directive and will be replaced by the ; pool name ('www' here) [www] ; Per pool prefix ; It only applies on the following directives: +; - 'access.log' ; - 'slowlog' ; - 'listen' (unixsocket) ; - 'chroot' @@ -24,28 +25,36 @@ user = nobody ; The address on which to accept FastCGI requests. ; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on ; a specific port; -; 'port' - to listen on a TCP socket to all addresses on a -; specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. listen = /var/run/php8-fpm.sock ; Set listen(2) backlog. -; Default Value: 128 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 128 +; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) +;listen.backlog = 511 ; Set permissions for unix socket, if one is used. In Linux, read/write ; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. +; BSD-derived systems allow connections regardless of permissions. The owner +; and group can be specified either by name or by their numeric IDs. ; Default Values: user and group are set as the running user -; mode is set to 0666 +; mode is set to 0660 ;listen.owner = www-data ;listen.group = www-data -;listen.mode = 0666 +;listen.mode = 0660 +; When POSIX Access Control Lists are supported you can set them using +; these options, value is a comma separated list of user/group names. +; When set, listen.owner and listen.group are ignored +;listen.acl_users = +;listen.acl_groups = -; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original ; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address ; must be separated by a comma. If this value is left blank, connections will be @@ -53,13 +62,24 @@ listen = /var/run/php8-fpm.sock ; Default Value: any ;listen.allowed_clients = 127.0.0.1 +; Set the associated the route table (FIB). FreeBSD only +; Default Value: -1 +;listen.setfib = 1 + ; Specify the nice(2) priority to apply to the pool processes (only if set) ; The value can vary from -19 (highest priority) to 20 (lower priority) ; Note: - It will only work if the FPM master process is launched as root ; - The pool processes will inherit the master process priority ; unless it specified otherwise ; Default Value: no set -; priority = -19 +; process.priority = -19 + +; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or +; PROC_TRACE_CTL procctl for FreeBSD) even if the process user +; or group is different than the master process user. It allows to create process +; core dump and ptrace the process for the pool user. +; Default Value: no +; process.dumpable = yes ; Choose how the process manager will control the number of child processes. ; Possible Values: @@ -78,6 +98,8 @@ listen = /var/run/php8-fpm.sock ; state (waiting to process). If the number ; of 'idle' processes is greater than this ; number then some children will be killed. +; pm.max_spawn_rate - the maximum number of rate to spawn child +; processes at once. ; ondemand - no children are created at startup. Children will be forked when ; new requests will connect. The following parameter are used: ; pm.max_children - the maximum number of children that @@ -100,7 +122,7 @@ pm.max_children = 5 ; The number of child processes created on startup. ; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +; Default Value: (min_spare_servers + max_spare_servers) / 2 pm.start_servers = 2 ; The desired minimum number of idle server processes. @@ -113,6 +135,12 @@ pm.min_spare_servers = 1 ; Note: Mandatory when pm is set to 'dynamic' pm.max_spare_servers = 3 +; The number of rate to spawn child processes at once. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' +; Default Value: 32 +;pm.max_spawn_rate = 32 + ; The number of seconds after which an idle process will be killed. ; Note: Used only when pm is set to 'ondemand' ; Default Value: 10s @@ -125,7 +153,7 @@ pm.max_spare_servers = 3 ;pm.max_requests = 500 ; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: +; recognized as a status page. It shows the following information: ; pool - the name of the pool; ; process manager - static, dynamic or ondemand; ; start time - the date and time FPM has started; @@ -170,7 +198,7 @@ pm.max_spare_servers = 3 ; ; By default the status page only outputs short status. Passing 'full' in the ; query string will also return status for each pool process. -; Example: +; Example: ; http://www.foo.bar/status?full ; http://www.foo.bar/status?json&full ; http://www.foo.bar/status?html&full @@ -220,9 +248,25 @@ pm.max_spare_servers = 3 ; Note: The value must start with a leading slash (/). The value can be ; anything, but it may not be a good idea to use the .php extension or it ; may conflict with a real PHP file. -; Default Value: not set +; Default Value: not set ;pm.status_path = /status +; The address on which to accept FastCGI status request. This creates a new +; invisible pool that can handle requests independently. This is useful +; if the main pool is busy with long running requests because it is still possible +; to get the status before finishing the long running requests. +; +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on +; a specific port; +; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses +; (IPv6 and IPv4-mapped) on a specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Default Value: value of the listen option +;pm.status_listen = 127.0.0.1:9001 + ; The ping URI to call the monitoring page of FPM. If this value is not set, no ; URI will be recognized as a ping page. This could be used to test from outside ; that FPM is alive and responding, or to @@ -255,13 +299,13 @@ pm.max_spare_servers = 3 ; %d: time taken to serve the request ; it can accept the following format: ; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d +; - %{milliseconds}d +; - %{milli}d ; - %{microseconds}d ; - %{micro}d ; %e: an environment variable (same as $_ENV or $_SERVER) ; it must be associated with embraces to specify the name of the env -; variable. Some exemples: +; variable. Some examples: ; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e ; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e ; %f: script filename @@ -275,7 +319,7 @@ pm.max_spare_servers = 3 ; - %{megabytes}M ; - %{mega}M ; %n: pool name -; %o: ouput header +; %o: output header ; it must be associated with embraces to specify the name of the header: ; - %{Content-Type}o ; - %{X-Powered-By}o @@ -283,7 +327,7 @@ pm.max_spare_servers = 3 ; - .... ; %p: PID of the child that serviced the request ; %P: PID of the parent of the child that serviced the request -; %q: the query string +; %q: the query string ; %Q: the '?' character if query string exists ; %r: the request URI (without the query string, see %q and %Q) ; %R: remote IP address @@ -291,13 +335,33 @@ pm.max_spare_servers = 3 ; %t: server time the request was received ; it can accept a strftime(3) format: ; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsulated in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t ; %T: time the log has been written (the request has finished) ; it can accept a strftime(3) format: ; %d/%b/%Y:%H:%M:%S %z (default) +; The strftime(3) format must be encapsulated in a %{}t tag +; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t ; %u: remote user ; ; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" + +; A list of request_uri values which should be filtered from the access log. +; +; As a security precuation, this setting will be ignored if: +; - the request method is not GET or HEAD; or +; - there is a request body; or +; - there are query parameters; or +; - the response code is outwith the successful range of 200 to 299 +; +; Note: The paths are matched against the output of the access.format tag "%r". +; On common configurations, this may look more like SCRIPT_NAME than the +; expected pre-rewrite URI. +; +; Default Value: not set +;access.suppress_path[] = /ping +;access.suppress_path[] = /health_check.php ; The log file for slow requests ; Default Value: not set @@ -310,6 +374,10 @@ pm.max_spare_servers = 3 ; Default Value: 0 ;request_slowlog_timeout = 0 +; Depth of slow log stack trace. +; Default Value: 20 +;request_slowlog_trace_depth = 20 + ; The timeout for serving a single request after which the worker process will ; be killed. This option should be used when the 'max_execution_time' ini option ; does not stop script execution for some reason. A value of '0' means 'off'. @@ -317,6 +385,14 @@ pm.max_spare_servers = 3 ; Default Value: 0 ;request_terminate_timeout = 0 +; The timeout set by 'request_terminate_timeout' ini option is not engaged after +; application calls 'fastcgi_finish_request' or when application has finished and +; shutdown functions are being called (registered via register_shutdown_function). +; This option will enable timeout limit to be applied unconditionally +; even in such cases. +; Default Value: no +;request_terminate_timeout_track_finished = no + ; Set open file descriptor rlimit. ; Default Value: system defined value ;rlimit_files = 1024 @@ -344,18 +420,34 @@ chdir = / ; Redirect worker stdout and stderr into main error log. If not set, stdout and ; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page +; Note: on highloaded environment, this can cause some delay in the page ; process time (several ms). ; Default Value: no ;catch_workers_output = yes +; Decorate worker output with prefix and suffix containing information about +; the child that writes to the log and if stdout or stderr is used as well as +; log level and time. This options is used only if catch_workers_output is yes. +; Settings to "no" will output data as written to the stdout or stderr. +; Default value: yes +;decorate_workers_output = no + +; Clear environment in FPM workers +; Prevents arbitrary environment variables from reaching FPM worker processes +; by clearing the environment in workers before env vars specified in this +; pool configuration are added. +; Setting to "no" will make all environment variables available to PHP code +; via getenv(), $_ENV and $_SERVER. +; Default Value: yes +;clear_env = no + ; Limits the extensions of the main script FPM will allow to parse. This can ; prevent configuration mistakes on the web server side. You should only limit ; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. +; execute php code. ; Note: set an empty value to allow all extensions. ; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 +;security.limit_extensions = .php .php3 .php4 .php5 .php7 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. @@ -370,7 +462,7 @@ chdir = / ; overwrite the values previously defined in the php.ini. The directives are the ; same as the PHP SAPI: ; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. +; be overwritten from PHP call 'ini_set'. ; php_admin_value/php_admin_flag - these directives won't be overwritten by ; PHP call 'ini_set' ; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. diff --git a/lang/php8/files/php8-fpm.conf b/lang/php8/files/php8-fpm.conf index 4a69e45d3..b37c6e534 100644 --- a/lang/php8/files/php8-fpm.conf +++ b/lang/php8/files/php8-fpm.conf @@ -6,14 +6,6 @@ ; prefix (/usr). This prefix can be dynamically changed by using the ; '-p' argument from the command line. -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p argument) -; - /usr otherwise -;include=/etc/php8/fpm/*.conf - ;;;;;;;;;;;;;;;;;; ; Global Options ; ;;;;;;;;;;;;;;;;;; @@ -26,7 +18,7 @@ pid = /var/run/php8-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written -; in a local file. +; into a local file. ; Note: the default prefix is /var ; Default Value: log/php-fpm.log error_log = /var/log/php8-fpm.log @@ -49,13 +41,31 @@ error_log = /var/log/php8-fpm.log ; Default Value: notice ;log_level = notice +; Log limit on number of characters in the single line (log entry). If the +; line is over the limit, it is wrapped on multiple lines. The limit is for +; all logged characters including message prefix and suffix if present. However +; the new line character does not count into it as it is present only when +; logging to a file descriptor. It means the new line character is not present +; when logging to syslog. +; Default Value: 1024 +;log_limit = 4096 + +; Log buffering specifies if the log line is buffered which means that the +; line is written in a single write operation. If the value is false, then the +; data is written directly into the file descriptor. It is an experimental +; option that can potentially improve logging performance and memory usage +; for some heavy logging scenarios. This option is ignored if logging to syslog +; as it has to be always buffered. +; Default value: yes +;log_buffering = no + ; If this number of child processes exit with SIGSEGV or SIGBUS within the time ; interval set by emergency_restart_interval then FPM will restart. A value ; of '0' means 'Off'. ; Default Value: 0 ;emergency_restart_threshold = 0 -; Interval of time used by emergency_restart_interval to determine when +; Interval of time used by emergency_restart_interval to determine when ; a graceful restart will be initiated. This can be useful to work around ; accidental corruptions in an accelerator's shared memory. ; Available Units: s(econds), m(inutes), h(ours), or d(ays) @@ -69,7 +79,7 @@ error_log = /var/log/php8-fpm.log ; Default Value: 0 ;process_control_timeout = 0 -; The maximum number of processes FPM will fork. This has been design to control +; The maximum number of processes FPM will fork. This has been designed to control ; the global number of processes when using dynamic PM within a lot of pools. ; Use it with caution. ; Note: A value of 0 indicates no limit @@ -77,10 +87,10 @@ error_log = /var/log/php8-fpm.log ; process.max = 128 ; Specify the nice(2) priority to apply to the master process (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) +; The value can vary from -19 (highest priority) to 20 (lowest priority) ; Note: - It will only work if the FPM master process is launched as root ; - The pool process will inherit the master process priority -; unless it specified otherwise +; unless specified otherwise ; Default Value: no set ; process.priority = -19 @@ -105,7 +115,15 @@ error_log = /var/log/php8-fpm.log ; - /dev/poll (Solaris >= 7) ; - port (Solaris >= 10) ; Default Value: not set (auto detection) -; events.mechanism = epoll +;events.mechanism = epoll + +; When FPM is built with systemd integration, specify the interval, +; in seconds, between health report notification to systemd. +; Set to 0 to disable. +; Available Units: s(econds), m(inutes), h(ours) +; Default Unit: seconds +; Default value: 10 +;systemd_interval = 10 ;;;;;;;;;;;;;;;;;;;; ; Pool Definitions ; diff --git a/lang/php8/patches/0022-Use-system-timezone.patch b/lang/php8/patches/0022-Use-system-timezone.patch index 2225fc39b..822c55abe 100644 --- a/lang/php8/patches/0022-Use-system-timezone.patch +++ b/lang/php8/patches/0022-Use-system-timezone.patch @@ -15,8 +15,8 @@ To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezon --- a/ext/date/php_date.c +++ b/ext/date/php_date.c -@@ -545,6 +545,23 @@ static char* guess_timezone(const timeli - DATEG(timezone_valid) = 1; +@@ -549,6 +549,23 @@ static char* guess_timezone(const timeli + } else if (*DATEG(default_timezone)) { return DATEG(default_timezone); } + /* Try to guess timezone from system information */ diff --git a/lang/php8/patches/0025-php-5.4.9-fixheader.patch b/lang/php8/patches/0025-php-5.4.9-fixheader.patch index b5632d267..8e018162f 100644 --- a/lang/php8/patches/0025-php-5.4.9-fixheader.patch +++ b/lang/php8/patches/0025-php-5.4.9-fixheader.patch @@ -9,7 +9,7 @@ Make generated php_config.h constant across rebuilds. --- a/configure.ac +++ b/configure.ac -@@ -1399,7 +1399,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) +@@ -1440,7 +1440,7 @@ PHP_REMOVE_USR_LIB(LDFLAGS) EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS" EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS" diff --git a/lang/php8/patches/1004-disable-phar-command.patch b/lang/php8/patches/1004-disable-phar-command.patch index c02b69cde..eddca2676 100644 --- a/lang/php8/patches/1004-disable-phar-command.patch +++ b/lang/php8/patches/1004-disable-phar-command.patch @@ -11,7 +11,7 @@ --- a/configure.ac +++ b/configure.ac -@@ -1576,13 +1576,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" +@@ -1623,13 +1623,13 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" diff --git a/lang/python/python-pycares/Makefile b/lang/python/python-pycares/Makefile index 4e75cf6ae..2eed1c2b1 100644 --- a/lang/python/python-pycares/Makefile +++ b/lang/python/python-pycares/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pycares -PKG_VERSION:=4.2.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.3.0 +PKG_RELEASE:=1 PYPI_NAME:=pycares -PKG_HASH:=e1f57a8004370080694bd6fb969a1ffc9171a59c6824d54f791c1b2e4d298385 +PKG_HASH:=c542696f6dac978e9d99192384745a65f80a7d9450501151e4a7563e06010d45 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/lang/python/python-pytz/Makefile b/lang/python/python-pytz/Makefile index 7c3dc9f2b..16490c00a 100644 --- a/lang/python/python-pytz/Makefile +++ b/lang/python/python-pytz/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pytz -PKG_VERSION:=2022.5 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2022.6 +PKG_RELEASE:=1 PYPI_NAME:=pytz -PKG_HASH:=c4d88f472f54d615e9cd582a5004d1e5f624854a6a27a6211591c251f22a6914 +PKG_HASH:=e89512406b793ca39f5971bc999cc538ce125c0e51c27941bef4568b460095e2 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT diff --git a/lang/python/python3-flent/Makefile b/lang/python/python3-flent/Makefile deleted file mode 100644 index 80433c5db..000000000 --- a/lang/python/python3-flent/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=python3-flent -PKG_VERSION:=2.0.1 -PKG_RELEASE:=$(AUTORELEASE) - -PYPI_NAME:=flent -PKG_HASH:=300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796 - -PKG_MAINTAINER:=Nick Hainke -PKG_LICENSE:=GPL-3.0-only -PKG_LICENSE_FILES:=LICENSE - -include ../pypi.mk -include $(INCLUDE_DIR)/package.mk -include ../python3-package.mk - -define Package/python3-flent - SECTION:=lang-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=The FLExible Network Tester - URL:=https://github.com/tohojo/flent - DEPENDS:= \ - +python3-light \ - +python3-email \ - +python3-urllib \ - +python3-uuid \ - +python3-logging \ - +python3-xml \ - +python3-decimal \ - +python3-distutils \ - +netperf \ - +fping -endef - -define Package/python3-flent/description - Flent is a Python wrapper to run multiple simultaneous - netperf/iperf/ping instances and aggregate the results. -endef - -$(eval $(call Py3Package,python3-flent)) -$(eval $(call BuildPackage,python3-flent)) -$(eval $(call BuildPackage,python3-flent-src)) diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index a0fc67918..db163c67f 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -11,15 +11,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ruby -PKG_VERSION:=3.1.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.1.3 +PKG_RELEASE:=1 # First two numbes PKG_ABI_VERSION:=$(subst $(space),.,$(wordlist 1, 2, $(subst .,$(space),$(PKG_VERSION)))) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://cache.ruby-lang.org/pub/ruby/$(PKG_ABI_VERSION)/ -PKG_HASH:=ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a +PKG_HASH:=4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYING 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 index 4bcf9213e..0462556da 100644 --- a/lang/ruby/patches/001-fix-build-with-libressl-3.5.patch +++ b/lang/ruby/patches/001-fix-build-with-libressl-3.5.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Fix build with LibreSSL 3.5 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c -@@ -670,7 +670,7 @@ ossl_pkey_export_traditional(int argc, V +@@ -710,7 +710,7 @@ ossl_pkey_export_traditional(int argc, V } } else { diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index 54c0a94c2..ccc45872a 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -21,8 +21,6 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:apache:apr-util -PKG_BUILD_PARALLEL:=1 - PKG_CONFIG_DEPENDS := \ CONFIG_PACKAGE_libaprutil-crypto-openssl \ CONFIG_PACKAGE_libaprutil-dbd-mysql \ diff --git a/libs/boost/Makefile b/libs/boost/Makefile index e18a35797..4fe77be5c 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -11,13 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boost -PKG_VERSION:=1.80.0 -PKG_SOURCE_VERSION:=1_80_0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.81.0 +PKG_SOURCE_VERSION:=1_81_0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://boostorg.jfrog.io/artifactory/main/release/$(PKG_VERSION)/source/ -PKG_HASH:=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0 +PKG_HASH:=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa PKG_MAINTAINER:=Carlos M. Ferreira PKG_LICENSE:=BSL-1.0 @@ -42,7 +42,7 @@ define Package/boost/Default endef define Package/boost/description -This package provides the Boost v1.80.0 libraries. +This package provides the Boost v1.81.0 libraries. Boost is a set of free, peer-reviewed, portable C++ source libraries. This package provides the following run-time libraries: @@ -74,10 +74,11 @@ This package provides the following run-time libraries: - thread - timer - type_erasure + - url (new) - wave There are many more header-only libraries supported by Boost. -See more at http://www.boost.org/doc/libs/1_78_0/ +See more at http://www.boost.org/doc/libs/1_81_0/ endef PKG_BUILD_DEPENDS:=boost/host @@ -362,6 +363,7 @@ $(eval $(call DefineBoostLibrary,system)) $(eval $(call DefineBoostLibrary,thread,system chrono atomic)) $(eval $(call DefineBoostLibrary,timer,chrono)) $(eval $(call DefineBoostLibrary,type_erasure,chrono system thread)) +$(eval $(call DefineBoostLibrary,url)) $(eval $(call DefineBoostLibrary,wave,date_time thread filesystem)) include $(INCLUDE_DIR)/host-build.mk diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index bac430823..7d386a1de 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.7 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=3.0.10 +PKG_RELEASE:=1 PKG_MAINTAINER:=W. Michael Petullo @@ -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:=e3af1ef17d764294ae428e662f7d2a6187a0085c6e0f15fc230e754a298cabe2 +PKG_HASH:=a540b8657dbacab61e23ead203564f351ee30af85f0261979f14f2b7159f701f PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 4f9119e6a..b86fdcb6d 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postfix PKG_VERSION:=3.5.8 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ diff --git a/mail/postfix/patches/502-detect-glibc.patch b/mail/postfix/patches/502-detect-glibc.patch new file mode 100644 index 000000000..abfc9d4fd --- /dev/null +++ b/mail/postfix/patches/502-detect-glibc.patch @@ -0,0 +1,12 @@ +--- a/src/util/sys_defs.h ++++ b/src/util/sys_defs.h +@@ -749,7 +749,8 @@ extern int initgroups(const char *, int) + /* + * LINUX. + */ +-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) ++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \ ++ || defined(LINUX6) + #define SUPPORTED + #define UINT32_TYPE unsigned int + #define UINT16_TYPE unsigned short diff --git a/multimedia/yt-dlp/Makefile b/multimedia/yt-dlp/Makefile index 40ba1b359..36162cff2 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:=2022.9.1 +PKG_VERSION:=2022.11.11 PKG_RELEASE:=1 PYPI_NAME:=yt-dlp -PKG_HASH:=bc74ee255790043e458197aaf25c6c104fefc9fcda4458f652619447ab4ae0d7 +PKG_HASH:=f6b962023c17a77151476f0f6ed71be87d017629ba5d9994528bc548521191b6 PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=Unlicense diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile index 0a198cc52..a5ffe76a5 100644 --- a/net/acme-acmesh/Makefile +++ b/net/acme-acmesh/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme-acmesh PKG_VERSION:=3.0.1 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)? diff --git a/net/acme-acmesh/files/hook.sh b/net/acme-acmesh/files/hook.sh index 4df82643d..03343dacb 100644 --- a/net/acme-acmesh/files/hook.sh +++ b/net/acme-acmesh/files/hook.sh @@ -2,8 +2,8 @@ set -u ACME=/usr/lib/acme/client/acme.sh LOG_TAG=acme-acmesh -# webroot option deprecated, use the hardcoded value directly in the next major version -WEBROOT=${webroot:-/var/run/acme/challenge} +# webroot option deprecated, use the exported value directly in the next major version +WEBROOT=${webroot:-$CHALLENGE_DIR} NOTIFY=/usr/lib/acme/notify # shellcheck source=net/acme/files/functions.sh @@ -13,6 +13,32 @@ NOTIFY=/usr/lib/acme/notify export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt export NO_TIMESTAMP=1 +link_certs() +{ + local main_domain + local domain_dir + domain_dir="$1" + main_domain="$2" + + (umask 077; cat "$domain_dir/fullchain.cer" "$domain_dir/$main_domain.key" > "$domain_dir/combined.cer") + + if [ ! -e "$CERT_DIR/$main_domain.crt" ]; then + ln -s "$domain_dir/$main_domain.cer" "$CERT_DIR/$main_domain.crt" + fi + if [ ! -e "$CERT_DIR/$main_domain.key" ]; then + ln -s "$domain_dir/$main_domain.key" "$CERT_DIR/$main_domain.key" + fi + if [ ! -e "$CERT_DIR/$main_domain.fullchain.crt" ]; then + ln -s "$domain_dir/fullchain.cer" "$CERT_DIR/$main_domain.fullchain.crt" + fi + if [ ! -e "$CERT_DIR/$main_domain.combined.crt" ]; then + ln -s "$domain_dir/combined.cer" "$CERT_DIR/$main_domain.combined.crt" + fi + if [ ! -e "$CERT_DIR/$main_domain.chain.crt" ]; then + ln -s "$domain_dir/ca.cer" "$CERT_DIR/$main_domain.chain.crt" + fi +} + case $1 in get) set -- @@ -45,20 +71,7 @@ get) case $status in 0) - mkdir -p /etc/ssl/acme - if [ ! -e "/etc/ssl/acme/$main_domain.crt" ]; then - ln -s "$domain_dir/$main_domain.cer" "/etc/ssl/acme/$main_domain.crt" - fi - if [ ! -e "/etc/ssl/acme/$main_domain.key" ]; then - ln -s "$domain_dir/$main_domain.key" "/etc/ssl/acme/$main_domain.key" - fi - if [ ! -e "/etc/ssl/acme/$main_domain.fullchain.crt" ]; then - ln -s "$domain_dir/fullchain.cer" "/etc/ssl/acme/$main_domain.fullchain.crt" - fi - if [ ! -e "/etc/ssl/acme/$main_domain.chain.crt" ]; then - ln -s "$domain_dir/ca.cer" "/etc/ssl/acme/$main_domain.chain.crt" - fi - + link_certs "$domain_dir" "$main_domain" $NOTIFY renewed exit ;; @@ -124,10 +137,7 @@ get) case $status in 0) - ln -s "$domain_dir/$main_domain.cer" "/etc/ssl/acme/$main_domain.crt" - ln -s "$domain_dir/$main_domain.key" "/etc/ssl/acme/$main_domain.key" - ln -s "$domain_dir/fullchain.cer" "/etc/ssl/acme/$main_domain.fullchain.crt" - ln -s "$domain_dir/ca.cer" "/etc/ssl/acme/$main_domain.chain.crt" + link_certs "$domain_dir" "$main_domain" $NOTIFY issued ;; *) diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile index 268df5c68..c8c4a0bb3 100644 --- a/net/acme-common/Makefile +++ b/net/acme-common/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme-common -PKG_VERSION:=1.0.1 +PKG_VERSION:=1.0.2 PKG_MAINTAINER:=Toke Høiland-Jørgensen PKG_LICENSE:=GPL-3.0-only @@ -34,6 +34,7 @@ define Package/acme-common/conffiles endef define Package/acme-common/install + $(INSTALL_DIR) $(1)/etc/acme $(INSTALL_DIR) $(1)/etc/ssl/acme $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./files/acme.config $(1)/etc/config/acme diff --git a/net/acme-common/files/acme.config b/net/acme-common/files/acme.config index d72547a6e..75fd1cf09 100644 --- a/net/acme-common/files/acme.config +++ b/net/acme-common/files/acme.config @@ -1,5 +1,4 @@ config acme - option state_dir '/etc/acme' option account_email 'email@example.org' option debug 0 diff --git a/net/acme-common/files/acme.sh b/net/acme-common/files/acme.sh index 582575f89..defd66005 100644 --- a/net/acme-common/files/acme.sh +++ b/net/acme-common/files/acme.sh @@ -8,10 +8,9 @@ # # Authors: Toke Høiland-Jørgensen -export state_dir=/etc/acme -export account_email= -export debug=0 -export run_dir=/var/run/acme +run_dir=/var/run/acme +export CHALLENGE_DIR=$run_dir/challenge +export CERT_DIR=/etc/ssl/acme NFT_HANDLE= HOOK=/usr/lib/acme/hook LOG_TAG=acme @@ -65,7 +64,7 @@ load_options() { config_get webroot "$section" webroot export webroot if [ "$webroot" ]; then - log warn "Option \"webroot\" is deprecated, please remove it and change your web server's config so it serves ACME challenge requests from $run_dir/challenge." + log warn "Option \"webroot\" is deprecated, please remove it and change your web server's config so it serves ACME challenge requests from $CHALLENGE_DIR." fi } @@ -81,7 +80,7 @@ get_cert() { load_options "$section" if [ -z "$dns" ] && [ "$standalone" = 0 ]; then - mkdir -p "$challenge_dir" + mkdir -p "$CHALLENGE_DIR" fi if [ "$standalone" = 1 ] && [ -z "$NFT_HANDLE" ]; then @@ -107,11 +106,19 @@ load_globals() { log err "account_email option is required" exit 1 fi + export account_email - config_get state_dir "$section" state_dir "$state_dir" - mkdir -p "$state_dir" + config_get state_dir "$section" state_dir + if [ "$state_dir" ]; then + log warn "Option \"state_dir\" is deprecated, please remove it. Certificates now exist in $CERT_DIR." + mkdir -p "$state_dir" + else + state_dir=/etc/acme + fi + export state_dir - config_get debug "$section" debug "$debug" + config_get debug "$section" debug 0 + export debug # only look for the first acme section return 1 diff --git a/net/adguardhome/Makefile b/net/adguardhome/Makefile index 8872fa4f4..51d92bd09 100644 --- a/net/adguardhome/Makefile +++ b/net/adguardhome/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adguardhome -PKG_VERSION:=0.107.18 +PKG_VERSION:=0.107.21 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome -PKG_MIRROR_HASH:=d362e4ab0f18b9c06d58b84e020ff578ffa25d6b7dacf0bb7755a789d8e678dd +PKG_MIRROR_HASH:=b7a5e666471f44e405088c5719c6bd030058a80ede1832c246cd70c10dc3993e PKG_LICENSE:=GPL-3.0-only PKG_LICENSE_FILES:=LICENSE.txt diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh b/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh index 8953072e4..321687d70 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh @@ -20,14 +20,23 @@ json_add_array rrset_values json_add_string "" "$__IP" json_close_array +# Log the curl command +write_log 7 "curl -s -X PUT \"$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE\" \ + -H \"Authorization: Apikey $password\" \ + -H \"Content-Type: application/json\" \ + -d \"$(json_dump)\" \ + --connect-timeout 30" + __STATUS=$(curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \ -H "Authorization: Apikey $password" \ -H "Content-Type: application/json" \ -d "$(json_dump)" \ + --connect-timeout 30 \ -w "%{http_code}\n" -o $DATFILE 2>$ERRFILE) -if [ $? -ne 0 ]; then - write_log 14 "Curl failed: $(cat $ERRFILE)" +local __ERRNO=$? +if [ $__ERRNO -ne 0 ]; then + write_log 14 "Curl failed with $__ERRNO: $(cat $ERRFILE)" return 1 elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)" diff --git a/net/flent/Makefile b/net/flent/Makefile new file mode 100644 index 000000000..276ff07da --- /dev/null +++ b/net/flent/Makefile @@ -0,0 +1,77 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=flent +PKG_VERSION:=2.1.1 +PKG_RELEASE:=1 + +PYPI_NAME:=flent +PKG_HASH:=db581deac3d8099965dd0d8eee4b9c4d1857bdce5bc97790af9d3ed5b6554f73 + +PKG_MAINTAINER:=Nick Hainke +PKG_LICENSE:=GPL-3.0-only +PKG_LICENSE_FILES:=LICENSE + +include ../../lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +include ../../lang/python/python3-package.mk + +define Package/flent + SECTION:=net + CATEGORY:=Network + TITLE:=The FLExible Network Tester + URL:=https://flent.org + CONFLICTS:=python3-flent + DEPENDS:= \ + +python3-light \ + +python3-uuid \ + +python3-logging \ + +python3-distutils \ + +python3-defusedxml \ + +flent-tools \ + +netperf \ + +fping +endef + +define Package/flent/description + Flent is a Python wrapper to run multiple simultaneous + netperf/iperf/ping instances and aggregate the results. +endef + + +define Package/flent-tools + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Helper programs for the Flent test tool + URL:=https://flent.org + DEPENDS+=+librt +coreutils-sleep +coreutils-date +endef + +define Package/flent-tools/description + This builds the C helper programs for gathering data for + the Flent network testing tool. These tools are needed for + gathering data when a Bash shell is not available (and also + perform better than the shell equivalents). +endef + +define Build/Compile/flent-tools + $(MAKE) -C $(PKG_BUILD_DIR)/misc \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +endef + +define Package/flent-tools/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/tc_iterate $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/wifistats_iterate $(1)/usr/sbin/ +endef + +define Build/Compile + $(call Py3Build/Compile) + $(call Build/Compile/flent-tools) +endef + +$(eval $(call Py3Package,flent)) +$(eval $(call BuildPackage,flent)) +$(eval $(call BuildPackage,flent-src)) +$(eval $(call BuildPackage,flent-tools)) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 179658361..1c0d8fde1 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy PKG_VERSION:=2.6.6 -PKG_RELEASE:=103 +PKG_RELEASE:=104 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src @@ -122,8 +122,6 @@ define Package/haproxy/install $(INSTALL_CONF) ./files/haproxy.cfg $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/haproxy.init $(1)/etc/init.d/haproxy - $(INSTALL_DIR) $(1)/etc/hotplug.d/acme - $(INSTALL_DATA) ./files/acme.hotplug $(1)/etc/hotplug.d/acme/00-haproxy endef Package/haproxy-nossl/install = $(Package/haproxy/install) diff --git a/net/haproxy/files/acme.hotplug b/net/haproxy/files/acme.hotplug deleted file mode 100644 index 9896bbdee..000000000 --- a/net/haproxy/files/acme.hotplug +++ /dev/null @@ -1,8 +0,0 @@ -case $ACTION in -issued|renewed) - cat \ - "/etc/ssl/acme/$main_domain.fullchain.crt" \ - "/etc/ssl/acme/$main_domain.key" \ - >"/etc/ssl/acme/$main_domain.combined.crt" - ;; -esac diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile index 4f3785cfa..3690bc077 100644 --- a/net/igmpproxy/Makefile +++ b/net/igmpproxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=igmpproxy -PKG_VERSION:=0.3 +PKG_VERSION:=0.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/pali/igmpproxy/releases/download/${PKG_VERSION}/ -PKG_HASH:=d1fc244cb2fbbf99f720bda3e841fe59ece9b6919073790b4b892739b1b844eb +PKG_HASH:=afa4b75a823b82f71ce99f33eae4e8136b906ae8a5ede5caaad93bac38cdae24 PKG_MAINTAINER:=Felix Fietkau include $(INCLUDE_DIR)/package.mk diff --git a/net/knot/Makefile b/net/knot/Makefile index e68fe8894..45c4fcb7e 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot -PKG_VERSION:=3.2.3 +PKG_VERSION:=3.2.4 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ -PKG_HASH:=f736ef284358923e312f8e1e3c6ce7c97b20965b09eb65705e9f7e3d5e9a9d79 +PKG_HASH:=299e8de918f9fc7ecbe625b41cb085e47cdda542612efbd51cd5ec60deb9dd13 PKG_MAINTAINER:=Daniel Salzman PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8 diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index 878c4b993..a72289fc6 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.11.3 -PKG_RELEASE:=3 +PKG_VERSION:=2.11.4 +PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert , \ Aaron Goodman PKG_LICENSE:=GPL-2.0 diff --git a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user index a9f42168b..0960a2628 100644 --- a/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user +++ b/net/mwan3/files/etc/hotplug.d/iface/16-mwan3-user @@ -19,6 +19,7 @@ exit 0 } + [ -x /etc/mwan3.user ] || chmod 755 /etc/mwan3.user env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" /etc/mwan3.user } diff --git a/net/openappid/Makefile b/net/openappid/Makefile new file mode 100644 index 000000000..42b26334c --- /dev/null +++ b/net/openappid/Makefile @@ -0,0 +1,58 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=openappid +PKG_VERSION:=20220617 +URL_CODE:=26425 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://www.snort.org/downloads/openappid/$(URL_CODE)? +PKG_HASH:=8513877ce2264bb22119d911c2cf11f73735c866e2ca0d061c35eef6740d51f9 + +PKG_MAINTAINER:=John Audia +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=LICENSE + +include $(INCLUDE_DIR)/package.mk +TAR_OPTIONS+= --strip-components 1 +TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) + +define Package/openappid + SUBMENU:=Firewall + SECTION:=net + CATEGORY:=Network + DEPENDS:=+snort3 + TITLE:=Detection language and processing module for Snort + URL:=https://www.snort.org/ +endef + +define Package/openappid/description + OpenAppId is an open, application-focused detection language and processing + module for Snort that enables users to create, share, and implement + application and service detection. +endef + +define Build/Compile + true +endef + +define Package/openappid/install + $(INSTALL_DIR) $(1)/usr/lib/openappid/custom/{libs,lua,port} + $(INSTALL_DIR) $(1)/usr/lib/openappid/odp + $(CP) $(PKG_BUILD_DIR)/lua $(1)/usr/lib/openappid/odp + $(CP) $(PKG_BUILD_DIR)/libs $(1)/usr/lib/openappid/odp + $(CP) $(PKG_BUILD_DIR)/port $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/appMapping.data $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/README $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/appid.conf $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/AUTHORS $(1)/usr/lib/openappid/odp + $(INSTALL_DATA) $(PKG_BUILD_DIR)/version.conf $(1)/usr/lib/openappid/odp +endef + +$(eval $(call BuildPackage,openappid)) diff --git a/net/openssh/Makefile b/net/openssh/Makefile index 15fef1bc8..cc5c27b91 100644 --- a/net/openssh/Makefile +++ b/net/openssh/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssh -PKG_VERSION:=9.0p1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=9.1p1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ https://ftp.spline.de/pub/OpenBSD/OpenSSH/portable/ -PKG_HASH:=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a +PKG_HASH:=19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 PKG_LICENSE:=BSD ISC PKG_LICENSE_FILES:=LICENCE diff --git a/net/pbr/Makefile b/net/pbr/Makefile index 0f2842ed8..4a7255c48 100644 --- a/net/pbr/Makefile +++ b/net/pbr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pbr PKG_VERSION:=1.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin diff --git a/net/pbr/files/etc/init.d/pbr.init b/net/pbr/files/etc/init.d/pbr.init index cf807f433..22c8b03a2 100755 --- a/net/pbr/files/etc/init.d/pbr.init +++ b/net/pbr/files/etc/init.d/pbr.init @@ -109,6 +109,7 @@ get_text() { case "$1" in errorConfigValidation) r="Config ($packageConfigFile) validation failure!";; errorNoIpFull) r="ip-full binary cannot be found!";; + errorNoIptables) r="iptables binary cannot be found!";; errorNoIpset) r="Resolver set support (${resolver_set}) requires ipset, but ipset binary cannot be found!";; errorNoNft) r="Resolver set support (${resolver_set}) requires nftables, but nft binary cannot be found!";; errorResolverNotSupported) r="Resolver set (${resolver_set}) is not supported on this system!";; @@ -336,6 +337,12 @@ load_environment() { state add 'errorSummary' 'errorNoIpFull' return 1 fi + if ! is_nft; then + if [ -z "$iptables" ] || [ ! -x "$iptables" ]; then + state add 'errorSummary' 'errorNoIptables' + return 1 + fi + fi resolver 'check_support' fi diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile index 5f284bf7a..1d953ccb6 100644 --- a/net/pdns-recursor/Makefile +++ b/net/pdns-recursor/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns-recursor -PKG_VERSION:=4.7.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.8.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=17b5c7c881e3f400bb3b527dd866e5cf2cd62d5d33566b1b70b58c608d9968d5 +PKG_HASH:=ccb9017a1a788e95e948e7b240ef8db53ae8a507b915f260188ef343f7f68bdc PKG_MAINTAINER:=Peter van Dijk PKG_LICENCE:=GPL-2.0-only diff --git a/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch b/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch index 5dc6a4de2..ab7aa6977 100644 --- a/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch +++ b/net/pdns-recursor/patches/100-disable-recursor.conf-dist.patch @@ -1,6 +1,6 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -492,12 +492,6 @@ $(srcdir)/effective_tld_names.dat: +@@ -503,12 +503,6 @@ $(srcdir)/effective_tld_names.dat: pubsuffix.cc: $(srcdir)/effective_tld_names.dat $(AM_V_GEN)./mkpubsuffixcc @@ -8,7 +8,7 @@ -sysconf_DATA = recursor.conf-dist - -recursor.conf-dist: pdns_recursor -- $(AM_V_GEN)./pdns_recursor --config > $@ +- $(AM_V_GEN)./pdns_recursor --config=default > $@ - ## Manpages MANPAGES=pdns_recursor.1 \ diff --git a/net/pdns/Makefile b/net/pdns/Makefile index c9ceda200..1ada8bd3c 100644 --- a/net/pdns/Makefile +++ b/net/pdns/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns -PKG_VERSION:=4.7.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.7.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=4dcae35ebdc04915872d7bf6e2d0bca4b05c6350a100a5cf9c29df53baa53ce2 +PKG_HASH:=8bad351b2e09426f6d4fb0346881a5155fe555497c3d85071e531e7c7afe3e76 PKG_MAINTAINER:=Peter van Dijk PKG_LICENCE:=GPL-2.0-only diff --git a/net/simple-adblock/Makefile b/net/simple-adblock/Makefile index ac2854e95..725ec66b8 100644 --- a/net/simple-adblock/Makefile +++ b/net/simple-adblock/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-adblock PKG_VERSION:=1.9.3 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_MAINTAINER:=Stan Grishin PKG_LICENSE:=GPL-3.0-or-later diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init index cdd2dac36..e57a03b45 100644 --- a/net/simple-adblock/files/simple-adblock.init +++ b/net/simple-adblock/files/simple-adblock.init @@ -1510,7 +1510,7 @@ load_validate_config() { 'verbosity:range(0,2):2' \ 'procd_trigger_wan6:bool:0' \ 'led:or("", "none", file, device, string)' \ - 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ + 'dns:or("dnsmasq.addnhosts", "dnsmasq.conf", "dnsmasq.ipset", "dnsmasq.nftset", "dnsmasq.servers", "unbound.adb_list"):dnsmasq.servers' \ 'dns_instance:or(list(integer, string)):0' \ 'allowed_domain:list(string)' \ 'allowed_domains_url:list(string)' \ diff --git a/net/smcroute/Makefile b/net/smcroute/Makefile index 501bb10b7..a14e8e2b3 100644 --- a/net/smcroute/Makefile +++ b/net/smcroute/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smcroute -PKG_VERSION:=2.5.5 +PKG_VERSION:=2.5.6 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/troglobit/smcroute/releases/download/$(PKG_VERSION) -PKG_HASH:=2569cd97fa2047df14203a7144be53a1b32928cb460421a302bbcce381b42bc3 +PKG_HASH:=0be38f617e322daafaa941c02423239f5c117b940cf0f45bacadb6733c4b3916 include $(INCLUDE_DIR)/package.mk diff --git a/net/tor/Makefile b/net/tor/Makefile index 9dec356f9..24145a7e1 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor -PKG_VERSION:=0.4.7.10 +PKG_VERSION:=0.4.7.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dist.torproject.org/ \ https://archive.torproject.org/tor-package-archive -PKG_HASH:=647e56dfa59ea36dab052027fcfc7663905c826c03509363c456900ecd435a5b +PKG_HASH:=3b5d969712c467851bd028f314343ef15a97ea457191e93ffa97310b05b9e395 PKG_MAINTAINER:=Hauke Mehrtens \ Peter Wagner PKG_LICENSE_FILES:=LICENSE diff --git a/utils/base16384/Makefile b/utils/base16384/Makefile new file mode 100644 index 000000000..90fe988d2 --- /dev/null +++ b/utils/base16384/Makefile @@ -0,0 +1,61 @@ +# SPDX-Identifier-License: GPL-3.0-or-later +# +# Copyright (C) 2022 源 文雨 + +include $(TOPDIR)/rules.mk + +PKG_NAME:=base16384 +PKG_VERSION:=2.2.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/fumiama/base16384/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=948da6d9eca3af64123a7df1aa0f71a81e38ab02815ab2218e71a7aface0035e + +PKG_MAINTAINER:=源 文雨 +PKG_LICENSE:=GPL-3.0-or-later +PKG_LICENSE_FILES:=LICENSE + +CMAKE_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/base16384 + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Encode binary files to printable utf16be + URL:=https://github.com/fumiama/base16384 +endef + +define Package/libbase16384 + SECTION:=libs + CATEGORY:=Libraries + TITLE:=Base16384 library + URL:=https://github.com/fumiama/base16384 +endef + +define Package/base16384/description + There are 16384 Chinese characters (from \u4E00 to \u8DFF) + as the "alphabet", just like what base64 did. + If length of the data has a remainder after mod 7, + an unicode Chinese character \u3Dxx will be appended to present it + with xx ranging from 01 to 06. +endef + +define Package/libbase16384/description + $(call Package/base16384/description) +endef + +define Package/base16384/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/base16384 $(1)/usr/bin/base16384 +endef + +define Package/libbase16384/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbase16384.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,base16384)) +$(eval $(call BuildPackage,libbase16384)) diff --git a/utils/base16384/test.sh b/utils/base16384/test.sh new file mode 100644 index 000000000..fcc070dfb --- /dev/null +++ b/utils/base16384/test.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +case "$1" in + "base16384") + i=1 + while [ $i -le 100 ]; do + s="$(head /dev/urandom | head -c $i)" + if [ "$(echo $s)" != "$(echo $s | base16384 -e - - | base16384 -d - -)" ]; then + exit $i + fi + i=$( expr $i + 1 ) + done +esac + +exit 0 diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index c62132da1..5ea73c5bf 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.14.0 +PKG_VERSION:=2.14.1 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=003efb3139298aa4795f7a9fa4723ef43c12b401c235fe0c93dd23cc2c6b5f2e +PKG_HASH:=4e3e92169ad9142718a168b71dc5027f173be4cdb6563f42c60677818efd7509 PKG_MAINTAINER:=Javier Marcet diff --git a/utils/dos2unix/Makefile b/utils/dos2unix/Makefile index 2326e0c87..10d6d5f31 100644 --- a/utils/dos2unix/Makefile +++ b/utils/dos2unix/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dos2unix PKG_VERSION:=7.4.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://waterlan.home.xs4all.nl/dos2unix/ \ @@ -22,7 +22,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -MAKE_FLAGS+= D2U_OS=Linux +MAKE_FLAGS+= D2U_OS=Linux ENABLE_NLS= define dos2unix/template define Package/$(1) diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile index b917818b3..939369e2d 100644 --- a/utils/dosfstools/Makefile +++ b/utils/dosfstools/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dosfstools PKG_VERSION:=4.2 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \ http://fossies.org/linux/misc -PKG_HASH:=ba7c716ff9b8208a3bba5094a77584a7dc814141de09ab4ce1ae9b84bbcd7844 +PKG_HASH:=64926eebf90092dca21b14259a5301b7b98e7b1943e8a201c7d726084809b527 PKG_MAINTAINER:=Álvaro Fernández Rojas PKG_LICENSE:=GPL-3.0-or-later diff --git a/utils/flent-tools/Makefile b/utils/flent-tools/Makefile deleted file mode 100644 index f2f551481..000000000 --- a/utils/flent-tools/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (C) 2007-2011 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:=flent-tools -PKG_VERSION:=1.3.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/tohojo/flent/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=f71793bb924b36d0e4c230182755c3f5dd26cd7f239b1fa6b717d942258cbf9a -PKG_BUILD_DIR:=$(BUILD_DIR)/flent-$(PKG_VERSION) - -PKG_LICENSE:=GPL-3.0-only -PKG_LICENSE_FILES:=LICENSE - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - -define Package/flent-tools - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Helper programs for the Flent test tool - URL:=https://flent.org - MAINTAINER:=Toke Høiland-Jørgensen - DEPENDS+=+librt +coreutils-sleep +coreutils-date -endef - -define Package/flent-tc_iterate/description - This builds the C helper programs for gathering data for - the Flent network testing tool. These tools are needed for - gathering data when a Bash shell is not available (and also - perform better than the shell equivalents). -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR)/misc \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" -endef - -define Package/flent-tools/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/tc_iterate $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/wifistats_iterate $(1)/usr/sbin/ -endef - -$(eval $(call BuildPackage,flent-tools)) diff --git a/utils/miniflux/Makefile b/utils/miniflux/Makefile index 8b5d47f28..10d78a3ab 100644 --- a/utils/miniflux/Makefile +++ b/utils/miniflux/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniflux -PKG_VERSION:=2.0.38 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.0.41 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/miniflux/v2/tar.gz/${PKG_VERSION}? -PKG_HASH:=8c2e35a91d9b47a0879bcee4c23f342375293e97cee9639bb44b359b21e14d2a +PKG_HASH:=01e150ebfba12c8b5ca7c1d9d5a5976d018081cafc11228d6f77a48ac3333e1b PKG_MAINTAINER:=Michal Vasilek PKG_LICENSE:=Apache-2.0 diff --git a/utils/nano/Makefile b/utils/nano/Makefile index f9f9575d4..b75158096 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano -PKG_VERSION:=7.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=7.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/nano -PKG_HASH:=8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149 +PKG_HASH:=57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING @@ -90,7 +90,6 @@ else ifeq ($(BUILD_VARIANT),plus) # plus variant with some features included CONFIGURE_ARGS += \ --enable-help \ - --enable-justify \ --enable-linenumbers \ --enable-multibuffer \ --enable-nanorc \ @@ -100,6 +99,7 @@ else ifeq ($(BUILD_VARIANT),plus) --disable-comment \ --disable-extra \ --disable-histories \ + --disable-justify \ --disable-libmagic \ --disable-mouse \ --disable-operatingdir \ diff --git a/utils/nano/patches/100-post-7.0-fix-commenting.patch b/utils/nano/patches/100-post-7.0-fix-commenting.patch deleted file mode 100644 index a0fb94f62..000000000 --- a/utils/nano/patches/100-post-7.0-fix-commenting.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/src/nano.c -+++ b/src/nano.c -@@ -1395,11 +1395,14 @@ bool changes_something(const void *f) - #ifndef NANO_TINY - f == chop_previous_word || f == chop_next_word || - f == zap_text || f == cut_till_eof || f == do_execute || -- f == do_indent || f == do_unindent || f == do_comment || -+ f == do_indent || f == do_unindent || - #endif - #ifdef ENABLE_JUSTIFY - f == do_justify || f == do_full_justify || - #endif -+#ifdef ENABLE_COMMENT -+ f == do_comment || -+#endif - #ifdef ENABLE_SPELLER - f == do_spell || - #endif diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile index d14d43675..2f116d9fd 100644 --- a/utils/stress-ng/Makefile +++ b/utils/stress-ng/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stress-ng -PKG_VERSION:=0.14.06 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.15.00 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ColinIanKing/stress-ng/tar.gz/refs/tags/V$(PKG_VERSION)? -PKG_HASH:=54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08 +PKG_HASH:=cdb18c7dfcdeb0ff2d716c141341d1b2ca6051e4338cee3a555a65f26958c256 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=GPL-2.0-only diff --git a/utils/stress-ng/patches/001-disable-gpu-stressor.patch b/utils/stress-ng/patches/001-disable-gpu-stressor.patch new file mode 100644 index 000000000..af1882901 --- /dev/null +++ b/utils/stress-ng/patches/001-disable-gpu-stressor.patch @@ -0,0 +1,11 @@ +--- a/Makefile.config ++++ b/Makefile.config +@@ -272,7 +272,7 @@ LD_GOLD: + libraries: \ + configdir \ + LIB_AIO LIB_APPARMOR LIB_BSD LIB_CRYPT LIB_DL \ +- LIB_EGL LIB_GBM LIB_GLES2 LIB_IPSEC_MB LIB_JPEG \ ++ LIB_IPSEC_MB LIB_JPEG \ + LIB_JUDY LIB_KMOD LIB_MD LIB_PTHREAD LIB_PTHREAD_SPINLOCK \ + LIB_RT LIB_SCTP LIB_XXHASH LIB_Z + diff --git a/utils/stress-ng/patches/002-disable-xxhash.patch b/utils/stress-ng/patches/002-disable-xxhash.patch new file mode 100644 index 000000000..5c01764cd --- /dev/null +++ b/utils/stress-ng/patches/002-disable-xxhash.patch @@ -0,0 +1,11 @@ +--- a/Makefile.config ++++ b/Makefile.config +@@ -274,7 +274,7 @@ libraries: \ + LIB_AIO LIB_APPARMOR LIB_BSD LIB_CRYPT LIB_DL \ + LIB_IPSEC_MB LIB_JPEG \ + LIB_JUDY LIB_KMOD LIB_MD LIB_PTHREAD LIB_PTHREAD_SPINLOCK \ +- LIB_RT LIB_SCTP LIB_XXHASH LIB_Z ++ LIB_RT LIB_SCTP LIB_Z + + LIB_AIO: + $(call check,test-libaio,HAVE_LIB_AIO,$(LIB_AIO),$(LIB_AIO)) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index a50d0f5b6..6848bd6ca 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing -PKG_VERSION:=1.22.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.22.2 +PKG_RELEASE:=1 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) -PKG_HASH:=b024d112167e0e81a785ab98c1a044aee1ac041dfe57a62772c08284f875a5bd +PKG_HASH:=211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/$(PKG_NAME)