Browse Source

firehol: ignore "dont_redistribute" for ipsets

I won't be doing "git push" anywhere, but I still want to see git track
the history for these non-redistributable ipsets.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
master
Steven Noonan 3 years ago
parent
commit
c54cb7a7df
No known key found for this signature in database GPG Key ID: 7EACB44BA7B30DB9
  1. 8
      firehol-git/PKGBUILD
  2. 10
      firehol/PKGBUILD
  3. 13
      firehol/ignore-dont_redistribute.patch

8
firehol-git/PKGBUILD

@ -18,10 +18,12 @@ backup=('etc/firehol/firehol.conf' 'etc/firehol/fireqos.conf')
install='firehol.install'
source=("$_gitname::git+https://github.com/firehol/firehol"
"firehol.service"
"fireqos.service")
"fireqos.service"
"ignore-dont_redistribute.patch")
sha256sums=('SKIP'
'f81f1d6000701912211d705f55f1bcbf145d810d7f1d318a97684236d5786234'
'2a06bea52ac6b54d3782a74fed3cb6e740e9a6a12cdc92e98cb7216433632fa0')
'2a06bea52ac6b54d3782a74fed3cb6e740e9a6a12cdc92e98cb7216433632fa0'
'4d596672c93f07656ab356cfdae080a1d76d039c9d812b2470668b38a2485942')
pkgver() {
cd "$_gitname"
@ -31,6 +33,8 @@ pkgver() {
build() {
cd "$_gitname"
patch -Np1 -i "${srcdir}/ignore-dont_redistribute.patch"
./autogen.sh
./configure \

10
firehol/PKGBUILD

@ -2,7 +2,7 @@
pkgname=firehol
pkgver=3.1.6
pkgrel=1
pkgrel=2
epoch=2
pkgdesc="The iptables stateful packet filtering firewall builder."
url="http://firehol.org/"
@ -14,14 +14,18 @@ backup=('etc/firehol/firehol.conf' 'etc/firehol/fireqos.conf')
install='firehol.install'
source=("https://github.com/firehol/firehol/releases/download/v$pkgver/firehol-$pkgver.tar.xz"
"firehol.service"
"fireqos.service")
"fireqos.service"
"ignore-dont_redistribute.patch")
sha256sums=('42a9d2622e160ff2f1e3b34fdb91c13ecf476957287e90fcbd8f3c679fcb1b7e'
'f81f1d6000701912211d705f55f1bcbf145d810d7f1d318a97684236d5786234'
'2a06bea52ac6b54d3782a74fed3cb6e740e9a6a12cdc92e98cb7216433632fa0')
'2a06bea52ac6b54d3782a74fed3cb6e740e9a6a12cdc92e98cb7216433632fa0'
'4d596672c93f07656ab356cfdae080a1d76d039c9d812b2470668b38a2485942')
build() {
cd "$pkgname-$pkgver"
patch -Np1 -i "${srcdir}/ignore-dont_redistribute.patch"
./configure \
--prefix=/usr \
--sbindir=/usr/bin \

13
firehol/ignore-dont_redistribute.patch

@ -0,0 +1,13 @@
diff --git a/sbin/update-ipsets b/sbin/update-ipsets
index 771aa75..e9ee5a2 100755
--- a/sbin/update-ipsets
+++ b/sbin/update-ipsets
@@ -2517,7 +2517,7 @@ ipset_attributes() {
do
case "${1}" in
redistribute) unset IPSET_TMP_DO_NOT_REDISTRIBUTE[${ipset}]; shift; continue ;;
- dont_redistribute) IPSET_TMP_DO_NOT_REDISTRIBUTE[${ipset}]="1"; shift; continue ;;
+ dont_redistribute) shift; continue ;;
can_be_empty|empty) IPSET_TMP_ACCEPT_EMPTY[${ipset}]="1"; shift; continue ;;
never_empty|no_empty) unset IPSET_TMP_ACCEPT_EMPTY[${ipset}]; shift; continue ;;
no_if_modified_since) IPSET_TMP_NO_IF_MODIFIED_SINCE[${ipset}]="1"; shift; continue ;;
Loading…
Cancel
Save