jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ebtables: removed in favor of the version provided by the iptables package.

Browse source
This commit is contained in:
Kyle Nusbaum 2019-03-27 10:47:20 -05:00 committed by maxice8
parent 140f539de6
commit 89e4f0f33f
6 changed files with 9 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/ebtables/INSTALL.msg Normal file
View file

@ -0,0 +1 @@
ebtables is no longer provided by Void Linux, and will be fully removed from the repos on 2019-06-26

2
srcpkgs/ebtables/files/ebtables/finish
View file

@ -1,2 +0,0 @@
#!/bin/sh
ebtables-save > /etc/ebtables.conf

3
srcpkgs/ebtables/files/ebtables/run
View file

@ -1,3 +0,0 @@
#!/bin/sh
ebtables-restore < "/etc/ebtables.conf"
exec chpst -b ebtables pause

141
srcpkgs/ebtables/patches/musl-fixes.patch
View file

@ -1,141 +0,0 @@
This patch was made by Natanael Copa of the Alpine Linux project.
http://git.alpinelinux.org/cgit/aports/commit/?id=0f5076024a9700644ac9d542d2ca643fa38e77da
--- Makefile.orig
+++ Makefile
@@ -17,7 +17,7 @@
SYSCONFIGDIR:=/etc/sysconfig
DESTDIR:=
-CFLAGS:=-Wall -Wunused -Werror
+CFLAGS:=-Wall -Wunused
CFLAGS_SH_LIB:=-fPIC -O3
CC:=gcc
--- extensions/ebt_among.c.orig
+++ extensions/ebt_among.c
@@ -12,14 +12,14 @@
#include <getopt.h>
#include <ctype.h>
#include <unistd.h>
-#include "../include/ebtables_u.h"
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <netinet/ether.h>
+#include "../include/ebtables_u.h"
#include "../include/ethernetdb.h"
#include <linux/if_ether.h>
#include <linux/netfilter_bridge/ebt_among.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#define AMONG_DST '1'
#define AMONG_SRC '2'
--- extensions/ebt_arpreply.c.orig
+++ extensions/ebt_arpreply.c
@@ -11,8 +11,8 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include "../include/ebtables_u.h"
#include <netinet/ether.h>
+#include "../include/ebtables_u.h"
#include <linux/netfilter_bridge/ebt_arpreply.h>
static int mac_supplied;
--- extensions/ebt_ip6.c.orig
+++ extensions/ebt_ip6.c
@@ -53,8 +53,8 @@
struct icmpv6_names {
const char *name;
- u_int8_t type;
- u_int8_t code_min, code_max;
+ uint8_t type;
+ uint8_t code_min, code_max;
};
static const struct icmpv6_names icmpv6_codes[] = {
--- extensions/ebt_limit.c.orig
+++ extensions/ebt_limit.c
@@ -59,11 +59,11 @@
" default %u\n", EBT_LIMIT_BURST);
}
-static int parse_rate(const char *rate, u_int32_t *val)
+static int parse_rate(const char *rate, uint32_t *val)
{
const char *delim;
- u_int32_t r;
- u_int32_t mult = 1; /* Seconds by default. */
+ uint32_t r;
+ uint32_t mult = 1; /* Seconds by default. */
delim = strchr(rate, '/');
if (delim) {
@@ -151,7 +151,7 @@
struct rates
{
const char *name;
- u_int32_t mult;
+ uint32_t mult;
};
static struct rates g_rates[] =
@@ -162,7 +162,7 @@
{ "sec", EBT_LIMIT_SCALE }
};
-static void print_rate(u_int32_t period)
+static void print_rate(uint32_t period)
{
unsigned int i;
--- extensions/ebt_nat.c.orig
+++ extensions/ebt_nat.c
@@ -10,8 +10,8 @@
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
-#include "../include/ebtables_u.h"
#include <netinet/ether.h>
+#include "../include/ebtables_u.h"
#include <linux/netfilter_bridge/ebt_nat.h>
static int to_source_supplied, to_dest_supplied;
--- include/ethernetdb.h.orig
+++ include/ethernetdb.h
@@ -30,6 +30,10 @@
#define _PATH_ETHERTYPES "/etc/ethertypes"
#endif /* _PATH_ETHERTYPES */
+#ifndef __THROW
+#define __THROW
+#endif
+
struct ethertypeent {
char *e_name; /* Official ethernet type name. */
char **e_aliases; /* Alias list. */
--- useful_functions.c.orig
+++ useful_functions.c
@@ -22,8 +22,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "include/ebtables_u.h"
-#include "include/ethernetdb.h"
+#define _GNU_SOURCE
#include <stdio.h>
#include <netinet/ether.h>
#include <string.h>
@@ -33,6 +32,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include "include/ebtables_u.h"
+#include "include/ethernetdb.h"
const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0};
const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0};

32
srcpkgs/ebtables/template
View file

@ -1,30 +1,10 @@
# Template file for 'ebtables'
pkgname=ebtables
version=2.0.10.4
revision=7
_distver=${version%.*}-${version##*.}
wrksrc=${pkgname}-v${_distver}
build_style=gnu-makefile
conf_files="/etc/ebtables.conf"
short_desc="Filtering tool for a Linux-based bridging firewall"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
revision=8
archs=noarch
build_style=meta
depends="iptables"
short_desc="Filtering tool for a Linux-based bridging firewall (removed package)"
license="metapackage"
homepage="http://ebtables.netfilter.org/"
depends="perl iptables"
distfiles="http://ftp.netfilter.org/pub/ebtables/${pkgname}-v${_distver}.tar.gz"
checksum=dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d
make_install_args="
MANDIR=/usr/share/man \
BINDIR=/usr/bin \
INITDIR=/etc/rc.d \
SYSCONFIGDIR=/etc
"
LDFLAGS="-Wl,--no-as-needed"
post_install() {
rm -r $DESTDIR/etc/rc.d $DESTDIR/etc/ebtables-config
touch $DESTDIR/etc/ebtables.conf
vsv ebtables
rm $DESTDIR/etc/ethertypes
}

4
srcpkgs/libvirt/template
View file

@ -1,7 +1,7 @@
# Template file for 'libvirt'
pkgname=libvirt
version=5.1.0
revision=1
revision=2
build_style=gnu-configure
configure_args="--without-hal --with-storage-lvm --with-qemu
--with-qemu-user=libvirt --with-qemu-group=libvirt --without-netcf
@ -27,7 +27,7 @@ makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel
libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel jansson-devel
python-devel libssh2-devel fuse-devel libtirpc-devel
libapparmor-devel"
depends="ebtables dnsmasq"
depends="iptables dnsmasq"
case "$XBPS_TARGET_MACHINE" in
i686*) configure_args+=" --without-xen"; makedepends+=" libnuma-devel";;