summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d44089a4a568..78dabf79cea4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = iptables-fullconenat
pkgdesc = Linux kernel packet control tool with FULLCONENAT support.
pkgver = 1.8.3
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://www.netfilter.org/projects/iptables/index.html
install = iptables-fullconenat.install
@@ -15,6 +15,7 @@ pkgbase = iptables-fullconenat
depends = bash
depends = netfilter-fullconenat-dkms-git
provides = iptables
+ conflicts = iptables
backup = etc/ethertypes
backup = etc/iptables/iptables.rules
backup = etc/iptables/ip6tables.rules
@@ -65,9 +66,11 @@ pkgname = iptables-fullconenat-nft
depends = netfilter-fullconenat-dkms-git
depends = nftables
provides = iptables
+ provides = iptables-fullconenat
provides = arptables
provides = ebtables
conflicts = iptables
+ conflicts = iptables-fullconenat
conflicts = arptables
conflicts = ebtables
backup = etc/ethertypes
diff --git a/PKGBUILD b/PKGBUILD
index 72df5917a3de..3cc7351e2a10 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgbase=iptables
pkgbase=iptables-fullconenat
pkgname=(iptables-fullconenat iptables-fullconenat-nft)
pkgver=1.8.3
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Linux kernel packet control tool with FULLCONENAT support.'
arch=(x86_64)
@@ -13,6 +13,7 @@ url='https://www.netfilter.org/projects/iptables/index.html'
depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash netfilter-fullconenat-dkms-git)
makedepends=(linux-api-headers)
provides=('iptables')
+conflicts=(iptables)
install=${pkgbase}.install
backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
source=(https://www.netfilter.org/projects/iptables/files/$_pkgbase-$pkgver.tar.bz2{,.sig}
@@ -69,8 +70,8 @@ package_iptables-fullconenat() {
package_iptables-fullconenat-nft() {
pkgdesc+=' (using nft interface)'
depends+=(nftables)
- provides=(iptables arptables ebtables)
- conflicts=(iptables arptables ebtables)
+ provides=(iptables iptables-fullconenat arptables ebtables)
+ conflicts=(iptables iptables-fullconenat arptables ebtables)
backup+=(etc/{arp,eb}tables.conf)
_package nft