diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 58f07ad9b..e76732362 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -76,7 +76,7 @@ Other changes in Shorewall 4.0.0 Beta 6 /usr/share/shorewall-perl/Shorewall/Ports.pm, using your /etc/protocols and /etc/services as input. - To re-generate the more from those two files: + To re-generate the module from those two files: 1. Backup your current /usr/share/shorewall-perl/Shorewall/Ports.pm file. @@ -84,15 +84,16 @@ Other changes in Shorewall 4.0.0 Beta 6 /usr/share/shorewall-perl/Shorewall/Ports.pm Note: If the buildports.pl program fails to run to a successful - completion during installation, a default version of - module will be installed. That default module was generated from the - /etc/protocols and /etc/services shipped with Ubuntu Feisty Fawn. + completion during installation, a fallback version of + module will be installed. That fallback module was generated from + the /etc/protocols and /etc/services shipped with Ubuntu Feisty + Fawn. - Even if the buildports.pl program runs successfully, the default + Even if the buildports.pl program runs successfully, the fallback module is also installed as - /usr/share/shorewall-perl/Shorewall/DefaultPorts.pm. So if you + /usr/share/shorewall-perl/Shorewall/FallbackPorts.pm. So if you encounter problems with the generated module, simply copy the - default module to /usr/share/shorewall-perl/Shorewall/Ports.pm. + fallback module to /usr/share/shorewall-perl/Shorewall/Ports.pm. Migration Considerations: diff --git a/Shorewall-perl/Shorewall/DefaultPorts.pm b/Shorewall-perl/Shorewall/FallbackPorts.pm similarity index 100% rename from Shorewall-perl/Shorewall/DefaultPorts.pm rename to Shorewall-perl/Shorewall/FallbackPorts.pm diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh index 2ae9037f3..d15331aa7 100755 --- a/Shorewall-perl/install.sh +++ b/Shorewall-perl/install.sh @@ -199,8 +199,8 @@ if [ -n "$INSTALL_PORTS_PM" ]; then if ./buildports.pl > ${PREFIX}/usr/share/shorewall-perl/Shorewall/Ports.pm; then chmod 0644 ${PREFIX}/usr/share/shorewall-perl/Shorewall/Ports.pm else - echo "The buildports.pl tool failed -- installing the default Protocol/Ports Module" - cp -a ${PREFIX}/usr/share/shorewall-perl/Shorewall/DefaultPorts.pm ${PREFIX}/usr/share/shorewall-perl/Shorewall/Ports.pm + echo "The buildports.pl tool failed -- installing the fallback Protocol/Ports Module" + cp -a ${PREFIX}/usr/share/shorewall-perl/Shorewall/FallbackPorts.pm ${PREFIX}/usr/share/shorewall-perl/Shorewall/Ports.pm fi fi diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index 036eaaa36..63d948739 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -49,8 +49,8 @@ rm -rf $RPM_BUILD_ROOT if /usr/share/shorewall-perl/buildports.pl > /usr/share/shorewall-perl/Shorewall/Ports.pm; then chmod 0555 /usr/share/shorewall-perl/Shorewall/Ports.pm else - echo "The buildports.pl tool failed -- installing the default Protocol/Ports Module" - cp -a /usr/share/shorewall-perl/Shorewall/DefaultPorts.pm /usr/share/shorewall-perl/Shorewall/Ports.pm + echo "The buildports.pl tool failed -- installing the fallback Protocol/Ports Module" + cp -a /usr/share/shorewall-perl/Shorewall/FallbackPorts.pm /usr/share/shorewall-perl/Shorewall/Ports.pm fi %preun @@ -73,7 +73,7 @@ fi %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Common.pm %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Compiler.pm %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Config.pm -%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/DefaultPorts.pm +%attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/FallbackPorts.pm %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Hosts.pm %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/Interfaces.pm %attr(0555,root,root) /usr/share/shorewall-perl/Shorewall/IPAddrs.pm