holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
12,086 Commits 104 Branches 736 Tags 54 MiB
4393a6c603
Commit Graph

12086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Eastep
dc21d015da Clean up white-space in Togan's patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-26 08:27:24 -07:00
Tom Eastep
f2cecfc33a Merge branch '4.5.7' 2012-08-26 08:15:05 -07:00
Tom Eastep
6392a4514d Clean up white-space in Togan's patch 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-26 08:14:23 -07:00
Tom Eastep
9e5d1cc1ce Merge branch '4.5.7' 2012-08-26 08:11:40 -07:00
Tom Eastep
779243094e Map NOTRACK to 'CT --notrack' if CT_TARGET is available. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-26 08:08:57 -07:00
Tom Eastep
15fd345545 FAQ update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 09:06:37 -07:00
Togan Muftuoglu
1a324fa37f Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:45:57 -07:00
Tom Eastep
b45d15eec6 Revert "Apply Togan Muftuoglu's SuSE-specific init patches" 
This reverts commit 2412998b57.
 2012-08-25 08:45:18 -07:00
Togan Muftuoglu
906795a4d7 Suse specific patches 
Hi Tom,

I have been patching shorewall packages for the opensuse releases, but I
guess it is better to send them to you . the upstream so it gets
incorporated into shorewall itself and I do not have to patch it ;)

I believe I have incorparted most of my patches in to this one. If you
can review them and if appropriate apply them that would be great

Thanks

Togan

>From 6072c08de753e7d1cc31bb758295dee198197e41 Mon Sep 17 00:00:00 2001
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Fri, 24 Aug 2012 13:17:12 +0200
Subject: [PATCH] suse-specific

Signed-off-by: Togan Muftuoglu <toganm@opensuse.org>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:41:28 -07:00
Tom Eastep
000c478ef7 FAQ update 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:10:26 -07:00
Tom Eastep
7208464c68 Change "Compilation aborted..." to "Check aborted ..." 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-25 08:10:12 -07:00
Tom Eastep
519e799ef1 Unify the mode of init files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:59:11 -07:00
Tom Eastep
e5d63f4212 Merge branch '4.5.7' 2012-08-24 06:56:01 -07:00
Tom Eastep
2412998b57 Apply Togan Muftuoglu's SuSE-specific init patches 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:32:30 -07:00
Tom Eastep
1067f8a9bb Use the non-fatal error reporting feature for missing capabilities 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-24 06:25:29 -07:00
Tom Eastep
3006452cea Unconditionally restore route mark in PREROUTING and OUTPUT. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 12:23:29 -07:00
Tom Eastep
0f7d96a5ec Move routing output closer to the IP output in 'dump'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 12:23:21 -07:00
Tom Eastep
e17010018c Unconditionally restore route mark in PREROUTING and OUTPUT. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 12:15:14 -07:00
Tom Eastep
5326f35789 Move routing output closer to the IP output in 'dump'. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 09:16:45 -07:00
Tom Eastep
112312f2ee Add non-fatal error capability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-23 05:50:36 -07:00
Tom Eastep
dffd98dff7 Revert change that added CONTINUE as a valid content of the ADDRESSES column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-21 10:51:01 -07:00
Tom Eastep
a789b18615 Merge branch 'master' into 4.5.7 2012-08-21 07:55:11 -07:00
Tom Eastep
64edd30a76 Correct link in shorewall[6].conf manpages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-21 07:54:51 -07:00
Tom Eastep
c20611b6c0 Add CONTINUE keyword to the masq file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-20 18:09:59 -07:00
Tom Eastep
59524d0d64 Merge branch 'master' into 4.5.7 
Conflicts:
	docs/Manpages6.xml
 2012-08-20 11:38:18 -07:00
Tom Eastep
0423769f59 Update docs for info added/changed in 4.5.7 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-20 11:36:32 -07:00
Tom Eastep
46e57d67d8 Merge branch 'master' into 4.5.7 2012-08-20 11:14:08 -07:00
Tom Eastep
8c8af31b7a Update docs for info added/changed in 4.5.7 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-20 11:13:39 -07:00
Tom Eastep
1fd9e5e95c Compensate for silly RHEL bug 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-20 07:20:21 -07:00
Tom Eastep
e4830f6342 Compensate for silly RHEL bug 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-19 06:43:25 -07:00
Tom Eastep
99efb518bd Add the HELPER column to the rules files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-18 12:05:42 -07:00
Tom Eastep
f273fdfda8 Merge branch 'master' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-18 08:00:56 -07:00
Tom Eastep
1b7a7d0fdf Remove some more hard-coded directory names from the installers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-17 14:24:52 -07:00
Tom Eastep
7ac9e46e1f Add a comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 15:49:33 -07:00
Tom Eastep
0a4f26a318 Correct handling of existing notrack file. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 14:46:48 -07:00
Tom Eastep
8d3cf6428f Install the conntrack file unconditionally. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 10:50:23 -07:00
Tom Eastep
f6c4650624 Allow a notrack with nothing but FORMAT and COMMENT lines to be removed. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 10:49:59 -07:00
Tom Eastep
3c35af9d8c Merge branch 'master' into 4.5.7 2012-08-16 08:34:54 -07:00
Tom Eastep
1e11109bb2 Don't combine rules with '-m policy' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 08:34:30 -07:00
Tom Eastep
f59612671b Don't optimize chains with '-m ipsec' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 07:33:01 -07:00
Tom Eastep
da4f7ee524 Handle ppp devices correctly in the 'enable' command. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-16 06:59:35 -07:00
Tom Eastep
b132176dae Correct reference adjustment in new opt4 code 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-14 13:36:39 -07:00
Tom Eastep
1f59e4f449 Update case in conditionals. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-14 11:42:46 -07:00
Tom Eastep
8487c78a0a Adjust reference counts when splicing in short chain 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-14 08:34:51 -07:00
Tom Eastep
fdc45a990d Arrange for HELPER to match in the RELATED section. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 15:44:19 -07:00
Tom Eastep
44a550870c Add HELPER action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 13:23:38 -07:00
Tom Eastep
bd3295b0e3 Remove temporary hack 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 08:55:43 -07:00
Tom Eastep
f1fbb95d48 Update documentation for content merged from the 4.5.8 (master) path 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2012-08-13 08:16:36 -07:00
Tom Eastep
45288f5927 Revise notrack/conntrack handling: 
- Purge empty notrack files.
- Process both files.
 2012-08-13 07:28:07 -07:00
Tom Eastep
75b830b10e Merge branch 'master' into 4.5.7 2012-08-13 06:57:54 -07:00