include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
-PKG_VERSION:=5.0.7
-PKG_RELEASE:=4
+PKG_VERSION:=5.0.18
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://cdn.zabbix.com/zabbix/sources/stable/5.0/
-PKG_HASH:=d762f8a9aa9e8717d2e85d2a82d27316ea5c2b214eb00aff41b6e9b06107916a
+PKG_HASH:=7d15c4d683801edc2bdcda3fd94afdf6a7142a1a92aa71f4a9220af8e39d9e0e
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
PKG_LICENSE:=GPL-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=node
-PKG_VERSION:=v14.18.1
+PKG_VERSION:=v14.18.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://nodejs.org/dist/$(PKG_VERSION)
-PKG_HASH:=3fa1d71adddfab2f5e3e41874b4eddbdf92b65cade4a43922fb1e437afcf89ed
+PKG_HASH:=3e8a9ce10f8bcd3628eb6dd049f7f03c84ba9219be6f9743e2221154b9cc680b
PKG_MAINTAINER:=Hirokazu MORIKAWA <morikw2@gmail.com>, Adrian Panella <ianchi74@outlook.com>
PKG_LICENSE:=MIT
+++ /dev/null
-From 8699aa501c4d4e1567ebe8901e5ec80cadaa9323 Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Thu, 12 Aug 2021 02:44:43 +0800
-Subject: [PATCH] deps: fix building with system c-ares on Linux
-
-The change in #39724 breaks building with system c-ares
-(`--shared-cares`):
-```
-In file included from ../src/cares_wrap.cc:25:
-../src/cares_wrap.h:25:11: fatal error: ares_nameser.h: No such file or
-directory
- 25 | # include <ares_nameser.h>
- | ^~~~~~~~~~~~~~~~
-```
-
-Since `ares_nameser.h` isn't available with a default system c-ares
-installation, let's add back the include check and use the old
-`arpa/nameser.h` routine instead.
-
-Tested to build fine on Arch Linux with shared c-ares.
----
- src/cares_wrap.h | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/src/cares_wrap.h
-+++ b/src/cares_wrap.h
-@@ -22,7 +22,15 @@
- # include <netdb.h>
- #endif // __POSIX__
-
-+#if defined(__ANDROID__) || \
-+ defined(__MINGW32__) || \
-+ defined(__OpenBSD__) || \
-+ defined(_MSC_VER)
-+
- # include <ares_nameser.h>
-+#else
-+# include <arpa/nameser.h>
-+#endif
-
- namespace node {
- namespace cares_wrap {
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=dio
-PECL_LONGNAME:=Direct I/O functions
-
-PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
-PKG_HASH:=062777e948dece374c2d7d9e92106c87d18c11128d2179b50dedb43175c4bd6e
-
-PKG_NAME:=php7-pecl-$(PECL_NAME)
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=pecl_http
-PECL_LONGNAME:=Extended HTTP Support
-
-PKG_VERSION:=3.2.4
-PKG_RELEASE:=1
-PKG_HASH:=37354ff7680b9b9839da8b908fff88227af7f6746c2611c873493af41d54f033
-
-PKG_NAME:=php7-pecl-http
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=php7 php7-pecl-propro php7-pecl-raphf
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_VARS+= \
- PECL_cv_HAVE_EXT_propro=yes \
- PECL_cv_HAVE_EXT_raphf=yes \
- PECL_cv_HAVE_LIBCURL_ARES=no \
- PECL_cv_HAVE_LIBCURL_OpenSSL=$(if $(CONFIG_LIBCURL_OPENSSL),yes,no) \
- PECL_cv_HAVE_LIBCURL_GnuTLS=$(if $(CONFIG_LIBCURL_GNUTLS),yes,no) \
- PECL_cv_HAVE_LIBCURL_NSS=no \
- PECL_cv_HAVE_LIBCURL_SecureTransport=no \
- PECL_cv_HAVE_LIBCURL_GSKit=no \
- PECL_cv_HAVE_LIBCURL_PolarSSL=no \
- PECL_cv_HAVE_LIBCURL_WolfSSL=$(if $(CONFIG_LIBCURL_WOLFSSL),yes,no) \
- PECL_cv_HAVE_LIBCURL_mbedTLS=$(if $(CONFIG_LIBCURL_MBEDTLS),yes,no) \
- PECL_cv_HAVE_LIBCURL_axTLS=no \
- PECL_cv_LIBCURL_TLSAUTH_SRP=$(if $(CONFIG_LIBCURL_TLS_SRP),yes,no) \
-
-CONFIGURE_ARGS+= \
- --with-http \
- --without-http-shared-deps \
- --with-http-zlib-dir="$(STAGING_DIR)/usr" \
- --with-http-libcurl-dir="$(STAGING_DIR)/usr" \
- --with-http-libevent-dir="$(STAGING_DIR)/usr" \
- --with-http-libidn-dir="$(STAGING_DIR)/usr" \
- --with-http-libidnkit-dir=no \
- --with-http-libidnkit2-dir=no
-
-$(eval $(call PHP7PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php7-mod-iconv +php7-mod-session +php7-pecl-raphf +php7-pecl-propro,30))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=imagick
-PECL_LONGNAME:=Image Processing (ImageMagick binding)
-
-PKG_VERSION:=3.5.1
-PKG_RELEASE:=1
-PKG_HASH:=243ff2094edcacb2ae46ee3a4d9f38a60a4f26a6a71f59023b6198cbed0f7f81
-
-PKG_NAME:=php7-pecl-imagick
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=php7
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr"
-
-$(eval $(call PHP7PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=krb5
-PECL_LONGNAME:=Bindings for the Kerberos library
-
-PKG_VERSION:=1.1.4
-PKG_RELEASE:=1
-PKG_HASH:=8aba35bb9f2892be9092e8717d3e13604a817cdfb478dbc3855a226abc6c5979
-
-PKG_NAME:=php7-pecl-krb5
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=php7
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= \
- --with-krb5=shared,"$(STAGING_DIR)/usr" \
- --with-krb5config=$(STAGING_DIR)/usr/bin/krb5-config
-
-$(eval $(call PHP7PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=libevent
-PECL_LONGNAME:=Libevent - event notification
-
-PKG_NAME:=php7-pecl-$(PECL_NAME)
-PKG_VERSION=2019-05-30-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/expressif/pecl-event-libevent.git
-PKG_SOURCE_VERSION:=ce255e7e1e293030951fd68d5df06b2a4c077a89
-PKG_SOURCE_SUBDIR:=$(PECL_NAME)-$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=9bb1665e020c2254bb347adc0779bea75876b8c21f2612eca723c99280a780dd
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_SOURCE_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"
-
-$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+libevent2 +php7-mod-sockets,25))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
---- a/libevent.c
-+++ b/libevent.c
-@@ -37,10 +37,12 @@
- # define LIBEVENT_SOCKETS_SUPPORT
- #endif
-
--#ifdef PHP_WIN32
-+//#ifdef PHP_WIN32
- /* XXX compiling with 2.x on Windows. Luckily the ext code works thanks to the
- compat exports from the libevent. However it might need to be adapted to the
- never version, so this ifdefs would go away. */
-+#if 1
-+/* force use of libevent2 on OpenWrt and by-pass compat event.h */
- # include <event2/event.h>
- # include <event2/event_compat.h>
- # include <event2/event_struct.h>
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=mcrypt
-PECL_LONGNAME:=Bindings for the libmcrypt library
-
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=1
-PKG_HASH:=98153e78958d7a48dcd0dcfe1fc3c16ec987121a0cb2d7c273d280ee7e4ea00d
-
-PKG_NAME:=php7-pecl-mcrypt
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=php7
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr"
-
-$(eval $(call PHP7PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=propro
-PECL_LONGNAME:=Property proxy
-
-PKG_VERSION:=2.1.0
-PKG_RELEASE:=1
-PKG_HASH:=7bba0653d90cd8f61816e13ac6c0f7102b4a16dc4c4e966095a121eeb4ae8271
-
-PKG_NAME:=php7-pecl-propro
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= \
- --enable-propro
-
-define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
- $(CP) $(PKG_BUILD_DIR)/php_propro.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
- $(CP) $(PKG_BUILD_DIR)/php_propro_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
-endef
-
-$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=raphf
-PECL_LONGNAME:=Resource and persistent handles factory
-
-PKG_VERSION:=2.0.1
-PKG_RELEASE:=2
-PKG_HASH:=da3566db17422e5ef08b7ff144162952aabc14cb22407cc6b1d2a2d095812bd0
-
-PKG_NAME:=php7-pecl-raphf
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=BSD-2-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= \
- --enable-raphf
-
-define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)
- cp $(PKG_BUILD_DIR)/php_raphf.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
- cp $(PKG_BUILD_DIR)/php_raphf_api.h $(STAGING_DIR)/usr/include/php7/ext/$(PECL_NAME)/
-endef
-
-$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=redis
-PECL_LONGNAME:=PHP extension for interfacing with Redis
-
-PKG_VERSION:=5.3.4
-PKG_RELEASE:=1
-PKG_HASH:=4b39056f3356f135255e059efd76398d1c7607c86bd52513e6341bb07a3fb4cc
-
-PKG_NAME:=php7-pecl-redis
-PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-CONFIGURE_ARGS+= \
- --enable-redis \
- --enable-redis-json \
- --disable-redis-igbinary \
- --disable-redis-lzf \
- --disable-redis-msgpack
-
-$(eval $(call PHP7PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php7-mod-json +php7-mod-session,25))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PECL_NAME:=sodium
-PECL_LONGNAME:=Bindings for libsodium
-
-PKG_VERSION:=2.0.23
-PKG_RELEASE:=$(AUTORELEASE)
-PKG_HASH:=f8c04533de8e4b48077f65de61b187e195c0919c41d4543e2263604fa0c50379
-
-PKG_NAME:=php7-pecl-sodium
-PKG_SOURCE:=lib$(PECL_NAME)-$(PKG_VERSION).tgz
-PKG_SOURCE_URL:=http://pecl.php.net/get/
-
-PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
-
-PKG_LICENSE:=ISC
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=php7
-PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php7/lib$(PECL_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-include ../php7/pecl.mk
-
-$(eval $(call PHP7PECLPackage,sodium,$(PECL_LONGNAME),+libsodium,30))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=php
-PKG_VERSION:=7.4.26
-PKG_RELEASE:=1
-
-PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
-PKG_LICENSE:=PHP-3.01
-PKG_LICENSE_FILES:=LICENSE
-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:=e305b3aafdc85fa73a81c53d3ce30578bc94d1633ec376add193a1e85e0f0ef8
-
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-PHP7_MODULES= \
- bcmath \
- calendar ctype curl \
- dom \
- exif \
- fileinfo filter ftp \
- gettext gd gmp \
- iconv imap intl \
- json \
- ldap \
- mbstring mysqli mysqlnd \
- opcache openssl \
- pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql phar \
- session shmop simplexml snmp soap sockets sqlite3 sysvmsg sysvsem sysvshm \
- tokenizer \
- xml xmlreader xmlwriter \
- zip
-
-PKG_CONFIG_DEPENDS:= \
- $(patsubst %,CONFIG_PACKAGE_php7-mod-%,$(PHP7_MODULES)) \
- CONFIG_PHP7_LIBXML CONFIG_PHP7_SYSTEMTZDATA
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/php7/Default
- SUBMENU:=PHP7
- SECTION:=lang
- CATEGORY:=Languages
- TITLE:=PHP7 Hypertext preprocessor
- URL:=http://www.php.net/
- DEPENDS:=php7
-endef
-
-define Package/php7/Default/description
- PHP is a widely-used general-purpose scripting language that is especially
- suited for Web development and can be embedded into HTML.
-endef
-
-define Package/php7/config
- config PHP7_LIBXML
- bool "PHP7 LIBXML support"
- depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
-
- config PHP7_SYSTEMTZDATA
- bool "Use system timezone data instead of php's built-in database"
- depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
- default y
- help
- Enabling this feature automatically selects the zoneinfo-core package
- which contains data for UTC timezone. To use other timezones you have
- to install the corresponding zoneinfo-... package(s).
-endef
-
-define Package/php7
- $(call Package/php7/Default)
-
- DEPENDS:=+libpcre2 +zlib \
- +PHP7_LIBXML:libxml2 \
- +PHP7_SYSTEMTZDATA:zoneinfo-core
-endef
-
-define Package/php7/description
- $(call Package/php7/Default/description)
- This package contains only the PHP config file. You must actually choose
- your PHP flavour (cli, cgi or fastcgi).
-
- Please note, that installing php5 and php7 in parallel on the same target
- is not supported in OpenWrt/LEDE.
-endef
-
-define Package/php7-cli
- $(call Package/php7/Default)
- DEPENDS+= +PACKAGE_php7-mod-intl:libstdcpp
- TITLE+= (CLI)
-endef
-
-define Package/php7-cli/description
- $(call Package/php7/Default/description)
- This package contains the CLI version of the PHP7 interpreter.
-endef
-
-define Package/php7-cgi
- $(call Package/php7/Default)
- DEPENDS+= +PACKAGE_php7-mod-intl:libstdcpp
- TITLE+= (CGI & FastCGI)
-endef
-
-define Package/php7-cgi/description
- $(call Package/php7/Default/description)
- This package contains the CGI version of the PHP7 interpreter.
-endef
-
-define Package/php7-fastcgi
- $(call Package/php7/Default)
- DEPENDS+= +php7-cgi
- TITLE:=FastCGI startup script
-endef
-
-define Package/php7-fastcgi/description
- As FastCGI support is now a core feature the php7-fastcgi package now depends
- on the php7-cgi package, containing just the startup script.
-endef
-
-define Package/php7-fpm
- $(call Package/php7/Default)
- DEPENDS+= +PACKAGE_php7-mod-intl:libstdcpp
- TITLE+= (FPM)
-endef
-
-define Package/php7-fpm/description
- $(call Package/php7/Default/description)
- This package contains the FastCGI Process Manager of the PHP7 interpreter.
-endef
-
-define Package/php7-mod-intl/config
- config PHP7_FULLICUDATA
- bool "Add dependency to full ICU Data"
- depends on PACKAGE_php7-mod-intl
- default n
-endef
-
-define Package/php7-mod-intl/description
- Note that this package depends in ICU library which is built without data
- by default. This is to satisfy programs build and run dependencies but to
- keep the installed footprint small on the target system(s).
- However, the data is required to make the ICU library useful - and thus
- directly affects PHPs ICU extension, too - so consider to also
- select/install package 'icu-full-data'.
-endef
-
-# not everything groks --disable-nls
-DISABLE_NLS:=
-
-CONFIGURE_ARGS+= \
- --enable-cli \
- --enable-cgi \
- --enable-fpm \
- --enable-shared \
- --disable-static \
- --with-pic \
- --disable-rpath \
- --disable-debug \
- --disable-phpdbg \
- --without-pear \
- \
- --with-config-file-path=/etc \
- --with-config-file-scan-dir=/etc/php7 \
- --disable-short-tags \
- \
- --without-valgrind \
- --with-external-pcre \
- --with-zlib="$(STAGING_DIR)/usr"
-
-ifeq ($(CONFIG_LIBC_USE_GLIBC),y)
-TARGET_LDFLAGS += -ldl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-bcmath),)
- CONFIGURE_ARGS+= --enable-bcmath=shared
-else
- CONFIGURE_ARGS+= --disable-bcmath
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-calendar),)
- CONFIGURE_ARGS+= --enable-calendar=shared
-else
- CONFIGURE_ARGS+= --disable-calendar
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-ctype),)
- CONFIGURE_ARGS+= --enable-ctype=shared
-else
- CONFIGURE_ARGS+= --disable-ctype
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-curl),)
- CONFIGURE_ARGS+= --with-curl=shared
-else
- CONFIGURE_ARGS+= --without-curl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-dom),)
- CONFIGURE_ARGS+= --enable-dom=shared
-else
- CONFIGURE_ARGS+= --disable-dom
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-exif),)
- CONFIGURE_ARGS+= --enable-exif=shared
-else
- CONFIGURE_ARGS+= --disable-exif
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-fileinfo),)
- CONFIGURE_ARGS+= --enable-fileinfo=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --disable-fileinfo
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-filter),)
- CONFIGURE_ARGS+= --enable-filter=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --disable-filter
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-ftp),)
- CONFIGURE_ARGS+= --enable-ftp=shared
-else
- CONFIGURE_ARGS+= --disable-ftp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gd),)
- CONFIGURE_ARGS+= \
- --enable-gd=shared,"$(STAGING_DIR)/usr" \
- --with-external-gd
-else
- CONFIGURE_ARGS+= --disable-gd
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gettext),)
- CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full"
-else
- CONFIGURE_ARGS+= --without-gettext
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-gmp),)
- CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-gmp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-iconv),)
- CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
-else
- CONFIGURE_ARGS+= --without-iconv
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-imap),)
- CONFIGURE_ARGS+= \
- --with-imap=shared,"$(STAGING_DIR)/usr" \
- --with-kerberos=no \
- --with-imap-ssl="$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-imap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-intl),)
- CONFIGURE_ARGS+= --enable-intl=shared
- TARGET_CXXFLAGS+= -std=c++0x
-else
- CONFIGURE_ARGS+= --disable-intl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-json),)
- CONFIGURE_ARGS+= --enable-json=shared
-else
- CONFIGURE_ARGS+= --disable-json
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-ldap),)
- CONFIGURE_ARGS+= \
- --with-ldap=shared,"$(STAGING_DIR)/usr" \
- --with-ldap-sasl
-else
- CONFIGURE_ARGS+= --without-ldap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mbstring),)
- CONFIGURE_ARGS+= \
- --enable-mbstring=shared \
- --enable-mbregex
-else
- CONFIGURE_ARGS+= --disable-mbstring
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqli),)
- CONFIGURE_ARGS+= --with-mysqli=shared
-else
- CONFIGURE_ARGS+= --without-mysqli
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqlnd),)
- CONFIGURE_ARGS+= --enable-mysqlnd=shared
-else
- CONFIGURE_ARGS+= --disable-mysqlnd
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-opcache),)
- CONFIGURE_ARGS+= --enable-opcache=shared
-else
- CONFIGURE_ARGS+= --disable-opcache
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-openssl)$(CONFIG_PACKAGE_php7-mod-ftp)$(CONFIG_PACKAGE_php7-mod-imap)$(CONFIG_PACKAGE_php7-mod-snmp),)
- CONFIGURE_ARGS+= \
- --with-openssl=shared \
- --with-kerberos=no \
- --with-openssl-dir="$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-openssl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pcntl),)
- CONFIGURE_ARGS+= --enable-pcntl=shared
-else
- CONFIGURE_ARGS+= --disable-pcntl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo),)
- CONFIGURE_ARGS+= --enable-pdo=shared
- ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo-mysql),)
- CONFIGURE_ARGS+= --with-pdo-mysql=shared
- else
- CONFIGURE_ARGS+= --without-pdo-mysql
- endif
- ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo-pgsql),)
- CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr"
- else
- CONFIGURE_ARGS+= --without-pdo-pgsql
- endif
- ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo-sqlite),)
- CONFIGURE_ARGS+= --with-pdo-sqlite=shared
- else
- CONFIGURE_ARGS+= --without-pdo-sqlite
- endif
-else
- CONFIGURE_ARGS+= --disable-pdo
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pgsql),)
- CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-pgsql
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-phar),)
- CONFIGURE_ARGS+= --enable-phar=shared
-else
- CONFIGURE_ARGS+= --disable-phar
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-session),)
- CONFIGURE_ARGS+= --enable-session=shared
-else
- CONFIGURE_ARGS+= --disable-session
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-shmop),)
- CONFIGURE_ARGS+= --enable-shmop=shared
-else
- CONFIGURE_ARGS+= --disable-shmop
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-simplexml),)
- CONFIGURE_ARGS+= --enable-simplexml=shared
-else
- CONFIGURE_ARGS+= --disable-simplexml
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-snmp),)
- CONFIGURE_ARGS+= --with-snmp=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-snmp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-soap),)
- CONFIGURE_ARGS+= --enable-soap=shared
-else
- CONFIGURE_ARGS+= --disable-soap
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-sockets),)
- CONFIGURE_ARGS+= --enable-sockets=shared
-else
- CONFIGURE_ARGS+= --disable-sockets
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-sqlite3),)
- CONFIGURE_ARGS+= --with-sqlite3=shared
-else
- CONFIGURE_ARGS+= --without-sqlite3
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-sysvmsg),)
- CONFIGURE_ARGS+= --enable-sysvmsg=shared
-else
- CONFIGURE_ARGS+= --disable-sysvmsg
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-sysvsem),)
- CONFIGURE_ARGS+= --enable-sysvsem=shared
-else
- CONFIGURE_ARGS+= --disable-sysvsem
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-sysvshm),)
- CONFIGURE_ARGS+= --enable-sysvshm=shared
-else
- CONFIGURE_ARGS+= --disable-sysvshm
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-tokenizer),)
- CONFIGURE_ARGS+= --enable-tokenizer=shared
-else
- CONFIGURE_ARGS+= --disable-tokenizer
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-xml),)
- CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
- ifneq ($(CONFIG_PHP7_LIBXML),y)
- CONFIGURE_ARGS+= --with-expat
- endif
-else
- CONFIGURE_ARGS+= --disable-xml
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-xmlreader),)
- CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --disable-xmlreader
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-xmlwriter),)
- CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --disable-xmlwriter
-endif
-
-ifneq ($(CONFIG_PACKAGE_php7-mod-zip),)
- CONFIGURE_ARGS+= --with-zip=shared,"$(STAGING_DIR)/usr"
-else
- CONFIGURE_ARGS+= --without-zip
-endif
-
-ifneq ($(SDK)$(CONFIG_PHP7_LIBXML),)
- CONFIGURE_ARGS+= --with-libxml
-else
- CONFIGURE_ARGS+= --without-libxml
-endif
-
-ifneq ($(CONFIG_PHP7_SYSTEMTZDATA),)
- CONFIGURE_ARGS+= --with-system-tzdata
-else
- CONFIGURE_ARGS+= --without-system-tzdata
-endif
-
-CONFIGURE_VARS+= \
- ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \
- php_cv_cc_rpath="no" \
- iconv_impl_name="gnu_libiconv" \
- ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \
- ac_cv_u8t_decompose=yes \
- ac_cv_have_pcre2_jit=no
-
-define Package/php7/conffiles
-/etc/php.ini
-/etc/php7/
-endef
-
-define Package/php7/install
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_DATA) ./files/php.ini $(1)/etc/
-endef
-
-define Package/php7-cli/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/sapi/cli/php $(1)/usr/bin/php-cli
-endef
-
-define Package/php7-cgi/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(CP) $(PKG_BUILD_DIR)/sapi/cgi/php-cgi $(1)/usr/bin/php-cgi
- ln -sf php-cgi $(1)/usr/bin/php-fcgi
-endef
-
-define Package/php7-fastcgi/install
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/php7-fastcgi.config $(1)/etc/config/php7-fastcgi
-
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/php7-fastcgi.init $(1)/etc/init.d/php7-fastcgi
-endef
-
-define Package/php7-fastcgi/conffiles
-/etc/config/php7-fastcgi
-endef
-
-define Package/php7-fpm/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/sapi/fpm/php-fpm $(1)/usr/bin/php-fpm
-
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_DATA) ./files/php7-fpm.conf $(1)/etc/php7-fpm.conf
-
- $(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/php7-fpm.config $(1)/etc/config/php7-fpm
-
- $(INSTALL_DIR) $(1)/etc/php7-fpm.d
- $(INSTALL_DATA) ./files/php7-fpm-www.conf $(1)/etc/php7-fpm.d/www.conf
-
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/php7-fpm.init $(1)/etc/init.d/php7-fpm
-endef
-
-define Package/php7-fpm/conffiles
-/etc/php7-fpm.conf
-/etc/php7-fpm.d/
-/etc/config/php7-fpm
-endef
-
-define Package/php7-mod-openssl/postinst
-#!/bin/sh
-[ -n "$$IPKG_INSTROOT" ] || {
- if [ -e "/etc/php7/20_openssl.ini" ] && [ -e "/etc/php7/15_openssl.ini" ]; then
- echo "Renaming PHP ini file '/etc/php7/20_openssl.ini' -> '/etc/php7/15_openssl.ini'"
- mv /etc/php7/20_openssl.ini /etc/php7/15_openssl.ini
- fi
-}
-endef
-
-define Package/php7-mod-mysqli/postinst
-#!/bin/sh
-[ -n "$$IPKG_INSTROOT" ] || {
- if [ -e "/etc/php7/20_mysqli.ini" ] && [ -e "/etc/php7/30_mysqli.ini" ]; then
- echo "Renaming PHP ini file '/etc/php7/20_mysqli.ini' -> '/etc/php7/30_mysqli.ini'"
- mv /etc/php7/20_mysqli.ini /etc/php7/30_mysqli.ini
- fi
-}
-endef
-
-define Build/Prepare
- $(call Build/Prepare/Default)
- $(if $(QUILT),,( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force ))
-endef
-
-define Build/Configure
- $(if $(QUILT),( cd $(PKG_BUILD_DIR); touch configure.ac; ./buildconf --force ))
- $(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
- rm -rf $(PKG_BUILD_DIR)/staging
- make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging
- rm -rf $(PKG_BUILD_DIR)/staging/usr/{share,man,sbin}
- rm -f $(PKG_BUILD_DIR)/staging/usr/bin/{php,php-cgi,php-cli}
- mv $(PKG_BUILD_DIR)/staging/usr/bin/phpize $(PKG_BUILD_DIR)/staging/usr/bin/phpize7
- mv $(PKG_BUILD_DIR)/staging/usr/bin/php-config $(PKG_BUILD_DIR)/staging/usr/bin/php7-config
- mv $(PKG_BUILD_DIR)/staging/usr/include/php $(PKG_BUILD_DIR)/staging/usr/include/php7
- mv $(PKG_BUILD_DIR)/staging/usr/lib/php $(PKG_BUILD_DIR)/staging/usr/lib/php7
-
- $(CP) $(PKG_BUILD_DIR)/staging/usr $(STAGING_DIR)/
-
- sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR)/usr'#" $(STAGING_DIR)/usr/bin/phpize7
- sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR)/usr'#" $(STAGING_DIR)/usr/bin/phpize7
- sed -i -e "s#/include\`/php\"#/include\`/php7\"#" $(STAGING_DIR)/usr/bin/phpize7
- sed -i -e "s#/lib/php\`/build\"#/lib/php7\`/build\"#" $(STAGING_DIR)/usr/bin/phpize7
-
- sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR)/usr\"#" $(STAGING_DIR)/usr/bin/php7-config
- sed -i -e "s#/include/php\"#/include/php7\"#" $(STAGING_DIR)/usr/bin/php7-config
-endef
-
-define BuildModule
-
- define Package/php7-mod-$(1)
- $(call Package/php7/Default)
-
- ifneq ($(3),)
- DEPENDS+=$(3)
- endif
-
- TITLE:=$(2) shared module
- endef
-
- define Package/php7-mod-$(1)/install
- $(INSTALL_DIR) $$(1)/usr/lib/php
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
- $(INSTALL_DIR) $$(1)/etc/php7
- ifeq ($(5),zend)
- echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
- else
- echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
- endif
- endef
-
- $$(eval $$(call BuildPackage,php7-mod-$(1)))
-
-endef
-
-$(eval $(call BuildPackage,php7))
-$(eval $(call BuildPackage,php7-cgi))
-$(eval $(call BuildPackage,php7-cli))
-$(eval $(call BuildPackage,php7-fastcgi))
-$(eval $(call BuildPackage,php7-fpm))
-
-#$(eval $(call BuildModule,NAME,TITLE[,PKG DEPENDS]))
-$(eval $(call BuildModule,bcmath,Bcmath))
-$(eval $(call BuildModule,calendar,Calendar))
-$(eval $(call BuildModule,ctype,Ctype))
-$(eval $(call BuildModule,curl,cURL,+PACKAGE_php7-mod-curl:libcurl))
-$(eval $(call BuildModule,dom,DOM,+@PHP7_LIBXML +PACKAGE_php7-mod-dom:libxml2))
-$(eval $(call BuildModule,exif,EXIF))
-$(eval $(call BuildModule,fileinfo,Fileinfo))
-$(eval $(call BuildModule,filter,Filter))
-$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php7-mod-ftp:libopenssl))
-$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php7-mod-gd:libgd-full))
-$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php7-mod-gettext:libintl-full))
-$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php7-mod-gmp:libgmp))
-$(eval $(call BuildModule,iconv,iConv,$(ICONV_DEPENDS)))
-$(eval $(call BuildModule,imap,IMAP,+PACKAGE_php7-mod-imap:libopenssl +PACKAGE_libpam:libpam +PACKAGE_php7-mod-imap:uw-imap))
-$(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php7-mod-intl:icu +PHP7_FULLICUDATA:icu-full-data))
-$(eval $(call BuildModule,json,JSON))
-$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php7-mod-ldap:libopenldap +PACKAGE_php7-mod-ldap:libsasl2))
-$(eval $(call BuildModule,mbstring,MBString,+PACKAGE_php7-mod-mbstring:oniguruma))
-$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:php7-mod-mysqlnd,30))
-$(eval $(call BuildModule,mysqlnd,MySQL Native Driver,+PACKAGE_php7-mod-openssl:php7-mod-openssl))
-$(eval $(call BuildModule,opcache,OPcache,,,zend))
-$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl,15))
-$(eval $(call BuildModule,pcntl,PCNTL))
-$(eval $(call BuildModule,pdo,PHP Data Objects))
-$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:php7-mod-mysqlnd))
-$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-pgsql:libpq))
-$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php7-mod-pdo +PACKAGE_php7-mod-pdo-sqlite:libsqlite3 +PACKAGE_php7-mod-pdo-sqlite:librt))
-$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php7-mod-pgsql:libpq))
-$(eval $(call BuildModule,phar,Phar Archives))
-$(eval $(call BuildModule,session,Session))
-$(eval $(call BuildModule,shmop,Shared Memory))
-$(eval $(call BuildModule,simplexml,SimpleXML,+@PHP7_LIBXML +PACKAGE_php7-mod-simplexml:libxml2))
-$(eval $(call BuildModule,snmp,SNMP,+PACKAGE_php7-mod-snmp:libnetsnmp +PACKAGE_php7-mod-snmp:libopenssl))
-$(eval $(call BuildModule,soap,SOAP,+@PHP7_LIBXML +PACKAGE_php7-mod-soap:libxml2))
-$(eval $(call BuildModule,sockets,Sockets))
-$(eval $(call BuildModule,sqlite3,SQLite3,+PACKAGE_php7-mod-sqlite3:libsqlite3))
-$(eval $(call BuildModule,sysvmsg,System V messages))
-$(eval $(call BuildModule,sysvsem,System V shared memory))
-$(eval $(call BuildModule,sysvshm,System V semaphore))
-$(eval $(call BuildModule,tokenizer,Tokenizer))
-$(eval $(call BuildModule,xml,XML,+PHP7_LIBXML:libxml2 +!PHP7_LIBXML:libexpat))
-$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP7_LIBXML +PACKAGE_php7-mod-dom:php7-mod-dom +PACKAGE_php7-mod-xmlreader:libxml2))
-$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP7_LIBXML +PACKAGE_php7-mod-xmlwriter:libxml2))
-$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php7-mod-zip:libzip))
+++ /dev/null
-[PHP]
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-engine = On
-;short_open_tag = Off
-precision = 12
-output_buffering = Off
-;output_handler =
-zlib.output_compression = Off
-;zlib.output_compression_level = -1
-;zlib.output_handler =
-implicit_flush = Off
-unserialize_callback_func =
-;unserialize_max_depth = 4096
-serialize_precision = 100
-;open_basedir =
-disable_functions =
-disable_classes =
-;highlight.string = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html = #000000
-;ignore_user_abort = On
-;realpath_cache_size = 16k
-;realpath_cache_ttl = 120
-;zend.enable_gc = On
-;zend.multibyte = Off
-;zend.script_encoding =
-;zend.exception_ignore_args = On
-
-;;;;;;;;;;;;;;;;;
-; Miscellaneous ;
-;;;;;;;;;;;;;;;;;
-
-expose_php = On
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 30
-max_input_time = 60
-;max_input_nesting_level = 64
-;max_input_vars = 1000
-memory_limit = 8M
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT
-display_errors = On
-display_startup_errors = Off
-log_errors = Off
-log_errors_max_len = 1024
-ignore_repeated_errors = Off
-ignore_repeated_source = Off
-report_memleaks = On
-;report_zend_debug = 0
-track_errors = Off
-;html_errors = Off
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-;error_prepend_string = "<span style='color: #ff0000'>"
-;error_append_string = "</span>"
-;error_log = syslog
-;syslog.ident = php
-;syslog.facility = user
-;syslog.filter = ascii
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-
-;arg_separator.output = "&"
-;arg_separator.input = ";&"
-variables_order = "EGPCS"
-request_order = "GP"
-register_argc_argv = On
-auto_globals_jit = On
-;enable_post_data_reading = Off
-post_max_size = 8M
-auto_prepend_file =
-auto_append_file =
-default_mimetype = "text/html"
-;default_charset = "UTF-8"
-;internal_encoding =
-;input_encoding =
-;output_encoding =
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;include_path = ".:/php/includes"
-doc_root = "/www"
-user_dir =
-extension_dir = "/usr/lib/php"
-;sys_temp_dir = "/tmp"
-enable_dl = On
-;cgi.force_redirect = 1
-;cgi.nph = 1
-;cgi.redirect_status_env =
-cgi.fix_pathinfo = 1
-;cgi.discard_path = 1
-;fastcgi.impersonate = 1
-;fastcgi.logging = 0
-;cgi.rfc2616_headers = 0
-;cgi.check_shebang_line = 1
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-file_uploads = On
-upload_tmp_dir = "/tmp"
-upload_max_filesize = 2M
-max_file_uploads = 20
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-allow_url_fopen = On
-allow_url_include = Off
-;from = "john@doe.com"
-;user_agent = "PHP"
-default_socket_timeout = 60
-;auto_detect_line_endings = Off
+++ /dev/null
-config php7-fastcgi
- option enabled 1
- option port '1026'
+++ /dev/null
-#!/bin/sh /etc/rc.common
-
-START=50
-
-SERVICE_DAEMONIZE=1
-SERVICE_WRITE_PID=1
-
-start_instance() {
- local section="$1"
- local enabled
- local port
-
- config_get_bool enabled "$section" 'enabled' 0
- config_get port "$section" 'port'
-
- [ $enabled -gt 0 ] || return 1
-
- PHP_FCGI_CHILDREN='' \
- service_start /usr/bin/php-fcgi ${port:+-b $port}
-}
-
-start() {
- config_load 'php7-fastcgi'
- config_foreach start_instance 'php7-fastcgi'
-}
-
-stop() {
- service_stop /usr/bin/php-fcgi
-}
+++ /dev/null
-; Start a new pool named 'www'.
-; the variable $pool can we 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:
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-; will be used.
-user = nobody
-;group =
-
-; 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
-; a specific port;
-; 'port' - to listen on a TCP socket to all addresses on a
-; specific port;
-; '/path/to/unix/socket' - to listen on a unix socket.
-; Note: This value is mandatory.
-listen = /var/run/php7-fpm.sock
-
-; Set listen(2) backlog.
-; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 128
-
-; 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.
-; Default Values: user and group are set as the running user
-; mode is set to 0666
-;listen.owner = www-data
-;listen.group = www-data
-;listen.mode = 0666
-
-; List of ipv4 addresses 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
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.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
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-; static - a fixed number (pm.max_children) of child processes;
-; dynamic - the number of child processes are set dynamically based on the
-; following directives. With this process management, there will be
-; always at least 1 children.
-; pm.max_children - the maximum number of children that can
-; be alive at the same time.
-; pm.start_servers - the number of children created on startup.
-; pm.min_spare_servers - the minimum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is less than this
-; number then some children will be created.
-; pm.max_spare_servers - the maximum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is greater than this
-; number then some children will be killed.
-; 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
-; can be alive at the same time.
-; pm.process_idle_timeout - The number of seconds after which
-; an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-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
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;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:
-; pool - the name of the pool;
-; process manager - static, dynamic or ondemand;
-; start time - the date and time FPM has started;
-; start since - number of seconds since FPM has started;
-; accepted conn - the number of request accepted by the pool;
-; listen queue - the number of request in the queue of pending
-; connections (see backlog in listen(2));
-; max listen queue - the maximum number of requests in the queue
-; of pending connections since FPM has started;
-; listen queue len - the size of the socket queue of pending connections;
-; idle processes - the number of idle processes;
-; active processes - the number of active processes;
-; total processes - the number of idle + active processes;
-; max active processes - the maximum number of active processes since FPM
-; has started;
-; max children reached - number of times, the process limit has been reached,
-; when pm tries to start more children (works only for
-; pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-; pool: www
-; process manager: static
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 62636
-; accepted conn: 190460
-; listen queue: 0
-; max listen queue: 1
-; listen queue len: 42
-; idle processes: 4
-; active processes: 11
-; total processes: 15
-; max active processes: 12
-; max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-; http://www.foo.bar/status
-; http://www.foo.bar/status?json
-; http://www.foo.bar/status?html
-; http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-; http://www.foo.bar/status?full
-; http://www.foo.bar/status?json&full
-; http://www.foo.bar/status?html&full
-; http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-; pid - the PID of the process;
-; state - the state of the process (Idle, Running, ...);
-; start time - the date and time the process has started;
-; start since - the number of seconds since the process has started;
-; requests - the number of requests the process has served;
-; request duration - the duration in µs of the requests;
-; request method - the request method (GET, POST, ...);
-; request URI - the request URI with the query string;
-; content length - the content length of the request (only with POST);
-; user - the user (PHP_AUTH_USER) (or '-' if not set);
-; script - the main script called (or '-' if not set);
-; last request cpu - the %cpu the last request consumed
-; it's always 0 if the process is not in Idle state
-; because CPU calculation is done when the request
-; processing has terminated;
-; last request memory - the max amount of memory the last request consumed
-; it's always 0 if the process is not in Idle state
-; because memory calculation is done when the request
-; processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-; ************************
-; pid: 31330
-; state: Running
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 63087
-; requests: 12808
-; request duration: 1250261
-; request method: GET
-; request URI: /test_mem.php?N=10000
-; content length: 0
-; user: -
-; script: /home/fat/web/docs/php/test_mem.php
-; last request cpu: 0.00
-; last request memory: 0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: ${prefix}/share/fpm/status.html
-;
-; 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
-;pm.status_path = /status
-
-; 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
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; 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
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-; %%: the '%' character
-; %C: %CPU used by the request
-; it can accept the following format:
-; - %{user}C for user CPU only
-; - %{system}C for system CPU only
-; - %{total}C for user + system CPU (default)
-; %d: time taken to serve the request
-; it can accept the following format:
-; - %{seconds}d (default)
-; - %{miliseconds}d
-; - %{mili}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:
-; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-; %f: script filename
-; %l: content-length of the request (for POST request only)
-; %m: request method
-; %M: peak of memory allocated by PHP
-; it can accept the following format:
-; - %{bytes}M (default)
-; - %{kilobytes}M
-; - %{kilo}M
-; - %{megabytes}M
-; - %{mega}M
-; %n: pool name
-; %o: ouput header
-; it must be associated with embraces to specify the name of the header:
-; - %{Content-Type}o
-; - %{X-Powered-By}o
-; - %{Transfert-Encoding}o
-; - ....
-; %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 '?' character if query string exists
-; %r: the request URI (without the query string, see %q and %Q)
-; %R: remote IP address
-; %s: status (response code)
-; %t: server time the request was received
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; %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)
-; %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%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; 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'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_terminate_timeout = 0
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-; possible. However, all PHP paths will be relative to the chroot
-; (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-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
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; 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.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; 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'.
-; 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.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-; specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
+++ /dev/null
-;;;;;;;;;;;;;;;;;;;;;
-; FPM Configuration ;
-;;;;;;;;;;;;;;;;;;;;;
-
-; All relative paths in this configuration file are relative to PHP's install
-; 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/php7/fpm/*.conf
-
-;;;;;;;;;;;;;;;;;;
-; Global Options ;
-;;;;;;;;;;;;;;;;;;
-
-[global]
-; Pid file
-; Note: the default prefix is /var
-; Default Value: none
-pid = /var/run/php7-fpm.pid
-
-; Error log file
-; If it's set to "syslog", log is sent to syslogd instead of being written
-; in a local file.
-; Note: the default prefix is /var
-; Default Value: log/php-fpm.log
-error_log = /var/log/php7-fpm.log
-
-; syslog_facility is used to specify what type of program is logging the
-; message. This lets syslogd specify that messages from different facilities
-; will be handled differently.
-; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON)
-; Default Value: daemon
-;syslog.facility = daemon
-
-; syslog_ident is prepended to every message. If you have multiple FPM
-; instances running on the same server, you can change the default value
-; which must suit common needs.
-; Default Value: php-fpm
-;syslog.ident = php-fpm
-
-; Log level
-; Possible Values: alert, error, warning, notice, debug
-; Default Value: notice
-;log_level = notice
-
-; 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
-; 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)
-; Default Unit: seconds
-; Default Value: 0
-;emergency_restart_interval = 0
-
-; Time limit for child processes to wait for a reaction on signals from master.
-; Available units: s(econds), m(inutes), h(ours), or d(ays)
-; Default Unit: seconds
-; Default Value: 0
-;process_control_timeout = 0
-
-; The maximum number of processes FPM will fork. This has been design 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
-; Default Value: 0
-; 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)
-; 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
-; Default Value: no set
-; process.priority = -19
-
-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
-; Default Value: yes
-;daemonize = yes
-
-; Set open file descriptor rlimit for the master process.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit for the master process.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Specify the event mechanism FPM will use. The following is available:
-; - select (any POSIX os)
-; - poll (any POSIX os)
-; - epoll (linux >= 2.5.44)
-; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0)
-; - /dev/poll (Solaris >= 7)
-; - port (Solaris >= 10)
-; Default Value: not set (auto detection)
-; events.mechanism = epoll
-
-;;;;;;;;;;;;;;;;;;;;
-; Pool Definitions ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Multiple pools of child processes may be started with different listening
-; ports and different management options. The name of the pool will be
-; used in logs and stats. There is no limitation on the number of pools which
-; FPM can handle. Your system will tell you anyway :)
-
-; To configure the pools it is recommended to have one .conf file per
-; pool in the following directory:
-include=/etc/php7-fpm.d/*.conf
+++ /dev/null
-config php7-fpm
- option enabled 1
+++ /dev/null
-#!/bin/sh /etc/rc.common
-
-START=50
-
-PROG=/usr/bin/php-fpm
-CONFIG=/etc/php7-fpm.conf
-
-SERVICE_PID_FILE=/var/run/php7-fpm.pid
-
-start_instance() {
- local section="$1"
- local enabled
-
- config_get_bool enabled "$section" 'enabled' 0
-
- [ $enabled -gt 0 ] || return 1
-
- service_start $PROG -y $CONFIG -g $SERVICE_PID_FILE
-}
-
-start() {
- config_load 'php7-fpm'
- config_foreach start_instance 'php7-fpm'
-}
-
-stop() {
- service_stop $PROG
-}
+++ /dev/null
-From: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
-Date: Thu, 7 Mar 2019 19:42:35 +0000
-Subject: Add-support-for-use-of-the-system-timezone-database
-
-# License: MIT
-# http://opensource.org/licenses/MIT
-
-# License: MIT
-# http://opensource.org/licenses/MIT
-
-Add support for use of the system timezone database, rather
-than embedding a copy. Discussed upstream but was not desired.
-
-History:
-r18: adapt for autotool change in 7.3.3RC1
-r17: adapt for timelib 2018.01 (in 7.3.2RC1)
-r16: adapt for timelib 2017.06 (in 7.2.3RC1)
-r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
-r14: improve check for valid tz file
-r13: adapt for upstream changes to use PHP allocator
-r12: adapt for upstream changes for new zic
-r11: use canonical names to avoid more case sensitivity issues
- round lat/long from zone.tab towards zero per builtin db
-r10: make timezone case insensitive
-r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold)
-r8: fix compile error without --with-system-tzdata configured
-r7: improve check for valid timezone id to exclude directories
-r6: fix fd leak in r5, fix country code/BC flag use in
- timezone_identifiers_list() using system db,
- fix use of PECL timezonedb to override system db,
-r5: reverts addition of "System/Localtime" fake tzname.
- updated for 5.3.0, parses zone.tab to pick up mapping between
- timezone name, country code and long/lat coords
-r4: added "System/Localtime" tzname which uses /etc/localtime
-r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
-r2: add filesystem trawl to set up name alias index
-r1: initial revision
----
- ext/date/config0.m4 | 13 ++
- ext/date/lib/parse_tz.c | 535 +++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 545 insertions(+), 3 deletions(-)
-
---- a/ext/date/config0.m4
-+++ b/ext/date/config0.m4
-@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
- dnl Check for strtoll, atoll
- AC_CHECK_FUNCS(strtoll atoll)
-
-+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
-+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
-+no, no)
-+
-+if test "$PHP_SYSTEM_TZDATA" != "no"; then
-+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
-+
-+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
-+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
-+ [Define for location of system timezone data])
-+ fi
-+fi
-+
- PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
- timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
- lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
---- a/ext/date/lib/parse_tz.c
-+++ b/ext/date/lib/parse_tz.c
-@@ -26,8 +26,21 @@
- #include "timelib.h"
- #include "timelib_private.h"
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+#include <sys/mman.h>
-+#include <sys/stat.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
-+#include "php_scandir.h"
-+
-+#else
- #define TIMELIB_SUPPORTS_V2DATA
- #include "timezonedb.h"
-+#endif
-+
-+#include <ctype.h>
-
- #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
- # if defined(__LITTLE_ENDIAN__)
-@@ -88,6 +101,11 @@ static int read_php_preamble(const unsig
- {
- uint32_t version;
-
-+ if (memcmp(*tzf, "TZif", 4) == 0) {
-+ *tzf += 20;
-+ return 0;
-+ }
-+
- /* read ID */
- version = (*tzf)[3] - '0';
- *tzf += 4;
-@@ -412,7 +430,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
- }
- }
-
--static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
-+#ifdef HAVE_SYSTEM_TZDATA
-+
-+#ifdef HAVE_SYSTEM_TZDATA_PREFIX
-+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX
-+#else
-+#define ZONEINFO_PREFIX "/usr/share/zoneinfo"
-+#endif
-+
-+/* System timezone database pointer. */
-+static const timelib_tzdb *timezonedb_system;
-+
-+/* Hash table entry for the cache of the zone.tab mapping table. */
-+struct location_info {
-+ char code[2];
-+ double latitude, longitude;
-+ char name[64];
-+ char *comment;
-+ struct location_info *next;
-+};
-+
-+/* Cache of zone.tab. */
-+static struct location_info **system_location_table;
-+
-+/* Size of the zone.tab hash table; a random-ish prime big enough to
-+ * prevent too many collisions. */
-+#define LOCINFO_HASH_SIZE (1021)
-+
-+/* Compute a case insensitive hash of str */
-+static uint32_t tz_hash(const char *str)
-+{
-+ const unsigned char *p = (const unsigned char *)str;
-+ uint32_t hash = 5381;
-+ int c;
-+
-+ while ((c = tolower(*p++)) != '\0') {
-+ hash = (hash << 5) ^ hash ^ c;
-+ }
-+
-+ return hash % LOCINFO_HASH_SIZE;
-+}
-+
-+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the
-+ * parsed string on success, or NULL on parse error. On success,
-+ * writes the parsed number to *result. */
-+static char *parse_iso6709(char *p, double *result)
-+{
-+ double v, sign;
-+ char *pend;
-+ size_t len;
-+
-+ if (*p == '+')
-+ sign = 1.0;
-+ else if (*p == '-')
-+ sign = -1.0;
-+ else
-+ return NULL;
-+
-+ p++;
-+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++)
-+ ;;
-+
-+ /* Annoying encoding used by zone.tab has no decimal point, so use
-+ * the length to determine the format:
-+ *
-+ * 4 = DDMM
-+ * 5 = DDDMM
-+ * 6 = DDMMSS
-+ * 7 = DDDMMSS
-+ */
-+ len = pend - p;
-+ if (len < 4 || len > 7) {
-+ return NULL;
-+ }
-+
-+ /* p => [D]DD */
-+ v = (p[0] - '0') * 10.0 + (p[1] - '0');
-+ p += 2;
-+ if (len == 5 || len == 7)
-+ v = v * 10.0 + (*p++ - '0');
-+ /* p => MM[SS] */
-+ v += (10.0 * (p[0] - '0')
-+ + p[1] - '0') / 60.0;
-+ p += 2;
-+ /* p => [SS] */
-+ if (len > 5) {
-+ v += (10.0 * (p[0] - '0')
-+ + p[1] - '0') / 3600.0;
-+ p += 2;
-+ }
-+
-+ /* Round to five decimal place, not because it's a good idea,
-+ * but, because the builtin data uses rounded data, so, match
-+ * that. */
-+ *result = trunc(v * sign * 100000.0) / 100000.0;
-+
-+ return p;
-+}
-+
-+/* This function parses the zone.tab file to build up the mapping of
-+ * timezone to country code and geographic location, and returns a
-+ * hash table. The hash table is indexed by the function:
-+ *
-+ * tz_hash(timezone-name)
-+ */
-+static struct location_info **create_location_table(void)
-+{
-+ struct location_info **li, *i;
-+ char zone_tab[PATH_MAX];
-+ char line[512];
-+ FILE *fp;
-+
-+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab);
-+
-+ fp = fopen(zone_tab, "r");
-+ if (!fp) {
-+ return NULL;
-+ }
-+
-+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li);
-+
-+ while (fgets(line, sizeof line, fp)) {
-+ char *p = line, *code, *name, *comment;
-+ uint32_t hash;
-+ double latitude, longitude;
-+
-+ while (isspace(*p))
-+ p++;
-+
-+ if (*p == '#' || *p == '\0' || *p == '\n')
-+ continue;
-+
-+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t')
-+ continue;
-+
-+ /* code => AA */
-+ code = p;
-+ p[2] = 0;
-+ p += 3;
-+
-+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */
-+ p = parse_iso6709(p, &latitude);
-+ if (!p) {
-+ continue;
-+ }
-+ p = parse_iso6709(p, &longitude);
-+ if (!p) {
-+ continue;
-+ }
-+
-+ if (!p || *p != '\t') {
-+ continue;
-+ }
-+
-+ /* name = string */
-+ name = ++p;
-+ while (*p != '\t' && *p && *p != '\n')
-+ p++;
-+
-+ *p++ = '\0';
-+
-+ /* comment = string */
-+ comment = p;
-+ while (*p != '\t' && *p && *p != '\n')
-+ p++;
-+
-+ if (*p == '\n' || *p == '\t')
-+ *p = '\0';
-+
-+ hash = tz_hash(name);
-+ i = malloc(sizeof *i);
-+ memcpy(i->code, code, 2);
-+ strncpy(i->name, name, sizeof i->name);
-+ i->comment = strdup(comment);
-+ i->longitude = longitude;
-+ i->latitude = latitude;
-+ i->next = li[hash];
-+ li[hash] = i;
-+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */
-+ }
-+
-+ fclose(fp);
-+
-+ return li;
-+}
-+
-+/* Return location info from hash table, using given timezone name.
-+ * Returns NULL if the name could not be found. */
-+const struct location_info *find_zone_info(struct location_info **li,
-+ const char *name)
-+{
-+ uint32_t hash = tz_hash(name);
-+ const struct location_info *l;
-+
-+ if (!li) {
-+ return NULL;
-+ }
-+
-+ for (l = li[hash]; l; l = l->next) {
-+ if (timelib_strcasecmp(l->name, name) == 0)
-+ return l;
-+ }
-+
-+ return NULL;
-+}
-+
-+/* Filter out some non-tzdata files and the posix/right databases, if
-+ * present. */
-+static int index_filter(const struct dirent *ent)
-+{
-+ return strcmp(ent->d_name, ".") != 0
-+ && strcmp(ent->d_name, "..") != 0
-+ && strcmp(ent->d_name, "posix") != 0
-+ && strcmp(ent->d_name, "posixrules") != 0
-+ && strcmp(ent->d_name, "right") != 0
-+ && strstr(ent->d_name, ".list") == NULL
-+ && strstr(ent->d_name, ".tab") == NULL;
-+}
-+
-+static int sysdbcmp(const void *first, const void *second)
-+{
-+ const timelib_tzdb_index_entry *alpha = first, *beta = second;
-+
-+ return timelib_strcasecmp(alpha->id, beta->id);
-+}
-+
-+
-+/* Create the zone identifier index by trawling the filesystem. */
-+static void create_zone_index(timelib_tzdb *db)
-+{
-+ size_t dirstack_size, dirstack_top;
-+ size_t index_size, index_next;
-+ timelib_tzdb_index_entry *db_index;
-+ char **dirstack;
-+
-+ /* LIFO stack to hold directory entries to scan; each slot is a
-+ * directory name relative to the zoneinfo prefix. */
-+ dirstack_size = 32;
-+ dirstack = malloc(dirstack_size * sizeof *dirstack);
-+ dirstack_top = 1;
-+ dirstack[0] = strdup("");
-+
-+ /* Index array. */
-+ index_size = 64;
-+ db_index = malloc(index_size * sizeof *db_index);
-+ index_next = 0;
-+
-+ do {
-+ struct dirent **ents;
-+ char name[PATH_MAX], *top;
-+ int count;
-+
-+ /* Pop the top stack entry, and iterate through its contents. */
-+ top = dirstack[--dirstack_top];
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top);
-+
-+ count = php_scandir(name, &ents, index_filter, php_alphasort);
-+
-+ while (count > 0) {
-+ struct stat st;
-+ const char *leaf = ents[count - 1]->d_name;
-+
-+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s",
-+ top, leaf);
-+
-+ if (strlen(name) && stat(name, &st) == 0) {
-+ /* Name, relative to the zoneinfo prefix. */
-+ const char *root = top;
-+
-+ if (root[0] == '/') root++;
-+
-+ snprintf(name, sizeof name, "%s%s%s", root,
-+ *root ? "/": "", leaf);
-+
-+ if (S_ISDIR(st.st_mode)) {
-+ if (dirstack_top == dirstack_size) {
-+ dirstack_size *= 2;
-+ dirstack = realloc(dirstack,
-+ dirstack_size * sizeof *dirstack);
-+ }
-+ dirstack[dirstack_top++] = strdup(name);
-+ }
-+ else {
-+ if (index_next == index_size) {
-+ index_size *= 2;
-+ db_index = realloc(db_index,
-+ index_size * sizeof *db_index);
-+ }
-+
-+ db_index[index_next++].id = strdup(name);
-+ }
-+ }
-+
-+ free(ents[--count]);
-+ }
-+
-+ if (count != -1) free(ents);
-+ free(top);
-+ } while (dirstack_top);
-+
-+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp);
-+
-+ db->index = db_index;
-+ db->index_size = index_next;
-+
-+ free(dirstack);
-+}
-+
-+#define FAKE_HEADER "1234\0??\1??"
-+#define FAKE_UTC_POS (7 - 4)
-+
-+/* Create a fake data segment for database 'sysdb'. */
-+static void fake_data_segment(timelib_tzdb *sysdb,
-+ struct location_info **info)
-+{
-+ size_t n;
-+ char *data, *p;
-+
-+ data = malloc(3 * sysdb->index_size + 7);
-+
-+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1);
-+
-+ for (n = 0; n < sysdb->index_size; n++) {
-+ const struct location_info *li;
-+ timelib_tzdb_index_entry *ent;
-+
-+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n];
-+
-+ /* Lookup the timezone name in the hash table. */
-+ if (strcmp(ent->id, "UTC") == 0) {
-+ ent->pos = FAKE_UTC_POS;
-+ continue;
-+ }
-+
-+ li = find_zone_info(info, ent->id);
-+ if (li) {
-+ /* If found, append the BC byte and the
-+ * country code; set the position for this
-+ * section of timezone data. */
-+ ent->pos = (p - data) - 4;
-+ *p++ = '\1';
-+ *p++ = li->code[0];
-+ *p++ = li->code[1];
-+ }
-+ else {
-+ /* If not found, the timezone data can
-+ * point at the header. */
-+ ent->pos = 0;
-+ }
-+ }
-+
-+ sysdb->data = (unsigned char *)data;
-+}
-+
-+/* Returns true if the passed-in stat structure describes a
-+ * probably-valid timezone file. */
-+static int is_valid_tzfile(const struct stat *st, int fd)
-+{
-+ if (fd) {
-+ char buf[20];
-+ if (read(fd, buf, 20)!=20) {
-+ return 0;
-+ }
-+ lseek(fd, SEEK_SET, 0);
-+ if (memcmp(buf, "TZif", 4)) {
-+ return 0;
-+ }
-+ }
-+ return S_ISREG(st->st_mode) && st->st_size > 20;
-+}
-+
-+/* To allow timezone names to be used case-insensitively, find the
-+ * canonical name for this timezone, if possible. */
-+static const char *canonical_tzname(const char *timezone)
-+{
-+ if (timezonedb_system) {
-+ timelib_tzdb_index_entry *ent, lookup;
-+
-+ lookup.id = (char *)timezone;
-+
-+ ent = bsearch(&lookup, timezonedb_system->index,
-+ timezonedb_system->index_size, sizeof lookup,
-+ sysdbcmp);
-+ if (ent) {
-+ return ent->id;
-+ }
-+ }
-+
-+ return timezone;
-+}
-+
-+/* Return the mmap()ed tzfile if found, else NULL. On success, the
-+ * length of the mapped data is placed in *length. */
-+static char *map_tzfile(const char *timezone, size_t *length)
-+{
-+ char fname[PATH_MAX];
-+ struct stat st;
-+ char *p;
-+ int fd;
-+
-+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+ return NULL;
-+ }
-+
-+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
-+
-+ fd = open(fname, O_RDONLY);
-+ if (fd == -1) {
-+ return NULL;
-+ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) {
-+ close(fd);
-+ return NULL;
-+ }
-+
-+ *length = st.st_size;
-+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-+ close(fd);
-+
-+ return p != MAP_FAILED ? p : NULL;
-+}
-+
-+#endif
-+
-+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
- {
- int left = 0, right = tzdb->index_size - 1;
-
-@@ -438,9 +878,48 @@ static int seek_to_tz_position(const uns
- return 0;
- }
-
-+static int seek_to_tz_position(const unsigned char **tzf, char *timezone,
-+ char **map, size_t *maplen,
-+ const timelib_tzdb *tzdb)
-+{
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (tzdb == timezonedb_system) {
-+ char *orig;
-+
-+ orig = map_tzfile(timezone, maplen);
-+ if (orig == NULL) {
-+ return 0;
-+ }
-+
-+ (*tzf) = (unsigned char *)orig;
-+ *map = orig;
-+ return 1;
-+ }
-+ else
-+#endif
-+ {
-+ return inmem_seek_to_tz_position(tzf, timezone, tzdb);
-+ }
-+}
-+
- const timelib_tzdb *timelib_builtin_db(void)
- {
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (timezonedb_system == NULL) {
-+ timelib_tzdb *tmp = malloc(sizeof *tmp);
-+
-+ tmp->version = "0.system";
-+ tmp->data = NULL;
-+ create_zone_index(tmp);
-+ system_location_table = create_location_table();
-+ fake_data_segment(tmp, system_location_table);
-+ timezonedb_system = tmp;
-+ }
-+
-+ return timezonedb_system;
-+#else
- return &timezonedb_builtin;
-+#endif
- }
-
- const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
-@@ -452,7 +931,30 @@ const timelib_tzdb_index_entry *timelib_
- int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
- {
- const unsigned char *tzf;
-- return (seek_to_tz_position(&tzf, timezone, tzdb));
-+
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (tzdb == timezonedb_system) {
-+ char fname[PATH_MAX];
-+ struct stat st;
-+
-+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) {
-+ return 0;
-+ }
-+
-+ if (system_location_table) {
-+ if (find_zone_info(system_location_table, timezone) != NULL) {
-+ /* found in cache */
-+ return 1;
-+ }
-+ }
-+
-+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone));
-+
-+ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0);
-+ }
-+#endif
-+
-+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb));
- }
-
- static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
-@@ -494,12 +996,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
- timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
- {
- const unsigned char *tzf;
-+ char *memmap = NULL;
-+ size_t maplen;
- timelib_tzinfo *tmp;
- int version;
- int transitions_result, types_result;
- unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */
-
-- if (seek_to_tz_position(&tzf, timezone, tzdb)) {
-+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) {
- tmp = timelib_tzinfo_ctor(timezone);
-
- version = read_preamble(&tzf, tmp, &type);
-@@ -534,11 +1038,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha
- }
- skip_posix_string(&tzf, tmp);
-
-+#ifdef HAVE_SYSTEM_TZDATA
-+ if (memmap) {
-+ const struct location_info *li;
-+
-+ /* TZif-style - grok the location info from the system database,
-+ * if possible. */
-+
-+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) {
-+ tmp->location.comments = timelib_strdup(li->comment);
-+ strncpy(tmp->location.country_code, li->code, 2);
-+ tmp->location.longitude = li->longitude;
-+ tmp->location.latitude = li->latitude;
-+ tmp->bc = 1;
-+ }
-+ else {
-+ set_default_location_and_comments(&tzf, tmp);
-+ }
-+
-+ /* Now done with the mmap segment - discard it. */
-+ munmap(memmap, maplen);
-+ } else {
-+#endif
- if (type == TIMELIB_TZINFO_PHP) {
- read_location(&tzf, tmp);
- } else {
- set_default_location_and_comments(&tzf, tmp);
- }
-+#ifdef HAVE_SYSTEM_TZDATA
-+ }
-+#endif
- } else {
- *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
- tmp = NULL;
+++ /dev/null
-From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
-Date: Sat, 2 May 2015 10:26:56 +0200
-Subject: Use system timezone
-
-Upstream don't want this patch. See
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=730771 for a summary.
-
-This delta is recovered from previous versions of the system timezone patch in
-Debian, and appears to have inadvertently been dropped. Author unknown.
-
-To be used in tandem with use_embedded_timezonedb.patch and use_embedded_timezonedb_fixes.patch.
----
- ext/date/php_date.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/ext/date/php_date.c
-+++ b/ext/date/php_date.c
-@@ -1039,6 +1039,23 @@ static char* guess_timezone(const timeli
- DATEG(timezone_valid) = 1;
- return DATEG(default_timezone);
- }
-+ /* Try to guess timezone from system information */
-+ {
-+ struct tm *ta, tmbuf;
-+ time_t the_time;
-+ char *tzid = NULL;
-+
-+ the_time = time(NULL);
-+ ta = php_localtime_r(&the_time, &tmbuf);
-+ if (ta) {
-+ tzid = timelib_timezone_id_from_abbr(ta->tm_zone, ta->tm_gmtoff, ta->tm_isdst);
-+ }
-+ if (! tzid) {
-+ tzid = "UTC";
-+ }
-+
-+ return tzid;
-+ }
- /* Fallback to UTC */
- return "UTC";
- }
+++ /dev/null
-From: Thijs Kinkhorst <thijs@debian.org>
-Date: Mon, 2 Dec 2019 22:18:43 +0100
-Subject: Add patch to remove build timestamps from generated binaries.
-
----
- ext/standard/info.c | 1 -
- sapi/apache2handler/config.m4 | 15 +++------------
- sapi/cgi/cgi_main.c | 4 ++--
- sapi/cli/php_cli.c | 4 ++--
- sapi/fpm/fpm/fpm_main.c | 4 ++--
- sapi/phpdbg/phpdbg.c | 4 +---
- 6 files changed, 10 insertions(+), 22 deletions(-)
-
---- a/ext/standard/info.c
-+++ b/ext/standard/info.c
-@@ -803,7 +803,6 @@ PHPAPI ZEND_COLD void php_print_info(int
- php_info_print_box_end();
- php_info_print_table_start();
- php_info_print_table_row(2, "System", ZSTR_VAL(php_uname));
-- php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__);
- #ifdef COMPILER
- php_info_print_table_row(2, "Compiler", COMPILER);
- #endif
---- a/sapi/apache2handler/config.m4
-+++ b/sapi/apache2handler/config.m4
-@@ -64,18 +64,9 @@ if test "$PHP_APXS2" != "no"; then
- fi
-
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-- if test -z `$APXS -q SYSCONFDIR`; then
-- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-- -i -n php7"
-- else
-- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-- INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-- \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-- $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-- -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-- -i -a -n php7"
-- fi
-+ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-+ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-+ -i -n php7"
-
- case $host_alias in
- *aix*)
---- a/sapi/cgi/cgi_main.c
-+++ b/sapi/cgi/cgi_main.c
-@@ -2401,9 +2401,9 @@ parent_loop_end:
- SG(headers_sent) = 1;
- SG(request_info).no_headers = 1;
- #if ZEND_DEBUG
-- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #else
-- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #endif
- php_request_shutdown((void *) 0);
- fcgi_shutdown();
---- a/sapi/cli/php_cli.c
-+++ b/sapi/cli/php_cli.c
-@@ -648,8 +648,8 @@ static int do_cli(int argc, char **argv)
- goto out;
-
- case 'v': /* show php version & quit */
-- php_printf("PHP %s (%s) (built: %s %s) ( %s)\nCopyright (c) The PHP Group\n%s",
-- PHP_VERSION, cli_sapi_module.name, __DATE__, __TIME__,
-+ php_printf("PHP %s (%s) ( %s)\nCopyright (c) The PHP Group\n%s",
-+ PHP_VERSION, cli_sapi_module.name,
- #if ZTS
- "ZTS "
- #else
---- a/sapi/fpm/fpm/fpm_main.c
-+++ b/sapi/fpm/fpm/fpm_main.c
-@@ -1718,9 +1718,9 @@ int main(int argc, char *argv[])
- SG(request_info).no_headers = 1;
-
- #if ZEND_DEBUG
-- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #else
-- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #endif
- php_request_shutdown((void *) 0);
- fcgi_shutdown();
---- a/sapi/phpdbg/phpdbg.c
-+++ b/sapi/phpdbg/phpdbg.c
-@@ -1697,10 +1697,8 @@ phpdbg_main:
- phpdbg_do_help_cmd(exec);
- } else if (show_version) {
- phpdbg_out(
-- "phpdbg %s (built: %s %s)\nPHP %s, Copyright (c) The PHP Group\n%s",
-+ "phpdbg %s\nPHP %s, Copyright (c) The PHP Group\n%s",
- PHPDBG_VERSION,
-- __DATE__,
-- __TIME__,
- PHP_VERSION,
- get_zend_version()
- );
+++ /dev/null
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= <ondrej@sury.org>
-Date: Wed, 29 Jul 2015 14:37:55 +0200
-Subject: Remove W3C validation icon to not expose the reader's IP address to
- potential tracking.
-
----
- sapi/fpm/status.html.in | 5 -----
- 1 file changed, 5 deletions(-)
-
---- a/sapi/fpm/status.html.in
-+++ b/sapi/fpm/status.html.in
-@@ -70,11 +70,6 @@
- <tr class="h"><th>PID↓</th><th>Start Time</th><th>Start Since</th><th>Requests Served</th><th>Request Duration</th><th>Request method</th><th>Request URI</th><th>Content Length</th><th>User</th><th>Script</th><th>Last Request %CPU</th><th>Last Request Memory</th></tr>
- </table>
- </div>
-- <p>
-- <a href="http://validator.w3.org/check?uri=referer">
-- <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" />
-- </a>
-- </p>
- <script type="text/javascript">
- <!--
- var xhr_object = null;
+++ /dev/null
---- a/ext/opcache/ZendAccelerator.c
-+++ b/ext/opcache/ZendAccelerator.c
-@@ -2670,11 +2670,6 @@ static void accel_gen_system_id(void)
- PHP_MD5Update(&context, PHP_VERSION, sizeof(PHP_VERSION)-1);
- PHP_MD5Update(&context, ZEND_EXTENSION_BUILD_ID, sizeof(ZEND_EXTENSION_BUILD_ID)-1);
- PHP_MD5Update(&context, ZEND_BIN_ID, sizeof(ZEND_BIN_ID)-1);
-- if (strstr(PHP_VERSION, "-dev") != 0) {
-- /* Development versions may be changed from build to build */
-- PHP_MD5Update(&context, __DATE__, sizeof(__DATE__)-1);
-- PHP_MD5Update(&context, __TIME__, sizeof(__TIME__)-1);
-- }
- /* Modules may have changed after restart which can cause dangling pointers from
- * custom opcode handlers in the second-level cache files
- */
---- a/sapi/litespeed/lsapi_main.c
-+++ b/sapi/litespeed/lsapi_main.c
-@@ -1288,9 +1288,9 @@ static int cli_main( int argc, char * ar
- case 'v':
- if (php_request_startup() != FAILURE) {
- #if ZEND_DEBUG
-- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s) (DEBUG)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #else
-- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+ php_printf("PHP %s (%s)\nCopyright (c) The PHP Group\n%s", PHP_VERSION, sapi_module.name, get_zend_version());
- #endif
- #ifdef PHP_OUTPUT_NEWAPI
- php_output_end_all();
+++ /dev/null
-From dd6ee0fb6715881b204fb4cb124db9134c1a6c7d Mon Sep 17 00:00:00 2001
-From: Michael Heimpold <mhei@heimpold.de>
-Date: Mon, 2 Dec 2019 22:42:28 +0100
-Subject: [PATCH] ext/opcache: fix detection of shm/mmap
-
-The detection of sysvipc and mmap doesn't work well when cross-compiling,
-so I decided to only check for the availability of the functions involved.
-This is not a clean solution, but works for now(tm) :-)
-
-It should be discussed with upstream to find a better solution.
-
-This solves the issue reported at
-https://github.com/openwrt/packages/issues/1010
-and makes opcache usable on OpenWrt.
-
-Signed-off-by: Michael Heimpold <mhei@heimpold.de>
----
- ext/opcache/config.m4 | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/ext/opcache/config.m4
-+++ b/ext/opcache/config.m4
-@@ -89,7 +89,10 @@ int main() {
- }
- ]])],[dnl
- AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-- msg=yes],[msg=no],[msg=no])
-+ msg=yes],[msg=no],[dnl
-+ AC_CHECK_FUNC(shmget,[dnl
-+ AC_DEFINE(HAVE_SHM_IPC, 1, [Define if you have SysV IPC SHM support])
-+ msg=yes],[msg=no])])
- AC_MSG_RESULT([$msg])
-
- AC_MSG_CHECKING(for mmap() using MAP_ANON shared memory support)
-@@ -141,7 +144,10 @@ int main() {
- }
- ]])],[dnl
- AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
-- msg=yes],[msg=no],[msg=no])
-+ msg=yes],[msg=no],[dnl
-+ AC_CHECK_FUNC(mmap,[dnl
-+ AC_DEFINE(HAVE_SHM_MMAP_ANON, 1, [Define if you have mmap(MAP_ANON) SHM support])
-+ msg=yes],[msg=no])])
- AC_MSG_RESULT([$msg])
-
- PHP_CHECK_FUNC_LIB(shm_open, rt)
+++ /dev/null
---- a/ext/phar/config.m4
-+++ b/ext/phar/config.m4
-@@ -19,7 +19,7 @@ if test "$PHP_PHAR" != "no"; then
- fi
- PHP_ADD_EXTENSION_DEP(phar, hash, true)
- PHP_ADD_EXTENSION_DEP(phar, spl, true)
-- PHP_ADD_MAKEFILE_FRAGMENT
-+ #PHP_ADD_MAKEFILE_FRAGMENT
-
- PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1454,13 +1454,13 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libto
- INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
- CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
-
--if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
-- pharcmd=pharcmd
-- pharcmd_install=install-pharcmd
--else
-+#if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
-+# pharcmd=pharcmd
-+# pharcmd_install=install-pharcmd
-+#else
- pharcmd=
- pharcmd_install=
--fi;
-+#fi;
-
- all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
- install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
+++ /dev/null
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Package/php7-pecl/Default
- SUBMENU:=PHP7
- SECTION:=lang
- CATEGORY:=Languages
- URL:=http://pecl.php.net/
- DEPENDS:=php7
-endef
-
-define Build/Prepare
- $(Build/Prepare/Default)
- $(if $(QUILT),,( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 ))
-endef
-
-define Build/Configure
- $(if $(QUILT),( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 ))
- $(Build/Configure/Default)
-endef
-
-CONFIGURE_VARS+= \
- ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no)
-
-CONFIGURE_ARGS+= \
- --with-php-config=$(STAGING_DIR)/usr/bin/php7-config
-
-define PHP7PECLPackage
-
- define Package/php7-pecl-$(1)
- $(call Package/php7-pecl/Default)
- TITLE:=$(2)
-
- ifneq ($(3),)
- DEPENDS+=$(3)
- endif
- endef
-
- define Package/php7-pecl-$(1)/install
- $(INSTALL_DIR) $$(1)/usr/lib/php
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/
- $(INSTALL_DIR) $$(1)/etc/php7
- ifeq ($(5),zend)
- echo "zend_extension=/usr/lib/php/$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
- else
- echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php7/$(if $(4),$(4),20)_$(subst -,_,$(1)).ini
- endif
- endef
-
-endef
+++ /dev/null
-#!/bin/sh
-
-case "$1" in
- php7-cgi)
- php-cgi -v | grep "$2"
- ;;
- php7-cli)
- php-cli -v | grep "$2"
- ;;
- php7-fpm)
- php-fpm -v | grep "$2"
- ;;
- php7-mod-*)
- PHP_MOD="${1#php7-mod-}"
- PHP_MOD="${PHP_MOD//-/_}"
-
- opkg install php7-cli
-
- php-cli -m | grep -i "$PHP_MOD"
- ;;
- *)
- ;;
-esac
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=dio
+PECL_LONGNAME:=Direct I/O functions
+
+PKG_VERSION:=0.2.0
+PKG_RELEASE:=1
+PKG_HASH:=062777e948dece374c2d7d9e92106c87d18c11128d2179b50dedb43175c4bd6e
+
+PKG_NAME:=php8-pecl-$(PECL_NAME)
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+
+PKG_LICENSE:=PHP-3.01
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+$(eval $(call PHP8PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=pecl_http
+PECL_LONGNAME:=Extended HTTP Support
+
+PKG_VERSION:=4.2.1
+PKG_RELEASE:=2
+PKG_HASH:=ab07d55ccdfa897c897c26f1c0851b557b363431766c9ea4c799ea61443bdcdc
+
+PKG_NAME:=php8-pecl-http
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php8 php8-pecl-raphf
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_VARS+= \
+ PECL_cv_HAVE_EXT_raphf=yes \
+ PECL_cv_HAVE_LIBCURL_ARES=no \
+ PECL_cv_HAVE_LIBCURL_OpenSSL=$(if $(CONFIG_LIBCURL_OPENSSL),yes,no) \
+ PECL_cv_HAVE_LIBCURL_GnuTLS=$(if $(CONFIG_LIBCURL_GNUTLS),yes,no) \
+ PECL_cv_HAVE_LIBCURL_NSS=no \
+ PECL_cv_HAVE_LIBCURL_SecureTransport=no \
+ PECL_cv_HAVE_LIBCURL_GSKit=no \
+ PECL_cv_HAVE_LIBCURL_PolarSSL=no \
+ PECL_cv_HAVE_LIBCURL_WolfSSL=$(if $(CONFIG_LIBCURL_WOLFSSL),yes,no) \
+ PECL_cv_HAVE_LIBCURL_mbedTLS=$(if $(CONFIG_LIBCURL_MBEDTLS),yes,no) \
+ PECL_cv_HAVE_LIBCURL_axTLS=no \
+ PECL_cv_LIBCURL_TLSAUTH_SRP=$(if $(CONFIG_LIBCURL_TLS_SRP),yes,no) \
+ PECL_cv_LIBCURL_SHARE_SSL=yes \
+ PECL_cv_LIBCURL_TLS13_CIPHERS=$(if $(CONFIG_OPENSSL_WITH_TLS13),yes,no) \
+
+CONFIGURE_ARGS+= \
+ --with-http \
+ --without-http-shared-deps \
+ --with-http-zlib-dir="$(STAGING_DIR)/usr" \
+ --with-http-libcurl-dir="$(STAGING_DIR)/usr" \
+ --with-http-libevent-dir="$(STAGING_DIR)/usr" \
+ --with-http-libidn-dir="$(STAGING_DIR)/usr" \
+ --with-http-libidnkit-dir=no \
+ --with-http-libidnkit2-dir=no
+
+$(eval $(call PHP8PECLPackage,http,$(PECL_LONGNAME),+icu +libcurl +librt +libevent2 +PACKAGE_libidn:libidn +libidn2 +php8-mod-iconv +php8-mod-session +php8-pecl-raphf,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=imagick
+PECL_LONGNAME:=Image Processing (ImageMagick binding)
+
+PKG_VERSION:=3.5.1
+PKG_RELEASE:=1
+PKG_HASH:=243ff2094edcacb2ae46ee3a4d9f38a60a4f26a6a71f59023b6198cbed0f7f81
+
+PKG_NAME:=php8-pecl-imagick
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=PHP-3.01
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php8
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_ARGS+= --with-imagick="$(STAGING_DIR)/usr"
+
+$(eval $(call PHP8PECLPackage,imagick,$(PECL_LONGNAME),+imagemagick,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=krb5
+PECL_LONGNAME:=Bindings for the Kerberos library
+
+PKG_VERSION:=1.1.4
+PKG_RELEASE:=1
+PKG_HASH:=8aba35bb9f2892be9092e8717d3e13604a817cdfb478dbc3855a226abc6c5979
+
+PKG_NAME:=php8-pecl-krb5
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php8
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_ARGS+= \
+ --with-krb5=shared,"$(STAGING_DIR)/usr" \
+ --with-krb5config=$(STAGING_DIR)/usr/bin/krb5-config
+
+$(eval $(call PHP8PECLPackage,krb5,$(PECL_LONGNAME),+krb5-libs,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=mcrypt
+PECL_LONGNAME:=Bindings for the libmcrypt library
+
+PKG_VERSION:=1.0.4
+PKG_RELEASE:=1
+PKG_HASH:=98153e78958d7a48dcd0dcfe1fc3c16ec987121a0cb2d7c273d280ee7e4ea00d
+
+PKG_NAME:=php8-pecl-mcrypt
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=PHP-3.01
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php8
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr"
+
+$(eval $(call PHP8PECLPackage,mcrypt,$(PECL_LONGNAME),+libmcrypt +libltdl,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=raphf
+PECL_LONGNAME:=Resource and persistent handles factory
+
+PKG_VERSION:=2.0.1
+PKG_RELEASE:=1
+PKG_HASH:=da3566db17422e5ef08b7ff144162952aabc14cb22407cc6b1d2a2d095812bd0
+
+PKG_NAME:=php8-pecl-raphf
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_ARGS+= \
+ --enable-raphf
+
+define Build/InstallDev
+ mkdir -p $(STAGING_DIR)/usr/include/php8/ext/$(PECL_NAME)
+ cp $(PKG_BUILD_DIR)/php_raphf.h $(STAGING_DIR)/usr/include/php8/ext/$(PECL_NAME)/
+ cp $(PKG_BUILD_DIR)/php_raphf_api.h $(STAGING_DIR)/usr/include/php8/ext/$(PECL_NAME)/
+endef
+
+$(eval $(call PHP8PECLPackage,$(PECL_NAME),$(PECL_LONGNAME)))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=redis
+PECL_LONGNAME:=PHP extension for interfacing with Redis
+
+PKG_VERSION:=5.3.4
+PKG_RELEASE:=1
+PKG_HASH:=4b39056f3356f135255e059efd76398d1c7607c86bd52513e6341bb07a3fb4cc
+
+PKG_NAME:=php8-pecl-redis
+PKG_SOURCE:=$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+
+PKG_LICENSE:=PHP-3.01
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+CONFIGURE_ARGS+= \
+ --enable-redis \
+ --enable-redis-json \
+ --disable-redis-igbinary \
+ --disable-redis-lzf \
+ --disable-redis-msgpack
+
+$(eval $(call PHP8PECLPackage,$(PECL_NAME),$(PECL_LONGNAME),+php8-mod-session,25))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- /dev/null
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PECL_NAME:=sodium
+PECL_LONGNAME:=Bindings for libsodium
+
+PKG_VERSION:=2.0.23
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_HASH:=f8c04533de8e4b48077f65de61b187e195c0919c41d4543e2263604fa0c50379
+
+PKG_NAME:=php8-pecl-sodium
+PKG_SOURCE:=lib$(PECL_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://pecl.php.net/get/
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=php8
+PKG_BUILD_DIR:=$(BUILD_DIR)/pecl-php8/lib$(PECL_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+include ../php8/pecl.mk
+
+$(eval $(call PHP8PECLPackage,sodium,$(PECL_LONGNAME),+libsodium,30))
+$(eval $(call BuildPackage,$(PKG_NAME)))
include $(TOPDIR)/rules.mk
PKG_NAME:=php
-PKG_VERSION:=8.1.0
+PKG_VERSION:=8.1.1
PKG_RELEASE:=1
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.php.net/distributions/
-PKG_HASH:=a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc
+PKG_HASH:=33c09d76d0a8bbb5dd930d9dd32e6bfd44e9efcf867563759eb5492c3aff8856
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
include $(TOPDIR)/rules.mk
PKG_NAME:=python-lxml
-PKG_VERSION:=4.6.4
+PKG_VERSION:=4.7.1
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=lxml
-PKG_HASH:=daf9bd1fee31f1c7a5928b3e1059e09a8d683ea58fb3ffc773b6c88cb8d1399c
+PKG_HASH:=a1613838aa6b89af4ba10a0f3a972836128801ed008078f8c1244e65958f1b24
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSES.txt
include $(TOPDIR)/rules.mk
PKG_NAME:=python-paramiko
-PKG_VERSION:=2.8.0
+PKG_VERSION:=2.9.1
PKG_RELEASE:=1
PYPI_NAME:=paramiko
-PKG_HASH:=e673b10ee0f1c80d46182d3af7751d033d9b573dd7054d2d0aa46be186c3c1d2
+PKG_HASH:=a1fdded3b55f61d23389e4fe52d9ae428960ac958d2edf50373faa5d8926edd0
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=LGPL-2.1-or-later
SRC_NAME:=libselinux
PKG_NAME:=python3-$(SRC_NAME)
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_BUILD_DIR:=$(BUILD_DIR)/python-libselinux/$(SRC_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(SRC_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
-PKG_HASH:=df758ef1d9d4811051dd901ea6b029ae334ffd7c671c128beb16bce1e25ac161
+PKG_HASH:=acfdee27633d2496508c28727c3d41d3748076f66d42fccde2e6b9f3463a7057
PKG_BUILD_DEPENDS:=swig/host
PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=python3-networkx
-PKG_VERSION:=2.5
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.3
+PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=networkx
-PKG_HASH:=7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602
+PKG_HASH:=c0946ed31d71f1b732b5aaa6da5a0388a345019af232ce2f49c766e2d6795c51
PKG_LICENSE:=BSD-3-clause
PKG_LICENSE_FILES:=LICENSE.txt
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-lib
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e
+PKG_HASH:=ad582993d52cdb5fb159a0beab60a6ac57eab0cc1bdf85dc4db6d6197f02333f
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Peter Wagner <tripolar@gmx.at>
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-ucm-conf
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/lib/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=5841a444166dcbf479db751303dbc3556f685085ac7e00f0c9e7755676195d97
+PKG_HASH:=8be24fb9fe789ee2778ae6f32e18e8043fe7f8bc735871e9d17c68a04566a822
PKG_MAINTAINER:=
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=file
-PKG_VERSION:=5.40
+PKG_VERSION:=5.41
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://download.openpkg.org/components/cache/file/ \
ftp://ftp.astron.com/pub/file/
-PKG_HASH:=167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
+PKG_HASH:=13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=BSD-2-Clause
+++ /dev/null
-From 6b34436ac766dae64749b8d14f18c6910be40131 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 5 Apr 2021 16:36:14 +0000
-Subject: [PATCH] remove "u" from the pattern (Joerg Jenderek)
-
----
- magic/Magdir/mail.news | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/magic/Magdir/mail.news
-+++ b/magic/Magdir/mail.news
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
-+# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
- # mail.news: file(1) magic for mail and news
- #
- # Unfortunately, saved netnews also has From line added in some news software.
-@@ -81,4 +81,4 @@
- # File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
- # From: Stephen Gildea
- 0 string CRYPTED\003\007 Dovecot encrypted message
-->9 byte xu \b, dcrypt version %d
-+>9 byte x \b, dcrypt version %d
include $(TOPDIR)/rules.mk
PKG_NAME:=freetype
-PKG_VERSION:=2.11.0
+PKG_VERSION:=2.11.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SF/freetype
-PKG_HASH:=8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
+PKG_HASH:=3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8
PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
PKG_LICENSE:=FTL GPL-2.0-only MIT ZLIB GPL-3.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=hwloc
-PKG_VERSION:=2.3.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.6.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.3
-PKG_HASH:=b607f6097873f69ef6b4b01e66e0dcb45f9939e8979827284664bbf0d4018a64
+PKG_SOURCE_URL:=https://download.open-mpi.org/release/$(PKG_NAME)/v2.6
+PKG_HASH:=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=COPYING
+PKG_BUILD_DEPENDS:=openssl
+
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk
-define Package/libjose
- SECTION:=libs
- TITLE:=Provides a full crypto stack including key generation, signing and encryption.
- DEPENDS:=+zlib +jansson +libopenssl +libpthread
- URL:=https://github.com/latchset/jose
-endef
-
define Package/jose
SECTION:=utils
TITLE:=Provides a full crypto stack including key generation, signing and encryption.
- DEPENDS:=+libjose
+ DEPENDS:=+jansson
URL:=https://github.com/latchset/jose
endef
crypto stack including key generation, signing and encryption.
endef
-define Package/libjose/description
- libjose is a library for performing various tasks on JSON
- Object Signing and Encryption (JOSE) objects. José provides a full
- crypto stack including key generation, signing and encryption.
-endef
+MESON_ARGS += \
+ -Ddefault_library=static
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME)
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so* $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).a $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/include/$(PKG_NAME)/*.h $(1)/usr/include/$(PKG_NAME)
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
endef
-define Package/libjose/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).so* $(1)/usr/lib/
-endef
-
define Package/jose/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
endef
-$(eval $(call BuildPackage,libjose))
$(eval $(call BuildPackage,jose))
include $(TOPDIR)/rules.mk
PKG_NAME:=jsoncpp
-PKG_VERSION:=1.9.4
-PKG_RELEASE:=3
+PKG_VERSION:=1.9.5
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999
+PKG_HASH:=f409856e5920c18d0c2fb85276e24ee607d2a09b5e7d5f0a371368903c275da2
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=ldns
-PKG_VERSION:=1.7.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.8.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns
-PKG_HASH:=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+PKG_HASH:=958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3
PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@gmail.com>
PKG_LICENSE:=BSD-3-Clause
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -861,7 +861,7 @@ AC_ARG_WITH(xcode-sdk, AC_HELP_STRING([-
- [],[with_xcode_sdk="yes"])
- if test "x_$with_xcode_sdk" != "x_no" ; then
- # check OSX deployment target, if needed
-- if echo $build_os | grep darwin > /dev/null; then
-+ if echo $target_os | grep darwin > /dev/null; then
- sdk_p=`xcode-select -print-path`;
- if test "x_$with_xcode_sdk" = "x_yes" ; then
- sdk_v="$( /usr/bin/xcrun --show-sdk-version 2>/dev/null )"
+++ /dev/null
-From cee98e71bb3d69e41cd4d2c6e33c68639dd1eaf0 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 5 Dec 2019 12:13:44 -0800
-Subject: [PATCH] Fix compilation without deprecated APIs
-
----
- dnssec_verify.c | 2 ++
- drill/drill.c | 2 ++
- keys.c | 1 +
- 3 files changed, 5 insertions(+)
-
---- a/dnssec_verify.c
-+++ b/dnssec_verify.c
-@@ -597,7 +597,9 @@ ldns_dnssec_trust_tree_print_sm_fmt(FILE
- if (tree->parent_status[i]
- == LDNS_STATUS_SSL_ERR) {
- printf("; SSL Error: ");
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- ERR_load_crypto_strings();
-+#endif
- ERR_print_errors_fp(stdout);
- printf("\n");
- }
---- a/drill/drill.c
-+++ b/drill/drill.c
-@@ -994,10 +994,12 @@ main(int argc, char *argv[])
- xfree(tsig_algorithm);
-
- #ifdef HAVE_SSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- CRYPTO_cleanup_all_ex_data();
- ERR_free_strings();
- EVP_cleanup();
- #endif
-+#endif
- #ifdef USE_WINSOCK
- WSACleanup();
- #endif
---- a/keys.c
-+++ b/keys.c
-@@ -15,6 +15,7 @@
- #include <ldns/ldns.h>
-
- #ifdef HAVE_SSL
-+#include <openssl/ui.h>
- #include <openssl/ssl.h>
- #include <openssl/rand.h>
- #include <openssl/bn.h>
+++ /dev/null
-From 8a12d9183271b2b16f399c3fe867f149dbf753d7 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Thu, 20 Feb 2020 18:58:52 -0800
-Subject: [PATCH] Fix compilation without DSA and deprecated APIs
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- dnssec.c | 2 ++
- examples/ldns-dane.c | 2 ++
- examples/ldns-keygen.c | 2 ++
- examples/ldns-signzone.c | 16 ++++++++++++++++
- examples/ldns-verify-zone.c | 2 ++
- host2str.c | 8 ++++++++
- keys.c | 10 +++++++---
- ldns/keys.h | 8 ++++++++
- rr_functions.c | 4 ++++
- 9 files changed, 51 insertions(+), 3 deletions(-)
-
---- a/dnssec.c
-+++ b/dnssec.c
-@@ -332,6 +332,7 @@ uint16_t ldns_calc_keytag_raw(const uint
- }
-
- #ifdef HAVE_SSL
-+#ifdef USE_DSA
- DSA *
- ldns_key_buf2dsa(const ldns_buffer *key)
- {
-@@ -407,6 +408,7 @@ ldns_key_buf2dsa_raw(const unsigned char
- #endif /* OPENSSL_VERSION_NUMBER */
- return dsa;
- }
-+#endif /* USE_DSA */
-
- RSA *
- ldns_key_buf2rsa(const ldns_buffer *key)
---- a/examples/ldns-dane.c
-+++ b/examples/ldns-dane.c
-@@ -1680,9 +1680,11 @@ main(int argc, char* const* argv)
- assert(0);
- }
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- /* ssl inititalize */
- SSL_load_error_strings();
- SSL_library_init();
-+#endif
-
- /* ssl load validation store */
- if (! assume_pkix_validity || CAfile || CApath) {
---- a/examples/ldns-keygen.c
-+++ b/examples/ldns-keygen.c
-@@ -148,6 +148,7 @@ main(int argc, char *argv[])
- exit(1);
- }
- break;
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- case LDNS_SIGN_DSA_NSEC3:
- if (bits < 512 || bits > 1024) {
-@@ -156,6 +157,7 @@ main(int argc, char *argv[])
- exit(1);
- }
- break;
-+#endif /* USE_DSA */
- #ifdef USE_GOST
- case LDNS_SIGN_ECC_GOST:
- if(!ldns_key_EVP_load_gost_id()) {
---- a/examples/ldns-signzone.c
-+++ b/examples/ldns-signzone.c
-@@ -72,10 +72,14 @@ usage(FILE *fp, const char *prog) {
-
- fprintf ( fp, "\n " );
- __LIST ( RSAMD5 );
-+#ifdef USE_DSA
- __LIST ( DSA );
-+#endif
- __LIST ( RSASHA1 );
- fprintf ( fp, "\n " );
-+#ifdef USE_DSA
- __LIST ( DSA_NSEC3 );
-+#endif
- __LIST ( RSASHA1_NSEC3 );
- __LIST ( RSASHA256 );
- fprintf ( fp, "\n " );
-@@ -350,11 +354,15 @@ parse_algspec ( const char * const p )
-
- __MATCH ( RSAMD5 );
- __MATCH ( RSASHA1 );
-+#ifdef USE_DSA
- __MATCH ( DSA );
-+#endif
- __MATCH ( RSASHA1_NSEC3 );
- __MATCH ( RSASHA256 );
- __MATCH ( RSASHA512 );
-+#ifdef USE_DSA
- __MATCH ( DSA_NSEC3 );
-+#endif
- __MATCH ( ECC_GOST );
- __MATCH ( ECDSAP256SHA256 );
- __MATCH ( ECDSAP384SHA384 );
-@@ -419,8 +427,10 @@ load_key ( const char * const p, ENGINE
- case LDNS_SIGN_RSASHA1_NSEC3:
- case LDNS_SIGN_RSASHA256:
- case LDNS_SIGN_RSASHA512:
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- case LDNS_SIGN_DSA_NSEC3:
-+#endif
- case LDNS_SIGN_ECC_GOST:
- #ifdef USE_ECDSA
- case LDNS_SIGN_ECDSAP256SHA256:
-@@ -995,9 +1005,13 @@ main(int argc, char *argv[])
-
- #ifdef HAVE_SSL
- if (ERR_peek_error()) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- ERR_load_crypto_strings();
-+#endif
- ERR_print_errors_fp(stderr);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(HAVE_LIBRESSL)
- ERR_free_strings();
-+#endif
- }
- #endif
- exit(EXIT_FAILURE);
-@@ -1018,8 +1032,10 @@ main(int argc, char *argv[])
- #ifndef OPENSSL_NO_ENGINE
- shutdown_openssl ( engine );
- #else
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- CRYPTO_cleanup_all_ex_data();
- #endif
-+#endif
-
- free(prog);
- exit(EXIT_SUCCESS);
---- a/examples/ldns-verify-zone.c
-+++ b/examples/ldns-verify-zone.c
-@@ -113,7 +113,9 @@ print_rr_status_error(FILE* stream, ldns
- if (status != LDNS_STATUS_OK) {
- print_rr_error(stream, rr, ldns_get_errorstr_by_id(status));
- if (verbosity > 0 && status == LDNS_STATUS_SSL_ERR) {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- ERR_load_crypto_strings();
-+#endif
- ERR_print_errors_fp(stream);
- }
- }
---- a/host2str.c
-+++ b/host2str.c
-@@ -49,10 +49,14 @@
- ldns_lookup_table ldns_algorithms[] = {
- { LDNS_RSAMD5, "RSAMD5" },
- { LDNS_DH, "DH" },
-+#ifdef USE_DSA
- { LDNS_DSA, "DSA" },
-+#endif /* USE_DSA */
- { LDNS_ECC, "ECC" },
- { LDNS_RSASHA1, "RSASHA1" },
-+#ifdef USE_DSA
- { LDNS_DSA_NSEC3, "DSA-NSEC3-SHA1" },
-+#endif /* USE_DSA */
- { LDNS_RSASHA1_NSEC3, "RSASHA1-NSEC3-SHA1" },
- #ifdef USE_SHA2
- { LDNS_RSASHA256, "RSASHA256"},
-@@ -2133,7 +2137,9 @@ ldns_key2buffer_str(ldns_buffer *output,
- unsigned char *bignum;
- #ifdef HAVE_SSL
- RSA *rsa;
-+#ifdef USE_DSA
- DSA *dsa;
-+#endif /* USE_DSA */
- #endif /* HAVE_SSL */
-
- if (!k) {
-@@ -2243,6 +2249,7 @@ ldns_key2buffer_str(ldns_buffer *output,
-
- RSA_free(rsa);
- break;
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- case LDNS_SIGN_DSA_NSEC3:
- dsa = ldns_key_dsa_key(k);
-@@ -2283,6 +2290,7 @@ ldns_key2buffer_str(ldns_buffer *output,
- goto error;
- }
- break;
-+#endif /* USE_DSA */
- case LDNS_SIGN_ECC_GOST:
- /* no format defined, use blob */
- #if defined(HAVE_SSL) && defined(USE_GOST)
---- a/keys.c
-+++ b/keys.c
-@@ -905,6 +905,7 @@ error:
- return NULL;
- }
-
-+#ifdef USE_DSA
- DSA *
- ldns_key_new_frm_fp_dsa(FILE *f)
- {
-@@ -1015,6 +1016,7 @@ error:
- BN_free(pub_key);
- return NULL;
- }
-+#endif /* USE_DSA */
-
- unsigned char *
- ldns_key_new_frm_fp_hmac(FILE *f, size_t *hmac_size)
-@@ -1149,9 +1151,9 @@ ldns_key_new_frm_algorithm(ldns_signing_
- #endif /* HAVE_EVP_PKEY_KEYGEN */
- #endif /* HAVE_SSL */
- break;
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- case LDNS_SIGN_DSA_NSEC3:
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- # if OPENSSL_VERSION_NUMBER < 0x00908000L
- d = DSA_generate_parameters((int)size, NULL, 0, NULL, NULL, NULL, NULL);
-@@ -1878,10 +1880,10 @@ ldns_key2rr(const ldns_key *k)
- #endif
- size++;
- break;
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- ldns_rr_push_rdf(pubkey,
- ldns_native2rdf_int8(LDNS_RDF_TYPE_ALG, LDNS_DSA));
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- dsa = ldns_key_dsa_key(k);
- if (dsa) {
-@@ -1901,10 +1903,10 @@ ldns_key2rr(const ldns_key *k)
- #endif /* HAVE_SSL */
- #endif /* USE_DSA */
- break;
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA_NSEC3:
- ldns_rr_push_rdf(pubkey,
- ldns_native2rdf_int8(LDNS_RDF_TYPE_ALG, LDNS_DSA_NSEC3));
--#ifdef USE_DSA
- #ifdef HAVE_SSL
- dsa = ldns_key_dsa_key(k);
- if (dsa) {
-@@ -2165,7 +2167,9 @@ ldns_signing_algorithm ldns_get_signing_
- ldns_lookup_table aliases[] = {
- /* from bind dnssec-keygen */
- {LDNS_SIGN_HMACMD5, "HMAC-MD5"},
-+#ifdef USE_DSA
- {LDNS_SIGN_DSA_NSEC3, "NSEC3DSA"},
-+#endif /* USE_DSA */
- {LDNS_SIGN_RSASHA1_NSEC3, "NSEC3RSASHA1"},
- /* old ldns usage, now RFC names */
- #ifdef USE_DSA
---- a/ldns/keys.h
-+++ b/ldns/keys.h
-@@ -45,10 +45,14 @@ enum ldns_enum_algorithm
- {
- LDNS_RSAMD5 = 1, /* RFC 4034,4035 */
- LDNS_DH = 2,
-+#ifdef USE_DSA
- LDNS_DSA = 3,
-+#endif /* USE_DSA */
- LDNS_ECC = 4,
- LDNS_RSASHA1 = 5,
-+#ifdef USE_DSA
- LDNS_DSA_NSEC3 = 6,
-+#endif /* USE_DSA */
- LDNS_RSASHA1_NSEC3 = 7,
- LDNS_RSASHA256 = 8, /* RFC 5702 */
- LDNS_RSASHA512 = 10, /* RFC 5702 */
-@@ -90,11 +94,15 @@ enum ldns_enum_signing_algorithm
- {
- LDNS_SIGN_RSAMD5 = LDNS_RSAMD5,
- LDNS_SIGN_RSASHA1 = LDNS_RSASHA1,
-+#ifdef USE_DSA
- LDNS_SIGN_DSA = LDNS_DSA,
-+#endif /* USE_DSA */
- LDNS_SIGN_RSASHA1_NSEC3 = LDNS_RSASHA1_NSEC3,
- LDNS_SIGN_RSASHA256 = LDNS_RSASHA256,
- LDNS_SIGN_RSASHA512 = LDNS_RSASHA512,
-+#ifdef USE_DSA
- LDNS_SIGN_DSA_NSEC3 = LDNS_DSA_NSEC3,
-+#endif /* USE_DSA */
- LDNS_SIGN_ECC_GOST = LDNS_ECC_GOST,
- LDNS_SIGN_ECDSAP256SHA256 = LDNS_ECDSAP256SHA256,
- LDNS_SIGN_ECDSAP384SHA384 = LDNS_ECDSAP384SHA384,
---- a/rr_functions.c
-+++ b/rr_functions.c
-@@ -269,14 +269,17 @@ ldns_rr_dnskey_key_size_raw(const unsign
- const size_t len,
- const ldns_algorithm alg)
- {
-+#ifdef USE_DSA
- /* for DSA keys */
- uint8_t t;
-+#endif /* USE_DSA */
-
- /* for RSA keys */
- uint16_t exp;
- uint16_t int16;
-
- switch ((ldns_signing_algorithm)alg) {
-+#ifdef USE_DSA
- case LDNS_SIGN_DSA:
- case LDNS_SIGN_DSA_NSEC3:
- if (len > 0) {
-@@ -286,6 +289,7 @@ ldns_rr_dnskey_key_size_raw(const unsign
- return 0;
- }
- break;
-+#endif /* USE_DSA */
- case LDNS_SIGN_RSAMD5:
- case LDNS_SIGN_RSASHA1:
- case LDNS_SIGN_RSASHA1_NSEC3:
+++ /dev/null
---- a/examples/ldns-signzone.c
-+++ b/examples/ldns-signzone.c
-@@ -535,6 +535,7 @@ init_openssl_engine ( const char * const
- static void
- shutdown_openssl ( ENGINE * const e )
- {
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
- if ( e != NULL ) {
- ENGINE_free ( e );
- ENGINE_cleanup ();
-@@ -544,6 +545,7 @@ shutdown_openssl ( ENGINE * const e )
- EVP_cleanup ();
- CRYPTO_cleanup_all_ex_data ();
- ERR_free_strings ();
-+#endif
- }
- #endif
-
include $(TOPDIR)/rules.mk
PKG_NAME:=libdaq3
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=920344f5c98ac68b401d1bc92ebaed78b0d15779b0480c213db279d0a60acc32
+PKG_HASH:=4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658
PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION)
PKG_FIXUP:=autoreconf
include $(TOPDIR)/rules.mk
PKG_NAME:=libexif
-PKG_VERSION:=0.6.23
+PKG_VERSION:=0.6.24
PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/libexif/libexif/releases/download/v$(PKG_VERSION)
-PKG_HASH:=a740a99920eb81ae0aa802bb46e683ce6e0cde061c210f5d5bde5b8572380431
+PKG_HASH:=d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae
PK_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=libgpg-error
-PKG_VERSION:=1.42
+PKG_VERSION:=1.43
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://mirrors.dotsrc.org/gcrypt/libgpg-error \
http://ring.ksc.gr.jp/archives/net/gnupg/libgpg-error \
https://www.gnupg.org/ftp/gcrypt/libgpg-error
-PKG_HASH:=fc07e70f6c615f8c4f590a8e37a9b8dd2e2ca1e9408f8e60459c67452b925e23
+PKG_HASH:=a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
+++ /dev/null
-From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 26 Mar 2021 16:06:50 +0900
-Subject: [PATCH 1/2] build: Fix generation of lock-obj-pub.native.h for cross
- build.
-
-* src/gen-lock-obj.sh: Capture echo output with quotes.
-
---
-
-Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
-Signed-off-by: David Michael <fedora.dm0@gmail.com>
----
- src/gen-lock-obj.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,7 +38,7 @@
- # AWK=gawk ./gen-lock-obj.sh
- #
-
--if test -n `echo -n`; then
-+if test -n "`echo -n`"; then
- ECHO_C='\c'
- ECHO_N=''
- else
include $(TOPDIR)/rules.mk
PKG_NAME:=libjpeg-turbo
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+PKG_HASH:=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
PKG_LICENSE:=BSD-3-Clause IJG zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=libmpdclient
-PKG_VERSION:=2.19
-PKG_RELEASE:=1
+PKG_VERSION:=2.20
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/libmpdclient/2
-PKG_HASH:=158aad4c2278ab08e76a3f2b0166c99b39fae00ee17231bd225c5a36e977a189
+PKG_HASH:=18793f68e939c3301e34d8fcadea1f7daa24143941263cecadb80126194e277d
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=libnetfilter_log
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=3
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
http://www.netfilter.org/projects/libnetfilter_log/files/ \
ftp://ftp.netfilter.org/pub/libnetfilter_log/
-PKG_HASH:=74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21
+PKG_HASH:=e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea
PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
PKG_FIXUP:=autoreconf
+++ /dev/null
-From 8858b8eacd1385f99796ead78b3a7157c5e93121 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:14 +0200
-Subject: [PATCH 1/6] build: remove unnecessary pkgconfig->config.status
- dependency
-
-The flags obtained from pkgconfig are in essence preprocessor ones.
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Make_global.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Make_global.am
-+++ b/Make_global.am
-@@ -1,2 +1,2 @@
--AM_CPPFLAGS = -I${top_srcdir}/include
--AM_CFLAGS = -Wall ${LIBNFNETLINK_CFLAGS}
-+AM_CPPFLAGS = -I${top_srcdir}/include ${LIBNFNETLINK_CFLAGS}
-+AM_CFLAGS = -Wall
+++ /dev/null
-From fee63b81ee432d0b3e03ffcf9f54cda99476f267 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Sun, 24 Jun 2012 14:57:48 +0200
-Subject: [PATCH 2/6] build: remove unused lines in Makefile.am
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,4 @@
--AM_CPPFLAGS = -I$(top_srcdir)/include
- SUBDIRS = include src utils
--LINKOPTS = -lnfnetlink
-
- ACLOCAL_AMFLAGS = -I m4
-
+++ /dev/null
-From 1aa23946431ac593568ccac0e0b6925e7dfd7bd3 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Mon, 8 Oct 2012 15:15:07 +0200
-Subject: [PATCH 3/6] build: resolve automake-1.12 warnings
-
-am/ltlibrary.am: warning: 'libnetfilter_log.la': linking libtool
-libraries using a non-POSIX archiver requires 'AM_PROG_AR' in
-'configure.ac'
-
-Signed-off-by: Jan Engelhardt <jengelh@inai.de>
----
- configure.ac | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,6 +7,7 @@ AC_CONFIG_MACRO_DIR([m4])
-
- AM_INIT_AUTOMAKE([-Wall foreign subdir-objects
- tar-pax no-dist-gzip dist-bzip2 1.6])
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-
- dnl kernel style compile messages
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+++ /dev/null
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: [PATCH 4/6] Add include needed for integer type definition.
-
----
- include/libnetfilter_log/libnetfilter_log.h | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
-
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
-
- struct nflog_handle;
+++ /dev/null
-From 2f22d3c4453135c27873b9014e9dc5b5712804df Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 10 Sep 2013 16:23:31 -0300
-Subject: [PATCH 5/6] configure: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
-
- case "$host" in
--*-*-linux*) ;;
-+*-*-linux* | *-*-uclinux*) ;;
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
-
+++ /dev/null
-From a1b392b4156db984ab2b695a4a70d113f70cb9b8 Mon Sep 17 00:00:00 2001
-From: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Date: Wed, 5 Feb 2014 14:18:57 +0100
-Subject: [PATCH 6/6] configure: add --without-ipulog option to disable
- libipulog build
-
-This is a compat library used for netfilter ULOG target.
-ULOG only works with IPv4. NFLOG has replaced ULOG.
-
-Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- configure.ac | 5 +++++
- include/libnetfilter_log/Makefile.am | 5 ++++-
- src/Makefile.am | 6 +++++-
- utils/Makefile.am | 7 +++++--
- 4 files changed, 19 insertions(+), 4 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,6 +24,11 @@ case "$host" in
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
-
-+AC_ARG_WITH([ipulog],
-+ AC_HELP_STRING([--without-ipulog], [don't build libipulog compat library]),
-+ [ipulog_skip=1], [ipulog_skip=0])
-+AM_CONDITIONAL([BUILD_IPULOG], [test $ipulog_skip = 0])
-+
- dnl Dependencies
- PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 0.0.41])
-
---- a/include/libnetfilter_log/Makefile.am
-+++ b/include/libnetfilter_log/Makefile.am
-@@ -1,3 +1,6 @@
-
--pkginclude_HEADERS = libnetfilter_log.h libipulog.h linux_nfnetlink_log.h
-+pkginclude_HEADERS = libnetfilter_log.h linux_nfnetlink_log.h
-
-+if BUILD_IPULOG
-+pkginclude_HEADERS += libipulog.h
-+endif
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,14 +22,18 @@ LIBVERSION=2:0:1
-
- include ${top_srcdir}/Make_global.am
-
--lib_LTLIBRARIES = libnetfilter_log.la libnetfilter_log_libipulog.la
-+lib_LTLIBRARIES = libnetfilter_log.la
-
- libnetfilter_log_la_LDFLAGS = -Wc,-nostartfiles -lnfnetlink \
- -version-info $(LIBVERSION)
- libnetfilter_log_la_SOURCES = libnetfilter_log.c
- libnetfilter_log_la_LIBADD = ${LIBNFNETLINK_LIBS}
-
-+if BUILD_IPULOG
-+lib_LTLIBRARIES += libnetfilter_log_libipulog.la
-+
- libnetfilter_log_libipulog_la_LDFLAGS = -Wc,-nostartfiles \
- -version-info 1:0:0
- libnetfilter_log_libipulog_la_LIBADD = libnetfilter_log.la
- libnetfilter_log_libipulog_la_SOURCES = libipulog_compat.c
-+endif
---- a/utils/Makefile.am
-+++ b/utils/Makefile.am
-@@ -1,12 +1,15 @@
- include ${top_srcdir}/Make_global.am
-
--check_PROGRAMS = nfulnl_test ulog_test
-+check_PROGRAMS = nfulnl_test
-
- nfulnl_test_SOURCES = nfulnl_test.c
- nfulnl_test_LDADD = ../src/libnetfilter_log.la
- nfulnl_test_LDFLAGS = -dynamic
-
-+if BUILD_IPULOG
-+check_PROGRAMS += ulog_test
-+
- ulog_test_SOURCES = ulog_test.c
- ulog_test_LDADD = ../src/libnetfilter_log_libipulog.la ../src/libnetfilter_log.la
- ulog_test_LDFLAGS = -dynamic
--
-+endif
+++ /dev/null
-From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 16 May 2015 13:37:53 +0200
-Subject: include: Sync with current kernel headers
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++-------------
- 1 file changed, 25 insertions(+), 26 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -20,33 +20,31 @@ enum nfulnl_msg_types {
- };
-
- struct nfulnl_msg_packet_hdr {
-- u_int16_t hw_protocol; /* hw protocol (network order) */
-- u_int8_t hook; /* netfilter hook */
-- u_int8_t _pad;
--} __attribute__ ((packed));
-+ __be16 hw_protocol; /* hw protocol (network order) */
-+ __u8 hook; /* netfilter hook */
-+ __u8 _pad;
-+};
-
- struct nfulnl_msg_packet_hw {
-- u_int16_t hw_addrlen;
-- u_int16_t _pad;
-- u_int8_t hw_addr[8];
--} __attribute__ ((packed));
-+ __be16 hw_addrlen;
-+ __u16 _pad;
-+ __u8 hw_addr[8];
-+};
-
- struct nfulnl_msg_packet_timestamp {
-- aligned_u64 sec;
-- aligned_u64 usec;
--} __attribute__ ((packed));
--
--#define NFULNL_PREFIXLEN 30 /* just like old log target */
-+ __aligned_be64 sec;
-+ __aligned_be64 usec;
-+};
-
- enum nfulnl_attr_type {
- NFULA_UNSPEC,
- NFULA_PACKET_HDR,
-- NFULA_MARK, /* u_int32_t nfmark */
-+ NFULA_MARK, /* __u32 nfmark */
- NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */
-- NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */
-+ NFULA_IFINDEX_INDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_OUTDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSINDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
- NFULA_HWADDR, /* nfulnl_msg_packet_hw */
- NFULA_PAYLOAD, /* opaque data payload */
- NFULA_PREFIX, /* string prefix */
-@@ -71,23 +69,23 @@ enum nfulnl_msg_config_cmds {
- };
-
- struct nfulnl_msg_config_cmd {
-- u_int8_t command; /* nfulnl_msg_config_cmds */
-+ __u8 command; /* nfulnl_msg_config_cmds */
- } __attribute__ ((packed));
-
- struct nfulnl_msg_config_mode {
-- u_int32_t copy_range;
-- u_int8_t copy_mode;
-- u_int8_t _pad;
-+ __be32 copy_range;
-+ __u8 copy_mode;
-+ __u8 _pad;
- } __attribute__ ((packed));
-
- enum nfulnl_attr_config {
- NFULA_CFG_UNSPEC,
- NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */
- NFULA_CFG_MODE, /* nfulnl_msg_config_mode */
-- NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */
-- NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */
-- NFULA_CFG_QTHRESH, /* u_int32_t */
-- NFULA_CFG_FLAGS, /* u_int16_t */
-+ NFULA_CFG_NLBUFSIZ, /* __u32 buffer size */
-+ NFULA_CFG_TIMEOUT, /* __u32 in 1/100 s */
-+ NFULA_CFG_QTHRESH, /* __u32 */
-+ NFULA_CFG_FLAGS, /* __u16 */
- __NFULA_CFG_MAX
- };
- #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-@@ -95,6 +93,7 @@ enum nfulnl_attr_config {
- #define NFULNL_COPY_NONE 0x00
- #define NFULNL_COPY_META 0x01
- #define NFULNL_COPY_PACKET 0x02
-+/* 0xff is reserved, don't use it for new copy modes. */
-
- #define NFULNL_CFG_F_SEQ 0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
+++ /dev/null
-From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001
-From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
-Date: Fri, 11 Sep 2015 12:12:11 +0900
-Subject: include: Sync with kernel headers
-
-Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -1,16 +1,12 @@
- #ifndef _NFNETLINK_LOG_H
- #define _NFNETLINK_LOG_H
-
--#ifndef aligned_u64
--#define aligned_u64 unsigned long long __attribute__((aligned(8)))
--#endif
--
- /* This file describes the netlink messages (i.e. 'protocol packets'),
- * and not any kind of function definitions. It is shared between kernel and
- * userspace. Don't put kernel specific stuff in here */
-
- #include <linux/types.h>
--#include <libnfnetlink/linux_nfnetlink.h>
-+#include <linux/netfilter/nfnetlink.h>
-
- enum nfulnl_msg_types {
- NFULNL_MSG_PACKET, /* packet from kernel to userspace */
-@@ -55,6 +51,8 @@ enum nfulnl_attr_type {
- NFULA_HWTYPE, /* hardware type */
- NFULA_HWHEADER, /* hardware header */
- NFULA_HWLEN, /* hardware header length */
-+ NFULA_CT, /* nf_conntrack_netlink.h */
-+ NFULA_CT_INFO, /* enum ip_conntrack_info */
-
- __NFULA_MAX
- };
-@@ -97,5 +95,6 @@ enum nfulnl_attr_config {
-
- #define NFULNL_CFG_F_SEQ 0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
-+#define NFULNL_CFG_F_CONNTRACK 0x0004
-
- #endif /* _NFNETLINK_LOG_H */
--disable-gtk-doc-pdf \
--disable-silent-rules \
--enable-firmware-update \
- --$(if $(LIBQMI_WITH_MBIM_QMUX),en,dis)able-mbim-qmux \
- --$(if $(LIBQMI_WITH_QRTR_GLIB),en,dis)able-qrtr \
--enable-more-warnings=yes \
--without-udev \
--without-udev-base-dir
+ifeq ($(CONFIG_LIBQMI_WITH_MBIM_QMUX),y)
+ CONFIGURE_ARGS += --enable-mbim-qmux
+else
+ CONFIGURE_ARGS += --disable-mbim-qmux
+endif
+
+ifeq ($(CONFIG_LIBQMI_WITH_QRTR_GLIB),y)
+ CONFIGURE_ARGS += --enable-qrtr
+else
+ CONFIGURE_ARGS += --disable-qrtr
+endif
+
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
$(CP) \
include $(TOPDIR)/rules.mk
PKG_NAME:=libsoup
-PKG_VERSION:=2.72.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.74.2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.72
-PKG_HASH:=170c3f8446b0f65f8e4b93603349172b1085fb8917c181d10962f02bb85f5387
+PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.74
+PKG_HASH:=f0a427656e5fe19e1df71c107e88dfa1b2e673c25c547b7823b6018b40d01159
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=libtorrent-rasterbar
-PKG_VERSION:=2.0.4
+PKG_VERSION:=2.0.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/arvidn/libtorrent/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=dfbc0d67c75e828530ee2b705442196429eaf255a3f757099e69c95f33e6f940
+PKG_HASH:=8879d233d81b9bc1b02fdac35f6e1f69509c74da9818c6a819d18b5e42983f56
PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
PKG_LICENSE:=BSD-3-Clause
+++ /dev/null
-From 8ed34b67df8c795780f80db5be35ad468713110e Mon Sep 17 00:00:00 2001
-From: arvidn <arvid@libtorrent.org>
-Date: Thu, 19 Aug 2021 11:54:13 +0200
-Subject: [PATCH] bump handler allocation sizes for boost-1.77 (linux)
-
----
- include/libtorrent/aux_/allocating_handler.hpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/include/libtorrent/aux_/allocating_handler.hpp
-+++ b/include/libtorrent/aux_/allocating_handler.hpp
-@@ -122,14 +122,14 @@ namespace libtorrent { namespace aux {
- constexpr std::size_t fuzzer_write_cost = 0;
- constexpr std::size_t fuzzer_read_cost = 0;
- #endif
-- constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 152;
-- constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 152;
-- constexpr std::size_t udp_handler_max_size = tracking + 144;
-- constexpr std::size_t utp_handler_max_size = tracking + 168;
-+ constexpr std::size_t write_handler_max_size = tracking + debug_write_iter + openssl_write_cost + fuzzer_write_cost + 168;
-+ constexpr std::size_t read_handler_max_size = tracking + debug_read_iter + openssl_read_cost + fuzzer_read_cost + 168;
-+ constexpr std::size_t udp_handler_max_size = tracking + 160;
-+ constexpr std::size_t utp_handler_max_size = tracking + 184;
- constexpr std::size_t abort_handler_max_size = tracking + 72;
- constexpr std::size_t submit_handler_max_size = tracking + 72;
- constexpr std::size_t deferred_handler_max_size = tracking + 80;
-- constexpr std::size_t tick_handler_max_size = tracking + 112;
-+ constexpr std::size_t tick_handler_max_size = tracking + 128;
- #endif
-
- enum HandlerName
include $(TOPDIR)/rules.mk
PKG_NAME:=libupnp
-PKG_VERSION:=1.14.7
+PKG_VERSION:=1.14.12
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/pupnp
-PKG_HASH:=7b66ac4a86bc0e218e2771ac274b2945bc4154bf9054e57b14afb67c26ac7c24
+PKG_HASH:=091c80aada1e939c2294245c122be2f5e337cc932af7f7d40504751680b5b5ac
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=minizip-ng
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/zlib-ng/minizip-ng/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=5f1dd0d38adbe9785cb9c4e6e47738c109d73a0afa86e58c4025ce3e2cc504ed
+PKG_HASH:=2ab219f651901a337a7d3c268128711b80330a99ea36bdc528c76b591a624c3c
PKG_MAINTAINER:=David Woodhouse <dwmw2@infradead.org>
PKG_LICENSE:=Zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=neon
-PKG_VERSION:=0.31.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.32.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://notroj.github.io/neon
-PKG_HASH:=cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+PKG_HASH:=05c54bc115030c89e463a4fb28d3a3f8215879528ba5ca70d676d3d21bf3af52
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
PKG_LICENSE:=LGPL-2.1-or-later
--- /dev/null
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -45,7 +45,7 @@ INSTALL = @INSTALL@
+ transform = @program_transform_name@
+
+ LIBTOOL = @LIBTOOL@
+-XMLTO = xmlto
++XMLTO = /bin/true
+ GCOV = gcov
+ XGETTEXT_OPTS = --keyword=_ --keyword=N_ --msgid-bugs-address=neon@lists.manyfish.co.uk \
+ --default-domain=neon --flag ne_print_request_header:3:c-format \
+@@ -149,7 +149,7 @@ install-memleak:
+ @echo "ERROR: purposes only; this copy of neon must not be installed."
+ @false
+
+-install-yes: install-lib install-headers install-config install-docs install-nls
++install-yes: install-lib install-headers install-config install-nls
+
+ # libtool does all the necessary magic here
+ install-lib: subdirs
include $(TOPDIR)/rules.mk
PKG_NAME:=nss
-PKG_VERSION:=3.69
+PKG_VERSION:=3.73
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
https://download.cdn.mozilla.net/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src \
https://archive.mozilla.org/pub/security/$(PKG_NAME)/releases/NSS_$(subst .,_,$(PKG_VERSION))_RTM/src
-PKG_HASH:=c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799
+PKG_HASH:=566d3a68da9b10d7da9ef84eb4fe182f8f04e20d85c55d1bf360bb2c0096d8e5
PKG_MAINTAINER:=Lucian Cristian <lucian.cristian@gmail.com>
PKG_LICENCE:=MPL-2.0
--- /dev/null
+if PACKAGE_libopenldap
+ config OPENLDAP_DEBUG
+ bool "Enable debugging information"
+ default y
+ help
+ Enable debugging information. This option must be enabled
+ for the loglevel directive to work.
+ config OPENLDAP_CRYPT
+ bool "Crypt(3) passwords support"
+ default n
+ help
+ With crypt(3) password storage scheme enabled, OpenLDAP can
+ receive and store SHA-256 and SHA-512 password hashes from
+ Samba AD-DC. If this option is disabled, synchronization of
+ passwords between Samba AD-DC (v4.5 and above) and OpenLDAP
+ requires use of cleartext passwords.
+ To enable crypt(3) password synchronization functionality:
+ 1. Re-include crypt(3) support in OpenWRT by enabling 'Include
+ crypt() support for SHA256, SHA512 and Blowfish ciphers' option
+ in "Advanced configuration options (for developers)" ->
+ "Toolchain Options".
+ 2. Provision AD-DC with 'password hash userPassword schemes'
+ option. For more information, see smb.conf manpage for details
+ on 'password hash userPassword schemes'.
+ 3. Use a script to synchronize passwords from AD-DC to
+ OpenLDAP. See samba-tool manpage for 'user syncpasswords'.
+ config OPENLDAP_MONITOR
+ bool "Enable monitor backend"
+ default n
+ help
+ Enable monitor backend to obtain information about the running
+ status of the daemon. See OpenLDAP documentation for more
+ information.
+ config OPENLDAP_DB47
+ bool "Berkeley DB support"
+ default n
+ help
+ Enable Berkeley DB support (BDB).
+ config OPENLDAP_ICU
+ bool "ICU support"
+ default n
+ help
+ Enable ICU (International Components for Unicode) support.
+endif
include $(TOPDIR)/rules.mk
PKG_NAME:=openldap
-PKG_VERSION:=2.4.58
+PKG_VERSION:=2.6.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
http://mirror.eu.oneandone.net/software/openldap/openldap-release/ \
http://mirror.switch.ch/ftp/software/mirror/OpenLDAP/openldap-release/ \
https://www.openldap.org/software/download/OpenLDAP/openldap-release/
-PKG_HASH:=57b59254be15d0bf6a9ab3d514c1c05777b02123291533134a87c94468f8f47b
+PKG_HASH:=b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f
PKG_LICENSE:=OLDAP-2.8
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:openldap:openldap
PKG_FIXUP:=autoreconf
+# Fixes the following:
+# libtool: Version mismatch error. This is libtool 2.4.2, but the
+# libtool: definition of this LT_INIT comes from libtool 2.4.6.
+# libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
+# libtool: and run autoconf again.
+PKG_REMOVE_FILES:=build/ltversion.m4
+
PKG_CONFIG_DEPENDS := \
CONFIG_OPENLDAP_DEBUG \
CONFIG_OPENLDAP_CRYPT \
define Package/libopenldap
$(call Package/libopenldap/Default)
MENU:=1
- DEPENDS:=+libopenssl +libsasl2 +libpthread +OPENLDAP_DB47:libdb47 +OPENLDAP_ICU:icu
+ DEPENDS:=+libopenssl +libsasl2 +libpthread +libuuid +OPENLDAP_DB47:libdb47 +OPENLDAP_ICU:icu
TITLE+= (libraries)
endef
-define Package/libopenldap/config
- config OPENLDAP_DEBUG
- bool "Enable debugging information"
- default y
- help
- Enable debugging information. This option must be enabled
- for the loglevel directive to work.
- config OPENLDAP_CRYPT
- bool "Crypt(3) passwords support"
- default n
- help
- With crypt(3) password storage scheme enabled, OpenLDAP can
- receive and store SHA-256 and SHA-512 password hashes from
- Samba AD-DC. If this option is disabled, synchronization of
- passwords between Samba AD-DC (v4.5 and above) and OpenLDAP
- requires use of cleartext passwords.
- To enable crypt(3) password synchronization functionality:
- 1. Re-include crypt(3) support in OpenWRT by enabling 'Include
- crypt() support for SHA256, SHA512 and Blowfish ciphers' option
- in "Advanced configuration options (for developers)" ->
- "Toolchain Options".
- 2. Provision AD-DC with 'password hash userPassword schemes'
- option. For more information, see smb.conf manpage for details
- on 'password hash userPassword schemes'.
- 3. Use a script to synchronize passwords from AD-DC to
- OpenLDAP. See samba-tool manpage for 'user syncpasswords'.
- config OPENLDAP_MONITOR
- bool "Enable monitor backend"
- default n
- help
- Enable monitor backend to obtain information about the running
- status of the daemon. See OpenLDAP documentation for more
- information.
- config OPENLDAP_DB47
- bool "Berkeley DB support"
- default n
- help
- Enable Berkeley DB support (BDB).
- config OPENLDAP_ICU
- bool "ICU support"
- default n
- help
- Enable ICU (International Components for Unicode) support.
+define Package/openldap/config
+ source "$(SOURCE)/Config.in"
endef
define Package/libopenldap/description
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1 @@
-+SUBDIRS = include libraries clients servers tests doc
---- a/libraries/Makefile.in
-+++ b/libraries/Makefile.in
+--- a/clients/tools/Makefile.in
++++ b/clients/tools/Makefile.in
@@ -13,6 +13,8 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
+SHELL = @SHELL@
+
- SUBDIRS= \
- liblutil \
- liblber \
+ SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
+ ldappasswd.c ldapwhoami.c ldapvc.c ldapcompare.c \
+ ldapexop.c ldapurl.c common.c
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -13,6 +13,8 @@
+
LIBRARY = libldap.la
- PROGRAMS = apitest dntest ftest ltest urltest
---- a/libraries/libldap_r/Makefile.in
-+++ b/libraries/libldap_r/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
-
-+SHELL = @SHELL@
-+
- LIBRARY = libldap_r.la
-
- PROGRAMS = apitest ltest
+ PROGRAMS = apitest dntest ftest ltest urltest testavl
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -13,6 +13,8 @@
+SHELL = @SHELL@
+
LIBRARY = liblutil.a
- PROGRAM = testavl
+ LDAP_INCDIR= ../../include
--- a/libraries/librewrite/Makefile.in
+++ b/libraries/librewrite/Makefile.in
@@ -16,6 +16,8 @@
SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \
session.c subst.c var.c xmap.c \
parse.c rewrite.c
---- a/clients/tools/Makefile.in
-+++ b/clients/tools/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
-
-+SHELL = @SHELL@
-+
- SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
- ldappasswd.c ldapwhoami.c ldapcompare.c \
- ldapexop.c ldapurl.c common.c
---- a/servers/slapd/Makefile.in
-+++ b/servers/slapd/Makefile.in
+--- a/libraries/Makefile.in
++++ b/libraries/Makefile.in
@@ -13,6 +13,8 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
+SHELL = @SHELL@
+
- SLAPTOOLS=slapadd slapcat slapdn slapindex slappasswd slaptest slapauth slapacl slapschema
- PROGRAMS=slapd $(SLAPTOOLS)
- XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -13,6 +13,8 @@
+ SUBDIRS= \
+ liblutil \
+ liblber \
+--- a/servers/lloadd/Makefile.in
++++ b/servers/lloadd/Makefile.in
+@@ -13,6 +13,7 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
+SHELL = @SHELL@
-+
- SRCS = overlays.c \
- accesslog.c \
- auditlog.c \
---- a/tests/progs/Makefile.in
-+++ b/tests/progs/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
-+SHELL = @SHELL@
-+
- PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
- slapd-modify slapd-bind slapd-mtread ldif-filter
+ XSRCS = version.c
---- a/servers/slapd/back-bdb/Makefile.in
-+++ b/servers/slapd/back-bdb/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
+--- a/servers/slapd/back-asyncmeta/Makefile.in
++++ b/servers/slapd/back-asyncmeta/Makefile.in
+@@ -19,6 +19,8 @@
+ ## based on back-meta module for inclusion in OpenLDAP Software.
+ ## This work was sponsored by Ericsson
+SHELL = @SHELL@
+
- SRCS = init.c tools.c config.c \
- add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
- extended.c referral.c operational.c \
+ SRCS = init.c config.c search.c message_queue.c bind.c add.c compare.c \
+ delete.c modify.c modrdn.c map.c \
+ conn.c candidates.c dncache.c meta_result.c
--- a/servers/slapd/back-dnssrv/Makefile.in
+++ b/servers/slapd/back-dnssrv/Makefile.in
@@ -18,6 +18,8 @@
SRCS = init.c bind.c search.c config.c referral.c
OBJS = init.lo bind.lo search.lo config.lo referral.lo
---- a/servers/slapd/back-hdb/Makefile.in
-+++ b/servers/slapd/back-hdb/Makefile.in
-@@ -15,6 +15,8 @@
- #
- ## Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
-
-+SHELL = @SHELL@
-+
- XXDIR = $(srcdir)/../back-bdb
-
- XXSRCS = init.c tools.c config.c \
--- a/servers/slapd/back-ldap/Makefile.in
+++ b/servers/slapd/back-ldap/Makefile.in
@@ -13,6 +13,8 @@
SRCS = init.c search.c compare.c modify.c bind.c \
operational.c \
cache.c entry.c \
---- a/servers/slapd/back-ndb/Makefile.in
-+++ b/servers/slapd/back-ndb/Makefile.in
-@@ -17,6 +17,8 @@
- ## This work was initially developed by Howard Chu for inclusion
- ## in OpenLDAP Software. This work was sponsored by MySQL.
-
-+SHELL = @SHELL@
-+
- SRCS = init.cpp tools.cpp config.cpp ndbio.cpp \
- add.cpp bind.cpp compare.cpp delete.cpp modify.cpp modrdn.cpp search.cpp
-
--- a/servers/slapd/back-null/Makefile.in
+++ b/servers/slapd/back-null/Makefile.in
@@ -13,6 +13,8 @@
SRCS = init.c op.c
OBJS = init.lo op.lo
---- a/servers/slapd/back-shell/Makefile.in
-+++ b/servers/slapd/back-shell/Makefile.in
-@@ -13,6 +13,8 @@
- ## top-level directory of the distribution or, alternatively, at
- ## <http://www.OpenLDAP.org/license.html>.
-
-+SHELL = @SHELL@
-+
- SRCS = init.c config.c fork.c search.c bind.c unbind.c add.c \
- delete.c modify.c modrdn.c compare.c result.c
- OBJS = init.lo config.lo fork.lo search.lo bind.lo unbind.lo add.lo \
--- a/servers/slapd/back-sock/Makefile.in
+++ b/servers/slapd/back-sock/Makefile.in
@@ -17,6 +17,8 @@
SRCS = init.c config.c search.c bind.c compare.c operational.c \
entry-id.c schema-map.c sql-wrap.c modify.c util.c \
add.c delete.c modrdn.c api.c
---- a/servers/slapd/shell-backends/Makefile.in
-+++ b/servers/slapd/shell-backends/Makefile.in
+--- a/servers/slapd/back-wt/Makefile.in
++++ b/servers/slapd/back-wt/Makefile.in
+@@ -13,6 +13,8 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
++SHELL = @SHELL@
++
+ SRCS = init.c tools.c config.c \
+ add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
+ extended.c operational.c \
+--- a/servers/slapd/Makefile.in
++++ b/servers/slapd/Makefile.in
+@@ -13,6 +13,8 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
++SHELL = @SHELL@
++
+ SLAPTOOLS=slapadd slapcat slapdn slapindex slapmodify slappasswd slaptest slapauth slapacl slapschema
+ PROGRAMS=slapd $(SLAPTOOLS)
+ XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
+--- a/servers/slapd/overlays/Makefile.in
++++ b/servers/slapd/overlays/Makefile.in
@@ -13,6 +13,8 @@
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
+SHELL = @SHELL@
+
- PROGRAMS = passwd-shell
+ SRCS = overlays.c \
+ accesslog.c \
+ auditlog.c \
+--- a/servers/slapd/pwmods/Makefile.in
++++ b/servers/slapd/pwmods/Makefile.in
+@@ -13,6 +13,8 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
- SRCS = passwd-shell.c shellutil.c
++SHELL = @SHELL@
++
+ SRCS = argon2.c
+
+ LTONLY_MOD = $(LTONLY_mod)
--- a/servers/slapd/slapi/Makefile.in
+++ b/servers/slapd/slapi/Makefile.in
@@ -14,6 +14,8 @@
LIBRARY = libslapi.la
#all-common: $(LIBRARY) $(PROGRAMS)
+--- a/tests/progs/Makefile.in
++++ b/tests/progs/Makefile.in
+@@ -13,6 +13,8 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
++SHELL = @SHELL@
++
+ PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
+ slapd-modify slapd-bind slapd-mtread ldif-filter slapd-watcher
+
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1 +1 @@
--SUBDIRS = include libraries clients servers tests doc
-+SUBDIRS = include libraries clients servers
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -13,7 +13,7 @@
+ ## top-level directory of the distribution or, alternatively, at
+ ## <http://www.OpenLDAP.org/license.html>.
+
+-SUBDIRS= include libraries clients servers tests doc
++SUBDIRS= include libraries clients servers
+ CLEANDIRS=
+ INSTALLDIRS=
+
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
-@@ -122,7 +122,7 @@ install-local: FORCE
+@@ -131,7 +131,7 @@ install-local: FORCE
-$(MKDIR) $(DESTDIR)$(bindir)
@( \
for prg in $(PROGRAMS); do \
-- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \
+- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$prg$(EXEEXT) \
$(DESTDIR)$(bindir); \
done \
)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
-@@ -380,7 +380,7 @@ install-local-srv: install-slapd install
+@@ -377,7 +377,7 @@ install-local-srv: install-slapd install
install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir)
-$(MKDIR) $(DESTDIR)$(localstatedir)/run
-- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
+- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \
+ $(LTINSTALL) $(INSTALLFLAGS) -m 755 \
slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
@for i in $(SUBDIRS); do \
+++ /dev/null
---- a/libraries/libldap/tls2.c
-+++ b/libraries/libldap/tls2.c
-@@ -41,6 +41,7 @@ static tls_impl *tls_imp = &ldap_int_tls
- #define HAS_TLS( sb ) ber_sockbuf_ctrl( sb, LBER_SB_OPT_HAS_IO, \
- (void *)tls_imp->ti_sbio )
-
-+static int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in );
- #endif /* HAVE_TLS */
-
- #ifdef LDAP_DEVEL
--- a/servers/slapd/slapd.conf
+++ b/servers/slapd/slapd.conf
-@@ -50,7 +50,7 @@ argsfile %LOCALSTATEDIR%/run/slapd.args
+@@ -59,7 +59,7 @@ database config
#######################################################################
database mdb
include $(TOPDIR)/rules.mk
PKG_NAME:=sqlite
-PKG_VERSION:=3330000
-PKG_RELEASE:=2
+PKG_VERSION:=3370000
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
-PKG_HASH:=106a2c48c7f75a298a7557bcc0d5f4f454e5b43811cc738b7ca294d6956bbb15
-PKG_SOURCE_URL:=https://www.sqlite.org/2020/
+PKG_HASH:=731a4651d4d4b36fc7d21db586b2de4dd00af31fd54fb5a9a4b7f492057479f7
+PKG_SOURCE_URL:=https://www.sqlite.org/2021/
PKG_LICENSE:=PUBLICDOMAIN
PKG_LICENSE_FILES:=
include $(TOPDIR)/rules.mk
PKG_NAME:=vips
-PKG_VERSION:=8.10.6
+PKG_VERSION:=8.12.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/libvips/libvips/releases/download/v$(PKG_VERSION)
-PKG_HASH:=2468088d958e0e2de1be2991ff8940bf45664a826c0dad12342e1804e2805a6e
+PKG_HASH:=474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=LGPL-2.1-or-later
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,9 +53,6 @@ AC_SUBST(LIBRARY_CURRENT)
- AC_SUBST(LIBRARY_REVISION)
- AC_SUBST(LIBRARY_AGE)
-
--# init introspection support
--GOBJECT_INTROSPECTION_CHECK([1.30.0])
--
- # remove the '(disabled, use --enable-introspection to enable)'
- # suffix from the found_introspection variable
- if test "x$found_introspection" != x"yes"; then
---- a/libvips/Makefile.am
-+++ b/libvips/Makefile.am
-@@ -67,56 +67,3 @@ install-exec-hook:
- echo "#define VIPS_SONAME \"$$dlname\"" >> soname.h && \
- cp soname.h $(DESTDIR)$(pkgincludedir) && \
- rm soname.h
--
---include $(INTROSPECTION_MAKEFILE)
--INTROSPECTION_GIRS =
--INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
--INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
--
--if HAVE_INTROSPECTION
--
--AM_CPPFLAGS = \
-- -I${top_srcdir}/libvips/include \
-- @VIPS_CFLAGS@ \
-- @VIPS_INCLUDES@ \
-- @INTROSPECTION_CFLAGS@
--AM_LDFLAGS = \
-- @INTROSPECTION_LIBS@ \
-- @LDFLAGS@
--LDADD = @INTROSPECTION_LIBS@ @VIPS_CFLAGS@ libvips.la @VIPS_LIBS@
--
--noinst_PROGRAMS = \
-- introspect$(EXEEXT)
--introspect_SOURCES = \
-- introspect.c
--
--# we can't get the _SOURCES lists from the subdirs directly, we get passed it
--# by configure instead
--introspection_sources = @vips_introspection_sources@
--
--# we make the vips8 API
--Vips-8.0.gir: introspect$(EXEEXT)
--Vips_8_0_gir_INCLUDES = GObject-2.0
--Vips_8_0_gir_CFLAGS = $(INCLUDES) -I${top_srcdir}/libvips/include
--Vips_8_0_gir_LIBS = libvips.la
--Vips_8_0_gir_FILES = $(introspection_sources)
--INTROSPECTION_GIRS += Vips-8.0.gir
--
--# don't use
--# --warn-all --verbose
--# too annoying
--Vips_8_0_gir_SCANNERFLAGS = \
-- --program=./introspect$(EXEEXT) \
-- --identifier-prefix=Vips \
-- --identifier-prefix=vips \
-- --symbol-prefix=vips \
-- --c-include=vips/vips.h
--
--girdir = $(datadir)/gir-1.0
--gir_DATA = $(INTROSPECTION_GIRS)
--
--typelibdir = $(libdir)/girepository-1.0
--typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
--
--CLEANFILES += $(gir_DATA) $(typelib_DATA)
--endif
VIPS_MINOR_VERSION=vips_minor_version()
VIPS_MICRO_VERSION=vips_micro_version()
VIPS_VERSION=vips_version()
--VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r $srcdir/ChangeLog`
+-VIPS_VERSION_STRING="$VIPS_VERSION-$(date -u -r $srcdir/ChangeLog)"
+if test "x$SOURCE_DATE_EPOCH" = "x"; then
+ VIPS_VERSION_STRING=$VIPS_VERSION-`date -u -r ChangeLog`
+else
+ VIPS_VERSION_STRING=$VIPS_VERSION-`LC_ALL=C date --utc --date="@$SOURCE_DATE_EPOCH"`
+fi
- # libtool library versioning ... not user-visible (except as part of the
- # library file name) and does not correspond to major/minor/micro above
+ # packages add to these as we find them
+ VIPS_CFLAGS=""
include $(TOPDIR)/rules.mk
PKG_NAME:=alpine
-PKG_VERSION:=2.24
-PKG_RELEASE:=2
+PKG_VERSION:=2.25
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://alpine.x10host.com/alpine/release/src
-PKG_HASH:=651a9ffa0a29e2b646a0a6e0d5a2c8c50f27a07a26a61640b7c783d06d0abcef
+PKG_HASH:=658a150982f6740bb4128e6dd81188eaa1212ca0bf689b83c2093bb518ecf776
PKG_MAINTAINER:=Antti Seppälä <a.seppala@gmail.com>
PKG_LICENSE:=Apache-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=mblaze
-PKG_VERSION:=1.1
+PKG_VERSION:=1.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://leahneukirchen.org/releases
-PKG_HASH:=edd8cb86f667543e703dee58263b81c7e47744339d23ebbb6a43e75059ba93b1
+PKG_HASH:=50c164c88cc83b4f52691341ee14060da5a6f1859e86aa73ff595de4b410037f
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-libav
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav
-PKG_HASH:=344a463badca216c2cef6ee36f9510c190862bdee48dc4591c0a430df7e8c396
+PKG_HASH:=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-bad
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
-PKG_HASH:=74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f
+PKG_HASH:=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-base
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base
-PKG_HASH:=29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323
+PKG_HASH:=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-good
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/
-PKG_HASH:=b6e50e3a9bbcd56ee6ec71c33aa8332cc9c926b0c1fae995aac8b3040ebe39b0
+PKG_HASH:=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
include $(TOPDIR)/rules.mk
PKG_NAME:=gst1-plugins-ugly
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly
-PKG_HASH:=218df0ce0d31e8ca9cdeb01a3b0c573172cc9c21bb3d41811c7820145623d13c
+PKG_HASH:=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
include $(TOPDIR)/rules.mk
PKG_NAME:=gstreamer1
-PKG_VERSION:=1.18.4
+PKG_VERSION:=1.18.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
-PKG_HASH:=9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5
+PKG_HASH:=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
+comment "Generic options"
+ depends on PACKAGE_tvheadend
+
+config TVHEADEND_OPTIMIZE_SPEED
+ bool "Optimize for speed"
+ depends on PACKAGE_tvheadend
+ default n
+ help
+ Optimize tvheadend for speed instead of size. This option adds -O2 and LTO (Link Time Optimization).
+ Note: No benchmarks were performed when this option was added. Speed improvements (if any) are not known.
+
+config TVHEADEND_TRACE
+ bool "Low level debug trace"
+ depends on PACKAGE_tvheadend
+ default n
+ help
+ Support low level debug trace for tvheadend subsystems.
+ For a list of available subsystems, run "tvheadend --subsystems" in OpenWRT console.
+ Note: Selecting this option does not automatically enable trace logging.
+ It only includes support for --trace command line option and GUI.
+
+config TVHEADEND_AVAHI_SUPPORT
+ bool "Avahi client"
+ depends on PACKAGE_tvheadend
+ select PACKAGE_libavahi-client
+ default n
+ help
+ Enables the opensource implementation of Apple's zero configuration protocol.
+ Tvheadend will advertise itself on the network using this protocol.
+
+choice
+ prompt "Regular Expression"
+ depends on PACKAGE_tvheadend
+ config TVHEADEND_REGEX_POSIX
+ bool "POSIX (internal)"
+ help
+ Use internal POSIX Regular Expressions.
+ Note that not all EPG parsers will work with POSIX RegEx.
+ config TVHEADEND_REGEX_PCRE
+ bool "PCRE (libpcre)"
+ select PACKAGE_libpcre
+ help
+ Use more advanced Perl-Compatible Regular Expressions, provided by libpcre.
+ config TVHEADEND_REGEX_PCRE2
+ bool "PCRE2 (libpcre2)"
+ select PACKAGE_libpcre2
+ help
+ Use more advanced Perl-Compatible Regular Expressions, provided by libpcre2.
+endchoice
+
+config TVHEADEND_IMAGECACHE
+ bool "Image cache"
+ depends on PACKAGE_tvheadend
+ default n
+ help
+ Support caching TV station logos and other images on disk.
+ Note: Activating disk cache will increase fash memory wear.
+ Selecting this option does not automatically enable disk caching. It only includes support for it.
+
comment "Input & output support"
+ depends on PACKAGE_tvheadend
config TVHEADEND_LINUXDVB_SUPPORT
- bool "DVB tuners"
- default y
- help
- Include support for DVB tuners.
- Note: Kernel driver(s) and firmware must also be installed.
+ bool "DVB tuners"
+ depends on PACKAGE_tvheadend
+ default y
+ help
+ Include support for DVB tuners.
+ Note: Kernel driver(s) and firmware must also be installed.
config TVHEADEND_DVBSCAN_SUPPORT
- bool "Fetch DVB-scan data"
- depends on TVHEADEND_LINUXDVB_SUPPORT
- default TVHEADEND_LINUXDVB_SUPPORT
- help
- Download and include DVB scan tables.
+ bool "Include DVB-scan tables"
+ depends on TVHEADEND_LINUXDVB_SUPPORT
+ default TVHEADEND_LINUXDVB_SUPPORT
+ help
+ Download and include DVB scan tables.
config TVHEADEND_IPTV
- bool "IPTV client"
- default y
- help
- Include IP-TV client.
+ bool "IPTV client"
+ depends on PACKAGE_tvheadend
+ default y
+ help
+ Include IP-TV client.
config TVHEADEND_SATIP_CLIENT
- bool "SAT>IP client"
- default y
- help
- Include SAT>IP client. This allows tvheadend to receive streams from a SAT>IP server.
- SAT>IP is a client-server communication protocol in which SAT>IP servers,
- connected to one or more DVB broadcast sources, send the program requested
- by an SAT>IP client over an IP based network.
- The main difference of SAT>IP to other IP-based TV distribution systems
- such as IP-TV and DLNA is that the SAT>IP client does not select a program
- from a server specific list, but has to specify the DVB reception parameters
- such as the signal source, frequency, polarisation, modulation, PIDs and others.
-
+ bool "SAT>IP client"
+ depends on PACKAGE_tvheadend
+ default y
+ help
+ Include SAT>IP client. This allows tvheadend to receive streams from a SAT>IP server.
+
config TVHEADEND_SATIP_SERVER
- bool "SAT>IP server"
- default y
- help
- Include SAT>IP server. This allows tvheadend to stream to SAT>IP clients.
- SAT>IP is a client-server communication protocol in which SAT>IP servers,
- connected to one or more DVB broadcast sources, send the program requested
- by an SAT>IP client over an IP based network.
- The main difference of SAT>IP to other IP-based TV distribution systems
- such as IP-TV and DLNA is that the SAT>IP client does not select a program
- from a server specific list, but has to specify the DVB reception parameters
- such as the signal source, frequency, polarisation, modulation, PIDs and others.
-
+ bool "SAT>IP server"
+ depends on PACKAGE_tvheadend
+ default y
+ help
+ Include SAT>IP server. This allows tvheadend to stream to SAT>IP clients.
+
config TVHEADEND_HDHOMERUN_CLIENT
- bool "HDHomeRun client"
- default y
- help
- Include HDHomeRun client.
- HDHomeRun is a network-attached, digital television tuner box.
+ bool "HDHomeRun client"
+ depends on PACKAGE_tvheadend
+ default y
+ help
+ Include HDHomeRun client.
+ HDHomeRun is a network-attached, digital television tuner box.
comment "SoftCAM (Software Conditional Access Module)"
+ depends on PACKAGE_tvheadend
+ depends on BUILD_PATENTED
-config TVHEADEND_CWC_SUPPORT
- bool "CWC newcamd"
- default y
- help
- Support descrambling using Code Word Client newcamd protocol.
+config TVHEADEND_CSA
+ bool "CSA decoding"
+ depends on PACKAGE_tvheadend
+ depends on BUILD_PATENTED
+ select PACKAGE_libdvbcsa
+ default n
+ help
+ Support decoding CSA (Common Scrambling Algorithm). Uses libdvbcsa package.
-config TVHEADEND_CAPMT_SUPPORT
- bool "CWC capmnt"
- default y
- help
- Support descrambling using Code Word Client capmnt (Linux Network DVBAPI) protocol.
+config TVHEADEND_CONSTCW
+ bool "CCW"
+ depends on TVHEADEND_CSA
+ default TVHEADEND_CSA
+ help
+ Support Constant Control Word.
-config TVHEADEND_CONSTCW_SUPPORT
- bool "CCW"
- default y
- help
- Support descrambling using Constant Code Word.
+config TVHEADEND_CAPMT
+ bool "CWC capmt client"
+ depends on TVHEADEND_CSA
+ default n
+ help
+ Support Control Word Client capmt (Linux Network DVBAPI) protocol.
-comment "Other options"
+config TVHEADEND_NEWCAMD
+ bool "CWC newcamd client"
+ depends on TVHEADEND_CSA
+ default n
+ help
+ Support Control Word Client newcamd protocol.
-config TVHEADEND_AVAHI_SUPPORT
- bool "Avahi client"
- select PACKAGE_libavahi-client
- default n
- help
- Enables the opensource implementation of Apple's zero configuration protocol.
- Tvheadend will advertise itself on the network using this protocol.
+config TVHEADEND_CCCAM
+ bool "CCCam client"
+ depends on TVHEADEND_CSA
+ default n
-config TVHEADEND_IMAGECACHE
- bool "Image cache"
- default n
- help
- Support caching TV station logos and other images on disk.
- Note: Activating disk cache will increase fash memory wear.
- Selecting this option does not automatically enable disk caching. It only includes support for it.
+comment "DVB descrambling and some codecs are only available with BUILD_PATENTED."
+ depends on PACKAGE_tvheadend
+ depends on !BUILD_PATENTED
-config TVHEADEND_TRACE
- bool "Low level debug trace"
- default n
- help
- Support low level debug trace for tvheadend subsystems.
- For a list of available subsystems, run "tvheadend --subsystems" in OpenWRT console.
- Note: Selecting this option does not automatically enable trace logging.
- It only includes support for --trace command line option and GUI.
+## Transcoding | Uncomment these options.
+##comment "Transcoding and codecs"
+## depends on PACKAGE_tvheadend
+##
+##config TVHEADEND_LIBFFMPEG
+## bool "ffmpeg transcoding"
+## depends on PACKAGE_tvheadend
+## depends on BUILD_PATENTED
+## select PACKAGE_libffmpeg-full
+## default n
+## help
+## Use ffmpeg libraries for transcoding.
+##
+##config TVHEADEND_LIBX264
+## bool "x264"
+## depends on PACKAGE_tvheadend
+## depends on BUILD_PATENTED
+## select PACKAGE_libx264
+## default n
+## help
+## Make x264 video codec available for transcoding. Uses libx264 package.
+##
+##config TVHEADEND_LIBX265
+## bool "x265"
+## depends on PACKAGE_tvheadend
+## depends on BUILD_PATENTED
+## default n
+## help
+## Make x265 video codec available for transcoding. Uses static (built-in) libx265.
+##
+##config TVHEADEND_LIBVPX
+## bool "VP8, VP9"
+## depends on PACKAGE_tvheadend
+## select PACKAGE_libvpx
+## default n
+## help
+## Make VP8 and VP9 video codecs available for transcoding. Uses libvpx package.
+##
+##config TVHEADEND_LIBTHEORA
+## bool "Theora"
+## depends on PACKAGE_tvheadend
+## select PACKAGE_libtheora
+## default n
+## help
+## Make Theora video codec available for transcoding. Uses libtheora package.
+##
+##config TVHEADEND_LIBFDKAAC
+## bool "AAC"
+## depends on PACKAGE_tvheadend
+## depends on BUILD_PATENTED
+## select PACKAGE_fdk-aac
+## default n
+## help
+## Make AAC audio codec available for transcoding. Uses fdk-aac package.
+##
+##config TVHEADEND_LIBVORBIS
+## bool "Vorbis"
+## depends on PACKAGE_tvheadend
+## select PACKAGE_libvorbis
+## default n
+## help
+## Make Vorbis audio codec available for transcoding. Uses libvorbis package.
+##
+##config TVHEADEND_LIBOPUS
+## bool "Opus"
+## depends on PACKAGE_tvheadend
+## select PACKAGE_libopusenc
+## default n
+## help
+## Make Opus audio codec available for transcoding. Uses libopusenc package.
-#
-# Copyright (C) 2015 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:=tvheadend
-PKG_VERSION:=4.2.8
+PKG_VERSION:=2021-11-16
PKG_RELEASE:=$(AUTORELEASE)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=1aef889373d5fad2a7bd2f139156d4d5e34a64b6d38b87b868a2df415f01f7ad
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/tvheadend/tvheadend.git
+PKG_MIRROR_HASH:=1645e90b6b8f104f2749fb0911493010f7ae3176253f2a96a4d6094536207c03
+PKG_SOURCE_VERSION:=2efe90cdcf74fdc4179692d283cf46c85e1cf681
+PKG_SOURCE_DATE:=2021-11-16
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=LICENSE.md
+PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=autoreconf
PKG_USE_MIPS16:=0
define Package/tvheadend
SECTION:=multimedia
CATEGORY:=Multimedia
- TITLE:=Tvheadend is a TV streaming server for Linux
- DEPENDS:=+libopenssl +librt +zlib +libffi +TVHEADEND_AVAHI_SUPPORT:libavahi-client $(ICONV_DEPENDS)
+ TITLE:=TV streaming server
+ MENU:=1
USERID:=tvheadend:dvb
URL:=https://tvheadend.org
MAINTAINER:=Marius Dinu <m95d+git@psihoexpert.ro>
+ DEPENDS:= \
+ +librt \
+ +libffi \
+ +libopenssl \
+ $(ICONV_DEPENDS) \
+ +zlib \
+ +TVHEADEND_AVAHI_SUPPORT:libavahi-client \
+ +TVHEADEND_REGEX_PCRE:libpcre \
+ +TVHEADEND_REGEX_PCRE2:libpcre2 \
+ +BUILD_PATENTED&&TVHEADEND_CSA:libdvbcsa
+
+## Transcoding | Add these to DEPENDS.
+## +TVHEADEND_LIBFFMPEG:libffmpeg-full \
+## +TVHEADEND_LIBVPX:libvpx \
+## +TVHEADEND_LIBTHEORA:libtheora \
+## +TVHEADEND_LIBVORBIS:libvorbis \
+## +TVHEADEND_LIBOPUS:libopusenc \
+## +TVHEADEND_LIBFDKAAC:fdk-aac \
+## +BUILD_PATENTED&&TVHEADEND_LIBX264:libx264 \
+
endef
define Package/tvheadend/description
Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android
supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.
-
Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
endef
define Package/tvheadend/config
- menu "Configuration"
- depends on PACKAGE_tvheadend
source "$(SOURCE)/Config.in"
- endmenu
endef
-# Generic build options
+## Generic OpenWrt options
ifneq ($(CONFIG_PKG_ASLR_PIE_NONE),)
- CONFIGURE_ARGS += --disable-pie
+ CONFIGURE_ARGS += --disable-pie
+endif
+
+## Generic tvheadend options
+ifneq ($(CONFIG_TVHEADEND_OPTIMIZE_SPEED),)
+ TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3 -flto
+ TARGET_CXXFLAGS := $(filter-out -O%,$(TARGET_CXXFLAGS)) -O3 -flto
+ TARGET_LDFLAGS += -flto
endif
-# TV sources
+ifeq ($(CONFIG_TVHEADEND_TRACE),)
+ CONFIGURE_ARGS += --disable-trace
+endif
+
+ifneq ($(CONFIG_TVHEADEND_REGEX_PCRE2),)
+ CONFIGURE_ARGS += --disable-pcre --enable-pcre2
+else
+ifneq ($(CONFIG_TVHEADEND_REGEX_PCRE),)
+ CONFIGURE_ARGS += --enable-pcre --disable-pcre2
+else
+ifneq ($(CONFIG_TVHEADEND_REGEX_POSIX),)
+ CONFIGURE_ARGS += --disable-pcre --disable-pcre2
+endif
+endif
+endif
+
+ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),)
+ CONFIGURE_ARGS += --disable-avahi
+else
+ CONFIGURE_ARGS += --enable-avahi
+endif
+
+ifeq ($(CONFIG_TVHEADEND_IMAGECACHE),)
+ CONFIGURE_ARGS += --disable-imagecache
+else
+ CONFIGURE_ARGS += --enable-imagecache
+endif
+
+## TV sources
ifeq ($(CONFIG_TVHEADEND_LINUXDVB_SUPPORT),)
- CONFIGURE_ARGS += --disable-linuxdvb
+ CONFIGURE_ARGS += --disable-linuxdvb
endif
ifeq ($(CONFIG_TVHEADEND_DVBSCAN_SUPPORT),)
- CONFIGURE_ARGS += --disable-dvbscan
+ CONFIGURE_ARGS += --disable-dvbscan
endif
ifeq ($(CONFIG_TVHEADEND_IPTV),)
- CONFIGURE_ARGS += --disable-iptv
+ CONFIGURE_ARGS += --disable-iptv
endif
ifeq ($(CONFIG_TVHEADEND_SATIP_SERVER),)
- CONFIGURE_ARGS += --disable-satip_server
+ CONFIGURE_ARGS += --disable-satip_server
endif
ifeq ($(CONFIG_TVHEADEND_SATIP_CLIENT),)
- CONFIGURE_ARGS += --disable-satip_client
+ CONFIGURE_ARGS += --disable-satip_client
endif
ifeq ($(CONFIG_TVHEADEND_HDHOMERUN_CLIENT),)
- CONFIGURE_ARGS += --disable-hdhomerun_static
+ CONFIGURE_ARGS += --disable-hdhomerun_static
else
- CONFIGURE_ARGS += --enable-hdhomerun_client
+ CONFIGURE_ARGS += --enable-hdhomerun_client
endif
-# Descrambling
-ifeq ($(CONFIG_TVHEADEND_CWC_SUPPORT),)
- CONFIGURE_ARGS += --disable-cwc
+## Descrambling
+ifeq ($(CONFIG_BUILD_PATENTED),)
+ CONFIGURE_ARGS += --disable-tvhcsa --disable-dvbcsa --disable-constcw --disable-cwc --disable-capmt --disable-cccam
+else
+ifeq ($(CONFIG_TVHEADEND_CSA),)
+ CONFIGURE_ARGS += --disable-tvhcsa --disable-dvbcsa --disable-constcw --disable-cwc --disable-capmt --disable-cccam
+else
+ CONFIGURE_ARGS += --enable-tvhcsa --enable-dvbcsa
+ifeq ($(CONFIG_TVHEADEND_CONSTCW),)
+ CONFIGURE_ARGS += --disable-constcw
endif
-
-ifeq ($(CONFIG_TVHEADEND_CAPMT_SUPPORT),)
- CONFIGURE_ARGS += --disable-capmt
+ifeq ($(CONFIG_TVHEADEND_NEWCAMD),)
+ CONFIGURE_ARGS += --disable-cwc
endif
-
-ifeq ($(CONFIG_TVHEADEND_CCW_SUPPORT),)
- CONFIGURE_ARGS += --disable-constcw
+ifeq ($(CONFIG_TVHEADEND_CAPMT),)
+ CONFIGURE_ARGS += --disable-capmt
endif
-
-# Other options
-ifeq ($(CONFIG_TVHEADEND_AVAHI_SUPPORT),)
- CONFIGURE_ARGS += --disable-avahi
-else
- CONFIGURE_ARGS += --enable-avahi
+ifeq ($(CONFIG_TVHEADEND_CCCAM),)
+ CONFIGURE_ARGS += --disable-cccam
endif
-
-ifeq ($(CONFIG_TVHEADEND_IMAGECACHE),)
- CONFIGURE_ARGS += --disable-imagecache
-else
- CONFIGURE_ARGS += --enable-imagecache
endif
-
-ifeq ($(CONFIG_TVHEADEND_TRACE),)
- CONFIGURE_ARGS += --disable-trace
endif
-# libav and ffmpeg are broken, so remove codecs too.
+## Transcoding | Uncomment these.
+##ifeq ($(CONFIG_BUILD_PATENTED),)
+## CONFIGURE_ARGS += --disable-libav --disable-libx264 --disable-libx265 --disable-libx265_static
+##else
+##ifeq ($(CONFIG_TVHEADEND_LIBFFMPEG),)
+## CONFIGURE_ARGS += --disable-libav
+##else
+## CONFIGURE_ARGS += --enable-libav
+##endif
+##ifeq ($(CONFIG_TVHEADEND_LIBX264),)
+## CONFIGURE_ARGS += --disable-libx264
+##endif
+##ifeq ($(CONFIG_TVHEADEND_LIBX265),)
+## CONFIGURE_ARGS += --disable-libx265 --disable-libx265_static
+##endif
+##ifneq ($(CONFIG_TVHEADEND_LIBFDKAAC),)
+## CONFIGURE_ARGS += --enable-libfdkaac
+##endif
+##endif
+##
+##ifeq ($(CONFIG_TVHEADEND_LIBVPX),)
+## CONFIGURE_ARGS += --disable-libvpx
+##endif
+##
+##ifeq ($(CONFIG_TVHEADEND_LIBlibtheora),)
+## CONFIGURE_ARGS += --disable-libtheora
+##endif
+##
+##ifeq ($(CONFIG_TVHEADEND_LIBVORBIS),)
+## CONFIGURE_ARGS += --disable-libvorbis
+##endif
+##
+##ifeq ($(CONFIG_TVHEADEND_LIBOPUS),)
+## CONFIGURE_ARGS += --disable-libopus
+##endif
+
CONFIGURE_ARGS += \
--arch=$(ARCH) \
+ --disable-libsystemd_daemon \
--disable-dbus_1 \
--disable-libav \
--disable-ffmpeg_static \
--disable-libtheora_static \
--disable-libvorbis \
--disable-libvorbis_static \
+ --disable-libopus \
+ --disable-libopus_static \
--disable-libfdkaac \
--disable-libfdkaac_static \
+ --disable-pcloud_cache \
--enable-bundle \
--nowerror=unused-variable
+## Transcoding | Remove these from CONFIGURE_ARGS.
+## --disable-libav \
+## --disable-libx265 \
+## --disable-libx265_static \
+## --disable-libx264_static \
+## --disable-libvpx_static \
+## --disable-libtheora_static \
+## --disable-libvorbis_static \
+## --disable-libopus_static \
+## --disable-libfdkaac_static \
+## --disable-pcloud_cache \
+
define Build/Prepare
$(call Build/Prepare/Default)
echo 'Tvheadend $(shell echo $(PKG_SOURCE_VERSION) | sed "s/^v//")~openwrt$(PKG_RELEASE)' \
$(INSTALL_CONF) ./files/tvheadend.config $(1)/etc/config/tvheadend
$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
$(INSTALL_BIN) ./files/dvb.hotplug $(1)/etc/hotplug.d/usb/50-dvb
-
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/build.linux/tvheadend $(1)/usr/bin/
endef
#!/bin/sh
case "$ACTION" in
add)
- chown -R root:dvb /dev/dvb/*/*
- chmod -R 660 /dev/dvb/*/*
+ chown -R root:dvb /dev/dvb/*
+ chmod -R 660 /dev/dvb/*
;;
esac
ensure_config_exists
procd_open_instance
procd_set_param file /etc/config/tvheadend
- chown -R root:$TVH_GROUP /dev/dvb/*/*
+ chown -R root:$TVH_GROUP /dev/dvb/*
procd_set_param command "$PROG" -B -u $TVH_USER -g $TVH_GROUP
load_uci_config
procd_close_instance
+++ /dev/null
-From 7d657f0a87be1f135f7e5146b06e26121691c33a Mon Sep 17 00:00:00 2001
-From: Josef Schlehofer <pepe.schlehofer@gmail.com>
-Date: Mon, 18 Oct 2021 22:54:02 +0200
-Subject: [PATCH] Makefile.hdhomerun: update library to version 20180817
-
-The previous tarball is not available and because of that, the
-compilation of tvheadend does not proceed.
-
-The latest version can not be used somehow as the compilation fails.
----
- Makefile.hdhomerun | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/Makefile.hdhomerun
-+++ b/Makefile.hdhomerun
-@@ -32,10 +32,10 @@ endif
- # Upstream Packages
- # ###########################################################################
-
--LIBHDHR = libhdhomerun_20171221
-+LIBHDHR = libhdhomerun_20180817
- LIBHDHR_TB = $(LIBHDHR).tgz
--LIBHDHR_URL = http://download.silicondust.com/hdhomerun/$(LIBHDHR_TB)
--LIBHDHR_SHA1 = 6b019728eadea3af7a5686ed5ba44e970bca7365
-+LIBHDHR_URL = https://download.silicondust.com/hdhomerun/$(LIBHDHR_TB)
-+LIBHDHR_SHA1 = 052868bde3a5713c55b4d060b77e0bc3a0d891d6
-
- # ###########################################################################
- # Library Config
+++ /dev/null
---- a/src/main.c
-+++ b/src/main.c
-@@ -1155,10 +1155,12 @@ main(int argc, char **argv)
- sigprocmask(SIG_BLOCK, &set, NULL);
- trap_init(argv[0]);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /* SSL library init */
- OPENSSL_config(NULL);
- SSL_load_error_strings();
- SSL_library_init();
-+#endif
- /* Rand seed */
- randseed.thread_id = (void *)main_tid;
- gettimeofday(&randseed.tv, NULL);
-@@ -1346,8 +1348,11 @@ main(int argc, char **argv)
- if(opt_fork)
- unlink(opt_pidpath);
-
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /* OpenSSL - welcome to the "cleanup" hell */
-+#ifndef OPENSSL_NO_ENGINE
- ENGINE_cleanup();
-+#endif
- RAND_cleanup();
- CRYPTO_cleanup_all_ex_data();
- EVP_cleanup();
-@@ -1355,12 +1360,13 @@ main(int argc, char **argv)
- #if !defined(OPENSSL_NO_COMP)
- COMP_zlib_cleanup();
- #endif
-- ERR_remove_state(0);
-+ ERR_remove_thread_state(NULL);
- ERR_free_strings();
- #if !defined(OPENSSL_NO_COMP) && OPENSSL_VERSION_NUMBER < 0x1010006f
- sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
- #endif
- /* end of OpenSSL cleanup code */
-+#endif
-
- #if ENABLE_DBUS_1
- extern void dbus_shutdown(void);
+++ /dev/null
---- a/src/input/mpegts.h
-+++ b/src/input/mpegts.h
-@@ -1132,7 +1132,7 @@ typedef struct mpegts_listener
- void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
- } mpegts_listener_t;
-
--LIST_HEAD(,mpegts_listener) mpegts_listeners;
-+static LIST_HEAD(,mpegts_listener) mpegts_listeners;
-
- #define mpegts_add_listener(ml)\
- LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
---- a/src/input.h
-+++ b/src/input.h
-@@ -128,8 +128,8 @@ void tvh_hardware_delete ( tvh_hardware_
- extern const idclass_t tvh_input_class;
- extern const idclass_t tvh_input_instance_class;
-
--tvh_input_list_t tvh_inputs;
--tvh_hardware_list_t tvh_hardware;
-+extern tvh_input_list_t tvh_inputs;
-+extern tvh_hardware_list_t tvh_hardware;
-
- #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
- #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
--- /dev/null
+--- a/src/intlconv.c
++++ b/src/intlconv.c
+@@ -36,9 +36,8 @@ intlconv_test( void )
+ (strcmp(s, "ZlutouckyKun") &&
+ strcmp(s, "Zlutouck'yKun") &&
+ strcmp(s, "?lu?ou?k?K??"))) {
+- tvherror(LS_MAIN, "iconv() routine is not working properly (%s), aborting!", s);
++ tvherror(LS_MAIN, "iconv() routine is not working properly (%s)", s);
+ tvh_safe_usleep(2000000);
+- abort();
+ }
+ free(s);
+ }
PKG_NAME:=adblock
PKG_VERSION:=4.1.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
sleep 1
cnt=$((cnt+1))
done
+ fi
+ if [ "${adb_action}" != "stop" ]
+ then
if [ -n "${adb_dnsdir}" ] && [ ! -d "${adb_dnsdir}" ]
then
mkdir -p "${adb_dnsdir}"
f_log "err" "dns backend directory '${adb_dnsdir}' could not be created"
fi
fi
-
+
if [ ! -f "${adb_dnsdir}/${adb_dnsfile}" ]
then
printf "${adb_dnsheader}" > "${adb_dnsdir}/${adb_dnsfile}"
include $(TOPDIR)/rules.mk
PKG_NAME:=adguardhome
-PKG_VERSION:=0.106.3
+PKG_VERSION:=0.107.0
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome
-PKG_MIRROR_HASH:=bdf5ad833df90969cd82b9fb6a91846338c738ed01671fc768d867b592102f7c
+PKG_MIRROR_HASH:=7bb70a3cdbde0d4c451454369317e6265832bcf6743c44fae7df7e3f8a37a108
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE.txt
PKG_MAINTAINER:=Dobroslaw Kijowski <dobo90@gmail.com>
-PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host packr/host
+PKG_BUILD_DEPENDS:=golang/host node/host node-yarn/host
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
define Package/adguardhome/conffiles
/etc/adguardhome.yaml
+/etc/config/adguardhome
endef
define Package/adguardhome/description
( \
pushd $(PKG_BUILD_DIR) ; \
make js-deps js-build ; \
- packr -z -v -i internal ; \
popd ; \
$(call GoPackage/Build/Compile) ; \
)
$(call GoPackage/Package/Install/Bin,$(1))
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/adguardhome.init $(1)/etc/init.d/adguardhome
+
+ $(INSTALL_DIR) $(1)/etc/config
+ $(INSTALL_DATA) ./files/adguardhome.config $(1)/etc/config/adguardhome
endef
$(eval $(call GoBinPackage,adguardhome))
--- /dev/null
+config adguardhome config
+ # Where to store persistent data by AdGuard Home
+ option workdir /var/adguardhome
#!/bin/sh /etc/rc.common
PROG=/usr/bin/AdGuardHome
-WORK_DIR=/tmp/adguardhome
USE_PROCD=1
STOP=89
start_service() {
+ config_load adguardhome
+ config_get WORK_DIR config workdir
+
[ -d "$WORK_DIR" ] || mkdir -m 0755 -p "$WORK_DIR"
procd_open_instance
include $(TOPDIR)/rules.mk
PKG_NAME:=ariang
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip
PKG_SOURCE_URL:=https://github.com/mayswind/AriaNg/releases/download/$(PKG_VERSION)
-PKG_HASH:=be5b050f5aaa10e27446c392f2e7d35b19908a591cd5ea3d2ab1228c7d350e3b
+PKG_HASH:=061af099d5772933889254ef926f34f973fd8c0ed82e24c7520b242eba00763f
UNPACK_CMD=unzip -q -d $(1) $(DL_DIR)/$(PKG_SOURCE)
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
$(CP) \
$(PKG_BUILD_DIR)/{langs,css,js,fonts} \
$(PKG_BUILD_DIR)/index.html \
- $(PKG_BUILD_DIR)/index.manifest \
$(PKG_BUILD_DIR)/LICENSE \
- $(PKG_BUILD_DIR)/{favicon.*,*.png} \
+ $(PKG_BUILD_DIR)/favicon.* \
$(PKG_BUILD_DIR)/robots.txt \
$(1)/www/ariang
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=atftp
-PKG_VERSION:=0.7.4
+PKG_VERSION:=0.7.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_HASH:=d3c9cd0d971dfc786d7a5f4055c35d4e66aafc8102ac03473ef225bdf7edb26a
+PKG_HASH:=93c87a4fb18218414e008e01c995dadd231ba4c752d0f894b34416d1e6d3038a
PKG_MAINTAINER:=Daniel Danzberger <daniel@dd-wrt.com>
PKG_LICENSE:=GPL-2.0-or-later
+++ /dev/null
---- a/tftpd.h
-+++ b/tftpd.h
-@@ -47,7 +47,7 @@ struct thread_data {
- char *mc_addr; /* multicast address */
- struct sockaddr_storage sa_mcast;
- union ip_mreq_storage mcastaddr;
-- u_char mcast_ttl;
-+ unsigned char mcast_ttl;
-
- /*
- * Self can read/write until client_ready is set. Then only allowed to read.
+++ /dev/null
---- a/tftp_io.c
-+++ b/tftp_io.c
-@@ -64,7 +64,7 @@ int tftp_send_request(int socket, struct
- buf_index += strlen(mode);
- buf_index++;
-
-- for (i = 2; ; i++)
-+ for (i = 2; i < OPT_NUMBER; i++)
- {
- if (strlen(tftp_options[i].option) == 0)
- break;
include $(TOPDIR)/rules.mk
PKG_NAME:=bwm-ng
-PKG_VERSION:=0.6.1
-PKG_RELEASE:=1
+PKG_VERSION:=0.6.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.gropp.org/bwm-ng
-PKG_HASH:=027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0
+PKG_HASH:=c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46
+
PKG_MAINTAINER:=Julen Landa Alustiza <julen@zokormazo.info>
PKG_LICENSE:=GPL2-2.0
PKG_LICENSE_FILES:=COPYING
+PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
source "$(SOURCE)/Config.in"
endef
-define Build/Configure
- $(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
$(if $(CONFIG_BWMNG_CONFIGFILE),--enable,--disable)-configfile \
$(if $(CONFIG_BWMNG_HTML),--enable,--disable)-html \
$(if $(CONFIG_BWMNG_CSV),--enable,--disable)-csv \
$(if $(CONFIG_BWMNG_GETOPT_LONG),--with,--without)-getopt_long \
--with-strip \
--with-procnetdev \
- --with-diskstats \
- )
-endef
+ --with-diskstats
define Package/bwm-ng/install
$(INSTALL_DIR) $(1)/usr/bin
+++ /dev/null
-From d5daf15c2098040b8b01753d3cdce8c1c79fc528 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Fri, 10 Feb 2017 21:30:49 +0100
-Subject: [PATCH] Use `static inline` instead of `inline`
-
-`inline` by itself is not portably guaranteed to emit
-an external definition when needed in C99. The current
-code base implicitly relies on GNU89 inline semantics,
-which _always_ emit an external definition. More recent
-versions of GCC and Clang switch to C99/C11 inline semantics
-by default, which fails with undefined references.
-
-See also:
-* http://www.greenend.org.uk/rjk/tech/inline.html
-* https://clang.llvm.org/compatibility.html#inline
-* http://blahg.josefsipek.net/?p=529
----
- src/bwm-ng.c | 4 ++--
- src/help.c | 4 ++--
- src/options.c | 16 ++++++++--------
- src/output.c | 22 +++++++++++-----------
- src/process.c | 28 ++++++++++++++--------------
- 5 files changed, 37 insertions(+), 37 deletions(-)
-
---- a/src/bwm-ng.c
-+++ b/src/bwm-ng.c
-@@ -26,7 +26,7 @@
-
- /* handle interrupt signal */
- void sigint(int sig) FUNCATTR_NORETURN;
--inline void init(void);
-+static inline void init(void);
-
- /* clear stuff and exit */
- #ifdef __STDC__
-@@ -98,7 +98,7 @@ void sigint(int sig) {
- deinit(0, NULL);
- }
-
--inline void init(void) {
-+static inline void init(void) {
- if_count=0;
- delay=500;
- #if EXTENDED_STATS
---- a/src/help.c
-+++ b/src/help.c
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
-
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
- printf(" %-23s",long_c);
- #else
---- a/src/options.c
-+++ b/src/options.c
-@@ -30,12 +30,12 @@ static char* getToken(char** str, const
- char *trim_whitespace(char *str);
- int read_config(const char *config_file);
- #endif
--inline int str2output_unit(char *optarg);
-+static inline int str2output_unit(char *optarg);
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg);
-+static inline int str2output_type(char *optarg);
- #endif
--inline int str2out_method(char *optarg);
--inline int str2in_method(char *optarg);
-+static inline int str2out_method(char *optarg);
-+static inline int str2in_method(char *optarg);
-
- #ifdef CONFIG_FILE
- /******************************************************************************
-@@ -65,7 +65,7 @@ static char* getToken(char** str, const
- /******************************************************************************/
- #endif
-
--inline int str2output_unit(char *optarg) {
-+static inline int str2output_unit(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"bytes")) return BYTES_OUT;
- if (!strcasecmp(optarg,"bits")) return BITS_OUT;
-@@ -76,7 +76,7 @@ inline int str2output_unit(char *optarg)
- }
-
- #if EXTENDED_STATS
--inline int str2output_type(char *optarg) {
-+static inline int str2output_type(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"rate")) return RATE_OUT;
- if (!strcasecmp(optarg,"max")) return MAX_OUT;
-@@ -87,7 +87,7 @@ inline int str2output_type(char *optarg)
- }
- #endif
-
--inline int str2out_method(char *optarg) {
-+static inline int str2out_method(char *optarg) {
- if (optarg) {
- if (!strcasecmp(optarg,"plain")) return PLAIN_OUT;
- #ifdef HAVE_CURSES
-@@ -109,7 +109,7 @@ inline int str2out_method(char *optarg)
- }
-
-
--inline int str2in_method(char *optarg) {
-+static inline int str2in_method(char *optarg) {
- if (optarg) {
- #ifdef PROC_NET_DEV
- if (!strcasecmp(optarg,"proc")) return PROC_IN;
---- a/src/output.c
-+++ b/src/output.c
-@@ -25,13 +25,13 @@
- #include "output.h"
-
- inline static const char *output_type2str(void);
--inline const char *input2str(void);
--inline const char *show_all_if2str(void);
--inline ullong direction2value(char mode,struct inout_long stats);
-+static inline const char *input2str(void);
-+static inline const char *show_all_if2str(void);
-+static inline ullong direction2value(char mode,struct inout_long stats);
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items);
- #endif
--inline char *dyn_byte_value2str(double value,char *str,int buf_size);
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size);
- char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size);
-
- inline static const char *output_type2str(void) {
-@@ -59,7 +59,7 @@ inline static const char *output_type2st
- }
-
-
--inline const char *input2str(void) {
-+static inline const char *input2str(void) {
- switch (input_method) {
- #ifdef SYSCTL
- case SYSCTL_IN:
-@@ -121,7 +121,7 @@ inline const char *input2str(void) {
- return "";
- }
-
--inline const char *show_all_if2str(void) {
-+static inline const char *show_all_if2str(void) {
- switch (show_all_if) {
- case 1:
- return " (all)";
-@@ -262,7 +262,7 @@ int print_header(int option) {
- }
-
-
--inline ullong direction2value(char mode,struct inout_long stats) {
-+static inline ullong direction2value(char mode,struct inout_long stats) {
- switch (mode) {
- case 0:
- return stats.in;
-@@ -275,7 +275,7 @@ inline ullong direction2value(char mode,
- }
-
- #if EXTENDED_STATS
--inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
-+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) {
- switch (mode) {
- case 0:
- return (double)(stats.in/items);
-@@ -288,7 +288,7 @@ inline double direction_max2value(char m
- }
- #endif
-
--inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) {
- if (dynamic) {
- if (value<1024)
- snprintf(str,buf_size,"%15.2f ",value);
-@@ -306,7 +306,7 @@ inline char *dyn_byte_value2str(double v
- return str;
- }
-
--inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
-+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) {
- if (dynamic) {
- if (value<1000)
- snprintf(str,buf_size,"%15.2f ",value);
---- a/src/process.c
-+++ b/src/process.c
-@@ -26,19 +26,19 @@
-
- short show_iface(char *instr, char *searchstr,char iface_is_up);
- #if HAVE_GETTIMEOFDAY
--inline long tvdiff(struct timeval newer, struct timeval older);
-+static inline long tvdiff(struct timeval newer, struct timeval older);
- float get_time_delay(int iface_num);
- #endif
--inline ullong calc_new_values(ullong new, ullong old);
-+static inline ullong calc_new_values(ullong new, ullong old);
- t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old);
- t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old);
- #if EXTENDED_STATS
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data);
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier);
- void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier);
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values);
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier);
- #endif
-
- /* returns the whether to show the iface or not
-@@ -74,7 +74,7 @@ short show_iface(char *instr, char *sear
-
- #if HAVE_GETTIMEOFDAY
- /* Returns: the time difference in milliseconds. */
--inline long tvdiff(struct timeval newer, struct timeval older) {
-+static inline long tvdiff(struct timeval newer, struct timeval older) {
- return labs((newer.tv_sec-older.tv_sec)*1000+
- (newer.tv_usec-older.tv_usec)/1000);
- }
-@@ -92,7 +92,7 @@ float get_time_delay(int iface_num) {
- #endif
-
- /* basically new-old, but handles "overflow" of source aswell */
--inline ullong calc_new_values(ullong new, ullong old) {
-+static inline ullong calc_new_values(ullong new, ullong old) {
- /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */
- return (new>=old) ? (ullong)(new-old) : (ullong)((
- #ifdef HAVE_LIBKSTAT
-@@ -133,13 +133,13 @@ t_iface_speed_stats convert2calced_disk_
-
- #if EXTENDED_STATS
- /* sub old values from cached for avg stats */
--inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
- values->in-=data.in;
- values->out-=data.out;
- values->total-=data.total;
- }
-
--inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
-+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) {
- values->in+=data.in;
- values->out+=data.out;
- values->total+=data.total;
-@@ -148,7 +148,7 @@ inline void add_avg_values(struct inoutt
-
- /* put new-old bytes in inout_long struct into a inouttotal_double struct
- * and add values to cached .value struct */
--inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
-+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) {
- data->in=calced_stats.in*multiplier;
- data->out=calced_stats.out*multiplier;
- data->total=(calced_stats.in+calced_stats.out)*multiplier;
-@@ -198,13 +198,13 @@ void save_avg(struct t_avg *avg,struct i
- }
-
- /* add current in and out bytes to totals struct */
--inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
-+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) {
- stats->in+=new_stats_values.in;
- stats->out+=new_stats_values.out;
- }
-
- /* lookup old max values and save new if higher */
--inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
-+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) {
- if (multiplier*calced_stats.in > stats->in)
- stats->in=multiplier*calced_stats.in;
- if (multiplier*calced_stats.out>stats->out)
include $(TOPDIR)/rules.mk
PKG_NAME:=chrony
-PKG_VERSION:=4.1
-PKG_RELEASE:=2
+PKG_VERSION:=4.2
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.tuxfamily.org/chrony/
-PKG_HASH:=ed76f2d3f9347ac6221a91ad4bd553dd0565ac188cd7490d0801d08f7171164c
+PKG_HASH:=273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a
PKG_MAINTAINER:=Miroslav Lichvar <mlichvar0@gmail.com>
PKG_LICENSE:=GPL-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=crowdsec-firewall-bouncer
-PKG_VERSION:=0.0.16
+PKG_VERSION:=0.0.18
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/crowdsecurity/cs-firewall-bouncer
+PKG_MIRROR_HASH:=2fb7ddb226f6a99c46826706da25f7cdbcd7615468129e7b07f8ac4edf0366f9
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_SOURCE_DATE:=20211117
-PKG_MIRROR_HASH:=769a01bcee0ac27627fc00a59259ca09f89f382fc228c7bb24dc5d7df8ae9a12
+PKG_SOURCE_DATE:=20211210
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
define Package/crowdsec-firewall-bouncer
$(call Package/crowdsec-firewall-bouncer/Default)
DEPENDS:=@(PACKAGE_iptables||PACKAGE_nftables) \
- $(GO_ARCH_DEPENDS) \
- +crowdsec
+ $(GO_ARCH_DEPENDS)
endef
define Package/golang-crowdsec-firewall-bouncer-dev
--- a/config/crowdsec-firewall-bouncer.yaml
+++ b/config/crowdsec-firewall-bouncer.yaml
-@@ -15,5 +15,5 @@ deny_log: false
+@@ -20,5 +20,5 @@ supported_decisions_types:
#if present, insert rule in those chains
iptables_chains:
- INPUT
include $(TOPDIR)/rules.mk
PKG_NAME:=davfs2
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SAVANNAH/davfs2
-PKG_HASH:=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50
+PKG_HASH:=ce3eb948ece582a51c934ccb0cc70e659839172717caff173f69a5e2af90c5c0
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
if (!mpoint)
error(EXIT_FAILURE, 0,
_("can't evaluate path of mount point %s"), mpoint);
-@@ -2131,7 +2131,7 @@ read_config(dav_args *args, const char *
+@@ -2109,7 +2109,7 @@ read_config(dav_args *args, const char *
error_at_line(EXIT_FAILURE, 0, filename, lineno,
_("malformed line"));
*(parmv[0] + strlen(parmv[0]) - 1) = '\0';
if (mp) {
applies = (strcmp(mp, mpoint) == 0);
free(mp);
-@@ -2386,7 +2386,7 @@ read_secrets(dav_args *args, const char
+@@ -2364,7 +2364,7 @@ read_secrets(dav_args *args, const char
if (scheme && !port)
port = ne_uri_defaultport(scheme);
PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2
-PKG_RELEASE:=19
+PKG_RELEASE:=20
PKG_LICENSE:=GPL-2.0
Dynamic DNS Client scripts extension for "no-ip.com".
endef
+define Package/ddns-scripts-ns1
+ $(call Package/ddns-scripts/Default)
+ TITLE:=NS1 API
+ DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-ns1/description
+ Dynamic DNS Client scripts extension for "ns1.com".
+ It requires:
+ "option username" to be a valid zone for ns1.com
+ "option password" to be a valid API key for ns1.com
+endef
+
define Package/ddns-scripts-nsupdate
$(call Package/ddns-scripts/Default)
rm $(1)/usr/share/ddns/default/gandi.net.json
rm $(1)/usr/share/ddns/default/pdns.json
rm $(1)/usr/share/ddns/default/transip.nl.json
+ rm $(1)/usr/share/ddns/default/ns1.com.json
endef
endef
+define Package/ddns-scripts-ns1/install
+ $(INSTALL_DIR) $(1)/usr/lib/ddns
+ $(INSTALL_BIN) ./files/usr/lib/ddns/update_ns1_com.sh \
+ $(1)/usr/lib/ddns
+
+ $(INSTALL_DIR) $(1)/usr/share/ddns/default
+ $(INSTALL_DATA) ./files/usr/share/ddns/default/ns1.com.json \
+ $(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-ns1/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+ /etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
define Package/ddns-scripts-nsupdate/install
$(INSTALL_DIR) $(1)/usr/lib/ddns
$(INSTALL_BIN) ./files/usr/lib/ddns/update_nsupdate.sh \
$(eval $(call BuildPackage,ddns-scripts-gandi))
$(eval $(call BuildPackage,ddns-scripts-pdns))
$(eval $(call BuildPackage,ddns-scripts-transip))
+$(eval $(call BuildPackage,ddns-scripts-ns1))
--- /dev/null
+#!/bin/sh
+# Derived from update_gandi_net.sh
+
+. /usr/share/libubox/jshn.sh
+
+local __ENDPOINT="https://api.nsone.net/v1"
+local __TTL=600
+local __RRTYPE
+local __URL
+local __STATUS
+
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing zone as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+
+# Construct JSON payload
+json_init
+# {"answers":[{"answer":["1.1.1.1"]}]}
+json_add_array answers
+json_add_object
+json_add_array answer
+json_add_string "" "$__IP"
+json_close_array
+json_close_object
+json_close_array
+
+__URL="$__ENDPOINT/zones/$username/$domain/$__RRTYPE"
+
+__STATUS=$(curl -s -X POST "$__URL" \
+ -H "X-NSONE-Key: $password" \
+ -H "Content-Type: application/json" \
+ -d "$(json_dump)" \
+ -w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+if [ $? -ne 0 ]; then
+ write_log 14 "Curl failed: $(cat $ERRFILE)"
+ return 1
+elif [ -z $__STATUS ] || [ $__STATUS != 200 ]; then
+ write_log 4 "Request failed: $__STATUS, NS1 answered: $(cat $DATFILE)"
+ if [ $__STATUS = 404 ]; then
+ write_log 4 "Status is 404, trying to create a DNS record"
+
+ json_init
+ json_add_string "zone" "$username"
+ json_add_string "domain" "$domain"
+ json_add_string "type" "$__RRTYPE"
+ json_add_string "ttl" "$__TTL"
+ json_add_array answers
+ json_add_object
+ json_add_array answer
+ json_add_string "" "$__IP"
+ json_close_array
+ json_close_object
+ json_close_array
+
+ __STATUS=$(curl -s -X PUT "$__URL" \
+ -H "X-NSONE-Key: $password" \
+ -H "Content-Type: application/json" \
+ -d "$(json_dump)" \
+ -w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+ if [ $? -ne 0 ]; then
+ write_log 14 "Curl failed: $(cat $ERRFILE)"
+ return 1
+ elif [ -z $__STATUS ] || [ $__STATUS != 200 ]; then
+ write_log 14 "Request failed: $__STATUS, NS1 answered: $(cat $DATFILE)"
+ return 1
+ fi
+ else
+ return 1
+ fi
+fi
+
+write_log 7 "NS1 answered: $(cat $DATFILE)"
+
+return 0
--- /dev/null
+{
+ "name": "ns1.com",
+ "ipv4": {
+ "url": "update_ns1_com.sh"
+ },
+ "ipv6": {
+ "url": "update_ns1_com.sh"
+ }
+}
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsproxy
-PKG_VERSION:=0.39.12
+PKG_VERSION:=0.40.1
PKG_RELEASE:=$(AUTORELESE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/AdguardTeam/dnsproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=14c8d8a06d0b6777efaa184cf248d688c5a8bc3280ccc1c97316915712bf1a5a
+PKG_HASH:=f968e5c38ce27e5bb827138d2f5991397fb338bceaa9566399f5d52ef8c26d80
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=Apache-2.0
--- /dev/null
+From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester@sebres.de>
+Date: Mon, 8 Feb 2021 17:19:24 +0100
+Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
+ moved to the :mod:`collections.abc` module
+
+(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
+---
+ fail2ban/server/action.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/fail2ban/server/action.py
++++ b/fail2ban/server/action.py
+@@ -30,7 +30,10 @@ import tempfile
+ import threading
+ import time
+ from abc import ABCMeta
+-from collections import MutableMapping
++try:
++ from collections.abc import MutableMapping
++except ImportError:
++ from collections import MutableMapping
+
+ from .failregex import mapTag2Opt
+ from .ipdns import DNSUtils
--- /dev/null
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=geoipupdate
+PKG_VERSION:=4.8.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/maxmind/geoipupdate/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=ca718c3ffcc595ef441363699888d20150f1d3a6583ac2d60bcbd34f052db09f
+
+PKG_LICENSE:=Apache-2.0 MIT
+PKG_LICENSE_FILES:=LICENSE-APACHE LICENSE-MIT
+PKG_MAINTAINER:=Matthew Hagan <mnhagan88@gmail.com>
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/maxmind/geoipupdate
+GO_PKG_LDFLAGS_X:= \
+ main.defaultConfigFile=/etc/GeoIP.conf \
+ main.defaultDatabaseDirectory=/var/GeoIP
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/geoipupdate
+ TITLE:=GeoIP Update
+ URL:=https://github.com/maxmind/geoipupdate
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/geoipupdate/description
+ The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP
+ Legacy binary databases. CSV databases are not supported.
+
+ Users will need to update /etc/GeoIP.conf with their API key and DB
+ choice, currently set to country only. To update the DB, the user can
+ manually run the utility or set up a cron job.
+
+ This package contains the program and config file.
+endef
+
+define Package/geoipupdate/install
+ $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+
+ $(INSTALL_DIR) \
+ $(1)/usr/sbin \
+ $(1)/etc/init.d
+
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/geoipupdate $(1)/usr/sbin/
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/GeoIP.conf.default $(1)/etc/GeoIP.conf
+ $(INSTALL_BIN) ./files/geoipupdate.init $(1)/etc/init.d/geoipupdate
+
+ $(SED) "s/^EditionIDs GeoLite2-Country GeoLite2-City/EditionIDs GeoLite2-Country/" $(1)/etc/GeoIP.conf
+endef
+
+define Package/geoipupdate/conffiles
+/etc/GeoIP.conf
+endef
+
+$(eval $(call GoBinPackage,geoipupdate))
+$(eval $(call BuildPackage,geoipupdate))
--- /dev/null
+#!/bin/sh /etc/rc.common
+
+START=99
+
+start() {
+ [ -d /var/GeoIP ] || {
+ mkdir -p /var/GeoIP
+ }
+}
--- /dev/null
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2021 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gg
+PKG_VERSION:=0.2.1
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/mzz2017/gg/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=51d1ccfb10ba0d9e8fdd68f4a566b8ed772980be1cf1d03da1969313f88b8bb6
+
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+PKG_LICENSE:=AGPL-3.0-only
+PKG_LICENSE_FILES:=LICENSE-AGPL
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/mzz2017/gg
+GO_PKG_LDFLAGS_X:=$(GO_PKG)/cmd.Version=$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+include ../../lang/golang/golang-package.mk
+
+define Package/gg
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=A command-line tool for one-click proxy
+ URL:=https://github.com/mzz2017/gg
+ DEPENDS:=@(aarch64||arm||x86_64) +ca-bundle
+endef
+
+define Package/gg/description
+ gg is a command-line tool for one-click proxy in your research and
+ development.
+
+ You can just add gg before another command to redirect its traffic
+ to your proxy without installing v2ray or anything else.
+ Usage example: gg python -m pip install torch.
+endef
+
+define Package/gg/conffiles
+/root/.config/gg/config.toml
+/root/.ggconfig.toml
+/etc/ggconfig.toml
+endef
+
+$(eval $(call GoBinPackage,gg))
+$(eval $(call BuildPackage,gg))
--- /dev/null
+#!/bin/sh
+
+gg --version | grep "$PKG_VERSION"
include $(TOPDIR)/rules.mk
PKG_NAME:=knot-resolver
-PKG_VERSION:=5.4.2
+PKG_VERSION:=5.4.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
-PKG_HASH:=ea6a219571a752056669bae3f2c0c3ed0bec58af5ab832d505a3ec9c4063a58b
+PKG_HASH:=488729eb93190336b6bca10de0d78ecb7919f77fcab105debc0a644aa7d0a506
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=GPL-3.0-later
It reintroduces a fix which enables policy related hack (knot/knot-resolver#205 (comment 94566) )
--- a/modules/policy/policy.lua
+++ b/modules/policy/policy.lua
-@@ -1000,7 +1000,7 @@ policy.layer = {
+@@ -1047,7 +1047,7 @@ policy.layer = {
if bit.band(state, bit.bor(kres.FAIL, kres.DONE)) ~= 0 then return state end
local qry = req:initial() -- same as :current() but more descriptive
return policy.evaluate(policy.rules, req, qry, state)
include $(TOPDIR)/rules.mk
PKG_NAME:=knot
-PKG_VERSION:=3.1.4
+PKG_VERSION:=3.1.5
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/
-PKG_HASH:=05ebca053b4ce62205a095b6885ed1a1167c629ccac2b3c8dcc431bd2deedf70
+PKG_HASH:=2da6e50b0662297d55f80e349568224e07fe88cad20bee1d2e22f54bb32da064
PKG_MAINTAINER:=Daniel Salzman <daniel.salzman@nic.cz>
PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8
include $(TOPDIR)/rules.mk
PKG_NAME:=knxd
-PKG_VERSION:=0.14.51
+PKG_VERSION:=0.14.52
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=c8378bc6f671a5ab75edb51b23e839ee1adcdd00b372314ca9d2bdcd37fb70fb
+PKG_HASH:=15a3593970f530787ffb70c8bd53db924e61b3b5113fe05382eb2d0b0038859e
PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
PKG_LICENSE:=GPL-2.0-or-later
-test -d .git || exit
-# git describe --tags
-git log --format=format:%D | perl -ne 'next unless s#.*tag: ##; s#,.*##; next if m#/#; print; exit;'
-+echo -n "0.14.51"
++echo -n "0.14.52"
include $(TOPDIR)/rules.mk
PKG_NAME:=krb5
-PKG_VERSION:=1.19.1
+PKG_VERSION:=1.19.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://web.mit.edu/kerberos/dist/krb5/1.19
-PKG_HASH:=fa16f87eb7e3ec3586143c800d7eaff98b5e0dcdf0772af7d98612e49dbeb20b
+PKG_HASH:=10453fee4e3a8f8ce6129059e5c050b8a65dab1c257df68b99b3112eaa0cdf6a
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
include $(TOPDIR)/rules.mk
PKG_NAME:=lighttpd
-PKG_VERSION:=1.4.61
+PKG_VERSION:=1.4.63
PKG_RELEASE:=1
# release candidate ~rcX testing; remove for release
-#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4.61
+#PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-1.4.63
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://download.lighttpd.net/lighttpd/releases-1.4.x
-PKG_HASH:=43f0d63d04a1b7c5b8aab07e0612e44ccad0afc0614bab784c5b019872363432
+PKG_HASH:=2aef7f0102ebf54a1241a1c3ea8976892f8684bfb21697c9fffb8de0e2d6eab9
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause
define Package/lighttpd
$(call Package/lighttpd/Default)
MENU:=1
- DEPENDS:=+libnettle +libpcre +libpthread +LIGHTTPD_LOGROTATE:logrotate
+ DEPENDS:=+libnettle +libpcre2 +libpthread +LIGHTTPD_LOGROTATE:logrotate
TITLE:=A flexible and lightweight web server
endef
-Dwith_nss=$(if $(CONFIG_PACKAGE_lighttpd-mod-nss),true,false) \
-Dwith_openssl=$(if $(CONFIG_PACKAGE_lighttpd-mod-openssl),true,false) \
-Dwith_pam=$(if $(CONFIG_PACKAGE_lighttpd-mod-authn_pam),true,false) \
- -Dwith_pcre=true \
+ -Dwith_pcre2=true \
-Dwith_pgsql=$(if $(CONFIG_PACKAGE_lighttpd-mod-vhostdb_pgsql),true,false) \
-Dwith_sasl=$(if $(CONFIG_PACKAGE_lighttpd-mod-authn_sasl),true,false) \
-Dwith_webdav_locks=$(if $(CONFIG_PACKAGE_lighttpd-mod-webdav),true,false) \
$(eval $(call BuildPackage,lighttpd))
# First, permit redirect from HTTP to HTTPS.
-$(eval $(call BuildPlugin,redirect,URL redirection,+PACKAGE_lighttpd-mod-redirect:libpcre,10))
+$(eval $(call BuildPlugin,redirect,URL redirection,+PACKAGE_lighttpd-mod-redirect:libpcre2,10))
# Next, permit authentication.
$(eval $(call BuildPlugin,auth,Authentication,+PACKAGE_lighttpd-mod-auth:libnettle,20))
$(eval $(call BuildPlugin,nss,TLS using nss,@LIGHTTPD_SSL +PACKAGE_lighttpd-mod-nss:libnss,30))
$(eval $(call BuildPlugin,openssl,TLS using openssl,@LIGHTTPD_SSL +PACKAGE_lighttpd-mod-openssl:libopenssl,30))
$(eval $(call BuildPlugin,proxy,Proxy,,30))
-$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre,30))
+$(eval $(call BuildPlugin,rewrite,URL rewriting,+PACKAGE_lighttpd-mod-rewrite:libpcre2,30))
$(eval $(call BuildPlugin,rrdtool,RRDtool,,30))
$(eval $(call BuildPlugin,scgi,SCGI,,30))
$(eval $(call BuildPlugin,secdownload,Secure and fast download,+PACKAGE_lighttpd-mod-secdownload:libnettle,30))
$(eval $(call BuildPlugin,setenv,Environment variable setting,,30))
$(eval $(call BuildPlugin,simple_vhost,Simple virtual hosting,,30))
$(eval $(call BuildPlugin,sockproxy,sockproxy,,30))
-$(eval $(call BuildPlugin,ssi,SSI,+PACKAGE_lighttpd-mod-ssi:libpcre,30))
+$(eval $(call BuildPlugin,ssi,SSI,,30))
$(eval $(call BuildPlugin,staticfile,staticfile,,30))
$(eval $(call BuildPlugin,status,Server status display,,30))
-$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre +PACKAGE_lighttpd-mod-trigger_b4_dl:libgdbm,30))
+$(eval $(call BuildPlugin,trigger_b4_dl,Trigger before download,+PACKAGE_lighttpd-mod-trigger_b4_dl:libpcre2 +PACKAGE_lighttpd-mod-trigger_b4_dl:libgdbm,30))
$(eval $(call BuildPlugin,uploadprogress,Upload Progress,,30))
$(eval $(call BuildPlugin,userdir,User directory,,30))
$(eval $(call BuildPlugin,usertrack,User tracking,+PACKAGE_lighttpd-mod-usertrack:libnettle,30))
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ModemManager $(1)/usr/sbin
+ $(INSTALL_BIN) ./files/usr/sbin/ModemManager-wrapper $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mmcli $(1)/usr/bin
# Common logging
mm_log() {
- logger -t "ModemManager" "hotplug: $*"
+ local level="$1"; shift
+ logger -p "daemon.${level}" -t "ModemManager[$$]" "hotplug: $*"
}
################################################################################
while [ $n -ge 0 ]; do
[ -d "${sysfspath}" ] || {
- mm_log "error: ignoring modem detection request: no device at ${sysfspath}"
+ mm_log "error" "ignoring modem detection request: no device at ${sysfspath}"
proto_set_available "${cfg}" 0
return 1
}
# Check if the modem exists at the given sysfs path
if ! mmcli -m "${sysfspath}" > /dev/null 2>&1
then
- mm_log "error: modem not detected at sysfs path"
+ mm_log "error" "modem not detected at sysfs path"
else
- mm_log "modem exported successfully at ${sysfspath}"
- mm_log "setting interface '${cfg}' as available"
+ mm_log "info" "modem exported successfully at ${sysfspath}"
+ mm_log "info" "setting interface '${cfg}' as available"
proto_set_available "${cfg}" 1
return 0
fi
n=$((n-step))
done
- mm_log "error: timed out waiting for the modem to get exported at ${sysfspath}"
+ mm_log "error" "timed out waiting for the modem to get exported at ${sysfspath}"
proto_set_available "${cfg}" 0
return 2
}
parent_sysfspath=$(mm_find_physdev_sysfs_path "$sysfspath")
[ -n "${parent_sysfspath}" ] || {
- mm_log "error: parent device sysfspath not found"
+ mm_log "error" "parent device sysfspath not found"
return
}
cfg=$(mm_get_modem_config "${parent_sysfspath}")
if [ -n "${cfg}" ]; then
- mm_log "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
- mm_log "now waiting for modem at sysfs path ${parent_sysfspath}"
+ mm_log "info" "interface '${cfg}' is set to configure device '${parent_sysfspath}'"
+ mm_log "info" "now waiting for modem at sysfs path ${parent_sysfspath}"
mm_set_modem_wait_status "${parent_sysfspath}" "processed"
# Launch subshell for the explicit wait
( mm_wait_for_modem "${cfg}" "${parent_sysfspath}" ) > /dev/null 2>&1 &
else
- mm_log "no need to wait for modem at sysfs path ${parent_sysfspath}"
+ mm_log "info" "no need to wait for modem at sysfs path ${parent_sysfspath}"
mm_set_modem_wait_status "${parent_sysfspath}" "ignored"
fi
;;
"processed")
- mm_log "already waiting for modem at sysfs path ${parent_sysfspath}"
+ mm_log "info" "already waiting for modem at sysfs path ${parent_sysfspath}"
;;
"ignored")
;;
*)
- mm_log "error: unknown status read for device at sysfs path ${parent_sysfspath}"
+ mm_log "error" "unknown status read for device at sysfs path ${parent_sysfspath}"
;;
esac
}
cfg=$(mm_get_modem_config "$dev")
[ -n "${cfg}" ] || return
- mm_log "setting interface '$cfg' as unavailable"
+ mm_log "info" "setting interface '$cfg' as unavailable"
proto_set_available "${cfg}" 0
}
esac
# Report the event
- mm_log "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
+ mm_log "debug" "event reported: action=${action}, name=${name}, subsystem=${subsystem}"
mmcli --report-kernel-event="action=${action},name=${name},subsystem=${subsystem}" 1>/dev/null 2>&1 &
# Wait for added modem if a sysfspath is given
subsystem=$(echo "${event_line}" | awk -F ',' '{ print $3 }')
sysfspath=$(echo "${event_line}" | awk -F ',' '{ print $4 }')
- mm_log "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
+ mm_log "debug" "cached event found: action=${action}, name=${name}, subsystem=${subsystem}, sysfspath=${sysfspath}"
mm_report_event "${action}" "${name}" "${subsystem}" "${sysfspath}"
}
# Wait for ModemManager to be available in the bus
while [ $n -ge 0 ]; do
sleep $step
- mm_log "checking if ModemManager is available..."
+ mm_log "info" "checking if ModemManager is available..."
if ! mmcli -L >/dev/null 2>&1
then
- mm_log "ModemManager not yet available"
+ mm_log "info" "ModemManager not yet available"
else
mmrunning=1
break
done
[ ${mmrunning} -eq 1 ] || {
- mm_log "error: couldn't report initial kernel events: ModemManager not running"
+ mm_log "error" "couldn't report initial kernel events: ModemManager not running"
return
}
USE_PROCD=1
START=70
+LOG_LEVEL="INFO"
+
stop_service() {
# Load common utils
. /usr/share/ModemManager/modemmanager.common
# it starts.
#
# All these commands need to be executed on every MM start, even after
- # procd-triggered respawns, which is why they're all included as instance command
+ # procd-triggered respawns, which is why this is wrapped in a startup
+ # wrapper script called '/usr/sbin/ModemManager-wrapper'.
#
+ . /usr/share/ModemManager/modemmanager.common
procd_open_instance
- procd_set_param command sh -c ". /usr/share/ModemManager/modemmanager.common; \
- mkdir -m 0755 -p ${MODEMMANAGER_RUNDIR}; \
- mm_cleanup_interfaces; \
- ( mm_report_events_from_cache ) >/dev/null 2>&1 & \
- /usr/sbin/ModemManager"
+ procd_set_param command /usr/sbin/ModemManager-wrapper
+ procd_append_param command --log-level="$LOG_LEVEL"
+ [ "$LOG_LEVEL" = "DEBUG" ] && procd_append_param command --debug
procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
procd_set_param pidfile "${MODEMMANAGER_PID_FILE}"
procd_close_instance
--- /dev/null
+#!/bin/sh
+
+trap_with_arg() {
+ func="$1" ; shift
+ for sig ; do
+ # shellcheck disable=SC2064
+ trap "$func $sig" "$sig"
+ done
+}
+
+func_trap() {
+ logger "ModemManager-wrapper[$$]" "Sending signal ${1}..."
+ kill "-${1}" "$CHILD" 2>/dev/null
+}
+
+main() {
+ . /usr/share/ModemManager/modemmanager.common
+
+ trap_with_arg func_trap INT TERM KILL
+
+ mkdir -p "${MODEMMANAGER_RUNDIR}"
+ chmod 0755 "${MODEMMANAGER_RUNDIR}"
+ mm_cleanup_interfaces
+
+ /usr/sbin/ModemManager "$@" 1>/dev/null 2>/dev/null &
+ CHILD="$!"
+ sleep 2
+ mm_report_events_from_cache
+
+ wait "$CHILD"
+}
+
+main "$@"
PKG_NAME:=nfs-kernel-server
PKG_VERSION:=2.5.4
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_HASH:=546ce4b51eeebc66e354b6cc6ca0ce509437efbdef0caaf99389534eef0e598b
PKG_SOURCE_URL:=@SF/nfs
ac_cv_header_nfsidmap_h=yes \
ac_cv_header_blkid_blkid_h=yes \
ac_cv_lib_resolv___res_querydomain=yes \
+ ac_cv_func_prctl=yes \
GSSGLUE_CFLAGS=" " \
GSSGLUE_LIBS=" " \
RPCSECGSS_CFLAGS=" " \
--- /dev/null
+fix stat64 issue for modern macos versions (including macos arm64)
+
+--- a/tools/rpcgen/rpc_main.c
++++ b/tools/rpcgen/rpc_main.c
+@@ -62,6 +62,12 @@
+ #define EXTEND 1 /* alias for TRUE */
+ #define DONT_EXTEND 0 /* alias for FALSE */
+
++#ifdef __APPLE__
++# if __DARWIN_ONLY_64_BIT_INO_T
++# define stat64 stat
++# endif
++#endif
++
+ struct commandline
+ {
+ int cflag; /* xdr C routines */
PKG_NAME:=nft-qos
PKG_VERSION:=1.0.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Rosy Song <rosysong@rosinson.com>
. /lib/nft-qos/core.sh
qosdef_monitor_get_ip_handle() { # <family> <chain> <ip>
- echo $(nft list chain $1 nft-qos-monitor $2 -a 2>/dev/null | grep $3 | awk '{print $11}')
+ echo $(nft -a list chain $1 nft-qos-monitor $2 2>/dev/null | grep $3 | awk '{print $11}')
}
qosdef_monitor_add() { # <mac> <ip> <hostname>
# Copyright (C) 2018 rosysong@rosinson.com
#
-. "${IPKG_INSTROOT}/lib/nft-qos/core.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/monitor.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/dynamic.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/static.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/mac.sh"
-. "${IPKG_INSTROOT}/lib/nft-qos/priority.sh"
+if [ -z "${IPKG_INSTROOT}" ]; then
+ . /lib/nft-qos/core.sh
+ . /lib/nft-qos/monitor.sh
+ . /lib/nft-qos/dynamic.sh
+ . /lib/nft-qos/static.sh
+ . /lib/nft-qos/mac.sh
+ . /lib/nft-qos/priority.sh
+fi
START=99
USE_PROCD=1
PKG_NAME:=openvpn
-PKG_VERSION:=2.5.4
+PKG_VERSION:=2.5.5
PKG_RELEASE:=1
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
https://swupdate.openvpn.net/community/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=56c0dcd27ab938c4ad07469c86eb8b7408ef64c3e68f98497db8c03f11792436
+PKG_HASH:=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b
PKG_MAINTAINER:=Magnus Kroken <mkroken@gmail.com>
#
PKG_NAME:=openvswitch
PKG_VERSION:=$(ovs_version)
-PKG_RELEASE:=10
+PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
PKG_HASH:=7d5797f2bf2449c6a266149e88f72123540f7fe7f31ad52902057ae8d8f88c38
ovs_kmod_openvswitch_kconfig:=CONFIG_OPENVSWITCH
ovs_kmod_openvswitch_depends:=\
+kmod-lib-crc32c \
+ +kmod-mpls \
+kmod-nf-nat \
+IPV6:kmod-nf-nat6 \
+kmod-nf-conntrack \
#
ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so)
ovs_libopenvswitch_hidden:=1
-ovs_libopenvswitch_depends:=+libopenssl +!(arc||arceb):libunwind
-ovs_libopenvswitch_depends+=+libatomic
-ifeq ($(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),y)
-ovs_libopenvswitch_depends+=+libunbound
-endif
+ovs_libopenvswitch_depends:= \
+ +libatomic +libopenssl +OPENVSWITCH_WITH_LIBUNBOUND:libunbound \
+ +!(arc||arceb):libunwind
ovs_libopenvswitch_files:=usr/lib/libopenvswitch*.so*
$(eval $(call OvsPackageTemplate,libopenvswitch))
ovs_libofproto_title:=Open vSwitch (libofproto.so libsflow.so)
ovs_libofproto_hidden:=1
-ovs_libofproto_depends+=+libatomic
+ovs_libofproto_depends:= +libatomic
ovs_libofproto_files:=usr/lib/libofproto*.so* usr/lib/libsflow*.so*
$(eval $(call OvsPackageTemplate,libofproto))
ovs_libovsdb_title:=Open vSwitch (libovsdb.so)
ovs_libovsdb_hidden:=1
-ovs_libovsdb_depends+=+libatomic
+ovs_libovsdb_depends:= +libatomic
ovs_libovsdb_files:=usr/lib/libovsdb*.so*
$(eval $(call OvsPackageTemplate,libovsdb))
ovs_vswitchd_title:=Open vSwitch (ovs-vswitchd)
ovs_vswitchd_hidden:=1
-ovs_vswitchd_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto
-ovs_vswitchd_depends+=+libatomic
+ovs_vswitchd_depends:= \
+ +libatomic +openvswitch-libofproto +openvswitch-libopenvswitch
ovs_vswitchd_files:=usr/sbin/ovs-vswitchd
$(eval $(call OvsPackageTemplate,vswitchd))
ovs_ovsdb_title:=Open vSwitch (ovsdb-server)
ovs_ovsdb_hidden:=1
-ovs_ovsdb_depends:=+openvswitch-libopenvswitch +openvswitch-libovsdb
-ovs_ovsdb_depends+=+libatomic
+ovs_ovsdb_depends:= \
+ +libatomic +openvswitch-libopenvswitch +openvswitch-libovsdb
ovs_ovsdb_files:=usr/sbin/ovsdb-server
$(eval $(call OvsPackageTemplate,ovsdb))
ovs_common_title:=Open vSwitch (common files)
ovs_common_hidden:=1
-ovs_common_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto +openvswitch-libovsdb
-ovs_common_depends+=+libatomic
+ovs_common_depends:= \
+ +libatomic +openvswitch-libofproto +openvswitch-libopenvswitch \
+ +openvswitch-libovsdb
ovs_common_files:= \
usr/share/openvswitch/scripts/ovs-lib \
usr/share/openvswitch/scripts/ovs-ctl \
# uuidgen is required for generating system-id
ovs_openvswitch_title:=Open vSwitch
ovs_openvswitch_hidden:=
-ovs_openvswitch_depends:=+coreutils +coreutils-sleep +uuidgen \
- +openvswitch-common +openvswitch-vswitchd +openvswitch-ovsdb +kmod-openvswitch
-ovs_openvswitch_depends+=+libatomic
+ovs_openvswitch_depends:= \
+ +coreutils +coreutils-sleep +kmod-openvswitch +libatomic +openvswitch-common \
+ +openvswitch-ovsdb +openvswitch-vswitchd +uuidgen
ovs_openvswitch_files:= usr/share/openvswitch/vswitch.ovsschema
$(eval $(call OvsPackageTemplate,openvswitch))
include $(TOPDIR)/rules.mk
PKG_NAME:=snort
-PKG_VERSION:=2.9.17.1
+PKG_VERSION:=2.9.19
PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=GPL-2.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.snort.org/downloads/archive/snort/ \
@SF/$(PKG_NAME)
-PKG_HASH:=303d3d5dc5affecfeaad3a331d3163f901d48d960fdd6598cb55c6d1591eed82
+PKG_HASH:=b12fc6db72afb58987a2bf1954b8f45bde02047c235513c7663857b9506369c7
PKG_BUILD_DEPENDS:=libtirpc
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
include $(TOPDIR)/rules.mk
PKG_NAME:=snort3
-PKG_VERSION:=3.1.4.0
+PKG_VERSION:=3.1.18.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
-PKG_HASH:=a68af8ea46a038dfb0ad489e8d11dee62a3e63cb4a639f6bb4fac4ded955fe11
+PKG_HASH:=6e45c16b1815d832b5d6edcd2b705e7838e25c76bfd54b3e86c55ecba6de420a
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPL-2.0-only
SUBMENU:=Firewall
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+libstdcpp +libdaq3 +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +libhwloc +libtirpc +luajit
+ DEPENDS:=+libstdcpp +libdaq3 +libdnet +libopenssl +libpcap +libpcre +libpthread +libuuid +zlib +libhwloc +libtirpc +luajit +libatomic
TITLE:=Lightweight Network Intrusion Detection System
URL:=http://www.snort.org/
MENU:=1
$(INSTALL_DIR) $(1)/usr/lib/snort
$(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/snort/daqs/daq_hext.so \
+ $(PKG_INSTALL_DIR)/usr/lib/snort/daq/daq_hext.so \
$(1)/usr/lib/snort/
$(CP) \
- $(PKG_INSTALL_DIR)/usr/lib/snort/daqs/daq_file.so \
+ $(PKG_INSTALL_DIR)/usr/lib/snort/daq/daq_file.so \
$(1)/usr/lib/snort/
$(INSTALL_DIR) $(1)/usr/share/lua
--- a/src/network_inspectors/appid/appid_inspector.cc
+++ b/src/network_inspectors/appid/appid_inspector.cc
-@@ -64,7 +64,6 @@ static THREAD_LOCAL PacketTracer::Tracer
+@@ -66,7 +66,6 @@ static THREAD_LOCAL PacketTracer::Tracer
// should probably be done outside of appid
static void openssl_cleanup()
{
- CRYPTO_cleanup_all_ex_data();
}
- static void populate_trace_data(Flow& flow, const OdpContext& odp_context)
+ static void add_appid_to_packet_trace(Flow& flow, const OdpContext& odp_context)
--- a/src/utils/util.cc
+++ b/src/utils/util.cc
@@ -111,7 +111,7 @@ int DisplayBanner()
--- /dev/null
+--- /dev/null
++++ b/cmake/FindAtomic.cmake
+@@ -0,0 +1,11 @@
++find_library(ATOMIC_LIBRARIES NAMES atomic
++ HINTS ${ATOMIC_LIBRARIES_DIR_HINT})
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Atomic DEFAULT_MSG ATOMIC_LIBRARIES)
++
++mark_as_advanced(ATOMIC_LIBRARIES)
++
++if (ATOMIC_LIBRARIES)
++ set(HAVE_ATOMIC "1")
++endif()
+--- a/cmake/include_libraries.cmake
++++ b/cmake/include_libraries.cmake
+@@ -15,6 +15,7 @@ if (ENABLE_UNIT_TESTS)
+ endif (ENABLE_UNIT_TESTS)
+
+ # optional libraries
++find_package(Atomic QUIET)
+ find_package(LibLZMA QUIET)
+ find_package(Asciidoc QUIET)
+ find_package(DBLATEX QUIET)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,6 +116,14 @@ else ()
+ DAQ Modules: Dynamic")
+ endif ()
+
++if (HAVE_ATOMIC)
++ message("\
++ libatomic: ON")
++else ()
++ message("\
++ libatomic: OFF")
++endif ()
++
+ if (HAVE_FLATBUFFERS)
+ message("\
+ Flatbuffers: ON")
+--- a/configure_cmake.sh
++++ b/configure_cmake.sh
+@@ -108,6 +108,8 @@ Optional Packages:
+ libhs include directory
+ --with-hyperscan-libraries=DIR
+ libhs library directory
++ --with-atomic-libraries=DIR
++ atomic library directory
+ --with-flatbuffers-includes=DIR
+ flatbuffers include directory
+ --with-flatbuffers-libraries=DIR
+@@ -447,6 +449,9 @@ while [ $# -ne 0 ]; do
+ --with-hyperscan-libraries=*)
+ append_cache_entry HS_LIBRARIES_DIR PATH $optarg
+ ;;
++ --with-atomic-libraries=*)
++ append_cache_entry ATOMIC_LIBRARIES_DIR_HINT PATH $optarg
++ ;;
+ --with-flatbuffers-includes=*)
+ append_cache_entry FLATBUFFERS_INCLUDE_DIR_HINT PATH $optarg
+ ;;
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -25,6 +25,10 @@ set(EXTERNAL_INCLUDES
+ ${ZLIB_INCLUDE_DIRS}
+ )
+
++if ( HAVE_ATOMIC )
++ LIST(APPEND EXTERNAL_LIBRARIES ${ATOMIC_LIBRARIES})
++endif()
++
+ if ( ENABLE_STATIC_DAQ )
+ LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS})
+ endif ()
PKG_NAME:=sqm-scripts
PKG_SOURCE_VERSION:=5d7e7977e14e147d5bcfa8a5f01636c7ab230fa4
PKG_VERSION:=1.5.1
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts
define Package/sqm-scripts
SECTION:=net
CATEGORY:=Base system
- DEPENDS:=+tc +kmod-sched-core +kmod-ifb +iptables \
- +iptables-mod-ipopt +iptables-mod-conntrack-extra \
- +kmod-sched-cake
+ DEPENDS:=+tc +kmod-sched-cake +kmod-ifb +iptables \
+ +iptables-mod-ipopt +iptables-mod-conntrack-extra
TITLE:=SQM Scripts (QoS)
PKGARCH:=all
endef
PKG_NAME:=stubby
PKG_VERSION:=0.4.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME)
upstream_recursive_servers_section=1
fi
config_get address "$config" address
- echo " - address_data: $address"
+ echo " - address_data: \"$address\""
config_get tls_auth_name "$config" tls_auth_name
echo " tls_auth_name: \"$tls_auth_name\""
include $(TOPDIR)/rules.mk
PKG_NAME:=tailscale
-PKG_VERSION:=1.12.3
+PKG_VERSION:=1.18.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=tailscale-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=05e5b1d382cad7ac5737d87d0b61277791c75938468c2c662f21665998d431e9
+PKG_HASH:=57206181868299027689651b6cd133627acad0c8c38f0151f469ab36d4130012
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=tgt
-PKG_VERSION:=1.0.80
+PKG_VERSION:=1.0.81
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/fujita/tgt/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75
+PKG_HASH:=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
PKG_LICENSE:=GPL-2.0-only
define Package/tgt
SECTION:=net
CATEGORY:=Network
- URL:=http://stgt.sourceforge.net/
+ URL:=https://github.com/fujita/tgt
TITLE:=userspace iSCSI target
DEPENDS:=+libpthread +libaio
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=unbound
-PKG_VERSION:=1.13.2
+PKG_VERSION:=1.14.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nlnetlabs.nl/downloads/unbound
-PKG_HASH:=0a13b547f3b92a026b5ebd0423f54c991e5718037fd9f72445817f6a040e1a83
+PKG_HASH:=6ef91cbf02d5299eab39328c0857393de7b4885a2fe7233ddfe3c124ff5a89c8
PKG_MAINTAINER:=Eric Luehrsen <ericluehrsen@gmail.com>
PKG_LICENSE:=BSD-3-Clause
--- /dev/null
+OpenWrt (modification):
+Fix cross compile errors by inserting an environment variable for the
+target. Use "uname" on host only if "UNAME" variable is empty.
+--- a/configure.ac
++++ b/configure.ac
+@@ -777,7 +777,7 @@ if test x_$ub_test_python != x_no; then
+ fi
+ fi
+
+-if test "`uname`" = "NetBSD"; then
++if test "${UNAME:-`uname`}" = "NetBSD"; then
+ NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_'
+ AC_SUBST(NETBSD_LINTFLAGS)
+ fi
+++ /dev/null
---- a/configure.ac
-+++ b/configure.ac
-@@ -772,7 +772,7 @@ if test x_$ub_test_python != x_no; then
- fi
- fi
-
--if test "`uname`" = "NetBSD"; then
-+if test "${UNAME:-`uname`}" = "NetBSD"; then
- NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_'
- AC_SUBST(NETBSD_LINTFLAGS)
- fi
+++ /dev/null
-From ad45e9b89ee18bbfeff0ed45da2c243ac17acfe6 Mon Sep 17 00:00:00 2001
-From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
-Date: Fri, 13 Aug 2021 09:27:58 +0200
-Subject: [PATCH] - Fix for #431: Squelch permission denied errors for udp
- connect, and udp send, they are visible at higher verbosity settings.
-
----
- doc/Changelog | 2 ++
- services/outside_network.c | 1 +
- util/netevent.c | 1 +
- 3 files changed, 4 insertions(+)
-
-# diff --git a/doc/Changelog b/doc/Changelog
-# index 62c747c85..1cd0f3bad 100644
-# --- a/doc/Changelog
-# +++ b/doc/Changelog
-# @@ -1,5 +1,7 @@
-# 13 August 2021: Wouter
-# - Support using system-wide crypto policies.
-# + - Fix for #431: Squelch permission denied errors for udp connect,
-# + and udp send, they are visible at higher verbosity settings.
-
-# 12 August 2021: George
-# - Merge PR #514, from ziollek: Docker environment for run tests.
---- a/services/outside_network.c
-+++ b/services/outside_network.c
-@@ -1962,6 +1962,7 @@ static int udp_connect_needs_log(int err
- case ENETDOWN:
- # endif
- case EPERM:
-+ case EACCES:
- if(verbosity >= VERB_ALGO)
- return 1;
- return 0;
---- a/util/netevent.c
-+++ b/util/netevent.c
-@@ -300,6 +300,7 @@ udp_send_errno_needs_log(struct sockaddr
- case ENETDOWN:
- # endif
- case EPERM:
-+ case EACCES:
- if(verbosity < VERB_ALGO)
- return 0;
- default:
include $(TOPDIR)/rules.mk
PKG_NAME:=usteer
-PKG_SOURCE_DATE:=2021-11-25
-PKG_SOURCE_VERSION:=7bf79a237c4eaf68fa9211fbf1d1c083fa749c91
+PKG_SOURCE_DATE:=2021-12-09
+PKG_SOURCE_VERSION:=8e7b1ffc26117c4b0338a69f5a6fb396c18448bf
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=https://git.openwrt.org/project/usteer.git
-PKG_MIRROR_HASH:=f965f085088c49531a39b9bb51e25cc275851511a4c8204442c0a12ef68162bf
+PKG_MIRROR_HASH:=3c030b2f1f9bf3b7497b288930d09dd8320fffdd9e3cdbd49ff53be0c8bb0f31
PKG_MAINTAINER:=David Bauer <mail@david-bauer.net>
PKG_LICENSE:=GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=v2rayA
-PKG_VERSION:=1.5.4
+PKG_VERSION:=1.5.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2rayA/v2rayA/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5ec7f4103e07fd4f3750284dc396823fcfccab73b0d101098771d419c9d836ac
+PKG_HASH:=7844cb4cddca0a4831925c38039226813a61ceaf24a19e471654d278387b8368
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/service
PKG_LICENSE:=AGPL-3.0-only
--- /dev/null
+From 366ef30071dc8cc73cd8768f6a0a58fa1b9533ff Mon Sep 17 00:00:00 2001
+From: mzz2017 <mzz@tuta.io>
+Date: Fri, 10 Dec 2021 20:47:24 +0800
+Subject: [PATCH] chore: re-support mips
+
+---
+ service/go.mod | 11 +++--------
+ service/go.sum | 29 ++++++++++++++++++-----------
+ 2 files changed, 21 insertions(+), 19 deletions(-)
+
+--- a/go.mod
++++ b/go.mod
+@@ -3,7 +3,6 @@ module github.com/v2rayA/v2rayA
+ go 1.16
+
+ require (
+- github.com/StackExchange/wmi v1.2.1 // indirect
+ github.com/beevik/ntp v0.3.0
+ github.com/boltdb/bolt v1.3.1
+ github.com/devfeel/mapper v0.7.5
+@@ -22,8 +21,7 @@ require (
+ github.com/mzz2017/go-engine v0.0.0-20200509094339-b56921189229
+ github.com/pkg/errors v0.9.1
+ github.com/shadowsocks/go-shadowsocks2 v0.1.5-0.20210421162817-acdbac05f5a5
+- github.com/shirou/gopsutil v3.21.8+incompatible // indirect
+- github.com/shirou/gopsutil/v3 v3.21.8
++ github.com/shirou/gopsutil/v3 v3.21.11
+ github.com/stevenroose/gonfig v0.1.5
+ github.com/tidwall/gjson v1.10.2
+ github.com/tidwall/sjson v1.2.3
+@@ -33,7 +31,7 @@ require (
+ github.com/v2rayA/go-uci v0.0.0-20210907104827-4cf744297b41
+ github.com/v2rayA/shadowsocksR v1.0.3
+ golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
+- golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55
++ golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
+ google.golang.org/grpc v1.40.0
+ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+ )
+@@ -44,7 +42,4 @@ require (
+ //replace github.com/mzz2017/go-engine => ../../go-engine
+ //replace github.com/v2rayA/beego/v2 => ../../beego
+
+-// windows/arm64 support
+-replace github.com/go-ole/go-ole => github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1
+-
+-replace github.com/shirou/gopsutil/v3 => github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f
++replace github.com/boltdb/bolt => github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0
+--- a/go.sum
++++ b/go.sum
+@@ -23,8 +23,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod
+ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
+ github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+-github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
+-github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
+ github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
+ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+@@ -41,8 +39,6 @@ github.com/beorn7/perks v0.0.0-201803211
+ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
+-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
+-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
+ github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+@@ -112,12 +108,14 @@ github.com/gin-gonic/gin v1.7.1 h1:qC89G
+ github.com/gin-gonic/gin v1.7.1/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
+ github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
++github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0 h1:ZaoAEDzwmAhThOTX8xAsr2fqSFHjbZYAkd2/A4Ha1Sk=
++github.com/go-gitea/bolt v0.0.0-20170420010917-ccd680d8c1a0/go.mod h1:rkz7AtkR0EmCCgcJRSvbsa5fW1VbxdcInaIKS7pvowU=
+ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+-github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1 h1:+EOKrBM9hIMe7nPoryEuVZfSC5avyLLFgvt4up790KM=
+-github.com/go-ole/go-ole v0.0.0-20210915003542-8b1f7f90f6b1/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
++github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
++github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+ github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+ github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+ github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
+@@ -262,6 +260,8 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL
+ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+ github.com/lucas-clemente/quic-go v0.23.0 h1:5vFnKtZ6nHDFsc/F3uuiF4T3y/AXaQdxjUqiVw26GZE=
+ github.com/lucas-clemente/quic-go v0.23.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
++github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
++github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=
+ github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=
+ github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+@@ -352,6 +352,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:b
+ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
++github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
++github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
+@@ -381,10 +383,8 @@ github.com/shadowsocks/go-shadowsocks2 v
+ github.com/shadowsocks/go-shadowsocks2 v0.1.5-0.20210421162817-acdbac05f5a5/go.mod h1:AGGpIoek4HRno4xzyFiAtLHkOpcoznZEkAccaI/rplM=
+ github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
+ github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
+-github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f h1:oegEiaH/bXSZaHdU8tXsVjaStvoBEvn8kpTpnbSiSA8=
+-github.com/shirou/gopsutil v0.0.0-20210919144451-80d5b574053f/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+-github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU=
+-github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
++github.com/shirou/gopsutil/v3 v3.21.11 h1:d5tOAP5+bmJ8Hf2+4bxOSkQ/64+sjEbjU9nSW9nJgG0=
++github.com/shirou/gopsutil/v3 v3.21.11/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
+ github.com/shiyanhui/dht v0.0.0-20190320084728-1b3b78ecf279/go.mod h1:BFWnSWg10ADimfxHLuCo6NcJ7hu2ghgk6X7KuO6svmQ=
+ github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
+ github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
+@@ -450,6 +450,8 @@ github.com/tidwall/pretty v1.2.0/go.mod
+ github.com/tidwall/sjson v1.2.3 h1:5+deguEhHSEjmuICXZ21uSSsXotWMA0orU783+Z7Cp8=
+ github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTAyGvZs=
+ github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=
++github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
++github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
+ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+ github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
+ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
+@@ -483,6 +485,8 @@ github.com/yuin/goldmark v1.1.27/go.mod
+ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
++github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
++github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+ gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c h1:yrfrd1u7MWIwWIulet2TZPEkeNQhQ/GcPLdPXgiEEr0=
+ gitlab.com/yawning/chacha20.git v0.0.0-20190903091407-6d1cb28dc72c/go.mod h1:3x6b94nWCP/a2XB/joOPMiGYUBvqbLfeY/BkHLeDs6s=
+ go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+@@ -640,6 +644,7 @@ golang.org/x/sys v0.0.0-20201101102859-d
+ golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -648,8 +653,10 @@ golang.org/x/sys v0.0.0-20210403161142-5
+ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+-golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 h1:rw6UNGRMfarCepjI8qOepea/SXwIBVfTKjztZ5gBbq4=
++golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
++golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
include $(TOPDIR)/rules.mk
PKG_NAME:=xray-core
-PKG_VERSION:=1.4.5
+PKG_VERSION:=1.5.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=54c6a687dd463b25afe8d8eb44d37e18b8177f58308207cd1d74f6cd04619854
+PKG_HASH:=b687a8fd1325bee0f6352c8dc3bfb70a7ee07cd74aacaece4e36c93cf7cda417
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MPL-2.0
/etc/config/xray
endef
-GEOIP_VER:=202110210032
+GEOIP_VER:=202112090029
GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
define Download/geoip
URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
URL_FILE:=geoip.dat
FILE:=$(GEOIP_FILE)
- HASH:=932cd484471f8066c040ab84a04fdd70df6c5cee99545de610e1f337bb696220
+ HASH:=704c53a30531b74a2c4c51b5ee958340717fc81906335c4342fb7d6ef4243ba9
endef
-GEOSITE_VER:=20211018134657
+GEOSITE_VER:=20211209100918
GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
define Download/geosite
URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
URL_FILE:=dlc.dat
FILE:=$(GEOSITE_FILE)
- HASH:=60b2388b11f1f9b6e14794fbacdf3bf693e3101e3ec651ce5423d8caceda5497
+ HASH:=a39901df0d0f7477d874cda50b045057610837dd0d80f7ff4c51b7ab87d88b18
endef
define Build/Prepare
include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-utils
-PKG_VERSION:=1.2.5.1
+PKG_VERSION:=1.2.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \
http://distfiles.gentoo.org/distfiles/
-PKG_HASH:=9c169ae37a49295f9b97b92ace772803daf6b6510a19574e0b78f87e562118d0
+PKG_HASH:=6a1efd8a1f1d9d38e489633eaec1fffa5c315663b316cab804be486887e6145d
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=mpc
-PKG_VERSION:=0.33
-PKG_RELEASE:=1
+PKG_VERSION:=0.34
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpc/0
-PKG_HASH:=4f40ccbe18f5095437283cfc525a97815e983cbfd3a29e48ff610fa4f1bf1296
+PKG_HASH:=691e3f3654bc10d022bb0310234d0bc2d8c075a698f09924d9ebed8f506fda20
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=mpd
-PKG_VERSION:=0.23.2
+PKG_VERSION:=0.23.5
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.23
-PKG_HASH:=74ec75689746baaeab7c65d70019f96f70b31b658cb25cfd2ebcca03f65acddf
+PKG_HASH:=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=shairport-sync
-PKG_VERSION:=3.3.8
+PKG_VERSION:=3.3.9
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikebrady/shairport-sync/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=c92f9a2d86dd1138673abc66e0010c94412ad6a46da8f36c3d538f4fa6b9faca
+PKG_HASH:=17990cb2620551caa07a1c3b371889e55803071eaada04e958c356547a7e1795
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Mike Brady <mikebrady@eircom.net>
include $(TOPDIR)/rules.mk
PKG_NAME:=upmpdcli
-PKG_VERSION:=1.5.12
+PKG_VERSION:=1.5.13
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.lesbonscomptes.com/upmpdcli/downloads
-PKG_HASH:=1d7b6ab360c2549a7e3eff4f261471761dd837e18327a3ca29de1981c090ff3b
+PKG_HASH:=c7726f0d4062ae253159102e499759bd513d3c68bfe16c44997ee3fba35509f8
PKG_MAINTAINER:=
PKG_LICENSE:=LGPL-2.1-or-later
$(INSTALL_DIR) $(1)/usr/share/apparmor/easyprof/templates $(1)/usr/share/apparmor/easyprof/policygroups
$(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/share/apparmor/easyprof/templates/* $(1)/usr/share/apparmor/easyprof/templates/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/share/apparmor/easyprof/policygroups/* $(1)/usr/share/apparmor/easyprof/policygroups/
- $(INSTALL_DIR) $(1)/usr/lib/python3.9/site-packages $(1)/usr/lib/python3.9/site-packages/apparmor $(1)/usr/lib/python3.9/site-packages/apparmor/rule
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python3.9/site-packages/*.egg-info \
- $(1)/usr/lib/python3.9/site-packages/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python3.9/site-packages/apparmor/*.py \
- $(1)/usr/lib/python3.9/site-packages/apparmor/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python3.9/site-packages/apparmor/rule/*.py \
- $(1)/usr/lib/python3.9/site-packages/apparmor/rule
+ $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/*.egg-info \
+ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/*.py \
+ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)-utils/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule/*.py \
+ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/apparmor/rule
$(INSTALL_DIR) $(1)/etc/init.d $(1)/lib/functions
$(INSTALL_BIN) ./files/apparmor.sh $(1)/lib/functions/
$(INSTALL_BIN) ./files/apparmor.init $(1)/etc/init.d/apparmor
PKG_NAME:=bandwidthd
PKG_VERSION:=2.0.1-35
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)?
$(call Package/bandwidthd/Default)
TITLE += (with sqlite enabled)
VARIANT:=sqlite
- DEPENDS:=+libgd +libpcap +libsqlite3 +php7 +php7-cgi +php7-mod-gd +php7-mod-pdo +php7-mod-pdo-sqlite
+ DEPENDS:=+libgd +libpcap +libsqlite3 +php8 +php8-cgi +php8-mod-gd +php8-mod-pdo +php8-mod-pdo-sqlite
endef
define Package/bandwidthd-php
$(call Package/bandwidthd/Default)
TITLE = PHP files to graph bandwidthd data from postgresql
VARIANT:=php
- DEPENDS:=+libpcre +libxml2 +php7 +php7-cgi +php7-mod-pgsql +php7-mod-gd
+ DEPENDS:=+libpcre +libxml2 +php8 +php8-cgi +php8-mod-pgsql +php8-mod-gd
endef
define Package/bandwidthd/description
include $(TOPDIR)/rules.mk
PKG_NAME:=bluez
-PKG_VERSION:=5.60
+PKG_VERSION:=5.62
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/bluetooth/
-PKG_HASH:=710999580d01ee59ec585e5e7c07fd94eddedc001aa26fe7464c546f9d945304
+PKG_HASH:=38090a5b750e17fc08d3e52178ed8d3254c5f4bd2c48830d5c1955b88e3bc0c2
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
--- a/Makefile.in
+++ b/Makefile.in
-@@ -3326,7 +3326,7 @@ unit_tests = $(am__append_52) unit/test-
- @CLIENT_TRUE@ client/gatt.h client/gatt.c
+@@ -3342,7 +3342,7 @@ unit_tests = $(am__append_54) unit/test-
+ @CLIENT_TRUE@ client/admin.c
@CLIENT_TRUE@client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
-@CLIENT_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) -lreadline
@ZSH_COMPLETIONS_TRUE@zshcompletiondir = $(ZSH_COMPLETIONDIR)
@ZSH_COMPLETIONS_TRUE@dist_zshcompletion_DATA = completion/zsh/_bluetoothctl
-@@ -3559,7 +3559,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3575,7 +3575,7 @@ unit_tests = $(am__append_54) unit/test-
@MESH_TRUE@@TOOLS_TRUE@tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
@MESH_TRUE@@TOOLS_TRUE@ lib/libbluetooth-internal.la \
@MESH_TRUE@@TOOLS_TRUE@tools_mesh_cfgclient_SOURCES = tools/mesh-cfgclient.c \
@MESH_TRUE@@TOOLS_TRUE@ tools/mesh/model.h tools/mesh/config-model.h \
-@@ -3630,7 +3630,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3646,7 +3646,7 @@ unit_tests = $(am__append_54) unit/test-
@READLINE_TRUE@ tools/obex-client-tool.c
@READLINE_TRUE@tools_obex_client_tool_LDADD = lib/libbluetooth-internal.la \
@READLINE_TRUE@tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
@READLINE_TRUE@ tools/obex-server-tool.c
-@@ -3639,15 +3639,15 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3655,15 +3655,15 @@ unit_tests = $(am__append_54) unit/test-
@READLINE_TRUE@tools_bluetooth_player_SOURCES = tools/bluetooth-player.c
@READLINE_TRUE@tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
@READLINE_TRUE@ src/libshared-glib.la \
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
@DEPRECATED_TRUE@@READLINE_TRUE@ attrib/gattrib.c btio/btio.c \
-@@ -3656,7 +3656,7 @@ unit_tests = $(am__append_52) unit/test-
+@@ -3672,7 +3672,7 @@ unit_tests = $(am__append_54) unit/test-
@DEPRECATED_TRUE@@READLINE_TRUE@ client/display.h
@DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
--- a/src/adapter.c
+++ b/src/adapter.c
-@@ -560,7 +560,8 @@ static void settings_changed(struct btd_
- g_dbus_emit_property_changed(dbus_conn, adapter->path,
- ADAPTER_INTERFACE, "Discoverable");
- store_adapter_info(adapter);
+@@ -606,7 +606,9 @@ static void settings_changed(struct btd_
+ */
+ if (!adapter->discovery_discoverable)
+ store_adapter_info(adapter);
- btd_adv_manager_refresh(adapter->adv_manager);
++
+ if (adapter->supported_settings & MGMT_SETTING_LE)
+ btd_adv_manager_refresh(adapter->adv_manager);
}
endef
define Build/Compile
- COMMON_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
- COMMON_LDFLAGS="$(TARGET_LINKFLAGS) $(TARGET_LDFLAGS)" \
- $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" bin/bossac
+ $(MAKE) -C $(PKG_BUILD_DIR) bin/bossac \
+ CC="$(TARGET_CC_NOCACHE)" \
+ CXX="$(TARGET_CXX_NOCACHE)" \
+ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
+ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"
endef
define Package/bossa/install
include $(TOPDIR)/rules.mk
PKG_NAME:=canutils
-PKG_VERSION:=2021.06.0
+PKG_VERSION:=2021.08.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/linux-can/can-utils/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f7874457224c89f8b2eb55ab741935ddb7f1c9bc52de2642330b0799f89d1040
+PKG_HASH:=c9b8f29515ad34af7f78450ec55c983abc5393e86b1f128a92ac0dfd141baaf7
PKG_BUILD_DIR:=$(BUILD_DIR)/can-utils-$(PKG_VERSION)
PKG_MAINTAINER:=Anton Glukhov <anton.a.glukhov@gmail.com>
include $(TOPDIR)/rules.mk
PKG_NAME:=conmon
-PKG_VERSION:=2.0.30
+PKG_VERSION:=2.0.31
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/$(PKG_NAME)/archive/v$(PKG_VERSION)
-PKG_HASH:=4b0a98fbe8a63c42f60edac25c19aa6606caa7b1e4fe7846fc7f7de0b566ba25
+PKG_HASH:=76286480065d4cf9b24610c159c683710fe9c8b9f753518f804f22bbb59796a8
PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
PKG_LICENSE:=Apache-2.0
--- /dev/null
+if PACKAGE_dbus
+
+config DBUS_VERBOSE
+ bool "Enable verbose error strings"
+ default n
+
+endif
PKG_LICENSE:=AFL-2.1
PKG_CPE_ID:=cpe:/a:freedesktop:dbus
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_DBUS_VERBOSE
+
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
This package contains D-Bus utilities.
endef
+define Package/dbus/config
+ source "$(SOURCE)/Config.in"
+endef
+
CMAKE_OPTIONS += \
-DDBUS_SYSTEM_SOCKET=/var/run/dbus/system_bus_socket \
-DDBUS_SESSION_SOCKET_DIR=/tmp \
- -DDBUS_SYSTEM_PID_FILE=/var/run/dbus.pid \
-DDBUS_BUILD_TESTS=OFF \
-DDBUS_LINUX=ON \
-DDBUS_DISABLE_ASSERT=ON \
-DDBUS_DISABLE_CHECKS=ON \
-DDBUS_BUILD_X11=OFF \
-DDBUS_ENABLE_DOXYGEN_DOCS=OFF \
- -DENABLE_QT_HELP=OFF
+ -DDBUS_ENABLE_QTHELP_DOCS=OFF \
+ -DDBUS_ENABLE_XML_DOCS=OFF
+
+ifeq ($(CONFIG_DBUS_VERBOSE),y)
+ CMAKE_OPTIONS += -DDBUS_ENABLE_VERBOSE_MODE=ON
+endif
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include
define Package/dbus-utils/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-{monitor,send,update-activation-environment} $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-monitor $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-send $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dbus-test-tool $(1)/usr/bin/
endef
$(eval $(call BuildPackage,libdbus))
START=60
-SERVICE_PID_FILE=/var/run/dbus.pid
+USE_PROCD=1
+PROG=/usr/bin/dbus-daemon
-start() {
+# To enable this makes only sense if the dbus has been compiled with
+# the option CONFIG_DBUS_VERBOSE=y
+
+#DEBUG=1
+
+start_service() {
mkdir -m 0755 -p /var/lib/dbus
mkdir -m 0755 -p /var/run/dbus
+
[ -x /usr/bin/dbus-uuidgen ] && /usr/bin/dbus-uuidgen --ensure
- service_start /usr/bin/dbus-daemon --system
+
+ procd_open_instance
+ procd_set_param command "${PROG}"
+ procd_append_param command --system
+ procd_append_param command --nofork
+ [ -n "$DEBUG" ] && procd_set_param env DBUS_VERBOSE=1
+ procd_set_param stdout 1
+ procd_set_param stderr 1
+ procd_close_instance
}
-stop() {
- service_stop /usr/bin/dbus-daemon
+stop_service() {
+ service_stop "${PROG}"
}
--- /dev/null
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -471,14 +471,16 @@ endif()
+
+ #### Find socket directories
+ if(UNIX)
+- if(NOT $ENV{TMPDIR} STREQUAL "")
+- set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
+- elseif(NOT $ENV{TEMP} STREQUAL "")
+- set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
+- elseif(NOT $ENV{TMP} STREQUAL "")
+- set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
+- else()
+- set(DBUS_SESSION_SOCKET_DIR /tmp)
++ if(NOT DEFINED DBUS_SESSION_SOCKET_DIR)
++ if(NOT $ENV{TMPDIR} STREQUAL "")
++ set(DBUS_SESSION_SOCKET_DIR $ENV{TMPDIR})
++ elseif(NOT $ENV{TEMP} STREQUAL "")
++ set(DBUS_SESSION_SOCKET_DIR $ENV{TEMP})
++ elseif(NOT $ENV{TMP} STREQUAL "")
++ set(DBUS_SESSION_SOCKET_DIR $ENV{TMP})
++ else()
++ set(DBUS_SESSION_SOCKET_DIR /tmp)
++ endif()
+ endif()
+ endif()
+
include $(TOPDIR)/rules.mk
PKG_NAME:=compose
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.2
PKG_RELEASE:=$(AUTORELEASE)
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:=5699734a4625507cf3e2382e056a0ff7ec60c9e1d654d8c7d93baf844313bcf9
+PKG_HASH:=001cf72f6bc8a8c43d100389e0bbd3d4d5f5c523f4e3f7ddd53f6a4cd2d6cb18
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
TARGET_CFLAGS += -flto
TARGET_CXXFLAGS += -DWITH_GPIO -flto
-TARGET_LDFLAGS += -lpython3.9
define Build/Prepare
$(call Build/Prepare/Default)
include $(TOPDIR)/rules.mk
PKG_NAME:=exfatprogs
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=23cb2b709821efe9eecf10a9594be0b26d7c01192b47339902328d817c6cb358
+PKG_HASH:=e3ee4fb5af4abc9335aed7a749c319917c652ac1af687ba40aabd04a6b71f1ca
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-only
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
PKG_HASH:=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df
-PKG_MAINTAINER:=Alif M. Ahmad <alive4ever@live.com>
+PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=hwdata
-PKG_VERSION:=0.350
+PKG_VERSION:=0.354
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/vcrhonek/hwdata/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=9810050ed5e1d1dc07138248bbc4dc774019a9a53d47a8f500c83e53d68ccdd9
+PKG_HASH:=ed9a2c8b90371ccf4f0ff88972d87770c1c644e63ca44d2ac72c33200642cdde
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later XFree86-1.0
include $(TOPDIR)/rules.mk
PKG_NAME:=less
-PKG_VERSION:=590
+PKG_VERSION:=598
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= @GNU/less \
http://www.greenwoodsoftware.com/less
-PKG_HASH:=6aadf54be8bf57d0e2999a3c5d67b1de63808bb90deb8f77b028eafae3a08e10
+PKG_HASH:=64e0eb24534ac70d15ff3a36c8853f7a48196aa230d2a104707fc4ff1a45e982
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_NAME:=logrotate
PKG_VERSION:=3.17.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/logrotate/logrotate/releases/download/$(PKG_VERSION)
define Package/logrotate/conffiles
/etc/logrotate.conf
+/etc/logrotate.d
endef
CONFIGURE_ARGS += \
include $(TOPDIR)/rules.mk
PKG_NAME:=mandoc
-PKG_VERSION:=1.14.5
+PKG_VERSION:=1.14.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://mandoc.bsd.lv/snapshots/
-PKG_HASH:=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
+PKG_HASH:=8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=BSD-3-Clause BSD-2-Clause
-Only in mandoc-1.14.5/: config.h
-Only in mandoc-1.14.5/: config.log
-Only in mandoc-1.14.5/: config.log.old
--- a/configure
+++ b/configure
-@@ -41,7 +41,6 @@ OSENUM=
- OSNAME=
- UTF8_LOCALE=
-
--CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
- CFLAGS=
- LDADD=
- LDFLAGS=
-@@ -60,7 +59,7 @@ HAVE_DIRENT_NAMLEN=
+@@ -62,7 +62,7 @@ HAVE_DIRENT_NAMLEN=
HAVE_EFTYPE=
HAVE_ENDIAN=
HAVE_ERR=
HAVE_FTS_COMPARE_CONST=
HAVE_GETLINE=
HAVE_GETSUBOPT=
-@@ -74,7 +73,7 @@ HAVE_OHASH=
+@@ -77,7 +77,7 @@ HAVE_OHASH=
HAVE_PATH_MAX=
HAVE_PLEDGE=
HAVE_PROGNAME=
HAVE_RECALLOCARRAY=
HAVE_RECVMSG=
HAVE_REWB_BSD=
-@@ -95,7 +94,7 @@ HAVE_WCHAR=
- NEED_GNU_SOURCE=0
- NEED_OPENBSD_SOURCE=0
+@@ -102,7 +102,7 @@ NEED_XPG4_2=0
+ MANDOC_COBJS=
+ SOELIM_COBJS=
-PREFIX="/usr/local"
+PREFIX="/usr"
BINDIR=
SBINDIR=
BIN_FROM_SBIN=
-@@ -299,8 +298,6 @@ runtest PATH_MAX PATH_MAX || true
- runtest pledge PLEDGE || true
- runtest sandbox_init SANDBOX_INIT || true
- runtest progname PROGNAME || true
--singletest reallocarray REALLOCARRAY || \
-- runtest reallocarray REALLOCARRAY -D_OPENBSD_SOURCE || true
- singletest recallocarray RECALLOCARRAY || \
- runtest recallocarray RECALLOCARRAY -D_OPENBSD_SOURCE || true
- runtest rewb-bsd REWB_BSD || true
+++ /dev/null
---- a/compat_getline.c
-+++ b/compat_getline.c
-@@ -2,7 +2,7 @@
-
- #if HAVE_GETLINE
-
--int dummy;
-+extern int dummy;
-
- #else
-
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git
-PKG_SOURCE_DATE:=2021-10-01
-PKG_SOURCE_VERSION:=7769a4d7abe339ce273c13a203394a79a11fcff9
-PKG_MIRROR_HASH:=4feb754875b680dfd815e1776e308d3296be84e4a345d9062677d5e7ee5490ed
+PKG_SOURCE_DATE:=2021-12-11
+PKG_SOURCE_VERSION:=a1b233c2a31baa5b77cb67c0c3be4767be86f727
+PKG_MIRROR_HASH:=3a1b75afd51f22054bc06d5dce79408c0c20b1f26b85251c8964bbc1e04a4b4b
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=
include $(TOPDIR)/rules.mk
PKG_NAME:=nano
-PKG_VERSION:=5.9
+PKG_VERSION:=6.0
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/nano
-PKG_HASH:=757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937
+PKG_HASH:=93ac8cb68b4ad10e0aaeb80a2dd15c5bb89eb665a4844f7ad01c67efcb169ea2
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=COPYING
SUBMENU:=Editors
SECTION:=utils
CATEGORY:=Utilities
- TITLE:=An enhanced clone of the Pico text editor
+ TITLE:=GNU nano - enhanced clone of the Pico text editor
URL:=https://www.nano-editor.org/
DEPENDS:=+libncurses
endef
define Package/nano/description
- Nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone
- of the Pico text editor.
+ Nano is a small and simple text editor for use on the terminal.
+
+ Nano started as an enhanced clone of the Pico text editor.
+ Nowadays Nano wants to be a generally useful editor with sensible
+ defaults (linewise scrolling, no automatic line breaking).
+
+ Nano is an official GNU package.
endef
CONFIGURE_ARGS += \
+++ /dev/null
-From 3a94a0bb89363ef8768546973aab051cd5bf4622 Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Wed, 10 Nov 2021 09:20:56 +0100
-Subject: [PATCH] bindings: allow toggling line numbers (when enabled) also in
- tiny version
-
-As a special case, and because it doesn't need any feedback on the
-status bar nor other calls, add a special function and key binding
-to allow the user to flip the LINE_NUMBERS flag also in a tiny nano.
-
-This fixes https://savannah.gnu.org/bugs/?61441.
-Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
----
- src/global.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/src/global.c
-+++ b/src/global.c
-@@ -554,6 +554,14 @@ functionptrtype interpret(int *keycode)
- }
- #endif /* ENABLE_BROWSER || ENABLE_HELP */
-
-+#if defined(NANO_TINY) && defined(ENABLE_LINENUMBERS)
-+/* Allow toggling line numbers (when enabled) also in the tiny version. */
-+void toggle_numbers(void)
-+{
-+ TOGGLE(LINE_NUMBERS);
-+}
-+#endif
-+
- /* These two tags are used elsewhere too, so they are global. */
- /* TRANSLATORS: Try to keep the next two strings at most 10 characters. */
- const char *exit_tag = N_("Exit");
-@@ -1250,9 +1258,13 @@ void shortcut_init(void)
- add_to_sclist(MMAIN|MBROWSER|MHELP, "M-W", 0, do_findnext, 0);
- add_to_sclist(MMAIN|MBROWSER|MHELP, "M-Q", 0, do_findprevious, 0);
- #ifdef NANO_TINY
-+#ifdef ENABLE_LINENUMBERS
-+ add_to_sclist(MMAIN, "M-N", 0, toggle_numbers, 0);
-+#else
- add_to_sclist(MMAIN, "M-B", 0, to_prev_word, 0);
-- add_to_sclist(MMAIN, "M-D", 0, to_prev_word, 0);
- add_to_sclist(MMAIN, "M-N", 0, to_next_word, 0);
-+#endif
-+ add_to_sclist(MMAIN, "M-D", 0, to_prev_word, 0);
- add_to_sclist(MMAIN, "M-F", 0, to_next_word, 0);
- #else
- add_to_sclist(MMAIN, "M-]", 0, do_find_bracket, 0);
include $(TOPDIR)/rules.mk
PKG_NAME:=open-plc-utils
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/qca/open-plc-utils.git
-PKG_SOURCE_VERSION:=bb50f635ef6cec8b52898051e0d18f4ac3fdd331
-PKG_MIRROR_HASH:=1fc202ee33fd768d631e5834ac62461e7b544251914d797d868b0de7f33b785b
+PKG_SOURCE_VERSION:=358dfcf78bdaf7b0b13dcdf91cb1aae1789f2770
+PKG_MIRROR_HASH:=3b24033f3d2d9ac33778fb772837bc5e0a8891ac708bbe1f35336ff792baf9f8
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
include $(TOPDIR)/rules.mk
PKG_NAME:=podman
-PKG_VERSION:=3.4.2
+PKG_VERSION:=3.4.4
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/containers/podman/archive/v$(PKG_VERSION)
-PKG_HASH:=b0c4f9a11eb500b1d440d5e51a6c0c632aa4ac458e2dc0362f50f999eb7fbf31
+PKG_HASH:=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
--- /dev/null
+--- a/pkg/rootless/rootless_linux.c
++++ b/pkg/rootless/rootless_linux.c
+@@ -19,6 +19,15 @@
+ #include <sys/select.h>
+ #include <stdio.h>
+
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++ (__extension__ \
++ ({ long int __result; \
++ do __result = (long int) (expression); \
++ while (__result == -1L && errno == EINTR); \
++ __result; }))
++#endif
++
+ #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
+ #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
+ #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
+@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, cons
+ return rename (oldpath, newpath);
+ }
+
+-#ifndef TEMP_FAILURE_RETRY
+-#define TEMP_FAILURE_RETRY(expression) \
+- (__extension__ \
+- ({ long int __result; \
+- do __result = (long int) (expression); \
+- while (__result == -1L && errno == EINTR); \
+- __result; }))
+-#endif
+-
+ static const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
+ static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
+
include $(TOPDIR)/rules.mk
PKG_NAME:=prometheus-node-exporter-lua
-PKG_VERSION:=2021.10.31
+PKG_VERSION:=2021.12.21
PKG_RELEASE:=1
PKG_MAINTAINER:=Etienne CHAMPETIER <champetier.etienne@gmail.com>
$(INSTALL_DIR) $(1)/usr/lib/lua/prometheus-collectors
$(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/cpu.lua $(1)/usr/lib/lua/prometheus-collectors/
$(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/conntrack.lua $(1)/usr/lib/lua/prometheus-collectors/
+ $(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/entropy.lua $(1)/usr/lib/lua/prometheus-collectors/
$(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/filefd.lua $(1)/usr/lib/lua/prometheus-collectors/
$(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/loadavg.lua $(1)/usr/lib/lua/prometheus-collectors/
$(INSTALL_BIN) ./files/usr/lib/lua/prometheus-collectors/meminfo.lua $(1)/usr/lib/lua/prometheus-collectors/
--- /dev/null
+local function scrape()
+ local available_bits = get_contents("/proc/sys/kernel/random/entropy_avail")
+ local pool_size_bits = get_contents("/proc/sys/kernel/random/poolsize")
+
+ metric("node_entropy_available_bits", "gauge", nil, available_bits)
+ metric("node_entropy_pool_size_bits", "gauge", nil, pool_size_bits)
+end
+
+return { scrape = scrape }
+QEMU_UI_VNC_SASL:libsasl2 \
+QEMU_UI_SPICE:libspice-server \
+QEMU_DEV_USB:libusb-1.0 \
- $(if $(filter %-softmmu,$(1)),+libncurses +libfdt +pixman +qemu-firmware-efi $(ICONV_DEPENDS))
+ $(if $(filter %-softmmu,$(1)),+libncurses +libfdt +libslirp +pixman +qemu-firmware-efi $(ICONV_DEPENDS))
endef
define Package/qemu-$(1)/description
--disable-bsd-user \
--disable-linux-user \
--enable-system \
+ --enable-slirp=system \
# accel
CONFIGURE_ARGS += \
include $(TOPDIR)/rules.mk
PKG_NAME:=semodule-utils
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
+PKG_VERSION:=3.3
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/$(PKG_VERSION)
-PKG_HASH:=be155654883c8dc4d05493e04a3eb9e56d28803009f1fdd721d42c68b878f757
+PKG_HASH:=3098ec5e5f04a1dbbf4aa569b63a4570750a9fe0d4da14ce45954aa300a17063
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
PKG_LICENSE:=GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=tang
-PKG_VERSION:=10
+PKG_VERSION:=11
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=082f17e031708ab5e2f88c9b767d228bcf92a0d089fdb164d4ae93845cbd2a48
+PKG_HASH:=ef5d3ae56030f20c290594b9be89ad9ec469dd385676595e1c7a2bfdc3f45d8f
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
PKG_LICENSE:=GPL-3.0-or-later
endef
define Package/tang/install
+ $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_DIR) $(1)/etc/xinetd.d/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/
- $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
- $(CP) ./files/tangdx $(1)/etc/xinetd.d/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tang-show-keys $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/
+ $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
+ $(CP) ./files/tangdx $(1)/etc/xinetd.d/
endef
define Package/tang/postinst
+++ /dev/null
---- a/meson.build
-+++ b/meson.build
-@@ -54,7 +54,7 @@ compiler = meson.get_compiler('c')
- if not compiler.has_header('http_parser.h',args : '-I/usr/local/include')
- error('http-parser devel files not found.')
- endif
--http_parser = compiler.find_library('http_parser',dirs:['/usr/lib','/usr/local/lib'])
-+http_parser = compiler.find_library('http_parser')
-
- licenses = ['COPYING']
- libexecbins = []
include $(TOPDIR)/rules.mk
PKG_NAME:=telegraf
-PKG_VERSION:=1.20.4
+PKG_VERSION:=1.21.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/influxdata/telegraf/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=75b6edbee5084bdf6e8cc216588d17b3e248d141baef5e917036f172099d6732
+PKG_HASH:=7ec38fa53747682290621b3162dbb0bb12cf73a559a689f8a75e1ec8b518da0b
PKG_MAINTAINER:=Jonathan Pagel <jonny_tischbein@systemli.org>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=unrar
-PKG_VERSION:=6.0.7
+PKG_VERSION:=6.1.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=unrarsrc-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.rarlab.com/rar
-PKG_HASH:=a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518
+PKG_HASH:=d05022442009202a792e588bec58921c123ff046fc755f7f2272871a5bd79636
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/unrar
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>, \
include $(TOPDIR)/rules.mk
PKG_NAME:=uvol
-PKG_VERSION:=0.5
+PKG_VERSION:=0.6
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
$(INSTALL_BIN) ./files/ubi.sh $(1)/usr/libexec/uvol/20-ubi.sh
$(INSTALL_BIN) ./files/lvm.sh $(1)/usr/libexec/uvol/50-lvm.sh
$(INSTALL_BIN) ./files/uvol $(1)/usr/sbin
- $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-restore-uci
+ $(INSTALL_BIN) ./files/uvol.defaults $(1)/etc/uci-defaults/90-uvol-init
endef
$(eval $(call BuildPackage,autopart))
uuid="${uuid:5}"
case "$uciname" in
- "_uxc")
- target="/var/run/uxc"
+ "_meta")
+ target="/var/run/uvol/.meta"
;;
"_"*)
return 1
local volname="$1"
local uciname
- uciname="${volname//-/_}"
+ uciname="${volname//[-.]/_}"
uciname="${uciname//[!([:alnum:]_)]}"
if [ -e "${UCI_SPOOLDIR}/add-$1" ]; then
rm "${UCI_SPOOLDIR}/add-$1"
vg_name=
exportpv() {
- local reports rep pv pvs
vg_name=
+ config_load fstab
+ local uvolsect="$(config_foreach echo uvol)"
+ [ -n "$uvolsect" ] && config_get vg_name "$uvolsect" vg_name
+ [ -n "$vg_name" ] && return
+ local reports rep pv pvs
json_init
json_load "$(pvs -o vg_name -S "pv_name=~^/dev/$rootdev.*\$")"
json_select report
for dms in /sys/devices/virtual/block/dm-* ; do
[ "$dms" = "/sys/devices/virtual/block/dm-*" ] && break
read -r dm_name < "$dms/dm/name"
- [ $(basename "$lv_dm_path") = "$dm_name" ] && echo "$(basename "$dms")"
+ [ "$(basename "$lv_dm_path")" = "$dm_name" ] && basename "$dms"
done
}
lv_mode="${lv_name:0:2}"
lv_name="${lv_name:3}"
lv_size=${lv_size%B}
+ [ "${lv_name:0:1}" = "." ] && continue
if [ "$json_output" = "1" ]; then
[ "$json_notfirst" = "1" ] && echo ","
echo -e "\t{"
}
detect() {
- local reports rep lv lvs lv_name lv_full_name lv_mode volname devname lv_skip_activation
+ local reports rep lv lvs lv_name lv_full_name lv_mode volname devname
local temp_up=""
json_init
esac
volmode="${volname:5:2}"
volname="${volname:8}"
+ [ "${volname:0:1}" = "." ] && continue
if [ "$json_output" = "1" ]; then
[ "$json_notfirst" = "1" ] && echo ","
echo -e "\t{"
#!/bin/sh
-uci -q get fstab.@uvol[0].initialized >/dev/null || uvol detect || true
+uvol_init() {
+ local metasz freesz totalsz
+ uvol detect
+ metasz="$(uvol size .meta 2>/dev/null)"
+ [ "$((metasz))" -gt 0 ] && return
+ totalsz="$(uvol total)"
+ freesz="$(uvol free)"
+ metasz="$((totalsz / 10240))"
+ [ "$metasz" -lt 4194304 ] && metasz=4194304
+ [ "$metasz" -gt "$freesz" ] && return
+ uvol create .meta "$metasz" rw
+ uvol up .meta
+}
+
+uci -q get fstab.@uvol[0].initialized >/dev/null || uvol_init
include $(TOPDIR)/rules.mk
PKG_NAME:=whois
-PKG_VERSION:=5.5.9
+PKG_VERSION:=5.5.10
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois
-PKG_HASH:=69088241ed33d2204f153c8005b312a69b60a1429075ff49f42f9f1f73a19c19
+PKG_HASH:=2391037b079695d0e9fd3c85ab021809a539cf093d25b6c51ca65019a54158dd
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS:=perl/host
include $(TOPDIR)/rules.mk
PKG_NAME:=yara
-PKG_VERSION:=4.1.1
+PKG_VERSION:=4.1.3
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/VirusTotal/yara/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=5f85c69606fad5cdb42e8f8101c96f6962a4928667395d9471e5aaea961e9b1d
+PKG_HASH:=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
PKG_LICENSE:=BSD-3-Clause
include $(TOPDIR)/rules.mk
PKG_NAME:=yq
-PKG_VERSION:=4.16.1
+PKG_VERSION:=4.16.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/mikefarah/yq/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=e96eb45992849d2e90f2f96b39dc713c345adafb6db551644118e58192565dd9
+PKG_HASH:=beb0f292d8375cddb82d25f11f5c203073c1d3e2437807450ddcad31758be8aa
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
PKG_LICENSE:=MIT
projects / feed / packages.git / commitdiff