diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | .gitignore | 17 | ||||
| -rw-r--r-- | PKGBUILD | 34 | ||||
| -rw-r--r-- | jool_siit.conf.example | 55 |
4 files changed, 92 insertions, 29 deletions
@@ -1,18 +1,23 @@ pkgbase = jool pkgdesc = Open Source SIIT and NAT64 for Linux. - pkgver = 4.1.7 + pkgver = 4.1.11 pkgrel = 1 url = https://www.jool.mx arch = x86_64 license = GPL2 makedepends = libnl + makedepends = dkms optdepends = iptables - source = https://github.com/NICMx/Jool/releases/download/v4.1.7/jool-4.1.7.tar.gz + backup = etc/jool/jool_siit.conf + backup = etc/jool/jool.conf + source = https://github.com/NICMx/Jool/releases/download/v4.1.11/jool-4.1.11.tar.gz source = jool.service source = jool_siit.service - sha256sums = 31fab9f9994e769b117354934742cfd8fc35a6a0aabcf4bab912bae4868c3778 - sha256sums = 2d50ad60e284876f09051a4d44d4cc51da4b354cb4ff7acf85de864427d360b5 - sha256sums = 0de3cc336ec9587bb3d62c81062977687a439403cc30d14d9798502d8626ce5f + source = jool_siit.conf.example + b2sums = 4f2700c90f6edbab4286c1b3231609edb101bd8080c26c20189401fce7965eb1aacb69bf12ed9f18bcbb6bb74ad9f6de83ae8c23475d3a4583cd67d0f3261b38 + b2sums = f8773d5091ac8c1b9e42f341f775d95ba5b3d5229fae5f621fc1ccf11627865473660b084a53ed4016b046c417e008f66e881e08e226eb77f3f62ff7dd1a911b + b2sums = e8a0a3118f85172b8eed8e714d5e1c52a6abf83db584d008e3d7842afb679e38b9b935f2308aaa6655b284d0642a43369b7e6411b0f2fba9cd371bcda16a084e + b2sums = c3290a1c2908e3789f9791d44f1f79a85ebbbcb4f2edea9b4e10f1fbee45138f203f49fb5b8066305f2dbebdc8d2d1a8b554ea23b1687ed57cf1879f2d0cd681 pkgname = jool-tools pkgdesc = Open Source SIIT and NAT64 for Linux. - Userspace tools and libraries diff --git a/.gitignore b/.gitignore index 9ce406aafdee..ef913f33642c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,7 @@ -pkg/ -src/ -*.tar -*.tar.bz2 -*.tar.gz -*.tar.xz -*.tar.zstd -*.tar.zst -jool-tools.jool.service -jool-tools.jool_siit.service +/* +!/.gitignore +!/.SRCINFO +!/PKGBUILD +!/jool.service +!/jool_siit.service +!/jool_siit.conf.example @@ -1,22 +1,27 @@ -# Maintainer: Nick Cao <nickcao@nichi.co> +# Maintainer: Stefan Gehr <stefan@gehr.xyz> pkgbase=jool pkgname=(jool-tools jool-dkms) -pkgver=4.1.7 +pkgver=4.1.11 pkgrel=1 pkgdesc="Open Source SIIT and NAT64 for Linux." -arch=('x86_64') +arch=("x86_64") url="https://www.jool.mx" -license=('GPL2') -makedepends=('libnl') -optdepends=('iptables') +license=("GPL2") +makedepends=("libnl" "dkms") +optdepends=("iptables") +backup=("etc/jool/jool_siit.conf" + "etc/jool/jool.conf" + ) source=("https://github.com/NICMx/Jool/releases/download/v${pkgver}/jool-${pkgver}.tar.gz" "jool.service" "jool_siit.service" + "jool_siit.conf.example" ) -sha256sums=('31fab9f9994e769b117354934742cfd8fc35a6a0aabcf4bab912bae4868c3778' - '2d50ad60e284876f09051a4d44d4cc51da4b354cb4ff7acf85de864427d360b5' - '0de3cc336ec9587bb3d62c81062977687a439403cc30d14d9798502d8626ce5f') +b2sums=("4f2700c90f6edbab4286c1b3231609edb101bd8080c26c20189401fce7965eb1aacb69bf12ed9f18bcbb6bb74ad9f6de83ae8c23475d3a4583cd67d0f3261b38" + "f8773d5091ac8c1b9e42f341f775d95ba5b3d5229fae5f621fc1ccf11627865473660b084a53ed4016b046c417e008f66e881e08e226eb77f3f62ff7dd1a911b" + "e8a0a3118f85172b8eed8e714d5e1c52a6abf83db584d008e3d7842afb679e38b9b935f2308aaa6655b284d0642a43369b7e6411b0f2fba9cd371bcda16a084e" + "c3290a1c2908e3789f9791d44f1f79a85ebbbcb4f2edea9b4e10f1fbee45138f203f49fb5b8066305f2dbebdc8d2d1a8b554ea23b1687ed57cf1879f2d0cd681") prepare() { cp -a "${pkgbase}-${pkgver}" "${pkgbase}-${pkgver}-dkms" @@ -30,18 +35,19 @@ build() { package_jool-tools() { pkgdesc="Open Source SIIT and NAT64 for Linux. - Userspace tools and libraries" - depends=('libnl') + depends=("libnl") cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m0644 "${srcdir}/jool.service" "${pkgdir}/usr/lib/systemd/system/jool.service" install -D -m0644 "${srcdir}/jool_siit.service" "${pkgdir}/usr/lib/systemd/system/jool_siit.service" + install -D -m0644 "${srcdir}/jool_siit.conf.example" "${pkgdir}/etc/jool/jool_siit.conf" } package_jool-dkms() { pkgdesc="Open Source SIIT and NAT64 for Linux. - Kernel modules" - depends=('dkms') - optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') + depends=("dkms") + optdepends=("linux-headers: Build the module for Arch kernel" + "linux-lts-headers: Build the module for LTS Arch kernel") install -dm 755 "${pkgdir}/usr/src" - cp -a --no-preserve='ownership' "${pkgbase}-${pkgver}-dkms" "${pkgdir}/usr/src/jool-${pkgver}" + cp -a --no-preserve="ownership" "${pkgbase}-${pkgver}-dkms" "${pkgdir}/usr/src/jool-${pkgver}" } diff --git a/jool_siit.conf.example b/jool_siit.conf.example new file mode 100644 index 000000000000..5c14dfdb0bf8 --- /dev/null +++ b/jool_siit.conf.example @@ -0,0 +1,55 @@ +{ + "comment": { + "description": "Sample full SIIT configuration.", + "notes": [ + "192.0.2/24, 198.51.100/24 and 2001:db8::/32 are", + "documentation blocks (RFC 5737 and RFC 3849), and you", + "WILL need to change or remove them for your setup." + ], + "last update": "2022-02-09" + }, + + "instance": "sample-siit", + "framework": "netfilter", + + "global": { + "manually-enabled": true, + "pool6": "2001:db8:0::/96", + "lowest-ipv6-mtu": 1280, + "logging-debug": false, + "zeroize-traffic-class": false, + "override-tos": false, + "tos": 0, + "mtu-plateaus": [ + 65535, 32000, 17914, 8166, + 4352, 2002, 1492, 1006, + 508, 296, 68 + ], + "amend-udp-checksum-zero": false, + "eam-hairpin-mode": "intrinsic", + "randomize-rfc6791-addresses": true, + "rfc6791v6-prefix": null, + "rfc6791v4-prefix": null + }, + + "eamt": [ + { + "comment": "Comments allowed here too.", + "ipv6 prefix": "2001:db8:1::/128", + "ipv4 prefix": "192.0.2.0" + }, { + "ipv6 prefix": "2001:db8:2::", + "ipv4 prefix": "192.0.2.1/32" + }, { + "ipv6 prefix": "2001:db8:3::/124", + "ipv4 prefix": "192.0.2.16/28" + } + ], + + "comment": "This comment is relevant to denylist4 maybe.", + "denylist4": [ + "198.51.100.0", + "198.51.100.2/32", + "198.51.100.32/27" + ] +} |