Phase II of publishing Shorewall::Ports.pm

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6621 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-20 21:07:08 +00:00
parent 18226fa474
commit ad06133e3b
7 changed files with 21 additions and 14 deletions

View File

@ -66,13 +66,22 @@ Other changes in Shorewall 4.0.0 Beta 6
3) Previously, Shorewall-perl read /etc/protocols and /etc/services 3) Previously, Shorewall-perl read /etc/protocols and /etc/services
during compiler startup to build internal protocol and service during compiler startup to build internal protocol and service
tables. This had a fixed cost of up to one second or more, tables. This had a fixed cost of up to one half second or more,
depending on the speed of the system and the distribution depending on the speed of the system and the distribution
(The /etc/services released with OpenSuSE 10.2 is over 14,000 (The /etc/services released with OpenSuSE 10.2 is over 14,000
lines!!) These tables are now initialized by the Perl compiler lines!!) These tables are now initialized by the Perl compiler
which speeds up compilation considerably. The /etc/protocols and which speeds up compilation considerably.
/etc/services used to build these tables are from Ubuntu Fiesty
Fawn and are included in /usr/share/shorewall-perl/. The file /usr/share/shorewall-perl/Shorewall/Ports.pm contains the
tables. As released from shorewall.net, the tables match
/etc/protocols and /etc/services from Ubuntu Feisty Fawn.
If you insist on having the tables match your own /etc/protocols
and /etc/services, then as root:
1. Backup your /usr/share/shorewall-perl/Shorewall/Ports.pm
file.
2. /usr/share/shorewall-perl/buildports.pl > /usr/share/shorewall-perl/Shorewall/Ports.pm
Migration Considerations: Migration Considerations:

View File

@ -29,6 +29,7 @@ require Exporter;
use Shorewall::Common; use Shorewall::Common;
use Shorewall::Config; use Shorewall::Config;
use Shorewall::Ports;
use Shorewall::Zones; use Shorewall::Zones;
use Shorewall::Interfaces; use Shorewall::Interfaces;
use Shorewall::IPAddrs; use Shorewall::IPAddrs;

View File

@ -30,7 +30,6 @@ package Shorewall::Config;
use strict; use strict;
use warnings; use warnings;
use Shorewall::Common; use Shorewall::Common;
use Shorewall::Ports;
use File::Basename; use File::Basename;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
@ -63,9 +62,7 @@ our @EXPORT = qw(
%config %config
%globals %globals
%capabilities %capabilities );
%protocols
%services );
our @EXPORT_OK = qw( $shorewall_dir initialize ); our @EXPORT_OK = qw( $shorewall_dir initialize );
our @VERSION = 1.00; our @VERSION = 1.00;

View File

@ -26,7 +26,7 @@
# modules files during compiler startup. # modules files during compiler startup.
# #
# #
# Protocol and Services module generated using buildproto.pl - Wed Jun 20 13:47:35 2007 # Protocol and Services module generated using buildports.pl - Wed Jun 20 14:03:53 2007
# #
package Shorewall::Ports; package Shorewall::Ports;

View File

@ -19,7 +19,7 @@
# #
# Usage: # Usage:
# #
# buildproto.pl [ <directory> ] > /usr/share/shorewall-perl/Shorewall/Ports.pm # buildports.pl [ <directory> ] > /usr/share/shorewall-perl/Shorewall/Ports.pm
# #
# Where: # Where:
# #
@ -93,7 +93,7 @@ print <<"EOF";
# modules files during compiler startup. # modules files during compiler startup.
# #
# #
# Protocol and Services module generated using buildproto.pl - $date # Protocol and Services module generated using buildports.pl - $date
# #
EOF EOF
@ -122,7 +122,7 @@ while ( read_a_line1 ) {
print "\t\t );\n\n"; print "\t\t );\n\n";
print "our %services = (\n"; print "our \%services = (\n";
open_file 'services' or fatal_error "Cannot open services: $!"; open_file 'services' or fatal_error "Cannot open services: $!";

View File

@ -188,7 +188,7 @@ done
# #
# Install buildproto.pl # Install buildproto.pl
# #
install_file buildproto.pl ${PREFIX}/usr/share/shorewall-perl/buildproto.pl 0555 install_file buildports.pl ${PREFIX}/usr/share/shorewall-perl/buildports.pl 0555
echo $VERSION > ${PREFIX}/usr/share/shorewall-perl/version echo $VERSION > ${PREFIX}/usr/share/shorewall-perl/version
# #

View File

@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %dir /usr/share/shorewall-perl %attr(0755,root,root) %dir /usr/share/shorewall-perl
%attr(0755,root,root) %dir /usr/share/shorewall-perl/Shorewall %attr(0755,root,root) %dir /usr/share/shorewall-perl/Shorewall
%attr(555,root,root) /usr/share/shorewall-perl/buildproto.pl %attr(555,root,root) /usr/share/shorewall-perl/buildports.pl
%attr(555,root,root) /usr/share/shorewall-perl/compiler.pl %attr(555,root,root) /usr/share/shorewall-perl/compiler.pl
%attr(0644,root,root) /usr/share/shorewall-perl/prog.header %attr(0644,root,root) /usr/share/shorewall-perl/prog.header
%attr(0644,root,root) /usr/share/shorewall-perl/prog.functions %attr(0644,root,root) /usr/share/shorewall-perl/prog.functions