Merge branch 'next'

diff --cc Config.in.legacy
Simple merge

diff --cc DEVELOPERS
Simple merge

diff --cc package/Config.in
Simple merge

diff --cc package/lighttpd/lighttpd.mk
index c39a5db20f6957bbb7294436b735d7ea51cb2c38,7ca71e356a8589438f452f26cd9eb43e1b40cd59..e7a33e1a1d52ae61a4cbfeb476c50276561cec70
--- 1/package/lighttpd/lighttpd.mk
--- 2/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@@ -12,12 -12,32 +12,34 @@@ LIGHTTPD_LICENSE = BSD-3-Claus
  LIGHTTPD_LICENSE_FILES = COPYING
  LIGHTTPD_CPE_ID_VENDOR = lighttpd
  LIGHTTPD_DEPENDENCIES = host-pkgconf
 +# Issue in configure script provided in tarball
 +LIGHTTPD_AUTORECONF = YES
  LIGHTTPD_CONF_OPTS = \
-       --without-wolfssl \
-       --libdir=/usr/lib/lighttpd \
-       --libexecdir=/usr/lib
+       -Dwith_brotli=false \
+       -Dwith_dbi=false \
+       -Dwith_fam=false \
+       -Dwith_gdbm=false \
+       -Dwith_geoip=false \
+       -Dwith_gnutls=false \
+       -Dwith_krb5=false \
+       -Dwith_ldap=false \
+       -Dwith_libev=false \
+       -Dwith_libunwind=false \
+       -Dwith_maxminddb=false \
+       -Dwith_mbedtls=false \
+       -Dwith_memcached=false \
+       -Dwith_mysql=false \
+       -Dwith_nettle=false \
+       -Dwith_nss=false \
+       -Dwith_pgsql=false \
+       -Dwith_sasl=false \
+       -Dwith_wolfssl=false \
+       -Dwith_xattr=false \
+       -Dwith_xxhash=false \
+       -Dwith_zstd=false \
+       -Dbuild_extra_warnings=false \
+       -Dbuild_static=false \
+       -Dmoduledir=lib/lighttpd
  
  ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
  LIGHTTPD_DEPENDENCIES += openssl

diff --cc package/mxml/mxml.mk
Simple merge

diff --cc package/smcroute/smcroute.mk
Simple merge

diff --cc package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index e649fbb7c635df7e1c937b080b457089a0ec6ed8,bedf05c8fa3ffc33dbd9afb8fe58352a52ec8a51..2518776da83deb25b17bddc6aabbd3c45dba3f2d
--- 1/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
--- 2/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@@ -9,12 -9,9 +9,9 @@@ XSERVER_XORG_SERVER_SOURCE = xorg-serve
  XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver
  XSERVER_XORG_SERVER_LICENSE = MIT
  XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
 -XSERVER_XORG_SERVER_SELINUX_MODULES = xserver
 +XSERVER_XORG_SERVER_SELINUX_MODULES = xdg xserver
  XSERVER_XORG_SERVER_INSTALL_STAGING = YES
- # xfont_font-util is needed only for autoreconf
- XSERVER_XORG_SERVER_AUTORECONF = YES
  XSERVER_XORG_SERVER_DEPENDENCIES = \
-       xfont_font-util \
        xutil_util-macros \
        xlib_libX11 \
        xlib_libXau \