From ce6071eed842484e91d1b5464c81ee5c39446428 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Fri, 25 Apr 2025 16:29:44 +0800 Subject: [PATCH] update 2025-04-25 16:29:44 --- haproxy/Makefile | 4 +- haproxy/get-latest-patches.sh | 2 +- libtorrent-rasterbar/Makefile | 93 ++++++++++++--------- nikki/Makefile | 8 +- transmission/Makefile | 2 +- transmission/files/transmission-daemon.json | 3 + 6 files changed, 66 insertions(+), 46 deletions(-) diff --git a/haproxy/Makefile b/haproxy/Makefile index 261596c02..edef6d993 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=3.0.9 +PKG_VERSION:=3.0.10 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src -PKG_HASH:=7dc731b681b7aa93dc23aa36b85fa7b91bb1cf53faaca97404544ea454acecad +PKG_HASH:=d1508670b6fd5839c669a0a916842f0d3d3d0b578bb351a2a74a1de3d929ce26 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/haproxy/get-latest-patches.sh b/haproxy/get-latest-patches.sh index 66946aab7..3e2d3943e 100755 --- a/haproxy/get-latest-patches.sh +++ b/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-3.0.git -BASE_TAG=v3.0.9 +BASE_TAG=v3.0.10 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/libtorrent-rasterbar/Makefile b/libtorrent-rasterbar/Makefile index 1a56820a7..7f8bed681 100644 --- a/libtorrent-rasterbar/Makefile +++ b/libtorrent-rasterbar/Makefile @@ -1,62 +1,83 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtorrent-rasterbar -PKG_VERSION:=2.0.10 +PKG_VERSION:=2.0.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/arvidn/libtorrent/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=fc935b8c1daca5c0a4d304bff59e64e532be16bb877c012aea4bda73d9ca885d +PKG_HASH:=f0db58580f4f29ade6cc40fa4ba80e2c9a70c90265cd77332d3cdec37ecf1e6d PKG_MAINTAINER:=David Yang PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=COPYING +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_python3-libtorrent + +CMAKE_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 +PYTHON3_PKG_WHEEL_NAME:=libtorrent + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk define Package/libtorrent-rasterbar/Default - TITLE:=Rasterbar BitTorrent library - URL:=https://libtorrent.org/ + TITLE:=Rasterbar BitTorrent library + URL:=https://libtorrent.org/ endef define Package/libtorrent-rasterbar - $(call Package/libtorrent-rasterbar/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+boost +boost-system +libopenssl +libatomic +libstdcpp + $(call Package/libtorrent-rasterbar/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+boost-system +libopenssl +libatomic +libstdcpp endef -#define Package/python3-libtorrent -# $(call Package/libtorrent-rasterbar/Default) -# SECTION:=lang -# CATEGORY:=Languages -# SUBMENU:=Python -# TITLE+= (Python 3) -# DEPENDS:=+libtorrent-rasterbar +boost-python -#endef +define Package/python3-libtorrent + $(call Package/libtorrent-rasterbar/Default) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE+= (Python 3) + DEPENDS:=+libtorrent-rasterbar +boost-python3 +endef define Package/libtorrent-rasterbar/description - Rasterbar libtorrent is a C++ library that aims to be a good alternative to - all the other bittorrent implementations around. + Rasterbar libtorrent is a C++ library that aims to be a good alternative to + all the other bittorrent implementations around. endef -#define Package/python3-libtorrent/description -# $(call Package/libtorrent-rasterbar/description) -# This package contains Python 3 bindings for the libtorrent-rasterbar library. -#endef +define Package/python3-libtorrent/description + $(call Package/libtorrent-rasterbar/description) + This package contains Python 3 bindings for the libtorrent-rasterbar library. +endef -#CMAKE_OPTIONS += \ -# -Dpython-bindings=ON \ -# -Dpython-egg-info=ON +ifneq ($(CONFIG_PACKAGE_python3-libtorrent),) +CMAKE_OPTIONS += \ + -Dpython-bindings=ON \ + -Dpython-egg-info=ON +endif -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent-rasterbar.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/ +define Build/Configure + $(call Build/Configure/Default) +ifneq ($(CONFIG_PACKAGE_python3-libtorrent),) + $(call Py3Build/Configure) +endif +endef + +define Build/Compile + $(call Build/Compile/Default) +ifneq ($(CONFIG_PACKAGE_python3-libtorrent),) + $(call Py3Build/Compile) +endif +endef + +define Build/Install + $(call Build/Install/Default) +ifneq ($(CONFIG_PACKAGE_python3-libtorrent),) + $(call Py3Build/Install/Default) +endif endef define Package/libtorrent-rasterbar/install @@ -64,10 +85,6 @@ define Package/libtorrent-rasterbar/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent-rasterbar.so.* $(1)/usr/lib/ endef -#define Package/python3-libtorrent/install -# $(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages -# $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/*.so* $(1)/usr/lib/python2.7/site-packages/ -#endef - $(eval $(call BuildPackage,libtorrent-rasterbar)) -#$(eval $(call BuildPackage,python3-libtorrent)) +$(eval $(call Py3Package,python3-libtorrent)) +$(eval $(call BuildPackage,python3-libtorrent)) diff --git a/nikki/Makefile b/nikki/Makefile index 4e775ec6d..5c380389e 100644 --- a/nikki/Makefile +++ b/nikki/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git -PKG_SOURCE_DATE:=2025-04-19 -PKG_SOURCE_VERSION:=d5243adf8911563677d3bd190b82623c93e554b7 -PKG_MIRROR_HASH:=21c1ae1ea0bbf74584f50a82261bea078aa6c600d17e105b4035287fb1dacc8b +PKG_SOURCE_DATE:=2025-04-25 +PKG_SOURCE_VERSION:=efc7abc6e0e00f4b4d8de084cf1460d7ce56ba22 +PKG_MIRROR_HASH:=95f2d53bfcc91ad16a22464e3de9f1a02fecd6cc1b758af1350b2fd8da2066c3 PKG_LICENSE:=GPL3.0+ PKG_MAINTAINER:=Joseph Mory @@ -16,7 +16,7 @@ PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 -PKG_BUILD_VERSION:=alpha-d5243ad +PKG_BUILD_VERSION:=alpha-efc7abc PKG_BUILD_TIME:=$(shell date -u -Iseconds) GO_PKG:=github.com/metacubex/mihomo diff --git a/transmission/Makefile b/transmission/Makefile index f4ee60ea6..0974ba7d0 100644 --- a/transmission/Makefile +++ b/transmission/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission PKG_VERSION:=4.0.6 -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/transmission/files/transmission-daemon.json b/transmission/files/transmission-daemon.json index d4125103d..77e0cc413 100644 --- a/transmission/files/transmission-daemon.json +++ b/transmission/files/transmission-daemon.json @@ -35,9 +35,12 @@ "fsync", "futex", "getdents64", + "getegid", "getegid32", "getenv", + "geteuid", "geteuid32", + "getgid", "getgid32", "getpeername", "getpid",