diff options
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 96 |
2 files changed, 63 insertions, 50 deletions
@@ -1,7 +1,7 @@ pkgbase = iptables-fullcone-nat pkgdesc = iptables with FULLCONENAT extension - pkgver = 1.8.0.r85.g0800d9b4 - pkgrel = 2 + pkgver = 1.8.2.r19.g2ed6c85f + pkgrel = 1 url = https://github.com/Chion82/netfilter-full-cone-nat install = iptables-fullcone-nat.install arch = i686 @@ -9,15 +9,18 @@ pkgbase = iptables-fullcone-nat license = GPL2 makedepends = git makedepends = linux-api-headers - depends = glibc - depends = libmnl depends = libnftnl depends = libpcap + depends = libnfnetlink + depends = libnetfilter_conntrack + depends = bash depends = netfilter-full-cone-nat-dkms provides = iptables conflicts = iptables source = file:///usr/src/netfilter-full-cone-nat-git+bc3fb32/libipt_FULLCONENAT.c source = git://git.netfilter.org/iptables + source = arptables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/arptables.service?h=packages/iptables + source = ebtables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ebtables.service?h=packages/iptables source = empty-filter.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-filter.rules?h=packages/iptables source = empty-mangle.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-mangle.rules?h=packages/iptables source = empty-nat.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-nat.rules?h=packages/iptables @@ -25,10 +28,11 @@ pkgbase = iptables-fullcone-nat source = empty-security.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-security.rules?h=packages/iptables source = empty.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty.rules?h=packages/iptables source = ip6tables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ip6tables.service?h=packages/iptables - source = iptables-flush::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables-flush?h=packages/iptables + source = iptables-legacy-flush::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables-legacy-flush?h=packages/iptables source = iptables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables.service?h=packages/iptables source = simple_firewall.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/simple_firewall.rules?h=packages/iptables - source = iptables-fullcone-nat.install + sha256sums = 42c9f4c15c38e2b20e25a2089d530207d3d9e642de4c1c6d2b7b5a65532355ec + sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -41,7 +45,6 @@ pkgbase = iptables-fullcone-nat sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 28c1f28f2e8b2b95b562ff807ac472134f27da350cb787f7e0f2d59f80d16ac0 pkgname = iptables-fullcone-nat @@ -1,44 +1,45 @@ # Maintainer: Edward Pacman <micro DOT fedora AT gmail DOT com> pkgname=iptables-fullcone-nat -pkgver=1.8.0.r85.g0800d9b4 -pkgrel=2 +pkgver=1.8.2.r19.g2ed6c85f +pkgrel=1 pkgdesc="iptables with FULLCONENAT extension" arch=('i686' 'x86_64') url="https://github.com/Chion82/netfilter-full-cone-nat" license=('GPL2') -depends=('glibc' 'libmnl' 'libnftnl' 'libpcap' 'netfilter-full-cone-nat-dkms') +depends=(libnftnl libpcap libnfnetlink libnetfilter_conntrack bash netfilter-full-cone-nat-dkms) makedepends=('git' 'linux-api-headers') provides=('iptables') conflicts=('iptables') install=${pkgname}.install source=("file:///usr/src/netfilter-full-cone-nat-git+bc3fb32/libipt_FULLCONENAT.c" - "git://git.netfilter.org/iptables" - "empty-filter.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-filter.rules?h=packages/iptables" - "empty-mangle.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-mangle.rules?h=packages/iptables" - "empty-nat.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-nat.rules?h=packages/iptables" - "empty-raw.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-raw.rules?h=packages/iptables" - "empty-security.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-security.rules?h=packages/iptables" - "empty.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty.rules?h=packages/iptables" - "ip6tables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ip6tables.service?h=packages/iptables" - "iptables-flush::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables-flush?h=packages/iptables" - "iptables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables.service?h=packages/iptables" - "simple_firewall.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/simple_firewall.rules?h=packages/iptables" - "iptables-fullcone-nat.install") -sha256sums=('SKIP' + "git://git.netfilter.org/iptables" + "arptables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/arptables.service?h=packages/iptables" + "ebtables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ebtables.service?h=packages/iptables" + "empty-filter.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-filter.rules?h=packages/iptables" + "empty-mangle.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-mangle.rules?h=packages/iptables" + "empty-nat.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-nat.rules?h=packages/iptables" + "empty-raw.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-raw.rules?h=packages/iptables" + "empty-security.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty-security.rules?h=packages/iptables" + "empty.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/empty.rules?h=packages/iptables" + "ip6tables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/ip6tables.service?h=packages/iptables" + "iptables-legacy-flush::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables-legacy-flush?h=packages/iptables" + "iptables.service::https://git.archlinux.org/svntogit/packages.git/plain/trunk/iptables.service?h=packages/iptables" + "simple_firewall.rules::https://git.archlinux.org/svntogit/packages.git/plain/trunk/simple_firewall.rules?h=packages/iptables") +sha256sums=('42c9f4c15c38e2b20e25a2089d530207d3d9e642de4c1c6d2b7b5a65532355ec' 'SKIP' 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - '28c1f28f2e8b2b95b562ff807ac472134f27da350cb787f7e0f2d59f80d16ac0') - + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') pkgver() { cd "iptables" @@ -48,27 +49,36 @@ pkgver() { build() { cd "iptables" - ./autogen.sh - ./configure --prefix="/usr" --sysconfdir="/etc" --sbindir="/usr/bin" --libexecdir="/usr/lib/iptables" --with-xtlibdir="/usr/lib/iptables" \ - --enable-bpf-compiler + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib \ + --enable-bpf-compiler \ + --enable-devel \ + --enable-libipq \ + --enable-shared + sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' -i libtool make } package() { - cd "iptables" - - make DESTDIR="$pkgdir" install - - cd "$srcdir" - install -Dm644 "empty.rules" "$pkgdir/etc/iptables/empty.rules" - install -Dm644 "simple_firewall.rules" "$pkgdir/etc/iptables/simple_firewall.rules" + DESTDIR="$pkgdir" make -C iptables install + + for _x in {arp,eb,ip,ip6}tables{,-restore,-save} iptables-xml; do + if [[ $1 = nft || $_x = ip* ]]; then + ln -sf xtables-$1-multi "$pkgdir/usr/bin/$_x" + else + rm "$pkgdir/usr/bin/$_x" + fi + done - install -d "$pkgdir/var/lib"/{iptables,ip6tables} - install -m644 empty-{filter,mangle,nat,raw,security}.rules "$pkgdir/var/lib/iptables" - install -m644 empty-{filter,mangle,nat,raw,security}.rules "$pkgdir/var/lib/ip6tables" + install -Dt "$pkgdir/usr/lib/systemd/system" -m644 {ip,ip6}tables.service + install -D iptables-legacy-flush "$pkgdir/usr/lib/systemd/scripts/iptables-flush" - install -Dm644 "iptables.service" "$pkgdir/usr/lib/systemd/system/iptables.service" - install -Dm644 "ip6tables.service" "$pkgdir/usr/lib/systemd/system/ip6tables.service" - install -Dm755 "iptables-flush" "$pkgdir/usr/lib/systemd/scripts/iptables-flush" + install -Dm644 empty.rules "$pkgdir/etc/iptables/iptables.rules" + install -Dm644 empty.rules "$pkgdir/etc/iptables/ip6tables.rules" + install -Dt "$pkgdir/usr/share/iptables" -m644 *.rules + ln -srt "$pkgdir/etc/iptables" "$pkgdir"/usr/share/iptables/{empty,simple_firewall}.rules } |