diff --git a/devel/lttng-modules/Makefile b/devel/lttng-modules/Makefile index 08d93d277..5eea851ae 100644 --- a/devel/lttng-modules/Makefile +++ b/devel/lttng-modules/Makefile @@ -8,17 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lttng-modules -PKG_VERSION:=2.10.8 +PKG_VERSION:=2.13.9 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/ -PKG_HASH:=fe1d269bca723e8948af871c322c37d3900e647cdc5eb3efbe821e434beee44c +PKG_HASH:=bf808b113544287cfe837a6382887fa66354ef5cc8216460cebbef3d27dc3581 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1 GPL-2.0 MIT PKG_LICENSE_FILES:=LICENSE +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk @@ -26,19 +28,17 @@ define KernelPackage/lttng SUBMENU:=Other modules TITLE:=Linux Trace Toolkit: next generation (kernel modules) URL:=https://lttng.org/ - DEPENDS:= @!TARGET_uml @KERNEL_FTRACE_SYSCALLS + DEPENDS:=@!TARGET_uml @KERNEL_FTRACE_SYSCALLS @KERNEL_KPROBES FILES:= \ - $(PKG_BUILD_DIR)/lttng-*.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/lib/lttng-*.$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/probes/lttng-*.$(LINUX_KMOD_SUFFIX) + $(PKG_BUILD_DIR)/src/lttng-*.$(LINUX_KMOD_SUFFIX) \ + $(PKG_BUILD_DIR)/src/lib/lttng-*.$(LINUX_KMOD_SUFFIX) \ + $(PKG_BUILD_DIR)/src/probes/lttng-*.$(LINUX_KMOD_SUFFIX) endef define Build/Compile - $(MAKE) -C "$(LINUX_DIR)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ + +$(KERNEL_MAKE) $(PKG_JOBS) \ M="$(PKG_BUILD_DIR)" \ - V="$(V)" \ + CONFIG_LTTNG=m \ modules endef diff --git a/devel/lttng-tools/Makefile b/devel/lttng-tools/Makefile index 7e20de149..c8eac7ae6 100644 --- a/devel/lttng-tools/Makefile +++ b/devel/lttng-tools/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lttng-tools -PKG_VERSION:=2.12.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.13.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/ -PKG_HASH:=0de7afc1f40a5acbede933cdfd6cf47b32ff84d02e170a1321f7fc86141585b8 +PKG_HASH:=8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1 GPL-2.0 diff --git a/devel/lttng-tools/patches/010-compat-off64_t-is-not-defined-by-musl.patch b/devel/lttng-tools/patches/010-compat-off64_t-is-not-defined-by-musl.patch new file mode 100644 index 000000000..8b65f428f --- /dev/null +++ b/devel/lttng-tools/patches/010-compat-off64_t-is-not-defined-by-musl.patch @@ -0,0 +1,78 @@ +From 57fd993799a2b081c826f6fc8def32d28d526bfb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= + +Date: Tue, 17 Jan 2023 16:57:35 -0500 +Subject: [PATCH] compat: off64_t is not defined by musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This helps compile with latest musl, where off64_t is not defined unless +_LARGEFILE64_SOURCE is defined. On glibc, _LARGEFILE64_SOURCE is defined +if _GNU_SOURCE is defined, so the problem is only seen with musl. + +Since the project uses AC_SYS_LARGEFILE, which from the autoconf doc: +"arrange for 64-bit file offsets, known as large-file support." + +As such, it is safe to assume off_t is 64-bit wide. This is checked by a +static_assert to catch any platform where autoconf would let a 32-bit +off_t slip. + +Reported-by: Khem Raj +Signed-off-by: Jérémie Galarneau +Change-Id: If2c6007a8c85bc3f3065002af8a7538b882fb4a8 +--- + src/common/compat/compat-fcntl.cpp | 2 +- + src/common/compat/fcntl.hpp | 11 +++++------ + 2 files changed, 6 insertions(+), 7 deletions(-) + +--- a/src/common/compat/compat-fcntl.c ++++ b/src/common/compat/compat-fcntl.c +@@ -13,7 +13,7 @@ + #ifdef __linux__ + + LTTNG_HIDDEN +-int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, ++int compat_sync_file_range(int fd, off_t offset, off_t nbytes, + unsigned int flags) + { + #ifdef HAVE_SYNC_FILE_RANGE +--- a/src/common/compat/fcntl.h ++++ b/src/common/compat/fcntl.h +@@ -8,21 +8,21 @@ + #ifndef _COMPAT_FCNTL_H + #define _COMPAT_FCNTL_H + ++#include + #include + #include + + #include + +-#if (defined(__CYGWIN__)) +-typedef long long off64_t; +-#endif ++static_assert(sizeof(off_t) == sizeof(int64_t), ++ "Build system is misconfigured, off_t must be 64-bit wide"); + + #if (defined(__FreeBSD__) || defined(__sun__)) + typedef off64_t loff_t; + #endif + + #ifdef __linux__ +-extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes, ++extern int compat_sync_file_range(int fd, off_t offset, off_t nbytes, + unsigned int flags); + #define lttng_sync_file_range(fd, offset, nbytes, flags) \ + compat_sync_file_range(fd, offset, nbytes, flags) +@@ -37,8 +37,8 @@ extern int compat_sync_file_range(int fd + #define SYNC_FILE_RANGE_WAIT_BEFORE 0 + #define SYNC_FILE_RANGE_WRITE 0 + +-static inline int lttng_sync_file_range(int fd, off64_t offset, +- off64_t nbytes, unsigned int flags) ++static inline int lttng_sync_file_range(int fd, off_t offset, ++ off_t nbytes, unsigned int flags) + { + return -ENOSYS; + } diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 99302cb1a..40532b5f0 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -11,7 +11,7 @@ include perlver.mk PKG_NAME:=perl PKG_VERSION:=$(PERL_VERSION) -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE_URL:=\ https://cpan.metacpan.org/src/5.0 \ @@ -40,6 +40,10 @@ HOST_BUILD_PARALLEL:=1 # Variables used during configuration/build HOST_PERL_PREFIX:=$(STAGING_DIR_HOSTPKG)/usr +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + # Filter -g3, it will break Compress-Raw-Zlib TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS)) TARGET_CPPFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CPPFLAGS)) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index 6e75554b6..fbe33886c 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=8.2.5 +PKG_VERSION:=8.2.6 PKG_RELEASE:=1 PKG_MAINTAINER:=Michael Heimpold @@ -16,7 +16,7 @@ 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:=800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 +PKG_HASH:=10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 @@ -194,6 +194,9 @@ CONFIGURE_ARGS+= \ ifeq ($(CONFIG_LIBC_USE_GLIBC),y) TARGET_LDFLAGS += -ldl endif +ifeq ($(CONFIG_USE_MUSL),y) +TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-bcmath),) CONFIGURE_ARGS+= --enable-bcmath=shared diff --git a/lang/python/python-attrs/Makefile b/lang/python/python-attrs/Makefile index f21a4ec37..d93b939c2 100644 --- a/lang/python/python-attrs/Makefile +++ b/lang/python/python-attrs/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2016-2018 OpenWrt.org +# Copyright (C) 2016, 2018-2023 Jeffery To # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-attrs -PKG_VERSION:=21.4.0 +PKG_VERSION:=23.1.0 PKG_RELEASE:=1 PYPI_NAME:=attrs -PKG_HASH:=626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd +PKG_HASH:=6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To +PKG_BUILD_DEPENDS:=python-hatchling/host python-hatch-vcs/host python-hatch-fancy-pypi-readme/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk diff --git a/lang/python/python-automat/Makefile b/lang/python/python-automat/Makefile index 7802168aa..83fc3ced6 100644 --- a/lang/python/python-automat/Makefile +++ b/lang/python/python-automat/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2018 OpenWrt.org +# Copyright (C) 2018-2020, 2023 Jeffery To # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,23 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-automat -PKG_VERSION:=20.2.0 -PKG_RELEASE:=3 +PKG_VERSION:=22.10.0 +PKG_RELEASE:=1 PYPI_NAME:=Automat -PKG_HASH:=7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 +PKG_HASH:=e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Jeffery To +PKG_BUILD_DEPENDS:=python-setuptools-scm/host + include ../pypi.mk include $(INCLUDE_DIR)/package.mk include ../python3-package.mk -PYTHON3_PKG_BUILD_VARS:= \ - PKG_VERSION="$(PKG_VERSION)" - define Package/python3-automat SECTION:=lang CATEGORY:=Languages diff --git a/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch b/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch deleted file mode 100644 index e749af361..000000000 --- a/lang/python/python-automat/patches/001-do-not-use-setuptools-scm-m2r.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -2,6 +2,7 @@ - Setup file for automat - """ - -+import os - from setuptools import setup, find_packages - - try: -@@ -14,7 +15,7 @@ except(IOError, ImportError): - - setup( - name='Automat', -- use_scm_version=True, -+ version=os.getenv('PKG_VERSION'), - url='https://github.com/glyph/Automat', - description=""" - Self-service finite-state machines for the programmer on the go. -@@ -22,10 +23,6 @@ setup( - long_description=long_description, - packages=find_packages(exclude=[]), - package_dir={'automat': 'automat'}, -- setup_requires=[ -- 'setuptools-scm', -- 'm2r', -- ], - install_requires=[ - "attrs>=19.2.0", - "six", diff --git a/lang/python/python-automat/patches/002-omit-visualize.patch b/lang/python/python-automat/patches/002-omit-visualize.patch index ede279696..977f96130 100644 --- a/lang/python/python-automat/patches/002-omit-visualize.patch +++ b/lang/python/python-automat/patches/002-omit-visualize.patch @@ -1,6 +1,6 @@ --- a/setup.py +++ b/setup.py -@@ -27,15 +27,6 @@ setup( +@@ -22,15 +22,6 @@ setup( "attrs>=19.2.0", "six", ], diff --git a/lang/python/python-automat/patches/003-omit-tests.patch b/lang/python/python-automat/patches/003-omit-tests.patch index 81f9e8b36..58eccf007 100644 --- a/lang/python/python-automat/patches/003-omit-tests.patch +++ b/lang/python/python-automat/patches/003-omit-tests.patch @@ -1,15 +1,15 @@ --- a/setup.py +++ b/setup.py -@@ -21,7 +21,7 @@ setup( +@@ -12,7 +12,7 @@ setup( Self-service finite-state machines for the programmer on the go. """.strip(), - long_description=long_description, + readme='README.md', - packages=find_packages(exclude=[]), + packages=find_packages(exclude=["*._test", "*._test.*"]), package_dir={'automat': 'automat'}, - install_requires=[ - "attrs>=19.2.0", -@@ -30,6 +30,7 @@ setup( + setup_requires=[ + 'wheel', +@@ -25,6 +25,7 @@ setup( author='Glyph', author_email='glyph@twistedmatrix.com', include_package_data=True, diff --git a/lang/python/python-packaging/Makefile b/lang/python/python-packaging/Makefile index 6348bbdc7..cb4e0d039 100644 --- a/lang/python/python-packaging/Makefile +++ b/lang/python/python-packaging/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-packaging -PKG_VERSION:=23.0 +PKG_VERSION:=23.1 PKG_RELEASE:=1 PYPI_NAME:=packaging -PKG_HASH:=b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97 +PKG_HASH:=a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f PKG_MAINTAINER:=Jan Pavlinec , Jeffery To PKG_LICENSE:=Apache-2.0 BSD-2-Clause diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index dc94591c2..ec7f72d64 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.8.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_FLAGS:=no-mips16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -132,6 +132,7 @@ CONFIGURE_ARGS+= \ --without-idn \ --with-default-trust-store-dir=/etc/ssl/certs/ \ --with-included-unistring \ + --with-included-libunistring \ --with-librt-prefix="$(LIBRT_ROOT_DIR)/" \ --with-pic \ --with-system-priority-file="" \ diff --git a/libs/gnutls/patches/030-unistring-optional.patch b/libs/gnutls/patches/030-unistring-optional.patch new file mode 100644 index 000000000..6b42caee8 --- /dev/null +++ b/libs/gnutls/patches/030-unistring-optional.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -471,6 +471,8 @@ DEFAULT_VALGRINDFLAGS='-q --error-exitco + + gl_VALGRIND_TESTS_DEFAULT_NO + ++gl_LIBUNISTRING_OPTIONAL ++ + dnl Note that g*l_INIT are run after we check for library capabilities, + dnl to prevent issues from caching lib dependencies. See discussion + dnl in https://bugs.gentoo.org/show_bug.cgi?id=494940 and diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile index fca33261a..de1436d19 100644 --- a/libs/gpgme/Makefile +++ b/libs/gpgme/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpgme PKG_VERSION:=1.18.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gnupg.org/ftp/gcrypt/$(PKG_NAME) @@ -52,6 +52,10 @@ CONFIGURE_ARGS += \ --disable-g13-test \ --enable-languages="cpp" +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/gpgme++ $(INSTALL_DATA) \ diff --git a/libs/libdeflate/Makefile b/libs/libdeflate/Makefile index 1eb16c799..d0a9ed805 100644 --- a/libs/libdeflate/Makefile +++ b/libs/libdeflate/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdeflate -PKG_VERSION:=1.17 +PKG_VERSION:=1.18 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ebiggers/libdeflate/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=fa4615af671513fa2a53dc2e7a89ff502792e2bdfc046869ef35160fcc373763 +PKG_HASH:=225d982bcaf553221c76726358d2ea139bb34913180b20823c782cede060affd PKG_LICENSE:=COPYING PKG_LICENSE_FILES:=MIT diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index 058dedf9b..3f7c3e608 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupm PKG_VERSION:=2.0.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/intel-iot-devkit/upm/tar.gz/v$(PKG_VERSION)? diff --git a/libs/libupm/patches/011-gcc-13-compatibility-fixes.patch b/libs/libupm/patches/011-gcc-13-compatibility-fixes.patch new file mode 100644 index 000000000..feed25e95 --- /dev/null +++ b/libs/libupm/patches/011-gcc-13-compatibility-fixes.patch @@ -0,0 +1,26 @@ +--- a/src/mcp9808/mcp9808.hpp ++++ b/src/mcp9808/mcp9808.hpp +@@ -30,6 +30,10 @@ + #include + #include + ++#ifndef uint8_t ++#include ++#endif ++ + #define MCP9808_REG_CONFIG 0x01 + #define MCP9808_REG_AMBIENT_TEMP 0x05 + #define MCP9808_REG_MANUF_ID 0x06 +--- a/src/micsv89/micsv89.hpp ++++ b/src/micsv89/micsv89.hpp +@@ -27,6 +27,10 @@ + #include + #include + ++#ifndef uint8_t ++#include ++#endif ++ + #include + + namespace mraa { class I2c;} diff --git a/libs/libvorbisidec/Makefile b/libs/libvorbisidec/Makefile index 079af96d4..16808172d 100644 --- a/libs/libvorbisidec/Makefile +++ b/libs/libvorbisidec/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libvorbisidec PKG_REV:=20180319 PKG_VERSION:=1.0.3-$(PKG_REV) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.xiph.org/xiph/tremor.git @@ -35,8 +35,7 @@ endef define Package/libvorbisidec/description libvorbisidec is "tremor", a fixed-point implementation of libvorbis. - It also has libogg built-in. It is suitable as a replacement for - libvorbis and libogg in tremor-aware applications. + It is suitable as a replacement for libvorbis in tremor-aware applications. Tremor is a decoder only. endef diff --git a/libs/lttng-ust/Makefile b/libs/lttng-ust/Makefile index 270d80ec0..0e90bf8aa 100644 --- a/libs/lttng-ust/Makefile +++ b/libs/lttng-ust/Makefile @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lttng-ust -PKG_VERSION:=2.12.0 +PKG_VERSION:=2.13.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://lttng.org/files/$(PKG_NAME)/ -PKG_HASH:=1983edb525f3f27e3494088d8d5389b4c71af66bbfe63c6f1df2ad95aa44a528 +PKG_HASH:=f1d7bb4984a3dc5dacd3b7bcb4c10c04b041b0eecd7cba1fef3d8f86aff02bd6 PKG_MAINTAINER:= PKG_LICENSE:=LGPL-2.1 GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:lttng:ust +PKG_FIXUP:=autoreconf PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 diff --git a/libs/lttng-ust/patches/100-no-tests.patch b/libs/lttng-ust/patches/100-no-tests.patch new file mode 100644 index 000000000..0849671c7 --- /dev/null +++ b/libs/lttng-ust/patches/100-no-tests.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,6 @@ SUBDIRS = \ + src \ + tools \ + doc \ +- tests \ + extras + + dist_doc_DATA = \ diff --git a/libs/pcre/Config.in b/libs/pcre/Config.in new file mode 100644 index 000000000..15e75fc75 --- /dev/null +++ b/libs/pcre/Config.in @@ -0,0 +1,11 @@ +config PCRE_JIT_ENABLED + bool + depends on PACKAGE_libpcre && (arm || i386 || i686 || x86_64 || mips || mipsel || powerpc || sparc) + default y if (arm || i686 || x86_64) + prompt "Enable JIT compiler support" + help + Enable JIT (Just-In-Time) compiler support. + + Enabling this option can give an about 10x performance increase on JIT operations. It can be desireable for e.g. high performance Apache mod_rewrite or HA-Proxy reqrep operations. + + However, JIT should _only_ be enabled on architectures that are supported. Enabling JIT on unsupported platforms will result in a compilation failure. A list of supported architectures can be found here: https://pcre.org/original/doc/html/pcrejit.html#SEC3 . diff --git a/libs/pcre/Makefile b/libs/pcre/Makefile new file mode 100644 index 000000000..5309f81d7 --- /dev/null +++ b/libs/pcre/Makefile @@ -0,0 +1,129 @@ +# +# Copyright (C) 2006-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:=pcre +PKG_VERSION:=8.45 +PKG_RELEASE:=5 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_HASH:=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 + +PKG_MAINTAINER:=Thomas Heil +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENCE +PKG_CPE_ID:=cpe:/a:pcre:pcre + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +PKG_CONFIG_DEPENDS:=\ + CONFIG_PACKAGE_libpcrecpp \ + CONFIG_PCRE_JIT_ENABLED + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk + +define Package/libpcre/default + SECTION:=libs + CATEGORY:=Libraries + URL:=https://www.pcre.org/ +endef + +define Package/libpcre/config + source "$(SOURCE)/Config.in" +endef + +define Package/libpcre + $(call Package/libpcre/default) + TITLE:=A Perl Compatible Regular Expression library +endef + +define Package/libpcre16 + $(call Package/libpcre/default) + TITLE:=A Perl Compatible Regular Expression library (16bit support) +endef + +define Package/libpcre32 + $(call Package/libpcre/default) + TITLE:=A Perl Compatible Regular Expression library (32bit support) +endef + +define Package/libpcrecpp + $(call Package/libpcre/default) + TITLE:=C++ wrapper for Perl Compatible Regular Expression library + DEPENDS:=+libpcre +libstdcpp +endef + +HOST_CONFIGURE_ARGS += \ + --disable-shared \ + --enable-utf8 \ + --enable-unicode-properties \ + --enable-pcre16 \ + --with-match-limit-recursion=16000 \ + --enable-cpp \ + --with-pic + +CONFIGURE_ARGS += \ + --enable-utf8 \ + --enable-unicode-properties \ + --enable-pcre16 \ + --enable-pcre32 \ + $(if $(CONFIG_PCRE_JIT_ENABLED),--enable-jit,--disable-jit) \ + --with-match-limit-recursion=16000 \ + --$(if $(CONFIG_PACKAGE_libpcrecpp),en,dis)able-cpp \ + --with-pic + +MAKE_FLAGS += \ + CFLAGS="$(TARGET_CFLAGS)" + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/ + $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/pcre-config + + $(INSTALL_DIR) $(2)/bin + $(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin + + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcre*.h $(1)/usr/include/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre*.{a,so*} $(1)/usr/lib/ + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpcre*.pc $(1)/usr/lib/pkgconfig/ +endef + +define Package/libpcre/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre.so $(1)/usr/lib/ +endef + +define Package/libpcre16/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre16.so* $(1)/usr/lib/ +endef + +define Package/libpcre32/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre32.so* $(1)/usr/lib/ +endef + +define Package/libpcrecpp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcrecpp.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libpcre)) +$(eval $(call BuildPackage,libpcre16)) +$(eval $(call BuildPackage,libpcre32)) +$(eval $(call BuildPackage,libpcrecpp)) +$(eval $(call HostBuild)) diff --git a/libs/pcre2/Config.in b/libs/pcre2/Config.in deleted file mode 100644 index 8777a4e84..000000000 --- a/libs/pcre2/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config PCRE2_JIT_ENABLED - bool - depends on PACKAGE_libpcre2 && (aarch64 || aarch64_be || arm || i386 || i686 || x86_64 || mips || mipsel || mips64 || mips64el || powerpc || powerpc64 || powerpcle || sparc) - default y if (arm || i686 || x86_64) - prompt "Enable JIT compiler support" - help - Enable JIT (Just-In-Time) compiler support. - - Just-in-time compiling is a heavyweight optimization that can greatly - speed up pattern matching. However, it comes at the cost of extra - processing before the match is performed, so it is of most benefit when - the same pattern is going to be matched many times. This does not - necessarily mean many calls of a matching function; if the pattern is - not anchored, matching attempts may take place many times at various - positions in the subject, even for a single call. Therefore, if the - subject string is very long, it may still pay to use JIT even for - one-off matches. JIT support is available for all of the 8-bit, 16-bit - and 32-bit PCRE2 libraries and adds about 100KB to the resulting - libpcre2.so. JIT support applies only to the traditional Perl-compatible - matching function. It does not apply when the DFA matching function is - being used. - - Enabling this option can give an about 10x performance increase on JIT - operations. It can be desireable for e.g. high performance Apache - mod_rewrite or HA-Proxy reqrep operations. - - However, JIT should _only_ be enabled on architectures that are supported. - Enabling JIT on unsupported platforms will result in a compilation - failure. A list of supported architectures can be found here: - https://pcre.org/current/doc/html/pcre2jit.html#SEC2 diff --git a/libs/pcre2/Makefile b/libs/pcre2/Makefile deleted file mode 100644 index ca761cc36..000000000 --- a/libs/pcre2/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -# -# Copyright (C) 2017 Shane Peelar -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pcre2 -PKG_VERSION:=10.37 -PKG_RELEASE:=2 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/pcre/$(PKG_NAME)/$(PKG_VERSION) -PKG_HASH:=4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270 - -PKG_MAINTAINER:=Shane Peelar -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=LICENCE -PKG_CPE_ID:=cpe:/a:pcre:pcre - -PKG_CONFIG_DEPENDS:=\ - CONFIG_PACKAGE_libpcre2-16 \ - CONFIG_PACKAGE_libpcre2-32 \ - CONFIG_PCRE2_JIT_ENABLED - -PKG_BUILD_DEPENDS:=zlib - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libpcre2/default - SECTION:=libs - CATEGORY:=Libraries - URL:=https://www.pcre.org/ -endef - -define Package/libpcre2/config - source "$(SOURCE)/Config.in" -endef - -define Package/libpcre2 - $(call Package/libpcre2/default) - TITLE:=A Perl Compatible Regular Expression library -endef - -define Package/libpcre2-16 - $(call Package/libpcre2/default) - TITLE:=A Perl Compatible Regular Expression library (16bit support) -endef - -define Package/libpcre2-32 - $(call Package/libpcre2/default) - TITLE:=A Perl Compatible Regular Expression library (32bit support) -endef - -CMAKE_HOST_OPTIONS += \ - -DBUILD_SHARED_LIBS=OFF \ - -DPCRE2_BUILD_PCRE2_8=ON \ - -DPCRE2_BUILD_PCRE2_16=ON \ - -DPCRE2_BUILD_PCRE2_32=ON \ - -DPCRE2_DEBUG=OFF \ - -DPCRE2_DISABLE_PERCENT_ZT=ON \ - -DPCRE2_SUPPORT_JIT=OFF \ - -DPCRE2_SHOW_REPORT=OFF \ - -DPCRE2_BUILD_PCRE2GREP=OFF \ - -DPCRE2_BUILD_TESTS=OFF - -CMAKE_OPTIONS += \ - -DBUILD_SHARED_LIBS=ON \ - -DPCRE2_BUILD_PCRE2_8=ON \ - -DPCRE2_BUILD_PCRE2_16=O$(if $(CONFIG_PACKAGE_libpcre2-16),N,FF) \ - -DPCRE2_BUILD_PCRE2_32=O$(if $(CONFIG_PACKAGE_libpcre2-32),N,FF) \ - -DPCRE2_DEBUG=OFF \ - -DPCRE2_DISABLE_PERCENT_ZT=ON \ - -DPCRE2_SUPPORT_JIT=O$(if $(CONFIG_PCRE2_JIT_ENABLED),N,FF) \ - -DPCRE2_SHOW_REPORT=OFF \ - -DPCRE2_BUILD_PCRE2GREP=OFF \ - -DPCRE2_BUILD_TESTS=OFF - -define Build/InstallDev - $(call Build/InstallDev/cmake,$(1)) - $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/pcre2-config - $(INSTALL_DIR) $(2)/bin - $(LN) ../../usr/bin/pcre2-config $(2)/bin/pcre2-config -endef - -define Package/libpcre2/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre2-{8,posix}.so* $(1)/usr/lib/ -endef - -define Package/libpcre2-16/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre2-16.so* $(1)/usr/lib/ -endef - -define Package/libpcre2-32/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre2-32.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libpcre2)) -$(eval $(call BuildPackage,libpcre2-16)) -$(eval $(call BuildPackage,libpcre2-32)) -$(eval $(call HostBuild)) diff --git a/mail/mblaze/Makefile b/mail/mblaze/Makefile index 98baddfc6..621fdbd04 100644 --- a/mail/mblaze/Makefile +++ b/mail/mblaze/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mblaze PKG_VERSION:=1.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://leahneukirchen.org/releases diff --git a/mail/mblaze/patches/010-mlist-use-fixed-width-integer-types-for-struct-linux_dire.patch b/mail/mblaze/patches/010-mlist-use-fixed-width-integer-types-for-struct-linux_dire.patch new file mode 100644 index 000000000..1ea1dae9a --- /dev/null +++ b/mail/mblaze/patches/010-mlist-use-fixed-width-integer-types-for-struct-linux_dire.patch @@ -0,0 +1,23 @@ +From 1babebc12c3ea8d3395f00c9607e863866c190fc Mon Sep 17 00:00:00 2001 +From: Michael Forney +Date: Wed, 7 Dec 2022 13:11:58 -0800 +Subject: [PATCH] mlist: use fixed-width integer types for struct + linux_dirent64 d_ino and d_off + +--- + mlist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mlist.c ++++ b/mlist.c +@@ -111,8 +111,8 @@ list(char *prefix, char *file) + #include + + struct linux_dirent64 { +- ino64_t d_ino; /* 64-bit inode number */ +- off64_t d_off; /* 64-bit offset to next structure */ ++ uint64_t d_ino; /* 64-bit inode number */ ++ int64_t d_off; /* 64-bit offset to next structure */ + unsigned short d_reclen; /* Size of this dirent */ + unsigned char d_type; /* File type */ + char d_name[]; /* Filename (null-terminated) */ diff --git a/multimedia/xupnpd/Makefile b/multimedia/xupnpd/Makefile index f82594cc4..bfc004537 100644 --- a/multimedia/xupnpd/Makefile +++ b/multimedia/xupnpd/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xupnpd PKG_REV:=e4e542d9b6d0043d470fda283e2cd325bbb91950 PKG_VERSION:=2018-11-20 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/clark15b/xupnpd/tar.gz/$(PKG_REV)? @@ -26,6 +26,10 @@ include $(INCLUDE_DIR)/package.mk LUA_FLAGS:=-llua -lssl -lcrypto +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Build/Compile (cd $(PKG_BUILD_DIR)/src; $(TARGET_CC) -v $(LUA_FLAGS) $(TARGET_CFLAGS) -fno-exceptions -fno-rtti -DWITH_URANDOM $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -lm -ldl -lcrypt -o xupnpd *.c *.cpp) endef diff --git a/net/arp-scan/Makefile b/net/arp-scan/Makefile index 853a4b117..64811e7a0 100644 --- a/net/arp-scan/Makefile +++ b/net/arp-scan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arp-scan PKG_VERSION:=1.10.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/royhills/arp-scan/tar.gz/$(PKG_VERSION)? @@ -42,6 +42,9 @@ define Package/arp-scan/description ARP scanner endef +CONFIGURE_ARGS += \ + --without-libcap + define Package/arp-scan/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/arp-scan $(1)/usr/bin/ diff --git a/net/crowdsec/Makefile b/net/crowdsec/Makefile index aa939df95..73258d170 100644 --- a/net/crowdsec/Makefile +++ b/net/crowdsec/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdsec -PKG_VERSION:=1.4.6 +PKG_VERSION:=1.5.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/crowdsecurity/crowdsec/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=acec1560593da78e37acbf44f2337a1e3026646ece00ab02eded78f71a2adda3 +PKG_HASH:=427f11b1a788a482b4fec8d23edd27ef589a58e1ebd0cb15182f105ad26f128b PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE @@ -82,6 +82,10 @@ $(call Package/crowdsec/Default/description) This package provides the source files for the program. endef +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Package/crowdsec/install $(call GoPackage/Package/Install/Bin,$(1)) diff --git a/net/crowdsec/patches/001-fix_config_data_dir.patch b/net/crowdsec/patches/001-fix_config_data_dir.patch index 2ab10e1d8..1d7321ab6 100644 --- a/net/crowdsec/patches/001-fix_config_data_dir.patch +++ b/net/crowdsec/patches/001-fix_config_data_dir.patch @@ -1,6 +1,6 @@ --- a/config/config.yaml +++ b/config/config.yaml -@@ -10,7 +10,7 @@ common: +@@ -9,7 +9,7 @@ common: working_dir: . config_paths: config_dir: /etc/crowdsec/ diff --git a/net/tgt/Makefile b/net/tgt/Makefile index 46720dddf..8939d51d1 100644 --- a/net/tgt/Makefile +++ b/net/tgt/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tgt -PKG_VERSION:=1.0.83 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.86 +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:=a9ddb0ff32d3396416df9639f9f398d14a6051f505b5772d7d196df99df8b8da +PKG_HASH:=af84c16bf8893d65666afcc0424b46dafddd2d0e5dcf818b319ea9ed3c3315a7 PKG_MAINTAINER:=Maxim Storchak PKG_LICENSE:=GPL-2.0-only @@ -35,6 +35,10 @@ supports multiple methods for accessing block storage. Tgt consists of user-space daemon and tools. endef +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Build/Compile $(call Build/Compile/Default,programs) endef diff --git a/net/transmission/Makefile b/net/transmission/Makefile index a000d6b61..d655c6da8 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission PKG_VERSION:=4.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/transmission/transmission/releases/download/$(PKG_VERSION)/ diff --git a/net/transmission/files/transmission-daemon.json b/net/transmission/files/transmission-daemon.json index f1fc456ec..3a2e82239 100644 --- a/net/transmission/files/transmission-daemon.json +++ b/net/transmission/files/transmission-daemon.json @@ -27,6 +27,7 @@ "fchmod", "fcntl", "fcntl64", + "ftruncate64", "fstat", "fstat64", "fsync", @@ -78,6 +79,7 @@ "readlinkat", "readv", "recvfrom", + "recvmsg", "rename", "renameat", "rmdir", diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index fd4d1f913..ce1eae5eb 100644 --- a/utils/btrfs-progs/Makefile +++ b/utils/btrfs-progs/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btrfs-progs -PKG_VERSION:=6.0.1 -PKG_RELEASE:=2 +PKG_VERSION:=6.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs -PKG_HASH:=b5316fff1d811e2ad3a067973109eb912bb0d92805735625fd8b82e700201c48 +PKG_HASH:=40a0bdff787ecb490e5533dbcefd4852176daf12aae5a1158203db43d8ad6a7d PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_MAINTAINER:=Karel Kočí diff --git a/utils/cryptsetup/Makefile b/utils/cryptsetup/Makefile index f9a76e6c4..575fb34a0 100644 --- a/utils/cryptsetup/Makefile +++ b/utils/cryptsetup/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cryptsetup PKG_VERSION:=2.6.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/cryptsetup/v2.6 @@ -75,6 +75,7 @@ CONFIGURE_VARS += \ LIBSSH_CFLAGS="-I$(STAGING_DIR)/usr/include" \ LIBSSH_LIBS="-L$(STAGING_DIR)/usr/lib -lssh" +TARGET_CFLAGS += -D_LARGEFILE64_SOURCE TARGET_LDFLAGS += -Wl,--gc-sections $(if $(INTL_FULL),-lintl) define Build/InstallDev diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index ae63e4f3e..fa7d7838e 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.17.3 +PKG_VERSION:=2.18.1 PKG_RELEASE:=1 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:=e5e9bdfc3a827240381b656da88f92b408ea2e203c3f8cfd9e0bbfe03f825f16 +PKG_HASH:=192c47c177d9bfd8492ed0c49214af0c740586da6db0b7e9c9a07da37c9dc722 PKG_MAINTAINER:=Javier Marcet diff --git a/utils/inotify-tools/Makefile b/utils/inotify-tools/Makefile index 090f044d8..a5d4203cf 100644 --- a/utils/inotify-tools/Makefile +++ b/utils/inotify-tools/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=inotify-tools PKG_VERSION:=3.20.11.0 PKG_HASH:=58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://codeload.github.com/rvoicilas/inotify-tools/tar.gz/$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -19,6 +19,10 @@ include $(INCLUDE_DIR)/package.mk CONFIGURE_ARGS+= --disable-doxygen +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Build/Prepare $(call Build/Prepare/Default) $(CP) $(PKG_BUILD_DIR)/README.md $(PKG_BUILD_DIR)/README diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index cf9c26666..5c4d6e7f2 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mariadb PKG_VERSION:=10.9.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL := https://archive.mariadb.org/$(PKG_NAME)-$(PKG_VERSION)/source @@ -178,6 +178,10 @@ MARIADB_COMMON_DEPENDS := \ # ignore them. TARGET_CFLAGS+=$(TARGET_CPPFLAGS) +ifneq ($(CONFIG_USE_MUSL),) + TARGET_CFLAGS += -D_LARGEFILE64_SOURCE +endif + define Package/mariadb/disable/engine echo > $(1)/storage/$(2)/CMakeLists.txt endef diff --git a/utils/oath-toolkit/Makefile b/utils/oath-toolkit/Makefile index ebee2ec71..3063d1fa6 100644 --- a/utils/oath-toolkit/Makefile +++ b/utils/oath-toolkit/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oath-toolkit PKG_VERSION:=2.6.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SAVANNAH/oath-toolkit @@ -44,6 +44,13 @@ define Package/oath-toolkit/description HOTP algorithm (RFC4226) and the time-based TOTP algorithm (RFC6238). endef +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/liboath + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + define Package/oath-toolkit/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/lib diff --git a/utils/xfsprogs/Makefile b/utils/xfsprogs/Makefile index 77cb58066..71cf38c7d 100644 --- a/utils/xfsprogs/Makefile +++ b/utils/xfsprogs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xfsprogs PKG_VERSION:=5.9.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs @@ -67,7 +67,7 @@ CONFIGURE_ARGS += \ --disable-scrub \ --disable-libicu -TARGET_CFLAGS += -DHAVE_MAP_SYNC +TARGET_CFLAGS += -DHAVE_MAP_SYNC $(if (CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE) TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt) define Package/xfs-admin/install