Mailinglist Archive: yast-commit (1271 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12
Script 'mail_helper' called by ro
Hello packager,

This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network ->
sle12



## BNC# 894419 : "internal error: service with name service:vnc-httpd does not
exist" (RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes
2014-09-03 16:38:52.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes
2014-09-04 12:55:28.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 4 11:03:29 CEST 2014 - locilka@xxxxxxxx
+
+- Fixed firewall proposal to survive missing SuSEfirewall2 services
+ files for openssh or VNC - if files are missing, services are not
+ handled by the proposal (bnc#894419)
+- 3.1.93
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
and /mounts/work_src_done/SLE12/yast2-network (BS:build ID:43592
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-network", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-network-3.1.92.tar.bz2

New:
----
yast2-network-3.1.93.tar.bz2

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.emjdIN/_old 2014-09-04 17:11:43.000000000 +0200
+++ /var/tmp/diff_new_pack.emjdIN/_new 2014-09-04 17:11:43.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-network
-Version: 3.1.92
+Version: 3.1.93
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-network-3.1.92.tar.bz2 -> yast2-network-3.1.93.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.92/package/yast2-network.changes
new/yast2-network-3.1.93/package/yast2-network.changes
--- old/yast2-network-3.1.92/package/yast2-network.changes 2014-09-03
13:34:31.000000000 +0200
+++ new/yast2-network-3.1.93/package/yast2-network.changes 2014-09-04
12:50:08.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 4 11:03:29 CEST 2014 - locilka@xxxxxxxx
+
+- Fixed firewall proposal to survive missing SuSEfirewall2 services
+ files for openssh or VNC - if files are missing, services are not
+ handled by the proposal (bnc#894419)
+- 3.1.93
+
+-------------------------------------------------------------------
Wed Sep 3 09:01:40 UTC 2014 - mvidner@xxxxxxxx

- Test speed-up.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-3.1.92/package/yast2-network.spec
new/yast2-network-3.1.93/package/yast2-network.spec
--- old/yast2-network-3.1.92/package/yast2-network.spec 2014-09-03
13:34:31.000000000 +0200
+++ new/yast2-network-3.1.93/package/yast2-network.spec 2014-09-04
12:50:08.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-network
-Version: 3.1.92
+Version: 3.1.93
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-3.1.92/src/clients/firewall_stage1_proposal.rb
new/yast2-network-3.1.93/src/clients/firewall_stage1_proposal.rb
--- old/yast2-network-3.1.92/src/clients/firewall_stage1_proposal.rb
2014-09-03 13:34:32.000000000 +0200
+++ new/yast2-network-3.1.93/src/clients/firewall_stage1_proposal.rb
2014-09-04 12:50:08.000000000 +0200
@@ -151,15 +151,6 @@
def FirewallDialogSimple
title = _("Basic Firewall and SSH Configuration")

- vnc_support = Left(
- CheckBox(
- Id(ID::VNC_PORT),
- # TRANSLATORS: check-box label
- _("Open &VNC Ports"),
- SuSEFirewall4Network.EnabledVnc1stStage
- )
- )
-
contents = VBox(
Frame(
# frame label
@@ -178,14 +169,7 @@
SuSEFirewall4Network.Enabled1stStage
)
),
- Left(
- CheckBox(
- Id(ID::SSH_PORT),
- # TRANSLATORS: check-box label
- _("Open SSH Port"),
- SuSEFirewall4Network.EnabledSsh1stStage
- )
- ),
+
Left(
CheckBox(
Id(ID::ENABLE_SSHD),
@@ -195,7 +179,9 @@
)
),

- Linuxrc.vnc ? vnc_support : Empty()
+ sshd_port_ui,
+
+ vnc_ports_ui
)
)
)
@@ -306,33 +292,75 @@
"SSH service will be disabled (<a href=\"%s\">enable</a>)"
) % LINK_ENABLE_SSHD

