diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt
index aa68b44fe..ad525cd12 100644
--- a/Shorewall-common/changelog.txt
+++ b/Shorewall-common/changelog.txt
@@ -1,3 +1,11 @@
+Changes in Shorewall 4.3.4
+
+1) Fix extra 'done'.
+
+2) Fix IPv6 range checking.
+
+3) Improve chain-combining optimizations.
+
Changes in Shorewall 4.3.3
1) Removed 'ecn'.
diff --git a/Shorewall-common/lib.cli b/Shorewall-common/lib.cli
index a09c40f5f..7d0d1ea53 100644
--- a/Shorewall-common/lib.cli
+++ b/Shorewall-common/lib.cli
@@ -462,7 +462,7 @@ show_command() {
[ $# -gt 1 ] && usage 1
echo "$PRODUCT $version Connections at $HOSTNAME - $(date)"
echo
- [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
+ [ -f /proc/net/ip_conntrack ] && /proc/net/ip_conntrack || grep -v '^ipv6' /proc/net/nf_conntrack
;;
nat)
[ $# -gt 1 ] && usage 1
@@ -714,7 +714,7 @@ dump_command() {
$IPTABLES -t mangle -L $IPT_OPTIONS
heading "Conntrack Table"
- [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
+ [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || grep -v '^ipv6' /proc/net/nf_conntrack
heading "IP Configuration"
ip -4 addr list
diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 99c1b3cf0..555adb076 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -1,18 +1,17 @@
-Shorewall 4.3.3
+Shorewall 4.3.4
Notice:
-There are two incompatible changes in this release.
+It was previously my intention to defer release of IPv6 support until
+4.4. That plan was based on an architecture that supported a single
+configuration for both IPv4 and IPv6.
-1) Rather than square brackets ([]), addresses following an interface
- name are now enclosed in angle brackets (<>). This change is made
- to avoid confusion in the documentation with the meta characters
- '[' and ']'.
+Splitting IPv6 support out into separate products has made adding that
+support an order of magnitude easier and less invasive. So it is my
+current plan to release IPv6 support in a future 4.2.x release.
-2) Only those macros that have different contents in IPv6 are now
- included in /usr/share/shorewall6/. As a consequence,
- /usr/share/shorewall must be added to your CONFIG_PATH in
- /etc/shorewall6/shorewall6.conf.
+I am therefore opening the testing of the development branch to a wider
+audience.
----------------------------------------------------------------------------
R E L E A S E 4 . 3 H I G H L I G H T S
@@ -26,46 +25,37 @@ There are two incompatible changes in this release.
- Perl 5.10 if you wish to use DNS names in your IPv6 config files.
In that case you will also have to install Perl Socket6 support.
-Problems Corrected in 4.3.3
+Problems Corrected in 4.3.4
-1) Previously, if IP6TABLES wasn't specified in shorewall6.conf, it
- was set to iptables rather than ip6tables.
+1) Previously, an extra 'done' could be emitted in the generated shell
+ script resulting in a shell syntax error at run-time.
-Other changes in 4.3.3
+2) In IPv6, ipranges were previously not supported even when the
+ kernel and ip6tables included support for them.
-1) In as much as ip6tables doesn't support the ECN target, the 'ecn'
- file has been removed and its processing disabled.
+3) An optimization in all Shorewall-perl 4.2 and 4.3 versions could
+ cause undesirable side effects. The optimization deleted the
+
2008-12-13
+2008-12-15
The current
-Stable Release version is 4.2.2
+Stable Release version is 4.2.3
Read more about the Release here.
The current Development Release
-version is 4.3.2 which includes support for IPv6
+version is 4.3.3 which includes support for IPv6