echo "Building $PACKAGES"
echo "PACKAGES=$PACKAGES" >> $GITHUB_ENV
- - name: Determine depended packages
- run: |
- DEPENDS=$(docker run --rm \
- "openwrt/imagebuilder:${{ matrix.target }}-$BRANCH" \
- make whatdepends PACKAGE="$PACKAGES" | grep $'\t' | \
- grep -v luci-i18n | awk '{ print $1 }' | tr '\n' ' ')
-
- echo "Building $DEPENDS"
- echo "PACKAGES=$PACKAGES $DEPENDS" >> $GITHUB_ENV
-
- name: Build
uses: openwrt/gh-action-sdk@v1
env:
--- /dev/null
+--- a/src/lj_arch.h
++++ b/src/lj_arch.h
+@@ -391,9 +391,6 @@
+ #endif
+ #endif
+ #elif !LJ_TARGET_PS3
+-#if (__GNUC__ < 4) || ((__GNUC__ == 4) && __GNUC_MINOR__ < 3)
+-#error "Need at least GCC 4.3 or newer"
+-#endif
+ #endif
+ #endif
+
include $(TOPDIR)/rules.mk
PKG_NAME:=luv
-PKG_VERSION:=1.22.0-1
-PKG_RELEASE:=1
+PKG_VERSION:=1.36.0-0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/luvit/luv/releases/download/$(PKG_VERSION)
-PKG_HASH:=27886acb3d3f531a3d6ca70360d2593ddf1a8d4daf94ca3beea14d9381227ff7
+PKG_HASH:=f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
PKG_MAINTAINER:=Morteza Milani <milani@pichak.co>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
+CMAKE_INSTALL:=1
+
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/luv
SUBMENU:=Lua
CMAKE_OPTIONS += -DWITH_LUA_ENGINE=Lua
endif
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include/luv
- $(CP) $(PKG_INSTALL_DIR)/usr/include/luv/*.h $(1)/usr/include/luv
- $(INSTALL_DIR) $(1)/usr/lib/
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib
-endef
-
define Package/luv/install
$(INSTALL_DIR) $(1)/usr/lib/lua
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libluv.so.1.9.1 $(1)/usr/lib/lua/luv.so
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libluv.so.1.36.0 $(1)/usr/lib/lua/luv.so
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=perl-mail-spamassassin
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_VERSION:=3.4.4
PKG_HASH:=8ea27a165b81e3ce8c84ae85c3ecba1f2edfa04ef4a86f07fe28ab612fc8ff60
--- /dev/null
+--- a/spamc/libspamc.c
++++ b/spamc/libspamc.c
+@@ -1213,9 +1213,11 @@ int message_filter(struct transport *tp,
+
+ if (flags & SPAMC_USE_SSL) {
+ #ifdef SPAMC_SSL
++#if 0
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv23_client_method();
+ SSL_load_error_strings();
++#endif
++ meth = SSLv23_client_method();
+ ctx = SSL_CTX_new(meth);
+ #else
+ UNUSED_VARIABLE(ssl);
+@@ -1600,9 +1602,11 @@ int message_tell(struct transport *tp, c
+
+ if (flags & SPAMC_USE_SSL) {
+ #ifdef SPAMC_SSL
++#if 0
+ SSLeay_add_ssl_algorithms();
+- meth = SSLv23_client_method();
+ SSL_load_error_strings();
++#endif
++ meth = SSLv23_client_method();
+ ctx = SSL_CTX_new(meth);
+ #else
+ UNUSED_VARIABLE(ssl);
PKG_NAME:=boost
PKG_VERSION:=1.75.0
PKG_SOURCE_VERSION:=1_75_0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://dl.bintray.com/boostorg/release/$(PKG_VERSION)/source/
# define cpu_relax() asm volatile ("nop" ::: "memory");
# endif
-#elif BOOST_ARCH_MIPS && (__mips_isa_rev > 1)
-+#elif BOOST_ARCH_MIPS && (__mips_isa_rev > 1) && !defined(_MIPS_ARCH_OCTEONP)
++#elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2) && defined(__mips64)))
# define cpu_relax() asm volatile ("pause" ::: "memory");
#elif BOOST_ARCH_PPC
// http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
PKG_LICENSE:=OpenSSL
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)"
PKG_INSTALL:=
--- /dev/null
+--- a/gost_pmeth.c
++++ b/gost_pmeth.c
+@@ -608,7 +608,7 @@ static int pkey_gost_mac_ctrl_str(EVP_PK
+ if (strcmp(type, hexkey_ctrl_string) == 0) {
+ long keylen;
+ int ret;
+- unsigned char *keybuf = string_to_hex(value, &keylen);
++ unsigned char *keybuf = OPENSSL_hexstr2buf(value, &keylen);
+ if (!keybuf || keylen != 32) {
+ GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
+ GOST_R_INVALID_MAC_KEY_LENGTH);
include $(TOPDIR)/rules.mk
PKG_NAME:=ipfs-http-client
-PKG_RELEASE:=3
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/vasild/cpp-ipfs-http-client.git
+PKG_SOURCE_DATE:=2021-03-01
+PKG_SOURCE_VERSION:=27f6439303f7afb5b8b2e4154f4269ba296059c7
+PKG_MIRROR_HASH:=61814d666bbd927750a0af7d350ad8ba27c2a78e0b5f5196ec4e0b5049ef2690
PKG_MAINTAINER:=Leonid Esman <leonid.esman@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE.MIT
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/vasild/cpp-ipfs-http-client.git
-PKG_SOURCE_DATE:=2019-11-05
-PKG_SOURCE_VERSION:=763e59ad698f3e3846f85df11e01c18ef3fbc401
-PKG_MIRROR_HASH:=a2b5721faf0d43ddb4a892245ef382666149c83f3f97e558e1a6acf2402fb9fd
-
-PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=nlohmannjson
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/ipfs-http-client/Default/description
IPFS (the InterPlanetary File System) is the Distributed Web.
define Package/ipfs-http-client-tests/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/block $(1)/usr/bin/ipfs-block
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/config $(1)/usr/bin/ipfs-config
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/dht $(1)/usr/bin/ipfs-dht
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/files $(1)/usr/bin/ipfs-files
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/generic $(1)/usr/bin/ipfs-generic
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/key $(1)/usr/bin/ipfs-key
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/name $(1)/usr/bin/ipfs-name
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/object $(1)/usr/bin/ipfs-object
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/pin $(1)/usr/bin/ipfs-pin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/swarm $(1)/usr/bin/ipfs-swarm
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_block $(1)/usr/bin/ipfs-block
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_config $(1)/usr/bin/ipfs-config
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_dht $(1)/usr/bin/ipfs-dht
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_files $(1)/usr/bin/ipfs-files
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_generic $(1)/usr/bin/ipfs-generic
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_key $(1)/usr/bin/ipfs-key
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_name $(1)/usr/bin/ipfs-name
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_object $(1)/usr/bin/ipfs-object
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_pin $(1)/usr/bin/ipfs-pin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_swarm $(1)/usr/bin/ipfs-swarm
endef
$(eval $(call BuildPackage,libipfs-http-client))
---- a/test/block.cc
-+++ b/test/block.cc
+--- a/test/test_block.cc
++++ b/test/test_block.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
/** [ipfs::Client::BlockPut] */
ipfs::Json block;
---- a/test/config.cc
-+++ b/test/config.cc
+--- a/test/test_config.cc
++++ b/test/test_config.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <iostream>
#include <stdexcept>
/** [ipfs::Client::ConfigSet] */
client.ConfigSet("Datastore.StorageMax", "20GB");
---- a/test/dht.cc
-+++ b/test/dht.cc
+--- a/test/test_dht.cc
++++ b/test/test_dht.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <iostream>
#include <stdexcept>
ipfs::Json add_result;
client.FilesAdd(
---- a/test/error.cc
-+++ b/test/error.cc
+--- a/test/test_error.cc
++++ b/test/test_error.cc
@@ -35,16 +35,23 @@ extern std::string replace_body;
}
} // namespace ipfs
std::string object_id;
client.ObjectNew(&object_id);
---- a/test/files.cc
-+++ b/test/files.cc
-@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+--- a/test/test_files.cc
++++ b/test/test_files.cc
+@@ -24,10 +24,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
+ srvaddr=argv[1];
+
try {
-- ipfs::Client client("localhost", 5001);
-+ ipfs::Client client(srvaddr, 5001);
+ // Try Files API tests with time-out setting of 20 seconds
+- ipfs::Client client("localhost", 5001, "20s");
++ ipfs::Client client(srvaddr, 5001, "20s");
/** [ipfs::Client::FilesGet] */
std::stringstream contents;
---- a/test/generic.cc
-+++ b/test/generic.cc
-@@ -24,16 +24,23 @@ CONNECTION WITH THE SOFTWARE OR THE USE
+--- a/test/test_generic.cc
++++ b/test/test_generic.cc
+@@ -24,11 +24,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <utility>
+ srvaddr=argv[1];
+
try {
+ // Test client constructor
/** [ipfs::Client::Client] */
- ipfs::Client client("localhost", 5001);
+ ipfs::Client client(srvaddr, 5001);
/** [ipfs::Client::Client] */
+ // Test client constructor with additional parameters
+@@ -38,7 +45,7 @@ int main(int, char**) {
ipfs::Client clientA(client);
clientA = client;
ipfs::Client clientB(std::move(clientA));
clientC = std::move(clientB);
#pragma GCC diagnostic push
---- a/test/key.cc
-+++ b/test/key.cc
+--- a/test/test_key.cc
++++ b/test/test_key.cc
@@ -26,9 +26,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
using Json = nlohmann::json;
/** [ipfs::Client::KeyGen] */
std::string key_id;
---- a/test/name.cc
-+++ b/test/name.cc
+--- a/test/test_name.cc
++++ b/test/test_name.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <sstream>
#include <stdexcept>
// We need a key here, so as not to clobber the "self" key.
std::string key_id;
---- a/test/object.cc
-+++ b/test/object.cc
+--- a/test/test_object.cc
++++ b/test/test_object.cc
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>
/** [ipfs::Client::ObjectNew] */
std::string object_id;
---- a/test/pin.cc
-+++ b/test/pin.cc
+--- a/test/test_pin.cc
++++ b/test/test_pin.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>
std::string object_id;
---- a/test/swarm.cc
-+++ b/test/swarm.cc
+--- a/test/test_swarm.cc
++++ b/test/test_swarm.cc
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
#include <stdexcept>
#include <string>
include $(TOPDIR)/rules.mk
PKG_NAME:=leptonica
-PKG_VERSION:=1.78.0
-PKG_RELEASE:=3
+PKG_VERSION:=1.80.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.leptonica.org/source/
-PKG_HASH:=e2ed2e81e7a22ddf45d2c05f0bc8b9ae7450545d995bfe28517ba408d14a5a88
+PKG_HASH:=ec9c46c2aefbb960fb6a6b7f800fe39de48343437b6ce08e30a8d9688ed14ba4
PKG_MAINTAINER:=ValentÃn Kivachuk <vk18496@gmail.com>
PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=leptonica-license.txt
-PKG_BUILD_PARALLEL:=1
CMAKE_BINARY_SUBDIR:=openwrt-build
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libleptonica
SECTION:=libs
DEPENDS:=+giflib +libjpeg +libpng +libtiff +libwebp +zlib
endef
+CMAKE_OPTIONS += \
+ -DBUILD_SHARED_LIBS=ON \
+ -DWEBPMUX_INCLUDE_DIR=$(STAGING_DIR)/usr/include
+
TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3
define Build/InstallDev
--- /dev/null
+--- a/cmake/Configure.cmake
++++ b/cmake/Configure.cmake
+@@ -113,7 +113,6 @@ endif()
+
+ if (WEBP_FOUND)
+ set(HAVE_LIBWEBP 1)
+- set(HAVE_LIBWEBP_ANIM 1)
+ endif()
+
+ if (ZLIB_FOUND)
include $(TOPDIR)/rules.mk
PKG_NAME:=libical
-PKG_VERSION:=3.0.6
-PKG_RELEASE:=1
+PKG_VERSION:=3.0.9
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=5c8a21c2b732ece4a33e5c862970b4f35a8548bbcda50de5695f6fc211ac4d97
+PKG_HASH:=bd26d98b7fcb2eb0cd5461747bbb02024ebe38e293ca53a7dfdcb2505265a728
PKG_SOURCE_URL:=https://github.com/libical/libical/releases/download/v$(PKG_VERSION)/
PKG_MAINTAINER:=Jose Zapater <jzapater@gmail.com>
PKG_LICENSE_FILES:=COPYING
CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libical
SECTION:=libs
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -170,43 +170,43 @@ endif()
+@@ -192,7 +192,6 @@ endif()
# libicu is highly recommended for RSCALE support
# libicu can be found at http://www.icu-project.org
- # RSCALE info at http://tools.ietf.org/html/rfc7529
+ # RSCALE info at https://tools.ietf.org/html/rfc7529
-find_package(ICU)
--set_package_properties(ICU PROPERTIES
-- TYPE RECOMMENDED
-- PURPOSE "For RSCALE (RFC7529) support"
--)
--add_feature_info(
-- "RSCALE support (RFC7529)"
-- ICU_FOUND
-- "build in RSCALE support"
--)
--if(ICU_FOUND)
-- set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
-- set(HAVE_LIBICU 1)
-- if(ICU_MAJOR_VERSION VERSION_GREATER 50)
-- set(HAVE_ICU_DANGI TRUE)
-- else()
-- set(HAVE_ICU_DANGI FALSE)
-- endif()
--endif()
--if(ICU_I18N_FOUND)
-- set(HAVE_LIBICU_I18N 1)
--endif()
-+# find_package(ICU)
-+# set_package_properties(ICU PROPERTIES
-+# TYPE RECOMMENDED
-+# PURPOSE "For RSCALE (RFC7529) support"
-+# )
-+# add_feature_info(
-+# "RSCALE support (RFC7529)"
-+# ICU_FOUND
-+# "build in RSCALE support"
-+# )
-+# if(ICU_FOUND)
-+# set(REQUIRES_PRIVATE_ICU "Requires.private: icu-i18n") #for libical.pc
-+# set(HAVE_LIBICU 1)
-+# if(ICU_MAJOR_VERSION VERSION_GREATER 50)
-+# set(HAVE_ICU_DANGI TRUE)
-+# else()
-+# set(HAVE_ICU_DANGI FALSE)
-+# endif()
-+# endif()
-+# if(ICU_I18N_FOUND)
-+# set(HAVE_LIBICU_I18N 1)
-+# endif()
+ set_package_properties(ICU PROPERTIES
+ TYPE RECOMMENDED
+ PURPOSE "For RSCALE (RFC7529) support"
+@@ -216,7 +215,6 @@ if(ICU_I18N_FOUND)
+ endif()
# compile in Berkeley DB support
-find_package(BDB)
--set_package_properties(BDB PROPERTIES
-- TYPE OPTIONAL
-- PURPOSE "For Berkeley DB storage support"
--)
--add_feature_info(
-- "Berkeley DB storage support"
-- BDB_FOUND
-- "build in support for Berkeley DB storage"
--)
--if(BDB_FOUND)
-- set(HAVE_BDB True)
--endif()
-+# find_package(BDB)
-+# set_package_properties(BDB PROPERTIES
-+# TYPE OPTIONAL
-+# PURPOSE "For Berkeley DB storage support"
-+# )
-+# add_feature_info(
-+# "Berkeley DB storage support"
-+# BDB_FOUND
-+# "build in support for Berkeley DB storage"
-+# )
-+# if(BDB_FOUND)
-+# set(HAVE_BDB True)
-+# endif()
-
- # MSVC specific definitions
- if(WIN32)
+ set_package_properties(BDB PROPERTIES
+ TYPE OPTIONAL
+ PURPOSE "For Berkeley DB storage support"
include $(TOPDIR)/rules.mk
PKG_NAME:=libmariadb
-PKG_VERSION:=3.1.10
-PKG_RELEASE:=2
+PKG_VERSION:=3.1.12
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz
PKG_SOURCE_URL := \
https://mirror.lstn.net/mariadb/connector-c-$(PKG_VERSION) \
https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/connector-c-$(PKG_VERSION) \
https://downloads.mariadb.org/interstitial/connector-c-$(PKG_VERSION)
-PKG_HASH:=af3e5613cb9e811f70db85a8a704c7140dc3e35f7c39912d0509511638f9658f
+PKG_HASH:=2f5ae14708b4813e4ff6857d152c22e6fc0e551c9fa743c1ef81a68e3254fe63
PKG_BUILD_DIR:=$(BUILD_DIR)/mariadb-connector-c-$(PKG_VERSION)-src
PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>
PKG_LICENSE_FILES:=COPYING.LIB
PKG_CPE_ID:=cpe:/a:mariadb:mariadb
-CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
MARIADB_CONF_DIR:=/etc/mysql
MARIADB_PLUGIN_DIR:=/usr/lib/mariadb/plugin
plugin-remote_io := CLIENT_PLUGIN_REMOTE_IO
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/nls.mk
+include ../../devel/ninja/ninja-cmake.mk
#Â Pass CPPFLAGS in the CFLAGS as otherwise the build system will
# ignore them.
include $(TOPDIR)/rules.mk
PKG_NAME:=liborcania
-PKG_VERSION:=2.1.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.2.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/babelouest/orcania/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=960074f6aa198e9db5440347d20cff8be3b82ee1c15ac7b23c0ac54a301a85cd
+PKG_HASH:=2a46460c6d93e5b8dd97db520edc1e9b3297577fdd8c485b2b6ebf315ceab6f0
PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/orcania-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/liborcania
SECTION:=libs
include $(TOPDIR)/rules.mk
PKG_NAME:=libtorrent-rasterbar
-PKG_VERSION:=2.0.1
-PKG_RELEASE:=1
+PKG_VERSION:=2.0.2
+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:=cf906167e0b332681f6304a9bb740404a53bb0efed39897e1d2bd0f6f0d9e9cd
+PKG_HASH:=d5960e8c9f80f62126d723c6cc0522e7900c9c323f28994027eae3325fe03a3f
PKG_MAINTAINER:=David Yang <mmyangfl@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libtorrent-rasterbar/Default
TITLE:=Rasterbar BitTorrent library
$(call Package/libtorrent-rasterbar/Default)
SECTION:=libs
CATEGORY:=Libraries
- DEPENDS:=+boost-system +libopenssl
+ DEPENDS:=+boost-system +libopenssl +libatomic
endef
#define Package/python3-libtorrent
#endef
define Download/try_signal
- VERSION:=2a99893f92b29a5948569cba1e16fd259dbc2016
+ VERSION:=334fd139e2bb387017b42d36753a03935e3bca75
SUBDIR:=deps/try_signal
FILE:=$(PKG_NAME)-try_signal-$$(VERSION).tar.xz
URL:=https://github.com/arvidn/try_signal.git
- MIRROR_HASH:=4dee408897de3475e6f7eca9c4e4617c3e746351d01cec3cccac38b9b4d38302
+ MIRROR_HASH:=c85d65352c20713cb6cfb005942b46ab7579dc7eef3b876666bff9347149d47f
PROTO:=git
endef
$(eval $(call Download,try_signal))
include $(TOPDIR)/rules.mk
PKG_NAME:=libudev-zero
-PKG_VERSION:=0.4.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.4.8
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/illiliti/libudev-zero/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=12d1b15478b033adbb1f34d49053afa5f42d862b82b2085e025dc184f5b64450
+PKG_HASH:=19e8af430997283a8a830797634757c299da13e9ca5a151bb919d45b46f5e95d
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=MIT
include $(TOPDIR)/rules.mk
PKG_NAME:=libulfius
-PKG_VERSION:=2.6.9
-PKG_RELEASE:=1
+PKG_VERSION:=2.7.2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/babelouest/ulfius/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=2255346a7715f14e8a9b8caeeb4f6ccd75e3617371a7028ac062742a972fcc0b
+PKG_HASH:=8d3456e85302d1218f83602f2166889d7e1a3d039fce579db7020d619f36c6e3
PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=LICENSE
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(BUILD_VARIANT)/ulfius-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libulfius/default
SECTION:=libs
$(call Package/libulfius/default)
TITLE+= with SSL support
VARIANT:=gnutls
- DEPENDS:=+libmicrohttpd +libcurl +libgnutls +liborcania
+ DEPENDS:=+libmicrohttpd +libcurl +liborcania +libgnutls +zlib
PROVIDES:=libulfius
endef
include $(TOPDIR)/rules.mk
PKG_NAME:=libuwsc
-PKG_VERSION:=3.3.4
-PKG_RELEASE:=1
+PKG_VERSION:=3.3.5
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://github.com/zhaojh329/libuwsc/releases/download/v$(PKG_VERSION)
-PKG_HASH:=ef789ff35e537e5191ec0d13f3e0df54187a54eace611e283ad4172d4411d08b
+PKG_HASH:=a06b7324671e181ffe3165e93e6f94c7ac1380f69e32a52e80c8da7016acd60d
PKG_MAINTAINER:=Jianhui Zhao <jianhuizhao329@gmail.com>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_PARALLEL:=1
CMAKE_INSTALL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_LIBUWSC_nossl_LUA_BINDING
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libuwsc/Default
SECTION:=libs
include $(TOPDIR)/rules.mk
PKG_NAME:=libyang
-PKG_VERSION:=1.0.215
-PKG_RELEASE:=1
+PKG_VERSION:=1.0.225
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/CESNET/libyang/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=c4498a77a7c12a28c9911f993eeafbf2badd2ecea58bb74781bd61cfc635e4c9
+PKG_HASH:=1b736443d2c69b5d7a71ac412655e6edab0647b18f35f7bf504b0a24e06cb046
PKG_MAINTAINER:=Jakov Smolic <jakov.smolic@sartura.hr>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
CMAKE_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
CMAKE_BINARY_SUBDIR:=build
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/libyang
SECTION:=libs
-DGEN_LANGUAGE_BINDINGS=ON \
-DGEN_PYTHON_BINDINGS=OFF
-
define Package/libyang/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libyang.so* $(1)/usr/lib/
include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql
-PKG_VERSION:=13.1
-PKG_RELEASE:=1
+PKG_VERSION:=13.2
+PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
PKG_CPE_ID:=cpe:/a:postgresql:postgresql
http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \
ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION)
-PKG_HASH:=12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
+PKG_HASH:=5fd7fcd08db86f5b2aed28fcfaf9ae0aca8e9428561ac547764c2a2b0f41adfc
PKG_USE_MIPS16:=0
PKG_FIXUP:=autoreconf
PKG_NAME:=exim
PKG_VERSION:=4.94
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ftp.exim.org/pub/exim/exim4/
--- /dev/null
+--- a/src/dane-openssl.c
++++ b/src/dane-openssl.c
+@@ -1098,8 +1098,8 @@ if (dane->selectors[DANESSL_USAGE_DANE_T
+ * Check that setting the untrusted chain updates the expected
+ * structure member at the expected offset.
+ */
+- X509_STORE_CTX_trusted_stack(ctx, dane->roots);
+- X509_STORE_CTX_set_chain(ctx, dane->chain);
++ X509_STORE_CTX_set0_trusted_stack(ctx, dane->roots);
++ X509_STORE_CTX_set0_untrusted(ctx, dane->chain);
+ OPENSSL_assert(dane->chain == X509_STORE_CTX_get0_untrusted(ctx));
+ }
+ }
+--- a/src/pdkim/signing.c
++++ b/src/pdkim/signing.c
+@@ -699,7 +699,6 @@ return NULL;
+ void
+ exim_dkim_init(void)
+ {
+-ERR_load_crypto_strings();
+ }
+
+
+--- a/src/tls-openssl.c
++++ b/src/tls-openssl.c
+@@ -22,7 +22,10 @@ functions from the OpenSSL library. */
+ #include <openssl/lhash.h>
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
++#include <openssl/bn.h>
++#include <openssl/dh.h>
+ #include <openssl/rand.h>
++#include <openssl/rsa.h>
+ #ifndef OPENSSL_NO_ECDH
+ # include <openssl/ec.h>
+ #endif
+@@ -1462,8 +1465,8 @@ if (!EVP_PKEY_assign_RSA(pkey, rsa))
+
+ X509_set_version(x509, 2); /* N+1 - version 3 */
+ ASN1_INTEGER_set(X509_get_serialNumber(x509), 1);
+-X509_gmtime_adj(X509_get_notBefore(x509), 0);
+-X509_gmtime_adj(X509_get_notAfter(x509), (long)60 * 60); /* 1 hour */
++X509_gmtime_adj(X509_getm_notBefore(x509), 0);
++X509_gmtime_adj(X509_getm_notAfter(x509), (long)60 * 60); /* 1 hour */
+ X509_set_pubkey(x509, pkey);
+
+ name = X509_get_subject_name(x509);
+@@ -3900,8 +3903,8 @@ fprintf(f, "Library version: OpenSSL: Co
+ " Runtime: %s\n"
+ " : %s\n",
+ OPENSSL_VERSION_TEXT,
+- SSLeay_version(SSLEAY_VERSION),
+- SSLeay_version(SSLEAY_BUILT_ON));
++ OpenSSL_version(OPENSSL_VERSION),
++ OpenSSL_version(OPENSSL_BUILT_ON));
+ /* third line is 38 characters for the %s and the line is 73 chars long;
+ the OpenSSL output includes a "built on: " prefix already. */
+ }
+@@ -3943,8 +3946,6 @@ if (pidnow != pidlast)
+ is unique for each thread", this doesn't apparently apply across processes,
+ so our own warning from vaguely_random_number_fallback() applies here too.
+ Fix per PostgreSQL. */
+- if (pidlast != 0)
+- RAND_cleanup();
+ pidlast = pidnow;
+ }
+
+--- a/src/tlscert-openssl.c
++++ b/src/tlscert-openssl.c
+@@ -217,13 +217,13 @@ return mod ? tls_field_from_dn(cp, mod)
+ uschar *
+ tls_cert_not_before(void * cert, uschar * mod)
+ {
+-return asn1_time_copy(X509_get_notBefore((X509 *)cert), mod);
++return asn1_time_copy(X509_getm_notBefore((X509 *)cert), mod);
+ }
+
+ uschar *
+ tls_cert_not_after(void * cert, uschar * mod)
+ {
+-return asn1_time_copy(X509_get_notAfter((X509 *)cert), mod);
++return asn1_time_copy(X509_getm_notAfter((X509 *)cert), mod);
+ }
+
+ uschar *
PKG_NAME:=acme
PKG_VERSION:=2.8.7
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
for listener in $(get_listeners); do
pid="${listener%/*}"
- cmd="${listener#*/}"
+ cmd="$(basename $(readlink /proc/$pid/exe))"
case "$cmd" in
uhttpd)
return 1
fi
;;
- nginx*)
+ nginx)
if [ "$NGINX_WEBSERVER" -eq "1" ]; then
debug "Already handled nginx; skipping"
continue
PKG_NAME:=https-dns-proxy
PKG_VERSION:=2021-01-17
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/aarond10/https_dns_proxy
PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
CMAKE_OPTIONS += -DCLANG_TIDY_EXE=
json_add_array firewall
for c in $forceDNSPorts; do
if netstat -tuln | grep LISTEN | grep ":${c}" >/dev/null 2>&1; then
- json_add_object ''
- json_add_string type 'redirect'
- json_add_string target 'DNAT'
- json_add_string src 'lan'
- json_add_string proto 'tcp udp'
+ json_add_object ""
+ json_add_string type redirect
+ json_add_string target DNAT
+ json_add_string src lan
+ json_add_string proto "tcp udp"
json_add_string src_dport "$c"
json_add_string dest_port "$c"
- json_add_string reflection '0'
+ json_add_boolean reflection 0
json_close_object
else
- json_add_object ''
- json_add_string type 'rule'
- json_add_string src 'lan'
- json_add_string dest '*'
- json_add_string proto 'tcp udp'
+ json_add_object ""
+ json_add_string type rule
+ json_add_string src lan
+ json_add_string dest "*"
+ json_add_string proto "tcp udp"
json_add_string dest_port "$c"
- json_add_string target 'REJECT'
+ json_add_string target REJECT
json_close_object
fi
done
--- /dev/null
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,6 @@ set(CMAKE_BUILD_TYPE "Debug")
+ #set(CMAKE_BUILD_TYPE "Release")
+
+ #set(CMAKE_C_FLAGS "-Wall -Wextra --pedantic -Wno-strict-aliasing")
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__FILENAME__='\"$(notdir $<)\"'")
+ set(CMAKE_C_FLAGS_DEBUG "-g")
+ set(CMAKE_C_FLAGS_RELEASE "-O2")
+
+--- a/src/logging.h
++++ b/src/logging.h
+@@ -34,6 +34,20 @@ enum _LogSeverity {
+ LOG_FATAL = 4,
+ };
+
++#define STRIPPATH(s)\
++ (sizeof(s) > 2 && (s)[sizeof(s)-2] == '/' ? (s) + sizeof(s) - 1 : \
++ sizeof(s) > 3 && (s)[sizeof(s)-3] == '/' ? (s) + sizeof(s) - 2 : \
++ sizeof(s) > 4 && (s)[sizeof(s)-4] == '/' ? (s) + sizeof(s) - 3 : \
++ sizeof(s) > 5 && (s)[sizeof(s)-5] == '/' ? (s) + sizeof(s) - 4 : \
++ sizeof(s) > 6 && (s)[sizeof(s)-6] == '/' ? (s) + sizeof(s) - 5 : \
++ sizeof(s) > 7 && (s)[sizeof(s)-7] == '/' ? (s) + sizeof(s) - 6 : \
++ sizeof(s) > 8 && (s)[sizeof(s)-8] == '/' ? (s) + sizeof(s) - 7 : \
++ sizeof(s) > 9 && (s)[sizeof(s)-9] == '/' ? (s) + sizeof(s) - 8 : \
++ sizeof(s) > 10 && (s)[sizeof(s)-10] == '/' ? (s) + sizeof(s) - 9 : \
++ sizeof(s) > 11 && (s)[sizeof(s)-11] == '/' ? (s) + sizeof(s) - 10 : (s))
++
++#define __FILENAME__ STRIPPATH(__FILE__)
++
+ // Debug, Info, Warning, Error logging.
+ #define DLOG(...) _log(__FILENAME__, __LINE__, LOG_DEBUG, __VA_ARGS__)
+ #define ILOG(...) _log(__FILENAME__, __LINE__, LOG_INFO, __VA_ARGS__)
include $(TOPDIR)/rules.mk
PKG_NAME:=mbusd
-PKG_VERSION:=0.4.0
-PKG_RELEASE:=1
+PKG_VERSION:=0.5.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://codeload.github.com/3cky/mbusd/tar.gz/v$(PKG_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=8458afc455a28c8f798cadd3982f9e03496a494a2269e31e8255a6ca273a6898
+PKG_HASH:=a41fc1254972d41d184d47e82b13c83577f22023f7a540d02062b704bce5c710
+PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/mbusd
SECTION:=net
include $(TOPDIR)/rules.mk
PKG_NAME:=netopeer2
-PKG_VERSION:=1.1.53
-PKG_RELEASE:=2
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_MAINTAINER:=Jakov Smolic <jakov.smolic@sartura.hr>
+PKG_VERSION:=1.1.70
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/CESNET/Netopeer2/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=6b43026211a787d5cb91d47cb7fdd7923649044c55f264aaf85bf5676c004211
+PKG_HASH:=7fc1a3520ee4bb488112f502e34cea465464dc933d2a5742a72eb32a6dfe3b3f
-CMAKE_INSTALL:=1
-
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
+PKG_MAINTAINER:=Jakov Smolic <jakov.smolic@sartura.hr>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES=LICENSE
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/netopeer2-server
SECTION:=utils
PKG_NAME:=netstinky
PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=nsids-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/wanduow/netstinky-ids/releases/download/v$(PKG_VERSION)/
--- /dev/null
+--- a/updates/ids_tls_update.c
++++ b/updates/ids_tls_update.c
+@@ -68,11 +68,13 @@ setup_context(const char *hostname, int
+ int rc;
+ unsigned long ssl_err = 0;
+
++#if OPENSSL_API_COMPAT < 0x10100000L
+ SSL_load_error_strings();
+ SSL_library_init();
+ OpenSSL_add_all_algorithms();
+ ERR_load_BIO_strings();
+ ERR_load_crypto_strings();
++#endif
+
+ #ifdef HAVE_TLS_METHOD
+ method = TLS_method();
include $(TOPDIR)/rules.mk
PKG_NAME:=ratechecker
-PKG_VERSION:=0.0.20170609
-PKG_RELEASE:=2
-PKG_REV:=4cd4e3c70d9832336af5ba157f2a272f9c0098dc
-PKG_MIRROR_HASH:=c6f02b273536738bbcf4b16e3859f733a02ada88b4078fc8a5b0ad8d1d184370
+PKG_RELEASE:=$(AUTORELEASE)
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_URL:=https://bitbucket.org/comnets/ratechecker.git
PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://bitbucket.org/comnets/ratechecker.git
+PKG_SOURCE_DATE:=2020-01-30
+PKG_SOURCE_VERSION:=a2b8b958548bacdb69ffac3aa033f519093415f7
+PKG_MIRROR_HASH:=ff89ca080cb5e557f47738078d5f0a70030f597e04c239426898ec7fc1e658ab
-PKG_BUILD_PARALLEL:=1
+PKG_MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/ratechecker
SECTION:=net
TITLE:=IEEE 802.11 bitrate analysis tool
URL:=https://bitbucket.org/comnets/ratechecker/
DEPENDS:=+libevent2
- MAINTAINER:=Simon Wunderlich <sw@simonwunderlich.de>
endef
define Package/ratechecker/install
PKG_NAME:=strongswan
PKG_VERSION:=5.9.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
PKG_HASH:=a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb
PKG_LICENSE:=GPL-2.0-or-later
-PKG_MAINTAINER:=Stijn Tintel <stijn@linux-ipv6.be>
+PKG_MAINTAINER:=Philip Prindeville <philipp@redfish-solutions.com>, Noel Kuntze <noel.kuntze@thermi.consulting>
PKG_CPE_ID:=cpe:/a:strongswan:strongswan
PKG_MOD_AVAILABLE:= \
DEPENDS:=+libgpg-error +libgcrypt +libgdbm +zlib +libexpat +libunistring \
+libevent2 +libdaemon +libantlr3c +confuse +alsa-lib +libffmpeg-full \
+mxml +libavahi-client +sqlite3-cli +libplist +libcurl +libjson-c \
- +libprotobuf-c +libgnutls +libsodium +libwebsockets $(ICONV_DEPENDS)
+ +libprotobuf-c +libgnutls +libsodium +libwebsockets $(ICONV_DEPENDS) \
+ +libuuid
endef
define Package/forked-daapd/description
PKG_NAME:=mpd
PKG_VERSION:=0.22.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.musicpd.org/download/mpd/0.22/
$(call Package/mpd/Default)
TITLE+= (full)
DEPENDS+= +AUDIO_SUPPORT:pulseaudio-daemon +libvorbis +libmms +libupnp +libshout +yajl \
- +BUILD_PATENTED:libffmpeg +!BUILD_PATENTED:libmad
+ +libffmpeg +!BUILD_PATENTED:libmad
PROVIDES:=mpd
VARIANT:=full
endef
--- /dev/null
+--- a/src/lib/ffmpeg/meson.build
++++ b/src/lib/ffmpeg/meson.build
+@@ -6,11 +6,7 @@ conf.set('HAVE_LIBAVUTIL', libavutil_dep
+ enable_ffmpeg = libavformat_dep.found() and libavcodec_dep.found() and libavutil_dep.found()
+ conf.set('ENABLE_FFMPEG', enable_ffmpeg)
+
+-if enable_ffmpeg
+- libavfilter_dep = dependency('libavfilter', required: false)
+-else
+ libavfilter_dep = dependency('', required: false)
+-endif
+ conf.set('HAVE_LIBAVFILTER', libavfilter_dep.found())
+
+ if not enable_ffmpeg
include $(TOPDIR)/rules.mk
PKG_NAME:=ccid
-PKG_VERSION:=1.4.33
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.34
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ccid.apdu.fr/files/
-PKG_HASH:=5256da939711deb42b74d05d2bd6bd0c73c4d564feb0c1a50212609eb680e424
+PKG_HASH:=e6f7645b59a9a2844eb4b1a7eff512960d7f04a4654af02f7fd2f8aded5db40a
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=cryptsetup
-PKG_VERSION:=2.3.4
-PKG_RELEASE:=2
+PKG_VERSION:=2.3.5
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.3
-PKG_HASH:=9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773
+PKG_HASH:=ced9946f444d132536daf92fc8aca4277638a3c2d96e20540b2bae4d36fd70c1
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later
include $(TOPDIR)/rules.mk
PKG_NAME:=docker-compose
-PKG_VERSION:=1.28.4
+PKG_VERSION:=1.28.6
PKG_RELEASE:=1
PYPI_NAME:=docker-compose
-PKG_HASH:=681aca74e70e238ae43c810a62f471b645942f0ce97b6a0ca375fcb64f3aca85
+PKG_HASH:=1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=Apache-2.0
include $(TOPDIR)/rules.mk
PKG_NAME:=exfatprogs
-PKG_VERSION:=1.0.4
-PKG_RELEASE:=1
+PKG_VERSION:=1.1.0
+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:=3f755d35785a74138348b3a22dfcda5afc8a69e66a6a0c79be48225e6ca321ce
+PKG_HASH:=88c12a2f9cbe4f12129f3b7fa2cd42f24dbed3f579e61bac2ca699ca79fad4e0
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=GPL-2.0-only
include $(TOPDIR)/rules.mk
PKG_NAME:=fish
-PKG_VERSION:=3.2.0
-PKG_RELEASE:=1
+PKG_VERSION:=3.2.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/fish-shell/fish-shell/releases/download/$(PKG_VERSION)
-PKG_HASH:=4f0293ed9f6a6b77e47d41efabe62f3319e86efc8bf83cc58733044fbc6f9211
+PKG_HASH:=d8e49f4090d3778df17dd825e4a2a80192015682423cd9dd02b6675d65c3af5b
PKG_MAINTAINER:=Curtis Jiang <jqqqqqqqqqq@gmail.com>, Hao Dong <halbertdong@gmail.com>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:fishshell:fish
-PKG_BUILD_PARALLEL:=1
-
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/fish
SECTION:=utils
include $(TOPDIR)/rules.mk
PKG_NAME:=oci-runtime-tools
-PKG_VERSION:=1.0.0-pre20210122
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.0-pre20210326
+PKG_RELEASE:=$(AUTORELEASE)
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE_NAME:=runtime-tools
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/opencontainers/runtime-tools.git
-PKG_SOURCE_VERSION:=453547deb724af135587e654f52d86b8619f21b9
-PKG_MIRROR_HASH:=34f3aefc4f6f3bb93330ec7cbeb2eb987b82184da53d453e8b04b5750faa8728
+PKG_SOURCE_VERSION:=59cdde06764be8d761db120664020f0415f36045
+PKG_MIRROR_HASH:=ef331e3ad5f99220583399fe1c2ded243f4b01f8dabc7acd152d46304da70f6f
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
+++ /dev/null
-From 6502e57dbebcacd9b55fc7a80655c8f31d7dae8f Mon Sep 17 00:00:00 2001
-From: Daniel Golle <daniel@makrotopia.org>
-Date: Mon, 8 Feb 2021 01:26:31 +0000
-Subject: [PATCH] Fix build of hugetlb tests on 32-bit platforms
-
-https://github.com/opencontainers/runtime-tools/pull/712
-
-Use explicit 64-bit types to avoid fall-back on incompatible 32-bit
-types on 32-bit platforms.
-
-Fixes: #711
-Signed-off-by: Daniel Golle <daniel@makrotopia.org>
----
- validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go | 2 +-
- .../linux_cgroups_relative_hugetlb.go | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go
-+++ b/validation/linux_cgroups_hugetlb/linux_cgroups_hugetlb.go
-@@ -24,7 +24,7 @@ func testHugetlbCgroups() error {
- // When setting the limit just for checking if writing works, the amount of memory
- // requested does not matter, as all insigned integers will be accepted.
- // Use 2GiB as an example
-- const limit = 2 * (1 << 30)
-+ var limit uint64 = 2 * (1 << 30)
-
- for _, pageSize := range pageSizes {
- g, err := util.GetDefaultGenerator()
---- a/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go
-+++ b/validation/linux_cgroups_relative_hugetlb/linux_cgroups_relative_hugetlb.go
-@@ -21,7 +21,7 @@ func main() {
- // When setting the limit just for checking if writing works, the amount of memory
- // requested does not matter, as all insigned integers will be accepted.
- // Use 2GiB as an example
-- const limit = 2 * (1 << 30)
-+ var limit uint64 = 2 * (1 << 30)
-
- for _, pageSize := range pageSizes {
- g, err := util.GetDefaultGenerator()
include $(TOPDIR)/rules.mk
PKG_NAME:=opensc
-PKG_VERSION:=0.20.0
-PKG_RELEASE:=1
-PKG_HASH:=bbf4b4f4a44463645c90a525e820a8059b2f742a53b7b944f941de3c97ba4863
+PKG_VERSION:=0.21.0
+PKG_RELEASE:=$(AUTORELEASE)
+PKG_HASH:=2bfbbb1dcb4b8d8d75685a3e95c30798fb6411d4efab3690fd89d2cb25f3325e
PKG_LICENSE:=LGPL-2.1-or-later
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=pcsc-lite
-PKG_VERSION:=1.9.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.9.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://pcsclite.apdu.fr/files/
-PKG_HASH:=0148d403137124552c5d0f10f8cdab2cbb8dfc7c6ce75e018faf667be34f2ef9
+PKG_HASH:=73c4789b7876a833a70f493cda21655dfe85689d9b7e29701c243276e55e683a
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=COPYING
include $(TOPDIR)/rules.mk
PKG_NAME:=tessdata
-PKG_VERSION:=4.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=4.1.0
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tessdata/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=38c637d3a1763f6c3d32e8f1d979f045668676ec5feb8ee1869ee77cedd31b08
+PKG_HASH:=990fffb9b7a9b52dc9a2d053a9ef6852ca2b72bd8dfb22988b0b990a700fd3c7
PKG_MAINTAINER:=ValentÃn Kivachuk <vk18496@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=COPYING
-PKG_INSTALL:=1
-
#No need to extract 1,5GB...
PKG_UNPACK:=
include $(INCLUDE_DIR)/package.mk
-ALLTESSERACTLANG:=afr amh ara asm aze aze_cyrl bel ben bod bos bre bul cat ceb ces chi_sim chi_sim_vert chi_tra chi_tra_vert chr cos cym dan dan_frak deu deu_frak div dzo ell eng enm epo equ est eus fao fas fil fin fra frk frm fry gla gle glg grc guj hat heb hin hrv hun hye iku ind isl ita ita_old jav jpn jpn_vert kan kat kat_old kaz khm kir kor kor_vert kur kur_ara lao lat lav lit ltz mal mar mkd mlt mon mri msa mya nep nld nor oci ori osd pan pol por pus que ron rus san sin slk slk_frak slv snd spa spa_old sqi srp srp_latn sun swa swe syr tam tat tel tgk tgl tha tir ton tur uig ukr urd uzb uzb_cyrl vie yid yor
+ALLTESSERACTLANG:=afr amh ara asm aze aze_cyrl bel ben bod bos bre bul cat ceb ces chi_sim chi_sim_vert chi_tra chi_tra_vert chr cos cym dan dan_frak deu deu_frak div dzo ell eng enm epo equ est eus fao fas fil fin fra frk frm fry gla gle glg grc guj hat heb hin hrv hun hye iku ind isl ita ita_old jav jpn jpn_vert kan kat kat_old kaz khm kir kmr kor kor_vert lao lat lav lit ltz mal mar mkd mlt mon mri msa mya nep nld nor oci ori osd pan pol por pus que ron rus san sin slk slk_frak slv snd spa spa_old sqi srp srp_latn sun swa swe syr tam tat tel tgk tgl tha tir ton tur uig ukr urd uzb uzb_cyrl vie yid yor
define Build/Compile
include $(TOPDIR)/rules.mk
PKG_NAME:=tesseract
-PKG_VERSION:=4.0.0
-PKG_RELEASE:=2
+PKG_VERSION:=4.1.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tesseract-ocr/tesseract/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=a1f5422ca49a32e5f35c54dee5112b11b99928fc9f4ee6695cdc6768d69f61dd
+PKG_HASH:=2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb
PKG_MAINTAINER:=Valentin Kivachuk <vk18496@gmail.com>
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_PARALLEL:=1
CMAKE_BINARY_SUBDIR:=openwrt-build
include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
+include ../../devel/ninja/ninja-cmake.mk
define Package/tesseract
MENU:=1
CATEGORY:=Utilities
TITLE:=Tesseract Open Source OCR Engine
URL:=https://github.com/tesseract-ocr/tesseract
- DEPENDS:=+libleptonica +libpthread +libstdcpp
+ DEPENDS:=+libleptonica +libarchive +libpthread +libstdcpp
endef
TARGET_CFLAGS:=$(filter-out -O%,$(TARGET_CFLAGS)) -O3
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -224,41 +224,6 @@ set(tesseract_src ${tesseract_src}
- src/api/pdfrenderer.cpp
- )
-
--if (WIN32)
-- if (MSVC)
-- include_directories(src/vs2010/tesseract)
-- set(tesseract_hdr
-- ${tesseract_hdr}
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/vs2010/tesseract/resource.h)
-- set(tesseract_rsc ${CMAKE_BINARY_DIR}/vs2010/tesseract/libtesseract.rc)
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp
-- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
-- PROPERTIES COMPILE_DEFINITIONS __SSE4_1__)
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
-- PROPERTIES COMPILE_FLAGS "/arch:AVX")
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
-- PROPERTIES COMPILE_FLAGS "/arch:AVX2")
+@@ -252,15 +252,6 @@ set(AVX2_OPT OFF)
+ set(FMA_OPT OFF)
+ set(SSE41_OPT OFF)
+ set(MARCH_NATIVE_OPT OFF)
+-foreach(flag ${_enable_vector_unit_list}) # from OptimizeForArchitecture()
+- string(TOUPPER "${flag}" flag)
+- string(REPLACE "\." "_" flag "${flag}")
+- set(simd_flags "${simd_flags} -D${flag}")
+- string(REPLACE "_" "" flag "${flag}")
+- if("${flag}" MATCHES "AVX|AVX2|FMA|SSE41")
+- set("${flag}_OPT" ON)
- endif()
--else()
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductsse.cpp
-- PROPERTIES COMPILE_FLAGS "-msse4.1")
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixsse.cpp
-- PROPERTIES COMPILE_FLAGS "-msse4.1")
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/dotproductavx.cpp
-- PROPERTIES COMPILE_FLAGS "-mavx")
-- set_source_files_properties(
-- ${CMAKE_CURRENT_SOURCE_DIR}/src/arch/intsimdmatrixavx2.cpp
-- PROPERTIES COMPILE_FLAGS "-mavx2")
--endif()
--
- add_library (libtesseract ${LIBRARY_TYPE} ${tesseract_src} ${tesseract_hdr}
- ${tesseract_rsc}
- )
+-endforeach(flag)
+ if (NOT MSVC)
+ set(MARCH_NATIVE_FLAGS "${MARCH_NATIVE_FLAGS} -O3 -ffast-math")
+ endif()
--- /dev/null
+--- a/src/ccutil/ocrclass.h
++++ b/src/ccutil/ocrclass.h
+@@ -28,6 +28,7 @@
+
+ #include <chrono>
+ #include <ctime>
++#include <sys/time.h>
+ #ifdef _WIN32
+ #include <winsock2.h> // for timeval
+ #endif
projects / feed / packages.git / commitdiff