[lilac] updated to 1:1.8.7-3

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4bb8e9268f5..5333b7e7c7d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = iptables-fullconenat
 	pkgdesc = Linux kernel packet control tool with FULLCONENAT support.
 	pkgver = 1.8.7
-	pkgrel = 1
+	pkgrel = 3
 	epoch = 1
 	url = https://www.netfilter.org/projects/iptables/index.html
 	install = iptables-fullconenat.install
@@ -13,7 +13,7 @@ pkgbase = iptables-fullconenat
 	depends = libnfnetlink
 	depends = libnetfilter_conntrack
 	depends = bash
-	depends = netfilter-fullconenat
+	optdepends = netfilter-fullconenat: kernel module for fullconenat
 	provides = iptables
 	conflicts = iptables
 	backup = etc/ethertypes
@@ -34,7 +34,8 @@ pkgbase = iptables-fullconenat
 	source = ip6tables.service
 	source = iptables-legacy-flush
 	source = iptables-nft-flush
-	source = libipt_FULLCONENAT.c::https://raw.githubusercontent.com/Chion82/netfilter-full-cone-nat/master/libipt_FULLCONENAT.c
+	source = libipt_FULLCONENAT.c::https://raw.githubusercontent.com/llccd/netfilter-full-cone-nat/dev/libipt_FULLCONENAT.c
+	source = libip6t_FULLCONENAT.c::https://raw.githubusercontent.com/llccd/netfilter-full-cone-nat/dev/libip6t_FULLCONENAT.c
 	validpgpkeys = 37D964ACC04981C75500FB9BD55D978A8A1420E4
 	sha1sums = 05ef75415cb7cb7641f51d51e74f3ea29cc31ab1
 	sha1sums = SKIP
@@ -51,7 +52,8 @@ pkgbase = iptables-fullconenat
 	sha1sums = 9cec592787e32451f58fa608ea057870e07aa704
 	sha1sums = d10af7780d1634778d898c709e2d950aa1561856
 	sha1sums = 15c1684f3e671f4d0ede639a7c9c08e1a841511c
-	sha1sums = 6defc372f039b484948c9bb6d88737967818b2dd
+	sha1sums = 4a4f5ebc8e30c573f9c3220b8135e3101f8da18c
+	sha1sums = 878a1e0a306f274b285a26d3d4a3f2072caa31e3
 
 pkgname = iptables-fullconenat
 	pkgdesc = Linux kernel packet control tool with FULLCONENAT support. (using legacy interface)
@@ -63,7 +65,6 @@ pkgname = iptables-fullconenat-nft
 	depends = libnfnetlink
 	depends = libnetfilter_conntrack
 	depends = bash
-	depends = netfilter-fullconenat
 	depends = nftables
 	provides = iptables
 	provides = iptables-fullconenat
@@ -78,4 +79,3 @@ pkgname = iptables-fullconenat-nft
 	backup = etc/iptables/ip6tables.rules
 	backup = etc/arptables.conf
 	backup = etc/ebtables.conf
-
diff --git a/PKGBUILD b/PKGBUILD
index 1b8c4255ade8..d86e3a110b6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,14 +4,15 @@ _pkgbase=iptables
 pkgbase=iptables-fullconenat
 pkgname=(iptables-fullconenat iptables-fullconenat-nft)
 pkgver=1.8.7
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc='Linux kernel packet control tool with FULLCONENAT support.'
 arch=(x86_64)
 license=(GPL2)
 url='https://www.netfilter.org/projects/iptables/index.html'
-depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash netfilter-fullconenat)
+depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash)
 makedepends=(linux-api-headers)
+optdepends=("netfilter-fullconenat: kernel module for fullconenat")
 provides=('iptables')
 conflicts=(iptables)
 install=${pkgbase}.install
@@ -19,7 +20,8 @@ backup=(etc/ethertypes etc/iptables/{ip,ip6}tables.rules)
 source=(https://www.netfilter.org/projects/iptables/files/$_pkgbase-$pkgver.tar.bz2{,.sig}
         empty.rules simple_firewall.rules empty-{filter,mangle,nat,raw,security}.rules
         {arp,eb,ip,ip6}tables.service iptables-{legacy,nft}-flush
-        "libipt_FULLCONENAT.c::https://raw.githubusercontent.com/Chion82/netfilter-full-cone-nat/master/libipt_FULLCONENAT.c")
+        "libipt_FULLCONENAT.c::https://raw.githubusercontent.com/llccd/netfilter-full-cone-nat/dev/libipt_FULLCONENAT.c"
+        "libip6t_FULLCONENAT.c::https://raw.githubusercontent.com/llccd/netfilter-full-cone-nat/dev/libip6t_FULLCONENAT.c")
 sha1sums=('05ef75415cb7cb7641f51d51e74f3ea29cc31ab1'
           'SKIP'
           '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
@@ -35,14 +37,15 @@ sha1sums=('05ef75415cb7cb7641f51d51e74f3ea29cc31ab1'
           '9cec592787e32451f58fa608ea057870e07aa704'
           'd10af7780d1634778d898c709e2d950aa1561856'
           '15c1684f3e671f4d0ede639a7c9c08e1a841511c'
-          '6defc372f039b484948c9bb6d88737967818b2dd')
+          '4a4f5ebc8e30c573f9c3220b8135e3101f8da18c'
+          '878a1e0a306f274b285a26d3d4a3f2072caa31e3')
 validpgpkeys=('37D964ACC04981C75500FB9BD55D978A8A1420E4') # Netfilter Core Team
 
 prepare() {
   mkdir build
   cd $_pkgbase-$pkgver
 
-  cp ../libipt_FULLCONENAT.c extensions/
+  cp ../libip{,6}t_FULLCONENAT.c extensions/
   # use system one
   rm include/linux/types.h
 }