From 140f539de65b34e60d70a970dfb68ae817d50616 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Wed, 27 Mar 2019 10:46:49 -0500 Subject: [PATCH] arptables: removed in favor of the version provided by the iptables package. --- srcpkgs/arptables/INSTALL.msg | 1 + srcpkgs/arptables/files/arptables/finish | 5 ---- srcpkgs/arptables/files/arptables/run | 6 ----- .../arptables/patches/makefile-cflags.patch | 13 ----------- srcpkgs/arptables/template | 23 +++++-------------- 5 files changed, 7 insertions(+), 41 deletions(-) create mode 100644 srcpkgs/arptables/INSTALL.msg delete mode 100755 srcpkgs/arptables/files/arptables/finish delete mode 100755 srcpkgs/arptables/files/arptables/run delete mode 100644 srcpkgs/arptables/patches/makefile-cflags.patch diff --git a/srcpkgs/arptables/INSTALL.msg b/srcpkgs/arptables/INSTALL.msg new file mode 100644 index 00000000000..c209534e908 --- /dev/null +++ b/srcpkgs/arptables/INSTALL.msg @@ -0,0 +1 @@ +arptables is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-26 diff --git a/srcpkgs/arptables/files/arptables/finish b/srcpkgs/arptables/files/arptables/finish deleted file mode 100755 index 5c5d5361f8f..00000000000 --- a/srcpkgs/arptables/files/arptables/finish +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -RULES=/etc/iptables/arptables.rules -[ -r conf ] && . ./conf -[ -n $SKIP_SAVE ] && exit 0 -arptables-save > $RULES diff --git a/srcpkgs/arptables/files/arptables/run b/srcpkgs/arptables/files/arptables/run deleted file mode 100755 index cf92801f9e6..00000000000 --- a/srcpkgs/arptables/files/arptables/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -RULES=/etc/iptables/arptables.rules -[ -r conf ] && . ./conf -[ -r $RULES ] || exit 0 -arptables-restore < $RULES -exec chpst -b arptables pause diff --git a/srcpkgs/arptables/patches/makefile-cflags.patch b/srcpkgs/arptables/patches/makefile-cflags.patch deleted file mode 100644 index 34dd2a8e776..00000000000 --- a/srcpkgs/arptables/patches/makefile-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ --D__GLIBC__=2 is required to build on *-musl, -it's normally defined by features.h of glibc. ---- Makefile.orig -+++ Makefile -@@ -11,7 +11,7 @@ - DESTDIR:= - - COPT_FLAGS:=-O2 --CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -+override CFLAGS+=-Wall -D__GLIBC__=2 -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" - - ifndef ARPT_LIBDIR - ARPT_LIBDIR:=$(LIBDIR)/arptables diff --git a/srcpkgs/arptables/template b/srcpkgs/arptables/template index 4c3e6f610ff..e01a175f92a 100644 --- a/srcpkgs/arptables/template +++ b/srcpkgs/arptables/template @@ -1,21 +1,10 @@ # Template file for 'arptables' pkgname=arptables version=0.0.4 -revision=2 -wrksrc="${pkgname}-v${version}" -build_style=gnu-makefile -depends="perl" -short_desc="ARP table administration" -maintainer="beefcurtains " -license="GPL-2.0-only" +revision=3 +archs=noarch +build_style=meta +depends="iptables" +short_desc="ARP table administration (removed package)" +license="metapackage" homepage="http://ebtables.sourceforge.net/" -distfiles="ftp://ftp.netfilter.org/pub/arptables/arptables-v${version}.tar.gz" -checksum=277985e29ecd93bd759a58242cad0e02ba9d4a6e1b7795235e3b507661bc0049 - -do_install() { - vbin arptables - vbin arptables-restore - vbin arptables-save - vman arptables.8 - vsv arptables -}