cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

firehol: move patches into files

Browse source
This commit is contained in:
Ben Siraphob 2021-01-01 19:44:58 +07:00 committed by Jonathan Ringer
parent 0eb369d907
commit 863054f9da
4 changed files with 53 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
pkgs/applications/networking/firehol/default.nix
View file

@ -20,69 +20,19 @@ stdenv.mkDerivation rec {
patches = [
# configure tries to determine if `ping6` or the newer, combined
# `ping` is installed by using `ping -6` which would fail.
(pkgs.writeText "firehol-ping6.patch"
''
--- a/m4/ax_check_ping_ipv6.m4
+++ b/m4/ax_check_ping_ipv6.m4
@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6],
AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt],
[
- ac_cv_ping_6_opt=no
- if test -n "$PING"; then
- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
- $PING -6 -c 1 ::1 > conftest.out 2>&1
- if test "$?" = 0; then
- ac_cv_ping_6_opt=yes
- fi
- cat conftest.out >&AS_MESSAGE_LOG_FD
- rm -f conftest.out
- fi
+ ac_cv_ping_6_opt=yes
+ #if test -n "$PING"; then
+ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
+ # $PING -6 -c 1 ::1 > conftest.out 2>&1
+ # if test "$?" = 0; then
+ # ac_cv_ping_6_opt=yes
+ # fi
+ # cat conftest.out >&AS_MESSAGE_LOG_FD
+ # rm -f conftest.out
+ #fi
])
AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[
'')
./firehol-ping6.patch
# put firehol config files in /etc/firehol (not $out/etc/firehol)
# to avoid error on startup, see #35114
(pkgs.writeText "firehol-sysconfdir.patch"
''
--- a/sbin/install.config.in.in
+++ b/sbin/install.config.in.in
@@ -4 +4 @@
-SYSCONFDIR="@sysconfdir_POST@"
+SYSCONFDIR="/etc"
'')
./firehol-sysconfdir.patch
# we must quote "$UNAME_CMD", or the dash in /nix/store/...-coreutils-.../bin/uname
# will be interpreted as IFS -> error. this might be considered an upstream bug
# but only appears when there are dashes in the command path
(pkgs.writeText "firehol-uname-command.patch"
''
--- a/sbin/firehol
+++ b/sbin/firehol
@@ -10295,7 +10295,7 @@
kmaj=$1
kmin=$2
- set -- $($UNAME_CMD -r)
+ set -- $("$UNAME_CMD" -r)
eval $kmaj=\$1 $kmin=\$2
}
kernel_maj_min KERNELMAJ KERNELMIN
'')
# we must quote "$UNAME_CMD", or the dash in
# /nix/store/...-coreutils-.../bin/uname will be interpreted as
# IFS -> error. this might be considered an upstream bug but only
# appears when there are dashes in the command path
./firehol-uname-command.patch
];
nativeBuildInputs = [ autoconf automake ];
buildInputs = [
curl iprange iproute ipset iptables iputils kmod

29
pkgs/applications/networking/firehol/firehol-ping6.patch Normal file
View file

@ -0,0 +1,29 @@
--- a/m4/ax_check_ping_ipv6.m4
+++ b/m4/ax_check_ping_ipv6.m4
@@ -42,16 +42,16 @@ AC_DEFUN([AX_CHECK_PING_IPV6],
AC_CACHE_CHECK([whether ]PING[ has working -6 option], [ac_cv_ping_6_opt],
[
- ac_cv_ping_6_opt=no
- if test -n "$PING"; then
- echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
- $PING -6 -c 1 ::1 > conftest.out 2>&1
- if test "$?" = 0; then
- ac_cv_ping_6_opt=yes
- fi
- cat conftest.out >&AS_MESSAGE_LOG_FD
- rm -f conftest.out
- fi
+ ac_cv_ping_6_opt=yes
+ #if test -n "$PING"; then
+ # echo "Trying '$PING -6 -c 1 ::1'" >&AS_MESSAGE_LOG_FD
+ # $PING -6 -c 1 ::1 > conftest.out 2>&1
+ # if test "$?" = 0; then
+ # ac_cv_ping_6_opt=yes
+ # fi
+ # cat conftest.out >&AS_MESSAGE_LOG_FD
+ # rm -f conftest.out
+ #fi
])
AS_IF([test "x$ac_cv_ping_6_opt" = "xyes"],[

5
pkgs/applications/networking/firehol/firehol-sysconfdir.patch Normal file
View file

@ -0,0 +1,5 @@
--- a/sbin/install.config.in.in
+++ b/sbin/install.config.in.in
@@ -4,1 +4,1 @@
-SYSCONFDIR="@sysconfdir_POST@"
+SYSCONFDIR="/etc"

11
pkgs/applications/networking/firehol/firehol-uname-command.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/sbin/firehol
+++ b/sbin/firehol
@@ -10295,7 +10295,7 @@
kmaj=$1
kmin=$2
- set -- $($UNAME_CMD -r)
+ set -- $("$UNAME_CMD" -r)
eval $kmaj=\$1 $kmin=\$2
}
kernel_maj_min KERNELMAJ KERNELMIN