d40d86d
diff -up psad-2.4.5/init-scripts/systemd/psad.service.f psad-2.4.5/init-scripts/systemd/psad.service
d40d86d
--- psad-2.4.5/init-scripts/systemd/psad.service.f	2017-06-14 04:23:48.000000000 +0200
d40d86d
+++ psad-2.4.5/init-scripts/systemd/psad.service	2018-02-13 14:46:47.995387999 +0100
d40d86d
@@ -1,6 +1,7 @@
d40d86d
 [Unit]
d40d86d
 Description=The Port Scan Attack Detector (psad)
d40d86d
 Documentation=man:psad(8) https://www.cipherdyne.org/psad/
d40d86d
+After=firewalld.service iptables.service ip6tables.service
d40d86d
 
d40d86d
 [Service]
d40d86d
 Type=forking
d40d86d
diff -up psad-2.4.5/Makefile.f psad-2.4.5/Makefile
d40d86d
--- psad-2.4.5/Makefile.f	2017-06-14 04:23:48.000000000 +0200
d40d86d
+++ psad-2.4.5/Makefile	2018-02-13 14:46:47.995387999 +0100
Dominik 'Rathann' Mierzejewski 11c9473
@@ -25,9 +25,10 @@
Dominik 'Rathann' Mierzejewski 11c9473
 #
Dominik 'Rathann' Mierzejewski 11c9473
 
Dominik 'Rathann' Mierzejewski 11c9473
 ### default
Dominik 'Rathann' Mierzejewski 11c9473
+OPTS=-O
Dominik 'Rathann' Mierzejewski 11c9473
 all : kmsgsd.c psadwatchd.c psad_funcs.c strlcpy.c strlcat.c psad.h
Dominik 'Rathann' Mierzejewski 11c9473
-	/usr/bin/gcc -Wall -O kmsgsd.c psad_funcs.c strlcpy.c strlcat.c -o kmsgsd
Dominik 'Rathann' Mierzejewski 11c9473
-	/usr/bin/gcc -Wall -O psadwatchd.c psad_funcs.c strlcpy.c strlcat.c -o psadwatchd
Dominik 'Rathann' Mierzejewski 11c9473
+	/usr/bin/gcc -Wall $(OPTS) kmsgsd.c psad_funcs.c strlcpy.c strlcat.c -o kmsgsd
Dominik 'Rathann' Mierzejewski 11c9473
+	/usr/bin/gcc -Wall $(OPTS) psadwatchd.c psad_funcs.c strlcpy.c strlcat.c -o psadwatchd
Dominik 'Rathann' Mierzejewski 11c9473
 
Dominik 'Rathann' Mierzejewski 11c9473
 ### debug mode
Dominik 'Rathann' Mierzejewski 11c9473
 debug : kmsgsd.c psadwatchd.c psad_funcs.c strlcpy.c strlcat.c psad.h
d40d86d
diff -up psad-2.4.5/psad.conf.f psad-2.4.5/psad.conf
d40d86d
--- psad-2.4.5/psad.conf.f	2017-06-14 04:23:48.000000000 +0200
d40d86d
+++ psad-2.4.5/psad.conf	2018-02-13 14:47:45.046745650 +0100
Dominik 'Rathann' Mierzejewski 11c9473
@@ -24,7 +24,7 @@
Dominik 'Rathann' Mierzejewski 11c9473
 EMAIL_ADDRESSES             root@localhost;
Dominik 'Rathann' Mierzejewski 11c9473
 
Dominik 'Rathann' Mierzejewski 11c9473
 ### Machine hostname
Dominik 'Rathann' Mierzejewski 11c9473
-HOSTNAME                    _CHANGEME_;
Dominik 'Rathann' Mierzejewski 11c9473
+HOSTNAME                    localhost;
Dominik 'Rathann' Mierzejewski 11c9473
 
d40d86d
 ### Specify the home and external networks. Note that by default the
Dominik 'Rathann' Mierzejewski 11c9473
 ### ENABLE_INTF_LOCAL_NETS is enabled, so psad automatically detects
d40d86d
@@ -64,8 +64,8 @@ FW_MSG_SEARCH               DROP;
d40d86d
 ### "iproute2" if you want to use the iproute2 type configuration.
d40d86d
 ### iproute2 does not use aliases for multi-homed interfaces and
d40d86d
 ### ifconfig does not show secondary addresses for multi-homed interfaces.
d40d86d
-#IFCFGTYPE  iproute2;
d40d86d
-IFCFGTYPE                   ifconfig;
d40d86d
+IFCFGTYPE  iproute2;
d40d86d
+#IFCFGTYPE                   ifconfig;
d40d86d
 
d40d86d
 ### Danger levels. These represent the total number of packets required for a
d40d86d
 ### scan to reach each danger level. A scan may also reach a danger level if
d40d86d
@@ -181,7 +181,7 @@ SYSLOG_DAEMON               syslogd;
d40d86d
 
d40d86d
 ### This is primarily used to acquire syslog messages from journalctl on
d40d86d
 ### systems where systemd is running.
d40d86d
-ENABLE_FW_MSG_READ_CMD      N;
d40d86d
+ENABLE_FW_MSG_READ_CMD      Y;
d40d86d
 FW_MSG_READ_CMD             /bin/journalctl;
d40d86d
 FW_MSG_READ_CMD_ARGS        -f -k;
d40d86d
 USE_FW_MSG_READ_CMD_ARGS    Y;
d40d86d
@@ -586,7 +586,7 @@ PSAD_FIFO_DIR               $INSTALL_ROO
Dominik 'Rathann' Mierzejewski 11c9473
 PSAD_LIBS_DIR               $INSTALL_ROOT/usr/lib/psad;
Dominik 'Rathann' Mierzejewski 11c9473
 PSAD_CONF_DIR               $INSTALL_ROOT/etc/psad;
Dominik 'Rathann' Mierzejewski 11c9473
 PSAD_ERR_DIR                $PSAD_DIR/errs;
Dominik 'Rathann' Mierzejewski 11c9473
-CONF_ARCHIVE_DIR            $PSAD_CONF_DIR/archive;
Dominik 'Rathann' Mierzejewski 11c9473
+CONF_ARCHIVE_DIR            $PSAD_DIR/archive;
Dominik 'Rathann' Mierzejewski 11c9473
 SCAN_DATA_ARCHIVE_DIR       $PSAD_DIR/scan_archive;
Dominik 'Rathann' Mierzejewski 11c9473
 ANALYSIS_MODE_DIR           $PSAD_DIR/ipt_analysis;
Dominik 'Rathann' Mierzejewski 11c9473
 SNORT_RULES_DIR             $PSAD_CONF_DIR/snort_rules;
d40d86d
@@ -678,7 +678,7 @@ ipCmd            /sbin/ip;
Dominik 'Rathann' Mierzejewski 11c9473
 killallCmd       /usr/bin/killall;
Dominik 'Rathann' Mierzejewski 11c9473
 netstatCmd       /bin/netstat;
Dominik 'Rathann' Mierzejewski 11c9473
 unameCmd         /bin/uname;
Dominik 'Rathann' Mierzejewski 11c9473
-whoisCmd         $INSTALL_ROOT/usr/bin/whois_psad;
Dominik 'Rathann' Mierzejewski 11c9473
+whoisCmd         /usr/bin/whois;
Dominik 'Rathann' Mierzejewski 11c9473
 dfCmd            /bin/df;
Dominik 'Rathann' Mierzejewski 11c9473
 fwcheck_psadCmd  $INSTALL_ROOT/usr/sbin/fwcheck_psad;
Dominik 'Rathann' Mierzejewski 11c9473
 psadwatchdCmd    $INSTALL_ROOT/usr/sbin/psadwatchd;