Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2012-08-31 10:10:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2012-08-08 11:47:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2012-08-31 10:10:05.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 27 08:51:54 CEST 2012 - [email protected] + +- fix bnc#776567 YaST doesn't support input method +- 2.23.4 + +------------------------------------------------------------------- +Fri Aug 17 15:47:42 CEST 2012 - [email protected] + +- Fixed a typo (BNC #766703) +- Added support for iSCSI Target into the Firewall proposal + (BNC #766300) + +------------------------------------------------------------------- Old: ---- yast2-2.23.3.tar.bz2 New: ---- yast2-2.23.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.G18YzI/_old 2012-08-31 10:10:08.000000000 +0200 +++ /var/tmp/diff_new_pack.G18YzI/_new 2012-08-31 10:10:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,25 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild + Name: yast2 -Version: 2.23.3 +Version: 2.23.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-%{version}.tar.bz2 + +Group: System/YaST +License: GPL-2.0+ Source1: yast2-rpmlintrc -BuildRequires: perl-XML-Writer -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite # Needed already in build time -BuildRequires: yast2-core >= 2.18.12 -BuildRequires: yast2-pkg-bindings >= 2.20.3 -BuildRequires: yast2-ycp-ui-bindings >= 2.18.4 +BuildRequires: yast2-core >= 2.18.12 yast2-pkg-bindings >= 2.20.3 yast2-ycp-ui-bindings >= 2.18.4 # pre-requires for filling the sysconfig template (sysconfig.yast2) PreReq: %fillup_prereq @@ -52,10 +51,8 @@ Requires: perl-Config-Crontab # for ag_tty (/bin/stty) # for /usr/bin/md5sum -Requires: coreutils -Requires: sysconfig -Requires: yast2-hardware-detection -Requires: yast2-xml +Requires: coreutils sysconfig +Requires: yast2-xml yast2-hardware-detection # for SLPAPI.pm Requires: yast2-perl-bindings # for ag_anyxml @@ -95,30 +92,22 @@ Provides: yast2-lib-sequencer Obsoletes: yast2-lib-sequencer -Provides: yast2-lib-wizard -Provides: yast2-lib-wizard-devel -Provides: yast2-trans-wizard -Obsoletes: yast2-lib-wizard -Obsoletes: yast2-lib-wizard-devel -Obsoletes: yast2-trans-wizard -Provides: y2t_menu -Provides: yast2-trans-menu -Obsoletes: y2t_menu -Obsoletes: yast2-trans-menu +Provides: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Obsoletes: yast2-lib-wizard yast2-lib-wizard-devel yast2-trans-wizard +Provides: yast2-trans-menu y2t_menu +Obsoletes: yast2-trans-menu y2t_menu # moved here from another packages -Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm -Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp -Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp Provides: yast2-installation:/usr/share/YaST2/modules/Installation.ycp Provides: yast2-installation:/usr/share/YaST2/modules/Product.ycp -Provides: yast2-mail-aliases +Provides: yast2-installation:/usr/share/YaST2/modules/Hotplug.ycp +Provides: yast2-installation:/usr/share/YaST2/modules/HwStatus.ycp Provides: yast2-network:/usr/share/YaST2/modules/Internet.ycp Provides: yast2-packager:/usr/lib/YaST2/servers_non_y2/ag_anyxml +Provides: yast2-dns-server:/usr/share/YaST2/modules/DnsServerAPI.pm +Provides: yast2-mail-aliases Summary: YaST2 - Main Package -License: GPL-2.0+ -Group: System/YaST %description This package contains scripts and data needed for SuSE Linux @@ -126,14 +115,14 @@ %package devel-doc Requires: yast2 = %version +Group: System/YaST Provides: yast2-lib-sequencer-devel -Obsoletes: yast2-devel Obsoletes: yast2-lib-sequencer-devel +Obsoletes: yast2-devel Provides: yast2-devel Requires: yast2-core-devel Summary: YaST2 - Development Scripts and Documentation -Group: System/YaST %description devel-doc This package contains scripts and data needed for a SUSE Linux @@ -165,6 +154,7 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/clients mkdir -p "$RPM_BUILD_ROOT"%{_prefix}/share/applications/YaST2 mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/images ++++++ yast2-2.23.3.tar.bz2 -> yast2-2.23.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/VERSION new/yast2-2.23.4/VERSION --- old/yast2-2.23.3/VERSION 2012-08-07 14:47:11.000000000 +0200 +++ new/yast2-2.23.4/VERSION 2012-08-27 08:52:16.000000000 +0200 @@ -1 +1 @@ -2.23.3 +2.23.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/configure.in new/yast2-2.23.4/configure.in --- old/yast2-2.23.3/configure.in 2012-08-07 14:48:19.000000000 +0200 +++ new/yast2-2.23.4/configure.in 2012-08-27 08:50:32.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2, 2.23.3, http://bugs.opensuse.org/, yast2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/library/modules/Linuxrc.ycp new/yast2-2.23.4/library/modules/Linuxrc.ycp --- old/yast2-2.23.3/library/modules/Linuxrc.ycp 2012-08-07 12:52:09.000000000 +0200 +++ new/yast2-2.23.4/library/modules/Linuxrc.ycp 2012-08-27 08:50:20.000000000 +0200 @@ -104,6 +104,13 @@ } /** + * Returns if iSCSI has been requested in Linuxrc. + */ + global boolean useiscsi () { + return Linuxrc::InstallInf("WithiSCSI") == "1"; + } + + /** * we're running in textmode (-> UI::GetDisplayInfo()) */ global boolean text () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/library/modules/Version.ycp new/yast2-2.23.4/library/modules/Version.ycp --- old/yast2-2.23.3/library/modules/Version.ycp 2012-08-07 14:48:29.000000000 +0200 +++ new/yast2-2.23.4/library/modules/Version.ycp 2012-08-27 08:53:48.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.23.3"; +global string yast2 = "2.23.4"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/library/network/src/DnsServerAPI.pm new/yast2-2.23.4/library/network/src/DnsServerAPI.pm --- old/yast2-2.23.3/library/network/src/DnsServerAPI.pm 2012-08-07 12:52:09.000000000 +0200 +++ new/yast2-2.23.4/library/network/src/DnsServerAPI.pm 2012-08-27 08:50:20.000000000 +0200 @@ -306,7 +306,7 @@ The hostname must be relative to the zone or must end with the zone name followed by a dot, for example, -'dhcp1' or 'dhcp1.example.org.' for the zone 'dhcp.org'. +'dhcp1' or 'dhcp1.example.org.' for the zone 'example.org'. "), $hostname, $zone)); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/library/network/src/SuSEFirewall.ycp new/yast2-2.23.4/library/network/src/SuSEFirewall.ycp --- old/yast2-2.23.3/library/network/src/SuSEFirewall.ycp 2012-08-07 12:52:09.000000000 +0200 +++ new/yast2-2.23.4/library/network/src/SuSEFirewall.ycp 2012-08-27 08:50:20.000000000 +0200 @@ -1440,6 +1440,11 @@ if (IsInterfaceInZone(interface, zone)) interface_zone = add (interface_zone, zone); }); + // Fallback handling for 'any' in the FW_DEV_* configuration + if (interface == special_all_interface_string && size(interface_zone) == 0) { + interface_zone = [special_all_interface_zone]; + } + if (IsVerbose() && size(interface_zone) > 1) { // TRANSLATORS: Error message, %1 = interface name (like eth0) Report::Error(sformat(_("Interface '%1' is included in multiple firewall zones. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.23.4/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.23.3/library/network/src/SuSEFirewallProposal.ycp 2012-08-07 12:52:09.000000000 +0200 +++ new/yast2-2.23.4/library/network/src/SuSEFirewallProposal.ycp 2012-08-27 08:50:20.000000000 +0200 @@ -40,6 +40,10 @@ string ssh_service = "service:sshd"; + string iscsi_target_service = "service:iscsitarget"; + + list <string> iscsi_target_fallback_ports = ["iscsi-target"]; + # <!-- SuSEFirewall LOCAL VARIABLES //--> # <!-- SuSEFirewall LOCAL FUNCTIONS //--> @@ -210,12 +214,72 @@ } /** + * Function opens service for network interfaces given as the third parameter. + * Fallback ports are used if the given service is uknown. + * + * @see OpenServiceOnNonDialUpInterfaces for more info. + * + * @param string service, e.g., "service:http-server" + * @param list <string> fallback_ports, e.g., ["80"] + * @param list <string> interfaces, e.g., ["eth3"] + */ + define void OpenServiceInInterfaces(string service, list <string> fallback_ports, list <string> interfaces) { + list <string> zones = SuSEFirewall::GetZonesOfInterfaces(interfaces); + + if (SuSEFirewallServices::IsKnownService (service)) { + y2milestone("Opening service %1 on interfaces %2 (zones %3)", + service, interfaces, zones); + SuSEFirewall::SetServicesForZones([service], zones, true); + } + + if (SuSEFirewallServices::IsKnownService (service) != true || ServiceEnabled (service, interfaces) != true) { + EnableFallbackPorts (fallback_ports, interfaces); + } + } + + /** + * Checks whether the given service or (TCP) ports are open at least in + * one FW zone. + * + * @param string service, e.g., "service:http-server" + * @param list <string> fallback_ports, e.g., ["80"] + */ + define boolean IsServiceOrPortsOpen(string service, list <string> fallback_ports) { + boolean ret = false; + + foreach (string zone, SuSEFirewall::GetKnownFirewallZones(), { + // either service is supported + if (SuSEFirewall::IsServiceSupportedInZone(service, zone)) { + ret = true; + // or check for ports + } else { + boolean all_ports = true; + + // all ports have to be open + foreach (string port, fallback_ports, { + if (! SuSEFirewall::HaveService (port, "TCP", zone)) { + all_ports = false; + break; + } + }); + + if (all_ports) ret = true; + } + + if (ret == true) break; + }); + + return ret; + } + + /** * Function opens up the service on all non-dial-up network interfaces. * If there are no network interfaces known and the 'any' feature is supported, * function opens the service for the zone supporting that feature. If there * are only dial-up interfaces, function opens the service for them. * * @param string service such as "service:koo" or "serice:boo" + * @param list <string> list of ports used as a fallback if the given service doesn't exist */ global define void OpenServiceOnNonDialUpInterfaces (string service, list <string> fallback_ports) { list <string> non_dial_up_interfaces = SuSEFirewall::GetAllNonDialUpInterfaces(); @@ -223,46 +287,15 @@ // Opening the service for non-dial-up interfaces if (size(non_dial_up_interfaces)>0) { - list <string> non_dial_up_interfaces_zones = SuSEFirewall::GetZonesOfInterfaces(non_dial_up_interfaces); - - if (SuSEFirewallServices::IsKnownService (service)) { - y2milestone("Opening service %1 on interfaces %2 (zones %3)", - service, non_dial_up_interfaces, non_dial_up_interfaces_zones); - SuSEFirewall::SetServicesForZones([service], non_dial_up_interfaces_zones, true); - } - - if (SuSEFirewallServices::IsKnownService (service) != true || ServiceEnabled (service, non_dial_up_interfaces_zones) != true) { - EnableFallbackPorts (fallback_ports, non_dial_up_interfaces_zones); - } - + OpenServiceInInterfaces(service, fallback_ports, non_dial_up_interfaces); // Only dial-up network interfaces, there mustn't be any non-dial-up one } else if (size(dial_up_interfaces) > 0) { - list <string> dial_up_interfaces_zones = SuSEFirewall::GetZonesOfInterfaces(dial_up_interfaces); - - if (SuSEFirewallServices::IsKnownService (service)) { - y2warning("Opening service %1 on interfaces %2 (zones %3)", - service, dial_up_interfaces, dial_up_interfaces_zones); - SuSEFirewall::SetServicesForZones([service], dial_up_interfaces_zones, true); - } - - if (SuSEFirewallServices::IsKnownService (service) != true || ServiceEnabled (service, dial_up_interfaces) != true) { - EnableFallbackPorts (fallback_ports, dial_up_interfaces); - } - + OpenServiceInInterfaces(service, fallback_ports, dial_up_interfaces); // No network interfaces are known } else if (size(known_interfaces) == 0) { if (SuSEFirewall::IsAnyNetworkInterfaceSupported() == true) { - if (SuSEFirewallServices::IsKnownService (service) == true) { - y2warning("WARNING: Opening %1 for the External zone without any known interface!", toupper(service)); - SuSEFirewall::SetServicesForZones([service], [SuSEFirewall::special_all_interface_zone], true); - y2milestone("By now, %1 for %2 zone is %3", - service, - SuSEFirewall::special_all_interface_zone, - SuSEFirewall::IsServiceSupportedInZone (service, SuSEFirewall::special_all_interface_zone) - ); - } else { - EnableFallbackPorts (fallback_ports, [SuSEFirewall::special_all_interface_zone]); - } + y2warning("WARNING: Opening %1 for the External zone without any known interface!", toupper(service)); + OpenServiceInInterfaces(service, fallback_ports, [SuSEFirewall::special_all_interface_string]); } } } @@ -357,6 +390,13 @@ SuSEFirewall::AddXenSupport(); } + // BNC #766300 - Automatically propose opening iscsi-target port + // when installing with withiscsi=1 + if (Linuxrc::useiscsi()) { + y2milestone("iSCSI has been used during installation, opening %1 service", iscsi_target_service); + OpenServiceOnNonDialUpInterfaces (iscsi_target_service, iscsi_target_fallback_ports); + } + SetKnownInterfaces(SuSEFirewall::GetListOfKnownInterfaces()); } @@ -564,7 +604,23 @@ // TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall AddWarning(_("You are installing a system using remote administration (VNC), but you have not opened the VNC ports on the firewall.")); } - + + if (Linuxrc::useiscsi()) { + boolean is_iscsi_enabled = IsServiceOrPortsOpen(iscsi_target_service, iscsi_target_fallback_ports); + + output = output + "<li>" + (is_iscsi_enabled ? + // TRANSLATORS: Network proposal informative text + _("iSCSI Target ports are open") + : + // TRANSLATORS: Network proposal informative text + _("iSCSI Target ports are blocked") + ) + "</li>\n"; + + if (! is_iscsi_enabled) + // TRANSLATORS: This is a warning message. Installation to iSCSI without iSCSI allowed on firewall + AddWarning(_("You are installing a system using iSCSI Target, but you have not opened the needed ports on the firewall.")); + } + list <string> warnings_strings = GetWarnings(); if (size(warnings_strings)>0) { ClearWarnings(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.23.3/scripts/yast2 new/yast2-2.23.4/scripts/yast2 --- old/yast2-2.23.3/scripts/yast2 2012-08-07 12:52:09.000000000 +0200 +++ new/yast2-2.23.4/scripts/yast2 2012-08-27 08:50:20.000000000 +0200 @@ -15,6 +15,10 @@ export PATH=/sbin:/usr/sbin:$PATH +# we need input methods for many locales bnc#776567 + +export QT_IM_MODULE=xim GTK_IM_MODULE=xim + # allow for a different prefix # strip the basename off $0, which can be: (bnc#382216, bnc#458385) # /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin/yast2 (PATH=/sbin/:...) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
