From 3dfe576c0df52c001649f51c5e0a23e560bda878 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Tue, 2 Jun 2015 20:02:42 +0200
Subject: [PATCH] iptables: move to usr/bin + removed systemd service

---
 srcpkgs/iptables/files/ip6tables.service      | 11 -----------
 srcpkgs/iptables/files/iptables-flush.scripts |  4 ++--
 srcpkgs/iptables/files/iptables.service       | 11 -----------
 srcpkgs/iptables/template                     | 10 ++--------
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/iptables/files/ip6tables.service
 delete mode 100644 srcpkgs/iptables/files/iptables.service

diff --git a/srcpkgs/iptables/files/ip6tables.service b/srcpkgs/iptables/files/ip6tables.service
deleted file mode 100644
index 204b0b36095..00000000000
--- a/srcpkgs/iptables/files/ip6tables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=IPv6 Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecStop=/usr/libexec/iptables-flush -6
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/iptables/files/iptables-flush.scripts b/srcpkgs/iptables/files/iptables-flush.scripts
index 238e1a9d891..8749c082a77 100644
--- a/srcpkgs/iptables/files/iptables-flush.scripts
+++ b/srcpkgs/iptables/files/iptables-flush.scripts
@@ -1,11 +1,11 @@
 #!/bin/sh
 # Usage: iptables-flush [-6]
 
-iptables=/usr/sbin/iptables
+iptables=/usr/bin/iptables
 tables="filter mangle raw"
 
 if [ "$1" = "-6" ]; then
-  iptables=/usr/sbin/ip6tables
+  iptables=/usr/bin/ip6tables
 else
   # Only ipv4 has a nat table
   tables="$tables nat"
diff --git a/srcpkgs/iptables/files/iptables.service b/srcpkgs/iptables/files/iptables.service
deleted file mode 100644
index f5288dfdde3..00000000000
--- a/srcpkgs/iptables/files/iptables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecStop=/usr/libexec/iptables-flush
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index bab14a5ec31..5c03e6db10c 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,10 +1,9 @@
 # Template file for 'iptables'
 pkgname=iptables
 version=1.4.21
-revision=6
+revision=8
 build_style=gnu-configure
-build_options="systemd"
-configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
+configure_args="--sbindir=/usr/bin --enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
 hostmakedepends="pkg-config"
 makedepends="libpcap-devel"
 short_desc="Linux IPv[46] packet filtering ruleset"
@@ -25,11 +24,6 @@ pre_build() {
 	rm include/linux/types.h
 }
 post_install() {
-	# systemd services.
-	if [ "$build_option_systemd" ]; then
-		vmkdir usr/lib/systemd/system
-		install -m644 ${FILESDIR}/*.service ${DESTDIR}/usr/lib/systemd/system
-	fi
 	vsv iptables
 	vsv ip6tables
 	vinstall ${FILESDIR}/iptables-flush.scripts 755 usr/libexec iptables-flush