announce: trim trailing spaces

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

Merge pull request #19770 from stangri/master-curl

curl: bugfix: building as selected package doesn't break build

curl: bugfix: building as selected package doesn't break build

* Reported-by: Chen Minqiang <ptpt52@gmail.com>
* details [here](https://github.com/openwrt/packages/commit/88009b2d5e394c1822ec55734b63b434981a2a9d#commitcomment-88604318)

Signed-off-by: Stan Grishin <stangri@melmac.ca>

knot: update to version 3.2.2

Signed-off-by: Jan Hák <jan.hak@nic.cz>

pulseaudio: change homepage URLs to freedesktop.org

The previous used domain http(s)://pulseaudio.org redirects to
https://www.freedesktop.org/wiki/Software/PulseAudio/

This change enforces to use HTTPS everywhere for homepage URLs

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

pulseaudio: use AUTORELEASE variable

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

pulseaudio: daemons should conflict to each other

It should not be possible to install pulseaudio-daemon and
pulseadio-daemon-avahi at the same time as they have the same files.
Let's avoid that situation by adding conflict.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

pulseaudio: simplify and rework Makefile

There were two conffiles sections and both of them were same, but for
different variants. We can have just one conffile section and use it also
for the other variant.

The same applies for the install section for different variants.
- We have two install sections, but we call the first one with the same
  files and then add something more for the second variant.

- While at it to make it easier, let's change those three rows for
  copying packages into the single one to make sure that I did not miss
anything. Also, we create a directory first and then move files.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

libedit: update to version 20221030-3.1

Signed-off-by: Jan Hák <jan.hak@nic.cz>

sudo: bump to version 1.9.12

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

kadnode: fix newlines in config file

Signed-off-by: Moritz Warning <moritzwarning@web.de>

rclone: Update to 1.60.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

ibrdtnd: run through dos2unix

This patch uses CRLF line endings for some reason...

Signed-off-by: Rosen Penev <rosenp@gmail.com>

cloudflared: Update to 2022.10.3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

yq: Update to 4.29.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

openobex: remove CXX patch

Signed-off-by: Rosen Penev <rosenp@gmail.com>

knxd: bump to new upstream version 0.14.54

Signed-off-by: Othmar Truniger <github@truniger.ch>

apcupsd: remove header file patch

Seems to be from a time when pkgconfig returned the wrong path.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Merge pull request #19747 from stangri/master-curl

curl: include nls.mk

curl: include nls.mk

Signed-off-by: Stan Grishin <stangri@melmac.ca>

Merge pull request #19745 from stangri/master-curl

curl: update to 7.86.0

python3-pytz: bump to version 2022.5

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

pillow: bump to version 9.3.0

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

curl: update to 7.86.0

* update to 7.86.0: https://curl.se/changes.html#7_86_0
* remove 300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch as
  it was fixed upstream: https://github.com/curl/curl/pull/9682
* update configure options for OpenSSL as --without-ssl is breaking build
* remove --without-libidn configure arg as it's no longer recognized

Signed-off-by: Stan Grishin <stangri@melmac.ca>

Merge pull request #19736 from champtar/phantap-lacp

phantap: update to latest commit

phantap: update to latest commit

815c312 Forward 01:80:C2:00:00:0{1,2} using nftables

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

attendedsysupgrade-common: update ASU CA pubkey

The old key was overwritten during a machine migration and the current
worker key is no longer valid. To create new valid worker certificates
this commit adds a new CA pubkey.

To update running OpenWrt devices via a client one needs to force
install it or upgrade to the latest version of
`attendedsysupgrade-common` - I'm sorry for the inconvenience.

This change is only related to the `usign` pubkey and `ucert`
certificate which is used to sign all created images on the server.

While at it, use INSTALL_DATA instead of INSTALL_BIN.

Signed-off-by: Paul Spooren <mail@aparcar.org>

rsync: update to 3.2.7

Bump to latest upstream release.

Signed-off-by: John Audia <therealgraysky@proton.me>

Merge pull request #19693 from turris-cz/ffmpeg-conflicts-provides

ffmpeg: add conflicts and provides

gdbm: configure with `--without-readline`

By default, gdbm configures/builds with readline and curses support
if they exist.

This can cause race conditions when compiling gdbm and ncurses in
parallel, as gdbm may try to link to ncurses when it doesn't exist.

This commit forces gdbm to skip using readline/ncurses, since it's
unlikely that anybody is using the line-editing feature of gdbm.

See [gdbm's README][1] for more info.

[1]: https://git.gnu.org.ua/gdbm.git/tree/README?h=v1.21#n50

Signed-off-by: Alois Klink <alois@aloisklink.com>

Merge pull request #19704 from Ansuel/fix-atlas

atlas-probe: fix SIGSEGV error on 32bit system

v2ray-geodata: Update to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

xray-core: Update to 1.6.1

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

xray-core: remove orphan xray-geodata definition

Fixes: 975153f93da132 ("v2ray-geodata: split from xray-geodata")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

dnsproxy: Update to 0.46.2

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

samplicator: update to latest master commit 2021-10-11

The newest master branch has important fixes. However, no new release is
published [0]. Switch to git and update to latest master commit.
This introduces new version scheme by using YYYY-MM-DD of the commit.

In addition, add necessary "PKG_FIXUP" and "PKG_REMOVE_FILES" to allow
compile the new version. Also add enable "PKG_BUILD_PARALLEL".

Further, use a pidfile and remove outdated patches.

https://github.com/sleinen/samplicator/issues/73

Signed-off-by: Nick Hainke <vincent@systemli.org>

Merge pull request #19714 from turris-cz/libwebsockets-dependency

libwebsockets: fix recursive dependency

libwebsockets: fix recursive dependency

While running `make menuconfig`, it was discovered then there is a
recursive dependency like this:
tmp/.config-package.in:59138:error: recursive dependency detected!
tmp/.config-package.in:59138: symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls
tmp/.config-package.in:59122: symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl

It is not possible with the recently added conflicts that two packages
(OpenSSL and full variant, which uses OpenSSL as well), which are almost the same
provides the same named package libwebsockets as their conflict - Mbed
TLS.

Fixes: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

bandwidthd: fix time_t problem
Fixes issu #19510 with the change in time_t with musl 1.2

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>

squeezelite: add opus codec support

Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>

frr: update to latest 8.3.1 branch

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

mariadb: Update to the latest version 10.9.3

Update to the latest upstream version. For more details, see:

https://mariadb.com/kb/en/changes-improvements-in-mariadb-109/

Added new dependency on libfmt.

Following two patches dropped as the issues were fixed in upstream.

 * 130-c11_atomics.patch
 * 140-mips-connect-unaligned.patch

The rest of the patches were refreshed.

Don't need to disable cassandra and tokudb anymore as they were dropped
from upstream tarball.

Signed-off-by: Michal Hrusecky <michal@hrusecky.net>

ci: update github actions to v3

Update checkout and upload-artifact action to v3 to mute nodejs
deprecation warning.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

openfortivpn: update to 1.19.0

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

Merge pull request #19701 from turris-cz/libwebsockets-conflicts-provides

libwebsockets: full variant provides OpenSSL

Merge pull request #19702 from turris-cz/lighttpd-fix-dummy-websocket

lighttpd: backport patch to fix dummy Sec-WebSocket-Key

libwebsockets: OpenSSL and mbedTLS variants should conflict

They provide the same files, but they don't conflict to each other, this
means that users can install them side by side.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

atlas-probe: fix SIGSEGV error on 32bit system

Changes to time_t cause SIGSEGV error on 32bit system and cause ripe
atlas malfunction. (registration successful but no traffic)
Also introduce minor patch to fix some compilation warning.

While at it move PKG_RELEASE to AUTORELEASE macro.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

lighttpd: backport patch to fix dummy Sec-WebSocket-Key

It was requested in https://gitlab.nic.cz/turris/os/packages/-/issues/873

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Merge pull request #19699 from stangri/master-https-dns-proxy

https-dns-proxy: add version information to binary

Merge pull request #19696 from stangri/master-simple-adblock

simple-adblock: service_triggers improvements

libwebsockets: full variant provides OpenSSL

For some time, it is not possible to install ttyd and mosquitto-ssl at the
same time, so let's solve it that libwebsockets-full provides
libwebsockets-openssl. This allows to install ttyd and mosquitto at
the same time.

Also, we need to add conflict, because we should not have installed
libwebsockets-openssl and libwebsockets-full at the same time as they
provides the same files.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

https-dns-proxy: add version information to binary

* add patches/020-cmakelists-add-version.patch (thanks @baranyaib90)
  to add version information to the binary and fix https://github.com/aarond10/https_dns_proxy/issues/149
* modify Makefile to add version information for the binary
* rename patches/010-fix-cmakelists.patch for better readability
* revert back to service restart in WAN/WAN6 trigger
* update test.sh to test both init script and binary versions

Signed-off-by: Stan Grishin <stangri@melmac.ca>

mariadb: Drop unused rundir fix socket dir perms

We had been creating "rundir" but it was never used, probably leftover
from some removed function. At the same time, we were setting quite
strict rights to the socket directory (while comments sugested
otherwise).

Signed-off-by: Michal Hrusecky <michal@hrusecky.net>

simple-adblock: service_triggers improvements

Signed-off-by: Stan Grishin <stangri@melmac.ca>

Merge pull request #19691 from stangri/master-https-dns-proxy

https-dns-proxy: bugfix: restore empty server; misc improvements

ffmpeg: add conflicts and provides

Motivation of this change is that full variants provides the mini
variant and as well audio-dec package, thus you can not install both as
it fails with the following output:

Collected errors:
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58.91.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58.10.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58.45.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56.51.100
But that file is already provided by package  * libffmpeg-full
 * opkg_install_cmd: Cannot install package libffmpeg-audio-dec.

Let's change it to:
Installing libffmpeg-audio-dec (4.3.4-1) to root...
Collected errors:
 * check_conflicts_for: The following packages conflict with libffmpeg-audio-dec:
 * check_conflicts_for:         libffmpeg-full *
 * opkg_install_cmd: Cannot install package libffmpeg-audio-dec.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

libmariadb: update to 3.1.18

The official download mirror does not host 3.1.12 anymore. Update to
newest version to solve the issue.

Signed-off-by: Nick Hainke <vincent@systemli.org>

Merge pull request #19669 from hgl/acme

acme: refactor

adblock: update 4.1.5-4

* fixed broken oisd regex

Signed-off-by: Dirk Brenken <dev@brenken.org>

docker-compose: Update to version 2.12.2

Signed-off-by: Javier Marcet <javier@marcet.info>

https-dns-proxy: bugfix: restore empty server; misc improvements

* bugfix: properly restore empty server config for dnsmasq (to
  address issue brought up in https://github.com/stangri/source.openwrt.melmac.net/pull/162)
* better handling of non-existant wan/wan6 interface for triggers
* add resolver url to ubus data for future-proofing WebUI js move

Signed-off-by: Stan Grishin <stangri@melmac.ca>

acme: update changed packages' versions

Signed-off-by: Glen Huang <i@glenhuang.com>

acme: add dns_wait option

acme.sh by default use public DNS resolvers to check if TXT record was
correctly added when using DNS-01. This can be undesirable in a private
environment where the DNS server is not publicly accessible.

This option allows bypassing such check and simply waiting for a
specific length of time for the TXT record to take effect.

Signed-off-by: Glen Huang <i@glenhuang.com>

acme: fix staging option

Legacy use_staging option was not respected, and the example config
still use the legacy name.

Signed-off-by: Glen Huang <i@glenhuang.com>

amce: use procd to restart services

Directly calling `/etc/init.d/<service> reload` in a hotplug script can
inadvertently start a stopped service.

Signed-off-by: Glen Huang <i@glenhuang.com>

acme: prevent concurrent running of acme get

Issuing certificates concurrently should not be supported.

Signed-off-by: Glen Huang <i@glenhuang.com>

samba4: update to 4.17.1

* update to 4.17.1
* changelog: https://www.samba.org/samba/history/samba-4.17.1
* refresh patch

Signed-off-by: Andrew Sim <andrewsimz@gmail.com>

icu: bump to 72.1

It updates to Unicode 15, including new characters, scripts, emoji, and corresponding API constants. It also updates to CLDR 42 locale data with various additions and corrections.

ICU 72 adds technology preview implementations for person name formatting, as well as for a new version of message formatting based on a proposed draft Unicode specification.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

softflowd: use %lld for time_t always

Add upstreamed patch to fix segmentation fault reported in [1].

[1] https://github.com/openwrt/packages/issues/19655

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

wsdd2: update to 2022-04-25

Signed-off-by: Andrew Sim <andrewsimz@gmail.com>

vnstat2: update to version 2.10

Signed-off-by: Jan Hoffmann <jan@3e8.eu>

node: bump to v16.18.0

Update to v16.18.0

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

acme: make package create dir /etc/ssl/acme

Since the dir is a standardized one, it should not be created
dynamically

Signed-off-by: Glen Huang <i@glenhuang.com>

acme: not creating state_dir in Makefile

Since state_dir can be customized, it should be create dynamically,
which it already does.

Signed-off-by: Glen Huang <i@glenhuang.com>

adblock: update 4.1.5-3

* fixed search regression in DNS report
* removed last shallalist pointers in the init help

Signed-off-by: Dirk Brenken <dev@brenken.org>

gnupg: add PKG_CPE_ID

Add PKG_CPE_ID:=cpe:/a:gnupg:gnupg to allow scanning for CVEs.

Signed-off-by: Nick Hainke <vincent@systemli.org>

gnupg: update to 2.2.39

Update to latest LTS version.

Signed-off-by: Nick Hainke <vincent@systemli.org>

adguardhome: Increase init start value to avoid network race conditions

Signed-off-by: James White <james@jmwhite.co.uk>

xfrpc: allow server_addr ip and domain

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>

iputils: provide iputils-ping6 in iputils-ping

iputils-ping6 was a subpackage of the iputils package providing the
ping4 and ping6 command before iputils was moved from core to packages.
Currently ping4 and ping6 are replaced by ping -4/-6 and compatibility
symlinks are only installed when explicitly told so with an option, but
the functionality is always provided by iputils-ping.

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>

isc-dhcp: support sending explicit default route

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

conntrack-tools: update to 1.4.7

Release Notes:
https://marc.info/?l=netfilter&m=166506855929074&w=2

Remove upstreamed:
- 001-endianness_fix.patch (upstreamed: conntrackd: fix endianness bug
  in IPv4 and IPv6 address)
- 002-conntrackd-do-not-include-conntrack-ID-in-hashtable-cmp.patch

Signed-off-by: Nick Hainke <vincent@systemli.org>

python-certifi: bump to 2022.9.24

This version updates the CA bundle, and needs urllib as dependency.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

AdGuardHome: update to v0.107.16

Signed-off-by: YiZhen Choo <yizhen.c02@gmail.com>

docker-compose: Update to version 2.12.0

Signed-off-by: Javier Marcet <javier@marcet.info>

uacme: update to 1.7.3

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

libreswan: update to 4.9

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

nss: update to 4.84

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

nspr: update to 4.35

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

boinc: run the executable in ujail

Signed-off-by: Marc Benoit <marcb62185@gmail.com>

v4l2rtspserver: upgrade to v0.3.7

Signed-off-by: Michel Promonet <michel.promonet@free.fr>

squeezelite: add SSL support

Signed-off-by: Robert Högberg <robert.hogberg@gmail.com>

python-docutils: bump to version 0.19

Package does not currently build because of distutil dependency.  Fix
this by updating to the latest version.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

Merge pull request #19660 from stangri/master-https-dns-proxy

https-dns-proxy: bugfix: prevent creation of empty interface trigger

Merge pull request #19658 from stangri/master-simple-adblock

simple-adblock: remove unnecessary procd_add_reload_interface_trigger

pdns: update to 4.7.0

Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com>

zoneinfo: updated to the latest release

Signed-off-by: Vladimir Ulrich <admin@evl.su>

https-dns-proxy: bugfix: prevent creation of empty interface trigger

* When $wan/$wan6 are empty but double-quoted, it leads to creation
  of an interface trigger with empty interface

Signed-off-by: Stan Grishin <stangri@melmac.ca>

simple-adblock: remove unnecessary procd_add_reload_interface_trigger

Signed-off-by: Stan Grishin <stangri@melmac.ca>