Merge pull request #21128 from mhei/php8-pecl-xdebug-update-to-3.2.1

php8-pecl-xdebug: update to 3.2.1

diff --git a/net/nginx-util/Makefile b/net/nginx-util/Makefile
index 52cdbb4eac6a1232dd90087d87b2aad1fa51b7fc..ce08d66289d8528713fbb18cb01a2c38b3c5753a 100644 (file)
--- a/net/nginx-util/Makefile
+++ b/net/nginx-util/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx-util
 PKG_VERSION:=1.6
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 PKG_MAINTAINER:=Peter Stadler <peter.stadler@student.uibk.ac.at>
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/net/nginx-util/files/uci.conf.template b/net/nginx-util/files/uci.conf.template
index 406ddb4cc13dea8389b6ef40f43019d1601b2d31..b56b1119eb64baabf9fe15f0eb15da5da3bab4fa 100644 (file)
--- a/net/nginx-util/files/uci.conf.template
+++ b/net/nginx-util/files/uci.conf.template
@@ -1,6 +1,7 @@
 # Consider using UCI or creating files in /etc/nginx/conf.d/ for configuration.
 # Parsing UCI configuration is skipped if uci set nginx.global.uci_enable=false
 # For details see: https://openwrt.org/docs/guide-user/services/webserver/nginx
+# UCI_CONF_VERSION=1.1
 
 worker_processes auto;
 

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 16767efdd39064f20f484223c5aa66207f334974..bb0b9441e8fac78791d7ebe1caf98cdfa036531c 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -402,6 +402,7 @@ CONFIGURE_ARGS += \
                        --prefix=/usr \
                        --conf-path=/etc/nginx/nginx.conf \
                        --modules-path=/usr/lib/nginx/modules \
+                       --with-compat \
                        $(ADDITIONAL_MODULES) \
                        --error-log-path=stderr \
                        --pid-path=/var/run/nginx.pid \

diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init
index 632a3f10a7ec6e7cce12f04948c16517795c4190..9e3ed0a7ac25c353cddf644bee8578c00357e581 100644 (file)
--- a/net/nginx/files/nginx.init
+++ b/net/nginx/files/nginx.init
@@ -8,11 +8,27 @@ USE_PROCD=1
 G_OPTS="daemon off;"
 
 NGINX_UTIL="/usr/bin/nginx-util"
+UCI_CONF_TEMPLATE="/etc/nginx/uci.conf.template"
+LATEST_UCI_CONF_VERSION="1.1"
 
 eval $("${NGINX_UTIL}" get_env)
 
 CONF=""
 