- vnc_fw_proposal = nil
- ssh_fw_proposal = nil
+ # Filter proposals with content and sort them
+ proposals = [firewall_proposal, ssh_fw_proposal, sshd_proposal,
vnc_fw_proposal].compact
+ "<ul>\n" + proposals.map {|prop| "<li>#{prop}</li>\n" }.join + "</ul>\n"
+ end
+
+ def sshd_port_ui
+ return Empty() unless
known_firewall_services?(SuSEFirewall4NetworkClass::SSH_SERVICES)
+
+ Left(
+ CheckBox(
+ Id(ID::SSH_PORT),
+ # TRANSLATORS: check-box label
+ _("Open SSH Port"),
+ SuSEFirewall4Network.EnabledSsh1stStage
+ )
+ )
+ end
+
+ def vnc_ports_ui
+ return Empty() unless Linuxrc.vnc
+ return Empty() unless
known_firewall_services?(SuSEFirewall4NetworkClass::VNC_SERVICES)
+
+ Left(
+ CheckBox(
+ Id(ID::VNC_PORT),
+ # TRANSLATORS: check-box label
+ _("Open &VNC Ports"),
+ SuSEFirewall4Network.EnabledVnc1stStage
+ )
+ )
+ end
+
+ # Returns the VNC-port part of the firewall proposal description
+ # Returns nil if this part should be skipped
+ # @return [String] proposal html text
+ def vnc_fw_proposal
# It only makes sense to show the blocked ports if firewall is
# enabled (bnc#886554)
- if SuSEFirewall4Network.Enabled1stStage
- # Display vnc port only if installing over VNC
- if Linuxrc.vnc
- vnc_fw_proposal = SuSEFirewall4Network.EnabledVnc1stStage ?
- _("VNC ports will be open (<a href=\"%s\">close</a>)") %
- LINK_DISABLE_VNC
- : _("VNC ports will be blocked (<a href=\"%s\">open</a>)") %
- LINK_ENABLE_VNC
- end
+ return nil unless SuSEFirewall4Network.Enabled1stStage
+ return nil unless
known_firewall_services?(SuSEFirewall4NetworkClass::VNC_SERVICES)
+ # Show VNC port only if installing over VNC
+ return nil unless Linuxrc.vnc

- ssh_fw_proposal = SuSEFirewall4Network.EnabledSsh1stStage ?
- _(
- "SSH port will be open (<a href=\"%s\">block</a>)"
- ) % LINK_BLOCK_SSH_PORT
- :
- _(
- "SSH port will be blocked (<a href=\"%s\">open</a>)"
- ) % LINK_OPEN_SSH_PORT
- end
+ SuSEFirewall4Network.EnabledVnc1stStage ?
+ _("VNC ports will be open (<a href=\"%s\">close</a>)") %
LINK_DISABLE_VNC
+ :
+ _("VNC ports will be blocked (<a href=\"%s\">open</a>)") %
LINK_ENABLE_VNC
+ end

- # Filter proposals with content and sort them
- proposals = [firewall_proposal, ssh_fw_proposal, sshd_proposal,
vnc_fw_proposal].compact
- "<ul>\n" + proposals.map {|prop| "<li>#{prop}</li>\n" }.join + "</ul>\n"
+ # Returns the SSH-port part of the firewall proposal description
+ # Returns nil if this part should be skipped
+ # @return [String] proposal html text
+ def ssh_fw_proposal
+ return nil unless SuSEFirewall4Network.Enabled1stStage
+ return nil unless
known_firewall_services?(SuSEFirewall4NetworkClass::SSH_SERVICES)
+
+ SuSEFirewall4Network.EnabledSsh1stStage ?
+ _("SSH port will be open (<a href=\"%s\">block</a>)") %
LINK_BLOCK_SSH_PORT
+ :
+ _("SSH port will be blocked (<a href=\"%s\">open</a>)") %
LINK_OPEN_SSH_PORT
+ end
+
+ # Returns true if all services are known to firewall
+ # @param [Array <String>] services
+ # @return [Boolean] if all are known
+ def known_firewall_services?(services)
+ @all_known_services ||= SuSEFirewallServices.all_services.keys
+
+ (services - @all_known_services).empty?
end

# Reads and adjust the configuration for SuSEfirewall2 according to the
current proposal.
@@ -375,17 +403,25 @@
# Open or close FW ports depending on user decision
# This can raise an exception if requested service-files are not part of
the current system
# For that reason, these files have to be part of the inst-sys
- SuSEFirewall.SetServicesForZones(
- SuSEFirewall4NetworkClass::SSH_SERVICES,
- SuSEFirewall.GetKnownFirewallZones,
- open_ssh_port
- )
+ if known_firewall_services?(SuSEFirewall4NetworkClass::SSH_SERVICES)
+ SuSEFirewall.SetServicesForZones(
+ SuSEFirewall4NetworkClass::SSH_SERVICES,
+ SuSEFirewall.GetKnownFirewallZones,
+ open_ssh_port
+ )
+ else
+ log.warn "Services #{SuSEFirewall4NetworkClass::SSH_SERVICES} are
unknown"
+ end

- SuSEFirewall.SetServicesForZones(
- SuSEFirewall4NetworkClass::VNC_SERVICES,
- SuSEFirewall.GetKnownFirewallZones,
- open_vnc_port
- )
+ if known_firewall_services?(SuSEFirewall4NetworkClass::VNC_SERVICES)
+ SuSEFirewall.SetServicesForZones(
+ SuSEFirewall4NetworkClass::VNC_SERVICES,
+ SuSEFirewall.GetKnownFirewallZones,
+ open_vnc_port
+ )
+ else
+ log.warn "Services #{SuSEFirewall4NetworkClass::VNC_SERVICES} are
unknown"
+ end

# Writing the configuration including adjusting services
# is done in firewall_stage1_finish

continue with "q"...


Checked in at Thu Sep 4 17:11:57 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread