summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGI_Jack2021-08-05 15:33:56 -0400
committerGI_Jack2021-08-05 15:33:56 -0400
commitc9103992e335935fd84df8c395d2226fa2486745 (patch)
tree713efc5aad53d1c794d3facaa82edc2a8db6cb80
parente75768c346bb85056c53dda87d93366a21eefd5a (diff)
downloadaur-c9103992e335935fd84df8c395d2226fa2486745.tar.gz
version 1.6.8
updated patch for modern Arch Linux
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD9
-rw-r--r--install_pl.patch143
3 files changed, 103 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb65273df3f8..d7185e5f6412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo(replacement shim) v8
-# Thu Aug 5 02:49:42 PM EDT 2021
+# Thu Aug 5 03:33:49 PM EDT 2021
pkgbase = fwsnort
pkgdesc = application layer IDS/IPS by translating snort rules into iptables
- pkgver = 1.6.3
- pkgrel = 3
+ pkgver = 1.6.8
+ pkgrel = 1
url = http://www.cipherdyne.org/fwsnort/
arch = any
license = GPL
@@ -14,9 +14,9 @@ pkgbase = fwsnort
depends = iptables
depends = net-tools
options = emptydirs
- source = http://www.cipherdyne.org/fwsnort/download/fwsnort-1.6.3.tar.bz2
+ source = http://www.cipherdyne.org/fwsnort/download/fwsnort-1.6.8.tar.bz2
source = install_pl.patch
- md5sums = 3e7501e4587a3e33615b604935c75e4e
- md5sums = d7925e3f869ec8decb0e8336801350d6
+ sha256sums = 19a0b92c214cb5652f2777ce05ffa5160acb551ddcfaa0f08b66f50b52ce6469
+ sha256sums = 4ff91b7cb37dcc56a95968864c30ea26442fb5d0efbaf737cc324178b322ac1b
pkgname = fwsnort
diff --git a/PKGBUILD b/PKGBUILD
index d5e2a1c86ba1..d757eb6ee57b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: GI Jack <GI_Jack@hackermail.com>
# Contributor: Colin Shea <colin@evaryont.me>
pkgname=fwsnort
-pkgver=1.6.3
-pkgrel=3
+pkgver=1.6.8
+pkgrel=1
pkgdesc="application layer IDS/IPS by translating snort rules into iptables"
arch=('any')
url="http://www.cipherdyne.org/fwsnort/"
@@ -12,8 +12,9 @@ depends=('perl' 'perl-netaddr-ip' 'perl-iptables-parse' 'iptables' 'net-tools')
makedepends=('wget')
source=(http://www.cipherdyne.org/$pkgname/download/$pkgname-$pkgver.tar.bz2
'install_pl.patch')
-md5sums=('3e7501e4587a3e33615b604935c75e4e'
- 'd7925e3f869ec8decb0e8336801350d6')
+sha256sums=('19a0b92c214cb5652f2777ce05ffa5160acb551ddcfaa0f08b66f50b52ce6469'
+ '4ff91b7cb37dcc56a95968864c30ea26442fb5d0efbaf737cc324178b322ac1b')
+
options=(emptydirs)
build() {
diff --git a/install_pl.patch b/install_pl.patch
index 39ffe3e9b80a..394c0c029891 100644
--- a/install_pl.patch
+++ b/install_pl.patch
@@ -1,29 +1,101 @@
-diff -u fwsnort-1.6.3-2/install.pl fwsnort-1.6.3/install.pl
---- fwsnort-1.6.3-2/install.pl 2012-12-24 21:31:28.597018440 -0700
-+++ fwsnort-1.6.3/install.pl 2012-12-24 21:40:38.564569377 -0700
-@@ -45,7 +45,7 @@
+Common subdirectories: fwsnort-1.6.8/deps and fwsnort-1.6.8-2/deps
+diff -u fwsnort-1.6.8/fwsnort.conf fwsnort-1.6.8-2/fwsnort.conf
+--- fwsnort-1.6.8/fwsnort.conf 2018-07-31 20:45:56.000000000 -0400
++++ fwsnort-1.6.8-2/fwsnort.conf 2021-08-05 15:26:33.058823615 -0400
+@@ -59,10 +59,10 @@
+ ### variables, one per line). Note that by default the update IP's for
+ ### Emerging Threats ruleset downloads are whitelisted:
+ ## Name: rules.emergingthreats.net
+-## Address: 96.43.137.99
++## Address: 52.5.252.216
+ ## Name: rules.emergingthreats.net
+-## Address: 204.12.217.19
+-WHITELIST 96.43.137.99, 204.12.217.19;
++## Address: 52.1.74.181
++WHITELIST 52.5.252.216, 52.1.74.181;
+
+ ### Use the BLACKLIST variable to define a list of hosts/networks
+ ### that for which fwsnort should DROP or REJECT all traffic. For
+@@ -106,18 +106,18 @@
+ IPT_BACKUP_SAVE_FILE $STATE_DIR/iptables.save; ### iptables policy backup
+
+ ### system binaries
+-shCmd /bin/sh;
+-catCmd /bin/cat;
+-grepCmd /bin/grep;
+-echoCmd /bin/echo;
+-tarCmd /bin/tar;
++shCmd /usr/bin/sh;
++catCmd /usr/bin/cat;
++grepCmd /usr/bin/grep;
++echoCmd /usr/bin/echo;
++tarCmd /usr/bin/tar;
+ wgetCmd /usr/bin/wget;
+ unameCmd /usr/bin/uname;
+-ifconfigCmd /sbin/ifconfig;
+-ipCmd /sbin/ip;
+-iptablesCmd /sbin/iptables;
+-iptables-saveCmd /sbin/iptables-save;
+-iptables-restoreCmd /sbin/iptables-restore;
+-ip6tablesCmd /sbin/ip6tables;
+-ip6tables-saveCmd /sbin/ip6tables-save;
+-ip6tables-restoreCmd /sbin/ip6tables-restore;
++ifconfigCmd /usr/bin/ifconfig;
++ipCmd /usr/bin/ip;
++iptablesCmd /usr/bin/iptables;
++iptables-saveCmd /usr/bin/iptables-save;
++iptables-restoreCmd /usr/bin/iptables-restore;
++ip6tablesCmd /usr/bin/ip6tables;
++ip6tables-saveCmd /usr/bin/ip6tables-save;
++ip6tables-restoreCmd /usr/bin/ip6tables-restore;
+diff -u fwsnort-1.6.8/install.pl fwsnort-1.6.8-2/install.pl
+--- fwsnort-1.6.8/install.pl 2018-07-31 20:45:56.000000000 -0400
++++ fwsnort-1.6.8-2/install.pl 2021-08-05 15:31:20.845968975 -0400
+@@ -36,7 +36,7 @@
+ #========================= config ========================
+ my $fwsnort_conf_file = 'fwsnort.conf';
+
+-my $sbin_dir = '/usr/sbin';
++my $sbin_dir = '/usr/bin';
+ my $install_root = '/';
+
+ my $update_website = 'www.emergingthreats.net';
+@@ -45,19 +45,15 @@
my $perlCmd = '/usr/bin/perl';
my $makeCmd = '/usr/bin/make';
my $wgetCmd = '/usr/bin/wget';
-my $gzipCmd = '/bin/gzip';
+-my $tarCmd = '/bin/tar';
+my $gzipCmd = '/usr/bin/gzip';
- my $tarCmd = '/bin/tar';
++my $tarCmd = '/usr/bin/tar';
#======================= end config ======================
-
-@@ -129,10 +129,6 @@
+
+ my %config = ();
+
+ my @cmd_search_paths = qw(
+- /bin
+- /sbin
+ /usr/bin
+- /usr/sbin
+ /usr/local/bin
+- /usr/local/sbin
+ );
+
+ my %exclude_cmds = (
+@@ -143,10 +139,6 @@
### make sure the system binaries are where we think they are.
&check_commands();
-
+
-### check to make sure we are running as root
--$< == 0 && $> == 0 or die "You need to be root (or equivalent UID 0",
-- " account) to install/uninstall fwsnort!\n";
+- die "You need to be root (or equivalent UID 0",
+- " account) to install/uninstall fwsnort!\n" unless &is_root();
-
if ($uninstall) {
&uninstall();
} else {
-@@ -154,10 +150,10 @@
+@@ -168,10 +160,10 @@
"sources directory." unless -e 'fwsnort' and -e 'fwsnort.conf';
-
+
unless (-d $config{'CONF_DIR'}) {
- &full_mkdir($config{'CONF_DIR'}, 0500);
+ &full_mkdir($config{'CONF_DIR'}, 0700);
@@ -32,16 +104,16 @@ diff -u fwsnort-1.6.3-2/install.pl fwsnort-1.6.3/install.pl
- &full_mkdir($config{'RULES_DIR'}, 0500);
+ &full_mkdir($config{'RULES_DIR'}, 0700);
}
-
+
### install perl modules
-@@ -336,52 +332,11 @@
-
+@@ -350,52 +342,11 @@
+
sub install_manpage() {
my $manpage = 'fwsnort.8';
- ### remove old man page
- unlink "/usr/local/man/man8/${manpage}" if
- (-e "/usr/local/man/man8/${manpage}");
-
+
### default location to put the fwsnort man page, but check with
### /etc/man.config
- my $mpath = '/usr/share/man/man8';
@@ -89,38 +161,7 @@ diff -u fwsnort-1.6.3-2/install.pl fwsnort-1.6.3/install.pl
&full_mkdir($mpath, 0755);
my $mfile = "${mpath}/${manpage}";
print "[+] Installing $manpage man page as $mfile\n";
-@@ -532,6 +487,9 @@
- /bin
- /usr/bin
- /usr/local/bin
-+ /sbin
-+ /usr/sbin
-+ /usr/local/sbin
- );
- CMD: for my $cmd (keys %cmds) {
- unless (-x $cmds{$cmd}) {
-diff -u fwsnort-1.6.3-2/fwsnort.conf fwsnort-1.6.3/fwsnort.conf
---- fwsnort-1.6.3-2/fwsnort.conf 2012-12-24 22:39:21.323178467 -0700
-+++ fwsnort-1.6.3/fwsnort.conf 2012-12-24 22:41:52.172194457 -0700
-@@ -103,14 +103,14 @@
-
- ### system binaries
- shCmd /bin/sh;
--echoCmd /bin/echo;
-+echoCmd /usr/bin/echo;
- tarCmd /bin/tar;
- wgetCmd /usr/bin/wget;
- unameCmd /usr/bin/uname;
- ifconfigCmd /sbin/ifconfig;
--iptablesCmd /sbin/iptables;
--iptables-saveCmd /sbin/iptables-save;
--iptables-restoreCmd /sbin/iptables-restore;
--ip6tablesCmd /sbin/ip6tables;
--ip6tables-saveCmd /sbin/ip6tables-save;
--ip6tables-restoreCmd /sbin/ip6tables-restore;
-+iptablesCmd /usr/sbin/iptables;
-+iptables-saveCmd /usr/sbin/iptables-save;
-+iptables-restoreCmd /usr/sbin/iptables-restore;
-+ip6tablesCmd /usr/sbin/ip6tables;
-+ip6tables-saveCmd /usr/sbin/ip6tables-save;
-+ip6tables-restoreCmd /usr/sbin/ip6tables-restore;
+Common subdirectories: fwsnort-1.6.8/lib and fwsnort-1.6.8-2/lib
+Common subdirectories: fwsnort-1.6.8/packaging and fwsnort-1.6.8-2/packaging
+Common subdirectories: fwsnort-1.6.8/patches and fwsnort-1.6.8-2/patches
+Common subdirectories: fwsnort-1.6.8/test and fwsnort-1.6.8-2/test