+nginx_check_luci_template() {
+       UCI_CONF_VERSION="$(sed -nr 's/# UCI_CONF_VERSION=(.*)/\1/p' $UCI_CONF_TEMPLATE)"
+
+       # No need to migrate already latest version
+       if [ "$UCI_CONF_VERSION" = "$LATEST_UCI_CONF_VERSION" ]; then
+               return
+       fi
+
+       if [ -z "$UCI_CONF_VERSION" ]; then
+               echo "" >> $UCI_CONF_TEMPLATE
+               echo "include module.d/*.module;" >> $UCI_CONF_TEMPLATE
+               echo "# UCI_CONF_VERSION=1.1" >> $UCI_CONF_TEMPLATE
+       fi
+}
 
 nginx_init() {
        [ -z "${CONF}" ] || return # already called.
@@ -23,6 +39,10 @@ nginx_init() {
        rm -f "$(readlink "${UCI_CONF}")"
        ${NGINX_UTIL} init_lan
 
+       if [ -f $UCI_CONF_TEMPLATE ]; then
+               nginx_check_luci_template
+       fi
+
        if [ -e "${UCI_CONF}" ]
        then CONF="${UCI_CONF}"
        else CONF="${NGINX_CONF}"

diff --git a/net/ocserv/Config.in b/net/ocserv/Config.in
index cf86bef172f907d2cd443c121ba6e3f7860a62c1..36533dfae1005ed8328c45aeb6e6cb60f11683a2 100644 (file)
--- a/net/ocserv/Config.in
+++ b/net/ocserv/Config.in
@@ -16,6 +16,10 @@ config OCSERV_RADIUS
        bool "enable radius authentication"
        default n
 
+config OCSERV_LIBOATH
+       bool "enable OTP"
+       default n
+
 config OCSERV_PROTOBUF
        bool "use external libprotobuf"
        default y

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 7db36a6e1e4605fcbe85391b501a42f80e9997b4..0bbe4f3b2b127128f638eabe2af566eef43cf42f 100644 (file)
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
 PKG_VERSION:=1.1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_BUILD_FLAGS:=no-mips16
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -39,7 +39,7 @@ define Package/ocserv
   TITLE:=OpenConnect VPN server
   URL:=http://www.infradead.org/ocserv/
   MAINTAINER:=Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
-  DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +libev +kmod-tun
+  DEPENDS:= +OCSERV_RADIUS:libradcli +OCSERV_HTTP_PARSER:libhttp-parser +OCSERV_SECCOMP:libseccomp +libgnutls +certtool +libncurses +libreadline +OCSERV_PAM:libpam +OCSERV_PROTOBUF:libprotobuf-c +OCSERV_LIBOATH:liboath +libev +kmod-tun
   USERID:=ocserv=72:ocserv=72
 endef
 
@@ -89,6 +89,10 @@ ifneq ($(CONFIG_OCSERV_HTTP_PARSER),y)
 CONFIGURE_ARGS += --without-http-parser
 endif
 
+ifndef CONFIG_OCSERV_LIBOATH
+CONFIGURE_ARGS += --without-liboath
+endif
+
 define Package/ocserv/conffiles
 /etc/config/ocserv
 endef

diff --git a/net/tailscale/Makefile b/net/tailscale/Makefile
index 53dffb79080017bc55decb5085d52693e1ec05c2..e71978a8e1f569e3bfa45efd47065997f7725b39 100644 (file)
--- a/net/tailscale/Makefile
+++ b/net/tailscale/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tailscale
-PKG_VERSION:=1.40.0
+PKG_VERSION:=1.40.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6964176889943e0e0b25d8d69e14226cfb1c1a9944a257b24cb2dd212f797141
+PKG_HASH:=9c0a9648c921f695fc501536e69c8b4998d318256c8049de538f72fbe1491c18
 
 PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
 PKG_LICENSE:=BSD-3-Clause

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index d655c6da8343d160b78dac5d7b78abbda37173e9..13b6b1de498e2f57e9e5f2238dc7f4df1fa85e3a 100644 (file)
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -34,6 +34,7 @@ PKG_CONFIG_DEPENDS:= \
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 include $(INCLUDE_DIR)/package-seccomp.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/transmission/template
   SUBMENU:=BitTorrent

diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile
index 3063d1fa660294d65ec53145bb4272523e056d37..fa29cc884ec9fc83a68e91d04a2fa7c98c8787dc 100644 (file)
--- a/utils/oath-toolkit/Makefile
+++ b/utils/oath-toolkit/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oath-toolkit
 PKG_VERSION:=2.6.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SAVANNAH/oath-toolkit
@@ -29,21 +29,40 @@ CONFIGURE_ARGS += \
        --disable-xmltest \
        --disable-pskc
 
+define Package/liboath
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A shared and static C library for OATH handling
+  URL:=http://www.nongnu.org/oath-toolkit/index.html
+endef
+
+define Package/oath-pam
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=The oath PAM module
+  URL:=http://www.nongnu.org/oath-toolkit/index.html
+  DEPENDS:= +libpam +liboath
+endef
+
 define Package/oath-toolkit
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Toolkit for building one-time password authentication
+  TITLE:=A command line tool for generating and validating OTPs
   URL:=http://www.nongnu.org/oath-toolkit/index.html
-  DEPENDS:=
+  DEPENDS:= +liboath
 endef
 
-define Package/oath-toolkit/description
-       The OATH Toolkit provide components for building one-time password
-       authentication systems. It contains shared libraries, command line
-       tools and a PAM module. Supported technologies include the event-based
-       HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238).
+define Package/liboath/description
+  The OATH Toolkit provide components for building one-time password
+  authentication systems. It contains shared libraries, command line
+  tools and a PAM module. Supported technologies include the event-based
+  HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238).
 endef
 
+Package/oath-pam/description = $(Package/liboath/description)
+
+Package/oath-toolkit/description = $(Package/liboath/description)
+
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include/liboath
        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
@@ -51,11 +70,21 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef
 
+define Package/liboath/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/
+endef
+
+define Package/oath-pam/install
+       $(INSTALL_DIR) $(1)/usr/lib/security
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/pam_oath.so* $(1)/usr/lib/security/
+endef
+
 define Package/oath-toolkit/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/oathtool $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/liboath.so* $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,liboath))
+$(eval $(call BuildPackage,oath-pam))
 $(eval $(call BuildPackage,oath-toolkit))