diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile index d871ef796bb452..8bd3b47edad4a3 100644 --- a/admin/debootstrap/Makefile +++ b/admin/debootstrap/Makefile @@ -9,10 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=debootstrap -PKG_VERSION:=1.0.128+nmu2+deb12u1 -PKG_RELEASE:=1 +PKG_REAL_VERSION:=1.0.128+nmu2+deb12u1 +PKG_VERSION:=1.0.128.2~deb121 +PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb +PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_REAL_VERSION)_all.udeb PKG_SOURCE_URL:=@DEBIAN/pool/main/d/debootstrap PKG_HASH:=4fa4ec7c144ed047c47d0d8eb9b91b56eaa9b2db2b52510777abbabf5965d268 @@ -20,6 +21,8 @@ PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=Unique PKG_LICENSE_FILES:=debian/copyright +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_REAL_VERSION) + UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf - include $(INCLUDE_DIR)/package.mk diff --git a/net/cifs-utils/Makefile b/net/cifs-utils/Makefile index fcc4b477387b9b..1055dd4610badc 100644 --- a/net/cifs-utils/Makefile +++ b/net/cifs-utils/Makefile @@ -30,6 +30,7 @@ include $(INCLUDE_DIR)/package.mk define Package/cifsmount SECTION:=net CATEGORY:=Network + SUBMENU:=Filesystem DEPENDS:=+kmod-fs-cifs TITLE:=CIFS mount URL:=https://wiki.samba.org/index.php/LinuxCIFS_utils diff --git a/net/dawn/Makefile b/net/dawn/Makefile index f67837690065dd..24abb9a926586b 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -25,6 +25,7 @@ include $(INCLUDE_DIR)/cmake.mk define Package/dawn SECTION:=net CATEGORY:=Network + SUBMENU:=Wireless TITLE:=Decentralized wifi controller URL:=https://github.com/berlin-open-wireless-lab/DAWN.git DEPENDS:=$(DRV_DEPENDS) +libubus +libubox +libblobmsg-json +libuci +libgcrypt +libiwinfo +umdns diff --git a/net/dnscrypt-proxy/Makefile b/net/dnscrypt-proxy/Makefile index 0ea8dbcf4cda32..bf8fc900122c1b 100644 --- a/net/dnscrypt-proxy/Makefile +++ b/net/dnscrypt-proxy/Makefile @@ -33,6 +33,7 @@ define Package/dnscrypt-proxy/Default SECTION:=net CATEGORY:=Network SUBMENU:=IP Addresses and Names + TITLE:=DNSCrypt-Proxy by Dyne, not actively maintained URL:=https://github.com/dyne/dnscrypt-proxy endef diff --git a/net/dnscrypt-proxy2/Makefile b/net/dnscrypt-proxy2/Makefile index 2c0286ed0c2527..1a1f10514a2136 100644 --- a/net/dnscrypt-proxy2/Makefile +++ b/net/dnscrypt-proxy2/Makefile @@ -36,6 +36,7 @@ define Package/dnscrypt-proxy2 SECTION:=net CATEGORY:=Network TITLE:=Flexible DNS proxy with encrypted DNS protocols + SUBMENU:=IP Addresses and Names URL:=https://github.com/DNSCrypt/dnscrypt-proxy DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle CONFLICTS:=dnscrypt-proxy diff --git a/net/family-dns/Makefile b/net/family-dns/Makefile index 54728656e0e644..544b78c1c82e39 100644 --- a/net/family-dns/Makefile +++ b/net/family-dns/Makefile @@ -17,6 +17,7 @@ define Package/family-dns SECTION:=net CATEGORY:=Network TITLE:=Family DNS + SUBMENU:=IP Addresses and Names PKGARCH:=all endef diff --git a/net/git-lfs/Makefile b/net/git-lfs/Makefile index 3c2b4320519448..e57169ec11123f 100644 --- a/net/git-lfs/Makefile +++ b/net/git-lfs/Makefile @@ -32,6 +32,7 @@ define Package/git-lfs SECTION:=net CATEGORY:=Network TITLE:=Git Large File Storage + SUBMENU:=Version Control Systems URL:=https://git-lfs.com DEPENDS:=$(GO_ARCH_DEPENDS) +git endef diff --git a/net/https-dns-proxy/Makefile b/net/https-dns-proxy/Makefile index 4746516491b307..81751e85493c52 100644 --- a/net/https-dns-proxy/Makefile +++ b/net/https-dns-proxy/Makefile @@ -30,6 +30,7 @@ define Package/https-dns-proxy SECTION:=net CATEGORY:=Network TITLE:=DNS Over HTTPS Proxy + SUBMENU:=IP Addresses and Names URL:=https://github.com/stangri/https-dns-proxy/ DEPENDS:=+libcares +libcurl +libev +ca-bundle +jsonfilter +resolveip DEPENDS+=+!BUSYBOX_DEFAULT_GREP:grep diff --git a/net/mdns-repeater/Makefile b/net/mdns-repeater/Makefile index 4546bedd1dde24..0c97556cad4584 100644 --- a/net/mdns-repeater/Makefile +++ b/net/mdns-repeater/Makefile @@ -24,6 +24,7 @@ define Package/mdns-repeater SECTION:=net CATEGORY:=Network TITLE:=Multicast DNS repeater for Linux + SUBMENU:=IP Addresses and Names URL:=https://github.com/kennylevinsen/mdns-repeater endef diff --git a/net/nbd/Makefile b/net/nbd/Makefile index d1aaa76a0b2794..e0e8bc6e4a3868 100644 --- a/net/nbd/Makefile +++ b/net/nbd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nbd PKG_VERSION:=3.25 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/NetworkBlockDevice/nbd/releases/download/$(PKG_NAME)-$(PKG_VERSION) diff --git a/net/nbd/patches/010-gcc14.patch b/net/nbd/patches/010-gcc14.patch new file mode 100644 index 00000000000000..73caec3cdbfbc2 --- /dev/null +++ b/net/nbd/patches/010-gcc14.patch @@ -0,0 +1,37 @@ +From 4664b8dd3bc124c27b160720113339c1da97c2c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 20 May 2024 17:50:51 -0700 +Subject: [PATCH] nbd-client: Fix build on musl + gcc14 + +GCC-14 has promoted incompatible-pointer-types warning into error which is +now flagged especially with when building on musl + +Fixes following error + +| ../nbd-3.26.1/nbd-client.c: In function 'openunix': +| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types] +| 345 | if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { +| | ^~~~~~~~ +| | | +| | struct sockaddr_un * +| In file included from ../nbd-3.26.1/nbd-client.c:25: +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' +| 386 | int connect (int, const struct sockaddr *, socklen_t); +| | ^~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- + nbd-client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/nbd-client.c ++++ b/nbd-client.c +@@ -341,7 +341,7 @@ int openunix(const char *path) { + return -1; + }; + +- if (connect(sock, &un_addr, sizeof(un_addr)) == -1) { ++ if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) { + err_nonfatal("CONNECT failed"); + close(sock); + return -1; diff --git a/net/nextdns/Makefile b/net/nextdns/Makefile index 66a05e71d85cab..0b62fded6ae5db 100644 --- a/net/nextdns/Makefile +++ b/net/nextdns/Makefile @@ -34,6 +34,7 @@ define Package/nextdns SECTION:=net CATEGORY:=Network TITLE:=NextDNS DNS over HTTPS Proxy + SUBMENU:=IP Addresses and Names URL:=https://github.com/nextdns/nextdns DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle endef diff --git a/net/onionshare-cli/Makefile b/net/onionshare-cli/Makefile index 42afb80fd1bce3..1295d0f1b3ef7c 100644 --- a/net/onionshare-cli/Makefile +++ b/net/onionshare-cli/Makefile @@ -31,6 +31,7 @@ define Package/onionshare-cli SECTION:=net CATEGORY:=Network TITLE:=Secure chat, web and file sharing + SUBMENU:=File Transfer URL:=https://onionshare.org/ DEPENDS:= \ +python3-light \ diff --git a/net/smartdns/Makefile b/net/smartdns/Makefile index 95482d2819434e..5cce92badcb111 100644 --- a/net/smartdns/Makefile +++ b/net/smartdns/Makefile @@ -29,6 +29,7 @@ define Package/smartdns SECTION:=net CATEGORY:=Network TITLE:=smartdns server + SUBMENU:=IP Addresses and Names DEPENDS:=+libpthread +libopenssl URL:=https://www.github.com/pymumu/smartdns/ endef diff --git a/net/xray-core/Makefile b/net/xray-core/Makefile index bb8971044bd0e3..e0020ced2b7165 100644 --- a/net/xray-core/Makefile +++ b/net/xray-core/Makefile @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk define Package/xray/template - TITLE:=A platform for building proxies to bypass network restrictions + TITLE:=A proxy platform to bypass network restrictions SECTION:=net CATEGORY:=Network URL:=https://xtls.github.io diff --git a/utils/hfsprogs/Makefile b/utils/hfsprogs/Makefile index a3c05c4132ed9b..e230dbcc1c4c67 100644 --- a/utils/hfsprogs/Makefile +++ b/utils/hfsprogs/Makefile @@ -8,13 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hfsprogs -PKG_VERSION:=540.1.linux3 +PKG_REAL_VERSION:=540.1.linux3 +PKG_VERSION:=$(subst linux,,$(PKG_REAL_VERSION)) PKG_RELEASE:=2 -PKG_SOURCE:=diskdev_cmds-$(PKG_VERSION).tar.gz +PKG_SOURCE:=diskdev_cmds-$(PKG_REAL_VERSION).tar.gz PKG_SOURCE_URL:=https://src.fedoraproject.org/repo/pkgs/hfsplus-tools/$(PKG_SOURCE)/0435afc389b919027b69616ad1b05709 PKG_HASH:=b01b203a97f9a3bf36a027c13ddfc59292730552e62722d690d33bd5c24f5497 -PKG_BUILD_DIR:=$(BUILD_DIR)/diskdev_cmds-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/diskdev_cmds-$(PKG_REAL_VERSION) PKG_MAINTAINER:= PKG_LICENSE:=APSL-2.0 @@ -59,7 +60,7 @@ TARGET_CFLAGS+=$(if $(CONFIG_USE_MUSL),-D__P\(x\)=x -D__va_copy=va_copy -DBSD_SO define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS+="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1 -D VERSION=\\\"$(PKG_VERSION)\\\"" \ + CFLAGS+="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -I$(PKG_BUILD_DIR)/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1 -D VERSION=\\\"$(PKG_REAL_VERSION)\\\"" \ LDFLAGS+="$(TARGET_LDFLAGS)" \ all endef diff --git a/utils/ncdu/Makefile b/utils/ncdu/Makefile index ffaff9c2045207..3579c8aafb8628 100644 --- a/utils/ncdu/Makefile +++ b/utils/ncdu/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ncdu -PKG_VERSION:=1.20 +PKG_VERSION:=1.21 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://dev.yorhel.nl/download -PKG_HASH:=5fe2bb841abe72374bb242dbb93293c4ae053078432d896a7481b2ff10be9572 +PKG_HASH:=a894d3a9b46bce578a6039bef48f54533ec402fb589b0769bfbb1d1edf9601a6 PKG_MAINTAINER:=Charles E. Lehner PKG_LICENSE:=MIT