diff --git a/devel/delve/Makefile b/devel/delve/Makefile index 5025b9853..498b5b3f3 100644 --- a/devel/delve/Makefile +++ b/devel/delve/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=delve -PKG_VERSION:=1.8.2 +PKG_VERSION:=1.20.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/go-delve/delve/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=fbf6ea7e1ed0c92e543c7f5f2343928e185e11e4cba1c7c9d3bfc28d1c323900 +PKG_HASH:=a10aa97d3f6b6219877a73dd305d511442ad0caab740de76fc005796a480de93 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile new file mode 100644 index 000000000..ef2e8024a --- /dev/null +++ b/devel/nasm/Makefile @@ -0,0 +1,41 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=nasm +PKG_VERSION:=2.16.01 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://www.nasm.us/pub/nasm/releasebuilds/$(PKG_VERSION)/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_HASH:=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558 + +PKG_MAINTAINER:=Oskari Rauta +PKG_LICENSE:=BSD-2-Clause +PKG_LICENSE_FILES:=LICENSE + +PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/nasm + SECTION:=devel + CATEGORY:=Development + TITLE:=nasm assembler + DEPENDS:=@TARGET_x86 +endef + +define Package/nasm/description + NASM, the Netwide Assembler: an assembler targetting the + Intel x86 series of processors, with portable source. +endef + +CONFIGURE_ARGS += --disable-lto --disable-werror --disable-gdb + +define Package/nasm/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisasm $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nasm $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,nasm)) diff --git a/kernel/v4l2loopback/Makefile b/kernel/v4l2loopback/Makefile index 648551920..18495c922 100644 --- a/kernel/v4l2loopback/Makefile +++ b/kernel/v4l2loopback/Makefile @@ -6,13 +6,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=v4l2loopback -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/umlaeute/v4l2loopback.git -PKG_SOURCE_VERSION:=baf9de279afc7a7c7513e9c40a0c9ff88f456af4 -PKG_SOURCE_DATE:=2021-07-13 -PKG_MIRROR_HASH:=811a4b0bbefe14cf4a74dbb3d45f5ae147f50f1d67dbb6f0fe3e5a9888adf49a +PKG_SOURCE_VERSION:=v0.12.7 +PKG_MIRROR_HASH:=e5e5d897bdaa7f2fb0b897e503cecaeee234fcdc7f2f138aae501ef742f5b2b2 PKG_MAINTAINER:=Michel Promonet @@ -22,7 +21,7 @@ define KernelPackage/v4l2loopback SUBMENU:=Video Support TITLE:=v4l2loopback kernel module FILES:=$(PKG_BUILD_DIR)/v4l2loopback.ko - DEPENDS:=+kmod-video-core +kmod-video-videobuf2 + DEPENDS:=+kmod-video-core AUTOLOAD:=$(call AutoProbe,v4l2loopback) endef diff --git a/lang/chicken-scheme/Makefile b/lang/chicken-scheme/Makefile index 79917fa5e..c7fb98da2 100644 --- a/lang/chicken-scheme/Makefile +++ b/lang/chicken-scheme/Makefile @@ -49,7 +49,7 @@ define Package/chicken-scheme-interpreter/description For more information, please refer to the Chicken Scheme website at https://call-cc.org. endef -MAKE_FLAGS += PLATFORM=linux C_COMPILER=$(TARGET_CC) LINKER=$(TARGET_CC) PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" +MAKE_FLAGS += PLATFORM=linux C_COMPILER="$(TARGET_CC)" LINKER="$(TARGET_CC)" PREFIX=/usr C_COMPILER_OPTIMIZATION_OPTIONS="$(TARGET_CFLAGS)" # not installed: # - csc and chicken, the compiler diff --git a/lang/python/pillow/Makefile b/lang/python/pillow/Makefile index d1981f9d8..157575cca 100644 --- a/lang/python/pillow/Makefile +++ b/lang/python/pillow/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pillow -PKG_VERSION:=9.3.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=9.4.0 +PKG_RELEASE:=1 PYPI_NAME:=Pillow -PKG_HASH:=c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f +PKG_HASH:=a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=HPND diff --git a/lang/python/python-pytz/Makefile b/lang/python/python-pytz/Makefile index f8e3cea8d..a39428a8e 100644 --- a/lang/python/python-pytz/Makefile +++ b/lang/python/python-pytz/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-pytz -PKG_VERSION:=2022.7 +PKG_VERSION:=2022.7.1 PKG_RELEASE:=1 PYPI_NAME:=pytz -PKG_HASH:=7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a +PKG_HASH:=01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=MIT diff --git a/lang/python/python-requests/Makefile b/lang/python/python-requests/Makefile index 163c49831..c375c1cd6 100644 --- a/lang/python/python-requests/Makefile +++ b/lang/python/python-requests/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-requests -PKG_VERSION:=2.28.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.28.2 +PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer , Alexandru Ardelean PKG_LICENSE:=Apache-2.0 @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:python-requests:requests PYPI_NAME:=requests -PKG_HASH:=7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 +PKG_HASH:=98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf include ../pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/lang/python/python3-host.mk b/lang/python/python3-host.mk index 9366b78d9..8a05c332c 100644 --- a/lang/python/python3-host.mk +++ b/lang/python/python3-host.mk @@ -51,6 +51,12 @@ HOST_PYTHON3_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON3_VERSION) HOST_PYTHON3_PIP_CACHE_DIR:=$(DL_DIR)/pip-cache +define SetupPyShim + if [ -f $(1)/pyproject.toml ] && [ ! -f $(1)/setup.py ] ; then \ + $(CP) $(python3_mk_path)setup.py.shim $(1)setup.py ; \ + fi +endef + # Multiple concurrent pip processes can lead to errors or unexpected results: https://github.com/pypa/pip/issues/2361 # $(1) => packages to install define HostPython3/PipInstall @@ -75,8 +81,9 @@ endef # $(2) => additional arguments to setup.py # $(3) => additional variables define HostPython3/ModSetup + $(call SetupPyShim,$(HOST_BUILD_DIR)/$(strip $(1))) $(call HostPython3/Run, \ $(HOST_BUILD_DIR)/$(strip $(1)), \ setup.py $(2), \ - $(3)) + $(3) PY_PKG_VERSION=$(PKG_VERSION)) endef diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk index c2617f69c..a24892ac5 100644 --- a/lang/python/python3-package.mk +++ b/lang/python/python3-package.mk @@ -62,10 +62,11 @@ endef # $(3) => additional variables define Python3/ModSetup $(INSTALL_DIR) $(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) + $(call SetupPyShim,$(PKG_BUILD_DIR)/$(strip $(1))) $(call Python3/Run, \ $(PKG_BUILD_DIR)/$(strip $(1)), \ setup.py $(2), \ - $(3)) + $(3) PY_PKG_VERSION=$(PKG_VERSION)) endef define Python3/FixShebang diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 816b1f1da..aa2f2624f 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk include ../python3-version.mk PKG_NAME:=python3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO) PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz @@ -272,7 +272,6 @@ define Py3Package/python3-light/filespec +|/usr/lib/python$(PYTHON3_VERSION) -|/usr/lib/python$(PYTHON3_VERSION)/distutils/cygwinccompiler.py -|/usr/lib/python$(PYTHON3_VERSION)/distutils/command/wininst* --|/usr/lib/python$(PYTHON3_VERSION)/ensurepip -|/usr/lib/python$(PYTHON3_VERSION)/idlelib -|/usr/lib/python$(PYTHON3_VERSION)/tkinter -|/usr/lib/python$(PYTHON3_VERSION)/turtledemo diff --git a/lang/python/python3/files/python3-package-pip.mk b/lang/python/python3/files/python3-package-pip.mk index 8b547cee8..61ea48022 100644 --- a/lang/python/python3/files/python3-package-pip.mk +++ b/lang/python/python3/files/python3-package-pip.mk @@ -29,6 +29,7 @@ define Py3Package/python3-pip/install endef $(eval $(call Py3BasePackage,python3-pip, \ + /usr/lib/python$(PYTHON3_VERSION)/ensurepip \ , \ DO_NOT_ADD_TO_PACKAGE_DEPENDS \ )) diff --git a/lang/python/setup.py.shim b/lang/python/setup.py.shim new file mode 100644 index 000000000..b309abc02 --- /dev/null +++ b/lang/python/setup.py.shim @@ -0,0 +1,6 @@ +import os +import setuptools + +# FIXME: see about getting rid of PY_PKG_VERSION asap when setuptools handles this correctly +if __name__ == "__main__": + setuptools.setup(version=os.environ['PY_PKG_VERSION']) diff --git a/libs/libjaylink/Makefile b/libs/libjaylink/Makefile new file mode 100644 index 000000000..2ed5753b1 --- /dev/null +++ b/libs/libjaylink/Makefile @@ -0,0 +1,48 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=libjaylink +PKG_VERSION:=0.3.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/$(PKG_VERSION) +PKG_HASH:=a2d98c1aa13dcf41c6c681767a43cdefc42b6f71af9362937555051007514cd9 + +PKG_MAINTAINER:=Paul Fertser +PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE_FILES:=COPYING + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/libjaylink + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libusb-1.0 + TITLE:=Library to access SEGGER J-Link and compatible devices + URL:=https://gitlab.zapb.de/libjaylink/libjaylink.git +endef + +define Package/libjaylink/description +libjaylink is a shared library written in C to access SEGGER J-Link and +compatible devices. +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/libjaylink + $(CP) $(PKG_INSTALL_DIR)/usr/include/libjaylink/*.h $(1)/usr/include/libjaylink/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjaylink.so* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libjaylink.pc $(1)/usr/lib/pkgconfig/ +endef + +define Package/libjaylink/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjaylink.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libjaylink)) diff --git a/libs/liburing/Makefile b/libs/liburing/Makefile index 6eb84b18d..445e535ad 100644 --- a/libs/liburing/Makefile +++ b/libs/liburing/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=liburing PKG_VERSION:=2.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.dk/cgit/liburing/snapshot @@ -32,7 +32,7 @@ define Package/liburing/description For more info on io_uring, please see: https://kernel.dk/io_uring.pdf endef -CONFIGURE_ARGS:=--prefix=$(CONFIGURE_PREFIX) --cc=${TARGET_CC} +CONFIGURE_ARGS:=--prefix=$(CONFIGURE_PREFIX) --cc="${TARGET_CC}" define Build/Compile $(MAKE) $(PKG_BUILD_DIR) \ diff --git a/libs/libwebp/Makefile b/libs/libwebp/Makefile index 8eca25ba9..a58062f35 100644 --- a/libs/libwebp/Makefile +++ b/libs/libwebp/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libwebp -PKG_VERSION:=1.2.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.3.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://storage.googleapis.com/downloads.webmproject.org/releases/webp -PKG_HASH:=7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df +PKG_HASH:=64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=BSD-3-Clause @@ -50,7 +50,7 @@ TARGET_CFLAGS += -flto define Package/libwebp/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwebp*.s* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.s* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libwebp)) diff --git a/libs/libwebp/patches/010-mips16.patch b/libs/libwebp/patches/010-mips16.patch index 021bb4484..85dc93287 100644 --- a/libs/libwebp/patches/010-mips16.patch +++ b/libs/libwebp/patches/010-mips16.patch @@ -1,6 +1,6 @@ --- a/src/dsp/cpu.h +++ b/src/dsp/cpu.h -@@ -106,7 +106,7 @@ +@@ -108,7 +108,7 @@ #define WEBP_HAVE_NEON #endif diff --git a/libs/nghttp2/Makefile b/libs/nghttp2/Makefile index ab4c1cd5c..7135194ea 100644 --- a/libs/nghttp2/Makefile +++ b/libs/nghttp2/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nghttp2 -PKG_VERSION:=1.44.0 +PKG_VERSION:=1.51.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/nghttp2/nghttp2/releases/download/v$(PKG_VERSION) -PKG_HASH:=5699473b29941e8dafed10de5c8cb37a3581edf62ba7d04b911ca247d4de3c5d +PKG_HASH:=66aa76d97c143f42295405a31413e5e7d157968dad9f957bb4b015b598882e6b PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=MIT diff --git a/libs/pcapplusplus/Makefile b/libs/pcapplusplus/Makefile index af44583a1..63d52f1a4 100644 --- a/libs/pcapplusplus/Makefile +++ b/libs/pcapplusplus/Makefile @@ -32,7 +32,7 @@ endef define Build/Compile cd $(PKG_BUILD_DIR)/PcapPlusPlus; ./configure-linux.sh --install-dir /usr - make -C $(PKG_BUILD_DIR)/PcapPlusPlus CXXFLAGS="$(TARGET_CXXFLAGS) -fPIC" CFLAGS="$(TARGET_CFLAGS) -fPIC" CXX=$(TARGET_CXX) CC=$(TARGET_CC) AR=$(TARGET_AR) libs + make -C $(PKG_BUILD_DIR)/PcapPlusPlus CXXFLAGS="$(TARGET_CXXFLAGS) -fPIC" CFLAGS="$(TARGET_CFLAGS) -fPIC" CXX="$(TARGET_CXX)" CC="$(TARGET_CC)" AR=$(TARGET_AR) libs endef define Build/InstallDev diff --git a/multimedia/v4l2tools/Makefile b/multimedia/v4l2tools/Makefile index 0b5779845..67b39bc75 100644 --- a/multimedia/v4l2tools/Makefile +++ b/multimedia/v4l2tools/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v4l2tools -PKG_VERSION:=0.1.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.2.0 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mpromonet/v4l2tools.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=5d848ab811126e9ad11cc374e312e460cebe40fab99164d4368fe0e69dc07997 +PKG_MIRROR_HASH:=8cb932b0aa3b273155e7814479b7bfc102b65912ca6d8537123916c514ba9ffd PKG_MAINTAINER:=Michel Promonet PKG_LICENSE:=Unlicense diff --git a/net/atlas-sw-probe/Makefile b/net/atlas-sw-probe/Makefile index 51b0256bc..21506dba2 100644 --- a/net/atlas-sw-probe/Makefile +++ b/net/atlas-sw-probe/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=atlas-sw-probe PKG_VERSION:=5080 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/RIPE-NCC/ripe-atlas-software-probe.git @@ -90,7 +90,8 @@ define Package/atlas-sw-probe/install echo "prod" > $(1)/$(SCRIPTS_DIR)/state/mode # Copy scripts - $(CP) $(PKG_BUILD_DIR)/bin/{ATLAS,common-pre.sh,common.sh,reginit.sh,resolvconf} $(1)/$(SCRIPTS_DIR)/bin/ + $(CP) $(PKG_BUILD_DIR)/bin/{ATLAS,resolvconf} $(1)/$(SCRIPTS_DIR)/bin/ + $(CP) $(PKG_BUILD_DIR)/bin/*.sh $(1)/$(SCRIPTS_DIR)/bin/ $(CP) $(PKG_BUILD_DIR)/bin/arch/{linux,openwrt-sw-probe} $(1)/$(SCRIPTS_DIR)/bin/arch/ # Create config info diff --git a/net/bind/Makefile b/net/bind/Makefile index c8e560591..a65cfe764 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind -PKG_VERSION:=9.18.10 -PKG_RELEASE:=3 +PKG_VERSION:=9.18.11 +PKG_RELEASE:=1 USERID:=bind=57:bind=57 PKG_MAINTAINER:=Noah Meyerhans @@ -22,7 +22,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:= \ https://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) \ https://ftp.isc.org/isc/bind9/$(PKG_VERSION) -PKG_HASH:=f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6 +PKG_HASH:=8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158 PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=aclocal.m4 libtool.m4 diff --git a/net/cloudflared/Makefile b/net/cloudflared/Makefile index 32680a2ed..c0e13fdbe 100644 --- a/net/cloudflared/Makefile +++ b/net/cloudflared/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cloudflared -PKG_VERSION:=2022.12.1 +PKG_VERSION:=2023.1.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/cloudflare/cloudflared/tar.gz/$(PKG_VERSION)? -PKG_HASH:=8cc5c41ea98a9d72687d5f62e733a9033191e834e4fa9b2aecc557f0ccfbda56 +PKG_HASH:=68b66ec333329cda386b304a333b6f24e3ecc09696184603ca37426d522c4cd2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/dawn/Makefile b/net/dawn/Makefile index e2bc31642..da2affe82 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dawn PKG_SOURCE_DATE:=2022-07-24 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index 1c0d8fde1..5c5189c48 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.6 -PKG_RELEASE:=104 +PKG_VERSION:=2.6.8 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=d0c80c90c04ae79598b58b9749d53787f00f7b515175e7d8203f2796e6a6594d +PKG_HASH:=a02ad64550dd30a94b25fd0e225ba699649d0c4037bca3b36b20e8e3235bb86f PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 2d885ba93..afd83a13a 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.6.git -BASE_TAG=v2.6.6 +BASE_TAG=v2.6.8 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile index 9f2b0555e..2c6dd442b 100644 --- a/net/isc-dhcp/Makefile +++ b/net/isc-dhcp/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=isc-dhcp UPSTREAM_NAME:=dhcp PKG_VERSION:=4.4.3 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=6 PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/isc-dhcp/patches/510-bind-CC.patch b/net/isc-dhcp/patches/510-bind-CC.patch index dcee7593c..bbbd949f0 100644 --- a/net/isc-dhcp/patches/510-bind-CC.patch +++ b/net/isc-dhcp/patches/510-bind-CC.patch @@ -5,7 +5,7 @@ rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ - ./configure ${bindconfig} > ${binddir}/configure.log); \ -+ export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ ++ export CC="${CROSS_CC}" AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + ./configure ${bindconfig} --disable-atomic \ + --disable-kqueue --disable-epoll --disable-kqueue \ + --disable-epoll --disable-devpoll --without-openssl \ diff --git a/net/isc-dhcp/patches/520-bind-no-catgets.patch b/net/isc-dhcp/patches/520-bind-no-catgets.patch index bd956032c..fbd4d5dc4 100644 --- a/net/isc-dhcp/patches/520-bind-no-catgets.patch +++ b/net/isc-dhcp/patches/520-bind-no-catgets.patch @@ -3,7 +3,7 @@ @@ -57,6 +57,7 @@ bind1: rm -rf ${cleandirs} ${cleanfiles} ; \ (cd ${bindsrcdir} && \ - export CC=${CROSS_CC} AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + export CC="${CROSS_CC}" AR=${TARGET_AR} RANLIB=${TARGET_RANLIB} && \ + ac_cv_func_catgets=no \ ./configure ${bindconfig} --disable-atomic \ --disable-kqueue --disable-epoll --disable-kqueue \ diff --git a/net/nextdns/Makefile b/net/nextdns/Makefile index c5930405f..fb9ca8c88 100644 --- a/net/nextdns/Makefile +++ b/net/nextdns/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nextdns -PKG_VERSION:=1.38.0 +PKG_VERSION:=1.39.4 PKG_RELEASE:=1 PKG_SOURCE:=nextdns-$(PKG_VERSION).tar.gz PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE_URL:=https://codeload.github.com/nextdns/nextdns/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=74cd9d37ea9051b5b5f8f10be1462fb4ebe77b4dbcccd8c94ba049828bd21bff +PKG_HASH:=e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac PKG_MAINTAINER:=Olivier Poitrey PKG_LICENSE:=MIT diff --git a/net/pbr/Makefile b/net/pbr/Makefile index ab931e7cd..3d8438d9e 100644 --- a/net/pbr/Makefile +++ b/net/pbr/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pbr PKG_VERSION:=1.0.1 -PKG_RELEASE:=14 +PKG_RELEASE:=16 PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin diff --git a/net/pbr/files/etc/config/pbr b/net/pbr/files/etc/config/pbr index 355fac205..857ef1e33 100644 --- a/net/pbr/files/etc/config/pbr +++ b/net/pbr/files/etc/config/pbr @@ -35,11 +35,3 @@ config policy option interface 'wan' option dest_addr 'plex.tv my.plexapp.com emby.media app.emby.media tv.emby.media' option enabled '0' - -config policy - option name 'WireGuard Server' - option interface 'wan' - option src_port '51820' - option chain 'OUTPUT' - option proto 'udp' - option enabled '0' diff --git a/net/pbr/files/etc/init.d/pbr.init b/net/pbr/files/etc/init.d/pbr.init index e612072c3..848dd2e9e 100755 --- a/net/pbr/files/etc/init.d/pbr.init +++ b/net/pbr/files/etc/init.d/pbr.init @@ -254,7 +254,7 @@ is_ipv6_global() { [ "${1:0:4}" = "2001" ]; } # is_ipv6_global() { is_ipv6 "$1" && ! is_ipv6_link_local "$1" && ! is_ipv6_link_local "$1"; } is_list() { str_contains "$1" "," || str_contains "$1" " "; } is_netmask() { local ip="${1%/*}"; [ "$ip" != "$1" ] && is_ipv4 "$ip"; } -is_domain() { str_contains "$1" '[a-zA-Z]'; } +is_domain() { ! is_ipv6 "$1" && str_contains "$1" '[a-zA-Z]'; } is_phys_dev() { [ "${1:0:1}" = "@" ] && ip l show | grep -E -q "^\\d+\\W+${1:1}"; } dnsmasq_kill() { killall -q -s HUP dnsmasq; } dnsmasq_restart() { output 3 'Restarting dnsmasq '; if /etc/init.d/dnsmasq restart >/dev/null 2>&1; then output_okn; else output_failn; fi; } @@ -579,7 +579,7 @@ nftset() { fi [ -z "$param4" ] && param4="$(resolveip_to_nftset4 "$param")" [ -z "$param6" ] && param6="$(resolveip_to_nftset6 "$param")" - if [ -z "$param4" ] && [ -z "$param6" ]; then + if [ -z "$param4" ] && [ -z "$param6" ]; then state add 'errorSummary' 'errorFailedToResolve' "$param" else nft4 add element inet "$nftTable" "$nftset4" "{ $param4 }" && ipv4_error=0 diff --git a/net/pdns-recursor/Makefile b/net/pdns-recursor/Makefile index 1d953ccb6..36b5a75a2 100644 --- a/net/pdns-recursor/Makefile +++ b/net/pdns-recursor/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pdns-recursor -PKG_VERSION:=4.8.0 +PKG_VERSION:=4.8.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://downloads.powerdns.com/releases/ -PKG_HASH:=ccb9017a1a788e95e948e7b240ef8db53ae8a507b915f260188ef343f7f68bdc +PKG_HASH:=d7b03447009257e512f01fcc46cbdb9c859b672a1c9b23faf382e870765b0f0d PKG_MAINTAINER:=Peter van Dijk PKG_LICENCE:=GPL-2.0-only diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index d5072e51e..fe6953e28 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.3.5 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) diff --git a/net/shadowsocks-libev/files/ss-rules/set.uc b/net/shadowsocks-libev/files/ss-rules/set.uc index 5947f6ccd..38140e7e1 100644 --- a/net/shadowsocks-libev/files/ss-rules/set.uc +++ b/net/shadowsocks-libev/files/ss-rules/set.uc @@ -102,6 +102,7 @@ function set_elements(suf, af) { set {{ set_name(suf, af) }} { type ipv{{af}}_addr; flags interval; + auto-merge; {% let elems = set_elements(suf, af); if (length(elems)): %} elements = { {% for (let i = 0; i < length(elems); i++): %} diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 698f28c4a..9ba031871 100644 --- a/net/snort3/Makefile +++ b/net/snort3/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snort3 -PKG_VERSION:=3.1.50.0 +PKG_VERSION:=3.1.53.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/ -PKG_HASH:=983497578587c5b1291994608fef70700d7f251461e79ac897751bba57cc56b5 +PKG_HASH:=e76429903cc56353ab21c0f4c0ec495054ba82f56d8d94943930bc0c3165be4c PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only diff --git a/net/snowflake/Makefile b/net/snowflake/Makefile index 7254f2eaa..cba160c64 100644 --- a/net/snowflake/Makefile +++ b/net/snowflake/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=snowflake -PKG_VERSION:=2.4.2 +PKG_VERSION:=2.5.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://git.torproject.org/pluggable-transports/snowflake.git PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_MIRROR_HASH:=b6e47a50558ed4f5a4b5f9bc25d6aaf7da168b305dd9b52b3a92ecb028d883fc +PKG_MIRROR_HASH:=7f36f48ab07ac9a3944202613b024072f3ad0ad55b495fde611ee30223410fdf PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 9a782b5ca..98013c7e2 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel -PKG_VERSION:=5.66 +PKG_VERSION:=5.67 PKG_RELEASE:=$(AUTORELEASE) PKG_LICENSE:=GPL-2.0-or-later @@ -23,7 +23,7 @@ PKG_SOURCE_URL:= \ https://www.usenix.org.uk/mirrors/stunnel/archive/$(word 1, $(subst .,$(space),$(PKG_VERSION))).x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=558178704d1aa5f6883aac6cc5d6bbf2a5714c8a0d2e91da0392468cee9f579c +PKG_HASH:=3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456 PKG_FIXUP:=autoreconf PKG_FIXUP:=patch-libtool diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile index a5ec2877c..4450b995d 100644 --- a/net/tcpreplay/Makefile +++ b/net/tcpreplay/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpreplay -PKG_VERSION:=4.4.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.4.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/appneta/tcpreplay/releases/download/v$(PKG_VERSION) -PKG_HASH:=51f70ed14be5913f19c25cdfa530e98c14cedab1c76fbdd26eca7b61b57344f2 +PKG_HASH:=352fcd073c61140e5008ffe4e37d4744c31037e73854a921cd8b6b5d9f29cd54 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=docs/LICENSE diff --git a/net/xfrpc/Makefile b/net/xfrpc/Makefile index 9a98f37db..bb8d33827 100644 --- a/net/xfrpc/Makefile +++ b/net/xfrpc/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xfrpc -PKG_VERSION:=1.11.587 +PKG_VERSION:=2.1.606 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/liudf0716/xfrpc.git PKG_SOURCE_VERSION:=$(PKG_VERSION) -PKG_MIRROR_HASH:=da58e702d3b451e1b5a3d59ac3842cc424f636ca879c19ebb94cce8aa8dde3bb +PKG_MIRROR_HASH:=2f9f98fde54f66a6c562356f66d0abd3ec41fcd6833915831378a37398ff2cc5 PKG_MAINTAINER:=Dengfeng Liu PKG_LICENSE:=GPL-3.0-or-later diff --git a/utils/bash/Makefile b/utils/bash/Makefile index 567fa8ee8..061729a9b 100644 --- a/utils/bash/Makefile +++ b/utils/bash/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bash -PKG_VERSION:=5.1.16 +PKG_VERSION:=5.2.15 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/bash -PKG_HASH:=5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558 +PKG_HASH:=13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c PKG_MAINTAINER:=Marcel Denia PKG_LICENSE:=GPL-3.0-or-later diff --git a/utils/bash/patches/900-no_doc.patch b/utils/bash/patches/900-no_doc.patch index eda7f2d55..9e9977c61 100644 --- a/utils/bash/patches/900-no_doc.patch +++ b/utils/bash/patches/900-no_doc.patch @@ -1,6 +1,6 @@ --- a/Makefile.in +++ b/Makefile.in -@@ -798,10 +798,8 @@ loadables: +@@ -813,10 +813,8 @@ loadables: # $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir) doc documentation: force diff --git a/utils/bash/patches/901-startup-files.patch b/utils/bash/patches/901-startup-files.patch index c97054da1..428298ddc 100644 --- a/utils/bash/patches/901-startup-files.patch +++ b/utils/bash/patches/901-startup-files.patch @@ -1,6 +1,6 @@ --- a/config-top.h +++ b/config-top.h -@@ -91,20 +91,20 @@ +@@ -97,20 +97,20 @@ #define DEFAULT_BASHRC "~/.bashrc" /* System-wide .bashrc file for interactive shells. */ diff --git a/utils/clocate/Makefile b/utils/clocate/Makefile index 3c955fcab..32d2f2cb2 100644 --- a/utils/clocate/Makefile +++ b/utils/clocate/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=clocate -PKG_SOURCE_DATE:=2021-11-09 -PKG_RELEASE:=$(AUTORELEASE) +PKG_SOURCE_DATE:=2023-01-20 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/blocktrron/clocate.git -PKG_SOURCE_VERSION:=4a4c0c0cb53fc3df2891d649eb457efdee843572 -PKG_MIRROR_HASH:=8eef756ea5e951097eea53feb243a317612f88c2628c9417f4b28a28a3b4686c +PKG_SOURCE_VERSION:=510cc944e4d4c28b5cc30d9808ab14e80486b437 +PKG_MIRROR_HASH:=f4bcb77df4fc163a0d9b3350088ba6692f718ba0a1d48fa968685e2fded79ab8 PKG_MAINTAINER:=David Bauer PKG_LICENSE:=GPL-2.0-only diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index dfcecc967..c3d2b8b6b 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.12.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=42 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ diff --git a/utils/crun/Makefile b/utils/crun/Makefile index 85d972180..7a1b64a7f 100644 --- a/utils/crun/Makefile +++ b/utils/crun/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crun PKG_VERSION:=1.7.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/containers/crun.git @@ -26,7 +26,7 @@ define Package/crun CATEGORY:=Utilities TITLE:=crun URL:=https://github.com/containers/crun - DEPENDS:=@!arc +libseccomp +libcap + DEPENDS:=@!arc +libseccomp +libcap +libgcrypt endef define Package/crun/description diff --git a/utils/ctop/Makefile b/utils/ctop/Makefile index 69268008b..65180fad6 100644 --- a/utils/ctop/Makefile +++ b/utils/ctop/Makefile @@ -38,8 +38,8 @@ MAKE_VARS += \ GOPATH=$(GO_PKG_BUILD_DIR) \ GOCACHE=$(GO_BUILD_CACHE_DIR) \ GOROOT_FINAL=$(GO_TARGET_ROOT) \ - CC=$(TARGET_CC) \ - CXX=$(TARGET_CXX) \ + CC="$(TARGET_CC)" \ + CXX="$(TARGET_CXX)" \ $(GO_PKG_VARS) MAKE_FLAGS += \ COMMIT=$(PKG_SOURCE_VERSION) diff --git a/utils/lrzsz/Makefile b/utils/lrzsz/Makefile index 9eab1b681..5eb6f81e8 100644 --- a/utils/lrzsz/Makefile +++ b/utils/lrzsz/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lrzsz -PKG_VERSION:=0.12.20 -PKG_RELEASE:=3 +PKG_VERSION:=0.12.21 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://ohse.de/uwe/releases/ -PKG_HASH:=c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz +PKG_SOURCE_URL:=@DEBIAN/pool/main/l/lrzsz/ +PKG_HASH:=3262e5df47b108d33e184ff3bf5af14ddca1ac15118ac4ed9171a57c1593ae00 +PKG_BUILD_DIR=$(BUILD_DIR)/lrzsz-990823 PKG_MAINTAINER:=Hsing-Wang Liao PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING +PKG_CPE_ID:=cpe:/a:lrzsz_project PKG_INSTALL:=1 @@ -26,15 +28,24 @@ include $(INCLUDE_DIR)/package.mk define Package/lrzsz SECTION:=utils CATEGORY:=Utilities - TITLE:=X, Y and Z-modem protocols + TITLE:=Tools for zmodem/xmodem/ymodem file transfer URL:=https://ohse.de/uwe/software/lrzsz.html endef define Package/lrzsz/description - Transfer files in your login sessions. - Very leightweight and straight forward. - You just need a terminal client that can do - either X, Y or Z-modem file transfers. + lrzsz is a cosmetically modified zmodem/ymodem/xmodem package built + from the public-domain version of Chuck Forsberg's rzsz package. + + These programs use error correcting protocols ({z,x,y}modem) to send + (sz, sx, sb) and receive (rz, rx, rb) files over a dial-in serial port + from a variety of programs running under various operating systems. +endef + +# to stop automake from running, the bundled autohell crap is too old +define Build/Configure + touch $(PKG_BUILD_DIR)/* + touch $(PKG_BUILD_DIR)/*/* + $(call Build/Configure/Default) endef define Package/lrzsz/install diff --git a/utils/lrzsz/patches/001-siginterrupt-after-the-call-to-signal-otherwise-ymod.patch b/utils/lrzsz/patches/001-siginterrupt-after-the-call-to-signal-otherwise-ymod.patch new file mode 100644 index 000000000..730d46689 --- /dev/null +++ b/utils/lrzsz/patches/001-siginterrupt-after-the-call-to-signal-otherwise-ymod.patch @@ -0,0 +1,22 @@ +From 89fef6d8dc539ed6225b46b8e755e08bbf48d27b Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Sun, 1 Mar 2020 22:34:24 +0000 +Subject: [PATCH] siginterrupt after the call to signal, otherwise ymodem + transfer hangs. WTF? + +--- + src/zreadline.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/src/zreadline.c ++++ b/src/zreadline.c +@@ -71,6 +71,9 @@ readline_internal(unsigned int timeout) + vstringf("Calling read: alarm=%d Readnum=%d ", + n, readline_readnum); + signal(SIGALRM, zreadline_alarm_handler); ++#ifdef HAVE_SIGINTERRUPT ++ siginterrupt(SIGALRM,1); ++#endif + alarm(n); + } + else if (Verbose > 5) diff --git a/utils/lrzsz/patches/002-may-be-security-fix-avoid-possible-underflow.patch b/utils/lrzsz/patches/002-may-be-security-fix-avoid-possible-underflow.patch new file mode 100644 index 000000000..81ec95963 --- /dev/null +++ b/utils/lrzsz/patches/002-may-be-security-fix-avoid-possible-underflow.patch @@ -0,0 +1,28 @@ +From a7c525191aa725f4ebb7b489cdd7dd854a4e42fb Mon Sep 17 00:00:00 2001 +From: Uwe Ohse +Date: Sun, 1 Mar 2020 22:35:28 +0000 +Subject: [PATCH] may-be-security-fix: avoid possible underflow + +Fixes: CVE-2018-10195 + +[a.heider: mention CVE in commit message] +--- + src/zm.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/src/zm.c ++++ b/src/zm.c +@@ -432,10 +432,11 @@ zsdata(const char *buf, size_t length, i + VPRINTF(3,("zsdata: %lu %s", (unsigned long) length, + Zendnames[(frameend-ZCRCE)&3])); + crc = 0; +- do { ++ while (length>0) { + zsendline(*buf); crc = updcrc((0377 & *buf), crc); + buf++; +- } while (--length>0); ++ length--; ++ } + xsendline(ZDLE); xsendline(frameend); + crc = updcrc(frameend, crc); + diff --git a/utils/lrzsz/patches/100-install_delete_fix.patch b/utils/lrzsz/patches/100-install_delete_fix.patch index 7f3995d51..7263ab843 100644 --- a/utils/lrzsz/patches/100-install_delete_fix.patch +++ b/utils/lrzsz/patches/100-install_delete_fix.patch @@ -1,6 +1,6 @@ --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -372,13 +372,13 @@ install-exec-local: +@@ -414,13 +414,13 @@ install-exec-local: rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'` ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \ $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` diff --git a/utils/lrzsz/patches/200-format.patch b/utils/lrzsz/patches/200-format.patch index 0e244a0e2..26b86c16a 100644 --- a/utils/lrzsz/patches/200-format.patch +++ b/utils/lrzsz/patches/200-format.patch @@ -10,7 +10,7 @@ --- a/src/lrz.c +++ b/src/lrz.c -@@ -2319,7 +2319,7 @@ exec2(const char *s) +@@ -2296,7 +2296,7 @@ exec2(const char *s) if (*s == '!') ++s; io_mode(0,0); @@ -31,7 +31,7 @@ #endif --- a/src/lsz.c +++ b/src/lsz.c -@@ -1997,7 +1997,7 @@ zsendfdata (struct zm_fileinfo *zi) +@@ -1988,7 +1988,7 @@ zsendfdata (struct zm_fileinfo *zi) blklen = calc_blklen (total_sent); total_sent += blklen + OVERHEAD; if (Verbose > 2 && blklen != old) @@ -40,29 +40,9 @@ #ifdef HAVE_MMAP if (mm_addr) { if (zi->bytes_sent + blklen < mm_size) ---- a/src/tcp.c -+++ b/src/tcp.c -@@ -56,7 +56,7 @@ tcp_server (char *buf) - struct sockaddr_in s; - struct sockaddr_in t; - int on=1; -- size_t len; -+ socklen_t len; - - if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) { - error(1,errno,"socket"); -@@ -91,7 +91,7 @@ tcp_accept (int d) - { - int so; - struct sockaddr_in s; -- size_t namelen; -+ socklen_t namelen; - int num=0; - - namelen = sizeof(s); --- a/src/zm.c +++ b/src/zm.c -@@ -451,7 +451,7 @@ zsda32(const char *buf, size_t length, i +@@ -453,7 +453,7 @@ zsda32(const char *buf, size_t length, i int c; unsigned long crc; int i; @@ -73,7 +53,7 @@ zsendline_s(buf,length); --- a/src/zreadline.c +++ b/src/zreadline.c -@@ -68,13 +68,13 @@ readline_internal(unsigned int timeout) +@@ -68,7 +68,7 @@ readline_internal(unsigned int timeout) else if (n==0) n=1; if (Verbose > 5) @@ -81,6 +61,8 @@ + vstringf("Calling read: alarm=%u Readnum=%zu ", n, readline_readnum); signal(SIGALRM, zreadline_alarm_handler); + #ifdef HAVE_SIGINTERRUPT +@@ -77,7 +77,7 @@ readline_internal(unsigned int timeout) alarm(n); } else if (Verbose > 5) diff --git a/utils/mv88e6xxx_dump/Makefile b/utils/mv88e6xxx_dump/Makefile new file mode 100644 index 000000000..52bcea5ab --- /dev/null +++ b/utils/mv88e6xxx_dump/Makefile @@ -0,0 +1,37 @@ +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=mv88e6xxx_dump +PKG_RELEASE:=1 + +PKG_FIXUP:=autoreconf + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/lunn/mv88e6xxx_dump +PKG_MIRROR_HASH:=2f1bce89212a10be89e106398ccc2f7eedcc1a7299bf8a1a05b3baf061f779f5 +PKG_SOURCE_DATE:=2022.03.29 +PKG_SOURCE_VERSION:=a3f713f99e0004d17d9282e0cb253505b9ca35b6 + +PKG_MAINTAINER:=Etienne Champetier +PKG_LICENSE:=GPL-2.0-only + +include $(INCLUDE_DIR)/package.mk + +define Package/mv88e6xxx_dump + SECTION:=utils + CATEGORY:=Utilities + URL:=https://github.com/lunn/mv88e6xxx_dump + TITLE:=mv88e6xxx_dump + DEPENDS:=@(TARGET_ath79||TARGET_imx||TARGET_kirkwood||TARGET_mvebu||TARGET_qoriq) +libmnl +endef + +define Package/mv88e6xxx_dump/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mv88e6xxx_dump $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,mv88e6xxx_dump)) diff --git a/utils/nano/Makefile b/utils/nano/Makefile index b75158096..2db13c583 100644 --- a/utils/nano/Makefile +++ b/utils/nano/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nano -PKG_VERSION:=7.1 +PKG_VERSION:=7.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/nano -PKG_HASH:=57ba751e9b7519f0f6ddee505202e387c75dde440c1f7aa1b9310cc381406836 +PKG_HASH:=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/utils/ncdu/Makefile b/utils/ncdu/Makefile index 1b1e4f16d..c24566b51 100644 --- a/utils/ncdu/Makefile +++ b/utils/ncdu/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncdu -PKG_VERSION:=1.17 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.18 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dev.yorhel.nl/download -PKG_HASH:=810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1 +PKG_HASH:=3c37a1a96580c9c5d2cc352dc3c5eef0d909158c05f1cc29db4712544c8b9f95 PKG_MAINTAINER:=Charles E. Lehner PKG_LICENSE:=MIT diff --git a/utils/ncdu/patches/900-use-alternative-color.patch b/utils/ncdu/patches/900-use-alternative-color.patch index f804af476..f74f36f17 100644 --- a/utils/ncdu/patches/900-use-alternative-color.patch +++ b/utils/ncdu/patches/900-use-alternative-color.patch @@ -1,6 +1,6 @@ --- a/src/util.h +++ b/src/util.h -@@ -36,18 +36,18 @@ +@@ -39,18 +39,18 @@ void die(const char *, ...); C(DEFAULT, _,_,0 , _, _, 0, WHITE, BLACK,0)\ C(BOX_TITLE, _,_,B , BLUE, _, B, BLUE, BLACK,B)\ C(HD, _,_,R , BLACK, CYAN, 0, BLACK, CYAN, 0) /* header & footer */\ diff --git a/utils/openocd/Makefile b/utils/openocd/Makefile index 511538c2d..0792db288 100644 --- a/utils/openocd/Makefile +++ b/utils/openocd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openocd -PKG_SOURCE_VERSION:=v0.11.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_SOURCE_VERSION:=v0.12.0 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.code.sf.net/p/openocd/code -PKG_MIRROR_HASH:=ec31ce908d951c6c7e173c7474269f3f105d7a7b3991afbe8f54f8d96646c725 +PKG_MIRROR_HASH:=19085e31904d9a04a77dc79e02c441372498e680361e77fe9ffdb482c2ddb19c PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING @@ -36,10 +36,10 @@ define Package/openocd TITLE:=OpenOCD Utility URL:=http://openocd.sf.net/ DEPENDS:=+libusb-1.0 \ - +libusb-compat \ +libftdi1 \ +hidapi \ - +libgpiod + +libgpiod \ + +libjaylink endef define Package/openocd/description @@ -63,6 +63,7 @@ endef define Build/Prepare $(call Build/Prepare/Default) -$(RM) $(PKG_BUILD_DIR)/guess-rev.sh + -$(RM) $(PKG_BUILD_DIR)/jimtcl/configure.ac endef CONFIGURE_ARGS += \ diff --git a/utils/uvol/Makefile b/utils/uvol/Makefile index ab2f8ba61..256dbfbd1 100644 --- a/utils/uvol/Makefile +++ b/utils/uvol/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uvol -PKG_VERSION:=0.8 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=0.9 +PKG_RELEASE:=2 PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=GPL-2.0-or-later diff --git a/utils/uvol/files/autopart.defaults b/utils/uvol/files/autopart.defaults index 99ea09406..b403dd6df 100644 --- a/utils/uvol/files/autopart.defaults +++ b/utils/uvol/files/autopart.defaults @@ -56,23 +56,14 @@ part_fixup() { get_free_area() { local found= - sfdisk -q -F "$1" 2>/dev/null | while read -r start end sectors size; do + sfdisk --bytes -q -F "$1" 2>/dev/null | while read -r start end sectors size; do case $start in *"Unpartitioned"* | *"Units:"* | *"Sector"* | *"Start"* ) continue ;; [0-9]*) - case "$size" in - *"k" | *"b") - continue - ;; - *"M") - [ "${size%%.*M}" -lt 100 ] && continue - ;; - *"G" | *"T") - ;; - esac - [ "$found" ] || echo "start=$start, size=$((end - start))" + [ "$size" -lt $((100 * 1024 * 1024)) ] && continue + [ "$found" ] || echo "start=$start, size=$sectors" found=1 ;; esac