Hello community,

here is the log from the commit of package webyast-firewall for 
openSUSE:Factory checked in at 2011-12-01 12:26:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/webyast-firewall (Old)
 and      /work/SRC/openSUSE:Factory/.webyast-firewall.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "webyast-firewall", Maintainer is ""

Changes:
--------
New Changes file:

--- /dev/null   2010-08-26 16:28:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.webyast-firewall.new/webyast-firewall.changes   
2011-12-01 12:26:58.000000000 +0100
@@ -0,0 +1,123 @@
+-------------------------------------------------------------------
+Mon Oct 24 14:55:31 UTC 2011 - [email protected]
+
+- Merging client and service
+- 0.3.0 
+
+-------------------------------------------------------------------
+Mon May 16 10:12:13 UTC 2011 - [email protected]
+
+- changed licence to the correct name GPL-2.0
+- 0.2.14 
+
+-------------------------------------------------------------------
+Mon May  2 12:21:31 UTC 2011 - [email protected]
+
+- adapt caching to the new job handling 
+- 0.2.13
+
+-------------------------------------------------------------------
+Tue Apr 12 13:11:51 UTC 2011 - [email protected]
+
+- new caching
+- 0.2.12 
+
+-------------------------------------------------------------------
+Fri Feb 25 10:27:38 UTC 2011 - [email protected]
+
+- Fixed bug: WebYaST firewall module crashes if firewall service description 
is missing 
+- 0.2.11
+
+-------------------------------------------------------------------
+Tue Feb  8 16:40:21 UTC 2011 - [email protected]
+
+- removed webyast-firewall-ws-rpmlintrc
+- 0.2.10 
+
+-------------------------------------------------------------------
+Wed Dec 22 12:05:20 UTC 2010 - [email protected]
+
+- fixed "Unknown variant type!" exception if description for firewall services 
is missing
+
+-------------------------------------------------------------------
+Mon Dec 13 09:35:36 UTC 2010 - [email protected]
+
+- added services description
+- 0.2.9 
+
+-------------------------------------------------------------------
+Tue Aug 31 07:17:40 UTC 2010 - [email protected]
+
+- resubmit due ULR changes
+- 0.2.8 
+
+-------------------------------------------------------------------
+Mon Aug 23 12:54:23 UTC 2010 - [email protected]
+
+- add url to spec file (bnc#625537)
+- move tasks to lib directory (bnc#622957)
+- 0.2.7
+
+-------------------------------------------------------------------
+Thu Jul  8 10:30:28 UTC 2010 - [email protected]
+
+- add REST API documentation (mkudlvasr)
+- remove shared test structures
+- 0.2.6
+
+-------------------------------------------------------------------
+Thu May  6 17:09:02 CEST 2010 - [email protected]
+
+- add very basic documentation about firewall-ws
+- version 0.2.5
+
+-------------------------------------------------------------------
+Fri Apr 30 13:31:49 UTC 2010 - [email protected]
+
+- fix spec file consistency (bnc#560061)
+- 0.2.4
+
+-------------------------------------------------------------------
+Fri Apr 23 11:37:16 UTC 2010 - [email protected]
+
+- add license header (bnc#586620)
+- 0.2.3
+
+-------------------------------------------------------------------
+Tue Apr  6 15:41:07 CEST 2010 - [email protected]
+
+- fix bnc#593331 - firewall reported as used even if not running
+- version 0.2.2
+
+-------------------------------------------------------------------
+Mon Mar 29 13:42:15 CEST 2010 - [email protected]
+
+- RPM-Provide WebYaST(org.opensuse.yast.modules.FOO) (bnc#583561)
+
+-------------------------------------------------------------------
+Tue Mar 16 17:46:36 CET 2010 - [email protected]
+
+- fix bnc#587862 (work around bnc#243624 - Mode::testsuite() == true 
+  in YaPI call)
+- fix bnc#587859 (package dependencies)
+- version 0.2.1
+
+-------------------------------------------------------------------
+Thu Feb 25 16:51:56 CET 2010 - [email protected]
+
+- change data structure, so that it doesn't use name of another
+  plugin (services). This was breaking ActiveRecord.
+- remove %config tags from spec-file
+- 0.2.0
+
+-------------------------------------------------------------------
+Thu Feb 18 14:10:04 UTC 2010 - [email protected]
+
+- ensure that rights is granted also for yastws (bnc#580861)
+- 0.1.0
+
+-------------------------------------------------------------------
+Mon Jan 25 15:40:47 CET 2010 - [email protected]
+
+- version 0.0.1
+

New:
----
  FIREWALL.pm
  org.opensuse.yast.modules.yapi.firewall.policy
  webyast-firewall.changes
  webyast-firewall.spec
  www.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ webyast-firewall.spec ++++++
# spec file for package webyast-firewall (Version 0.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name:           webyast-firewall
Provides:       WebYaST(org.opensuse.yast.modules.yapi.firewall)
Provides:       webyast-firewall-ws = 0.2.14 webyast-firewall-ui = 0.2.12
Obsoletes:      webyast-firewall-ws <= 0.2.14 webyast-firewall-ui <= 0.2.12
License:        GPL-2.0 
Group:          Productivity/Networking/Web/Utilities
URL:            http://en.opensuse.org/Portal:WebYaST
Autoreqprov:    on
Version:        0.3.0
Release:        0
Summary:        WebYaST - Firewall management service
Source:         www.tar.bz2
Source1:        org.opensuse.yast.modules.yapi.firewall.policy
Source2:        FIREWALL.pm
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
BuildArch:      noarch
BuildRequires:  rubygem-webyast-rake-tasks rubygem-restility
PreReq:         webyast-base
Requires:       SuSEfirewall2 yast2

BuildRequires:  webyast-base-testsuite
BuildRequires:  rubygem-test-unit rubygem-mocha

#
%define plugin_name firewall
%define plugin_dir %{webyast_dir}/vendor/plugins/%{plugin_name}
#

%package testsuite
Group:     Productivity/Networking/Web/Utilities
Requires:  %{name} = %{version}
Provides:  webyast-firewall-ws-testsuite = 0.2.14 webyast-firewall-ui-testsuite 
= 0.2.12
Obsoletes: webyast-firewall-ws-testsuite <= 0.2.14 
webyast-firewall-ui-testsuite <= 0.2.12
Requires:  webyast-base-testsuite
Summary:   Testsuite for webyast-firewall package

%description
WebYaST - Plugin provides REST based interface to handle firewall settings.
Authors:
--------
    Martin Kudlvasr<[email protected]>

%description testsuite
This package contains complete testsuite for webyast-firewall package.
It's only needed for verifying the functionality of the module and it's not
needed at runtime.

%prep
%setup -q -n www

%build
# build restdoc documentation
mkdir -p public/firewall/restdoc
%webyast_restdoc

# do not package restdoc sources
rm -rf restdoc
#remove generated doc
rm -rf doc

export RAILS_PARENT=%{webyast_dir}
env LANG=en rake makemo

%check
# run the testsuite
%webyast_check

%install

#
# Install all web and frontend parts.
#
mkdir -p $RPM_BUILD_ROOT%{plugin_dir}
cp -a * $RPM_BUILD_ROOT%{plugin_dir}/
rm -f $RPM_BUILD_ROOT%{plugin_dir}/COPYING

# Policies
mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions
install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/

#YaPI
mkdir -p $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/
cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/YaST2/modules/YaPI/

# remove .po files (no longer needed)
rm -rf $RPM_BUILD_ROOT/%{plugin_dir}/po

# search locale files
%find_lang webyast-firewall

%clean
rm -rf $RPM_BUILD_ROOT

%post
#
# granting all permissions for root
#
/usr/sbin/grantwebyastrights --user root --action grant > /dev/null ||:
/usr/sbin/grantwebyastrights --user %{webyast_user} --action grant > /dev/null 
||:

%files -f webyast-firewall.lang
%defattr(-,root,root)
%dir %{webyast_dir}
%dir %{webyast_dir}/vendor
%dir %{webyast_dir}/vendor/plugins
%dir %{plugin_dir}

%dir /usr/share/YaST2/
%dir /usr/share/YaST2/modules/
%dir /usr/share/YaST2/modules/YaPI/
%dir /usr/share/polkit-1
%dir /usr/share/polkit-1/actions
%{plugin_dir}/locale
%{plugin_dir}/README
%{plugin_dir}/Rakefile
%{plugin_dir}/shortcuts.yml
%{plugin_dir}/init.rb
%{plugin_dir}/install.rb
%{plugin_dir}/uninstall.rb
%{plugin_dir}/app
%{plugin_dir}/config
%{plugin_dir}/public
%{plugin_dir}/lib
/usr/share/YaST2/modules/YaPI/FIREWALL.pm
%attr(644,root,root) %config 
/usr/share/polkit-1/actions/org.opensuse.yast.modules.yapi.firewall.policy
%doc COPYING

%files testsuite
%defattr(-,root,root)
%{plugin_dir}/test

%changelog
++++++ FIREWALL.pm ++++++
#--
# Copyright (c) 2009-2010 Novell, Inc.
# 
# All Rights Reserved.
# 
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License
# as published by the Free Software Foundation.
# 
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# 
# You should have received a copy of the GNU General Public License
# along with this program; if not, contact Novell, Inc.
# 
# To contact Novell about this file by physical or electronic mail,
# you may find current contact information at www.novell.com
#++

package YaPI::FIREWALL;

use strict;
use YaST::YCP qw(:LOGGING);
use YaPI;
use Data::Dumper;

# --------------- imported modules
YaST::YCP::Import ("SuSEFirewall");
YaST::YCP::Import ("SuSEFirewallServices");
YaST::YCP::Import ("Mode");
# --------------------------------

our $VERSION            = '1.0.0';
our @CAPABILITIES       = ('SLES11');
our %TYPEINFO;

# Return a boolean value indicating, whether a firewall is running and
# a list of services with their translated name and a boolean value indicating 
whether
# they should be allowed or not (in the external zone).
BEGIN{$TYPEINFO{Read} = ["function", ["map", "string", "any"]];
}

sub Read {
  my $self = shift;
  SuSEFirewall->ResetReadFlag();
  SuSEFirewall->Read();
  my $status  = YaST::YCP::Boolean( SuSEFirewall->GetEnableService () );
  my $known_services = SuSEFirewallServices->GetSupportedServices();
  my @service_ids = keys %$known_services;
  my $service_zones = SuSEFirewall->GetServices(\@service_ids);
  my $mkService = mkServiceGenerator($known_services, $service_zones, "EXT");
  my @services = map($mkService->($_),@service_ids);
  y2milestone "YaPI::FIREWALL::mkService -> 
'".($mkService->($service_ids[0]))."'";
  my %ret = ('use_firewall' => $status, 
             'fw_services'  => \@services
            );
  return \%ret;
}

sub mkServiceGenerator {
  my($service_names,$service_zones,$zone) = @_;
  my $generator = sub { my $service_id = shift;
                        if 
(defined(SuSEFirewallServices->GetDescription($service_id))) {
                                { 'id'      => $service_id,
                                  'name'    => $service_names->{$service_id},
                                  'allowed' => YaST::YCP::Boolean( 
$service_zones->{$service_id}->{$zone} ),
                                  'description' => 
SuSEFirewallServices->GetDescription($service_id)
                                }
                        } else {
                                { 'id'      => $service_id,
                                   'name'    => $service_names->{$service_id},
                                   'allowed' => YaST::YCP::Boolean( 
$service_zones->{$service_id}->{$zone} ),
                                   'description' => ' '
                                }
                        }
                      };
  return $generator;
}

#  Write firewall settings
#  { "use_firewall" => 1,
#    "fw_services"     => [ { "id"      => "service:lighttpd-ssl",
#                          "allowed" => 1 },
#                        { "id"      => "service:samba-client",
#                          "allowed" => 0 }
#                      ]
#  }
#  Return structure
#  { "result" => YaST::YCP::Boolean(1),
#    "error"  => "error string"
#  }
BEGIN{$TYPEINFO{Write} = [ "function", 
                          ["map","string","any"], 
                          ["map","string","any"]]}
sub Write {
  my $self     = shift;
  my $settings = shift;
  y2milestone("YaPI::FIREWALL::Write - setting Mode::_test to none");
  Mode->testMode();
  Mode->SetTest("none");
  y2milestone("YaPI::FIREWALL::Write - settings", Dumper($settings));
  SuSEFirewall->SetEnableService ( $settings->{"use_firewall"} );
  SuSEFirewall->SetStartService ( $settings->{"use_firewall"} );
  my @allowed_services = map {$_ ->{"id"}} (grep { $_->{"allowed"}} 
@{$settings->{"fw_services"}} );
  my @forbidden_services = map {$_->{"id"}} (grep { ! $_->{"allowed"} } 
@{$settings->{"fw_services"}});
  y2milestone("YaPI::FIREWALL::Write - allowing services", 
Dumper(\@allowed_services));
  y2milestone("YaPI::FIREWALL::Write - forbidding services", 
Dumper(\@forbidden_services));
  SuSEFirewall->SetServicesForZones( \@allowed_services, ["EXT"], 1 );
  SuSEFirewall->SetServicesForZones( \@forbidden_services, ["EXT"], 0 );
  my $result = SuSEFirewall->Write();
  # SetServicesForZones should return boolean result according to description, 
but in code it never does.
  return {"saved_ok" => YaST::YCP::Boolean($result), "error"=>""};
}
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to