From 9820b3f4b1d2aa79354f33c025556eec12ca18f7 Mon Sep 17 00:00:00 2001 From: Echo Nar Date: Wed, 18 Jun 2025 20:56:09 -0500 Subject: [PATCH] Revert "New package: miniupnpd-nftables" This reverts commit 2c9f97e064454d64065b1fcbe1c84bb8cea7ddf7. Remove package as this work was not ready to be merged due issues with nftable rule generation. --- .../miniupnpd-nftables/files/README.voidlinux | 3 -- .../miniupnpd-nftables/files/miniupnpd/run | 4 -- .../patches/fix-configure-script.patch | 11 ---- srcpkgs/miniupnpd-nftables/template | 53 ------------------- srcpkgs/miniupnpd-nftables/update | 1 - 5 files changed, 72 deletions(-) delete mode 100644 srcpkgs/miniupnpd-nftables/files/README.voidlinux delete mode 100644 srcpkgs/miniupnpd-nftables/files/miniupnpd/run delete mode 100644 srcpkgs/miniupnpd-nftables/patches/fix-configure-script.patch delete mode 100644 srcpkgs/miniupnpd-nftables/template delete mode 100644 srcpkgs/miniupnpd-nftables/update diff --git a/srcpkgs/miniupnpd-nftables/files/README.voidlinux b/srcpkgs/miniupnpd-nftables/files/README.voidlinux deleted file mode 100644 index eb4380b5753..00000000000 --- a/srcpkgs/miniupnpd-nftables/files/README.voidlinux +++ /dev/null @@ -1,3 +0,0 @@ -Before running miniupnpd edit the scripts and configuration files in /etc/miniupnpd/. -Load the nftable rules by executing /etc/miniupnpd/nft_init.sh manually or by adding -the script to /etc/sv/minidlnad/run. diff --git a/srcpkgs/miniupnpd-nftables/files/miniupnpd/run b/srcpkgs/miniupnpd-nftables/files/miniupnpd/run deleted file mode 100644 index 9634ae5d576..00000000000 --- a/srcpkgs/miniupnpd-nftables/files/miniupnpd/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ -r conf ] && . ./conf -exec 2>&1 -exec miniupnpd ${OPTS:=-f /etc/miniupnpd/miniupnpd.conf} diff --git a/srcpkgs/miniupnpd-nftables/patches/fix-configure-script.patch b/srcpkgs/miniupnpd-nftables/patches/fix-configure-script.patch deleted file mode 100644 index 3836c3b1844..00000000000 --- a/srcpkgs/miniupnpd-nftables/patches/fix-configure-script.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure -+++ b/configure -@@ -49,7 +49,7 @@ - --iptablespath=*) - IPTABLESPATH=$(echo $argv | cut -d= -f2) ;; - --getifaddrs) GETIFADDRS=1 ;; -- --v6sockets-v6only) V6SOCKETS_ARE_V6ONLY="0" -+ --v6sockets-v6only) V6SOCKETS_ARE_V6ONLY="0" ;; - --host-os=*) - OS_NAME=$(echo $argv | cut -d= -f2) ;; - --host-os-version=*) diff --git a/srcpkgs/miniupnpd-nftables/template b/srcpkgs/miniupnpd-nftables/template deleted file mode 100644 index c4ece3fcfcc..00000000000 --- a/srcpkgs/miniupnpd-nftables/template +++ /dev/null @@ -1,53 +0,0 @@ -# Template file for 'miniupnpd-nftables' -pkgname=miniupnpd-nftables -version=2.3.9 -revision=1 -build_style=configure -configure_args=" - --disable-fork - --ipv6 - --igd2 - --leasefile - --firewall=nftables" -make_install_args=" - INSTALLPREFIX=/usr - SBINDIR=/usr/bin" -conf_files=" - /etc/miniupnpd/*.conf - /etc/miniupnpd/*.sh" -hostmakedepends="pkg-config" -makedepends="libnfnetlink-devel libnftnl-devel openssl-devel" -checkdepends="iproute2 nftables which" -short_desc="Lightweight UPnP IGD daemon with nftables support" -maintainer="Echo Nar " -license="BSD-3-Clause" -homepage="http://miniupnp.free.fr" -changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpd-${version}.tar.gz" -distfiles="http://miniupnp.free.fr/files/miniupnpd-${version}.tar.gz" -checksum=66cb3c3d697ab2bb3a61d3c48628166d6ba328d7c2dbeb95898fdf2a3202af7b -conflicts="miniupnpd" - -if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" -fi - -post_extract() { - vsed -i "${wrksrc}/configure" \ - -e 's|LSB_RELEASE=.*|LSB_RELEASE=$(false)|' \ - -e 's|V6SOCKETS_ARE_V6ONLY=.*|V6SOCKETS_ARE_V6ONLY="0"|' -} - - -post_configure() { - vsed -i "${wrksrc}/config.h" \ - -e 's|^#define OS_URL.*$|#define OS_URL "https://voidlinux.org/"|g' \ - -e 's|^#define OS_NAME.*$|#define OS_NAME "Void"|g' \ - -e 's|^#define OS_VERSION.*$|#define OS_VERSION "Void"|g' -} - -post_install() { - rm -rf "${DESTDIR}/etc/init.d" - vsv miniupnpd - vlicense LICENSE - vdoc "${FILESDIR}/README.voidlinux" -} diff --git a/srcpkgs/miniupnpd-nftables/update b/srcpkgs/miniupnpd-nftables/update deleted file mode 100644 index 7096d869ff8..00000000000 --- a/srcpkgs/miniupnpd-nftables/update +++ /dev/null @@ -1 +0,0 @@ -ignore="*.???????? 20[0123456789][0123456789]????"