Hello community,
here is the log from the commit of package yast2
checked in at Thu Sep 25 23:52:45 CEST 2008.
--------
--- yast2/yast2.changes 2008-09-24 12:52:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-25 15:17:56.014807000 +0200
@@ -1,0 +2,14 @@
+Thu Sep 25 15:03:02 CEST 2008 - lslezak@suse.cz
+
+- reverted back the base product detection, fixed in pkg-bindings
+ (bnc#413444)
+- display the affected repository while importing a GPG key,
+ updated GPG callbacks (bnc#370223)
+- 2.17.30
+
+-------------------------------------------------------------------
+Thu Sep 25 13:30:01 CEST 2008 - locilka@suse.cz
+
+- Fixed VNC handling in Firewall Proposal (bnc #427708).
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.29.tar.bz2
New:
----
yast2-2.17.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.cT8570/_old 2008-09-25 23:52:33.000000000 +0200
+++ /var/tmp/diff_new_pack.cT8570/_new 2008-09-25 23:52:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.29)
+# spec file for package yast2 (Version 2.17.30)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,17 +19,17 @@
Name: yast2
-Version: 2.17.29
+Version: 2.17.30
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.29.tar.bz2
+Source0: yast2-2.17.30.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
# Needed already in build time
-BuildRequires: yast2-core >= 2.17.1 yast2-pkg-bindings >= 2.17.1
+BuildRequires: yast2-core >= 2.17.1 yast2-pkg-bindings >= 2.17.13
# pre-requires for filling the sysconfig template (sysconfig.yast2)
PreReq: %fillup_prereq
# y2base foo -S (hello) UI, list:: namespace
@@ -37,8 +37,8 @@
# Mod_UI
# new YButtonBox widget (fate #303446)
Requires: yast2-ycp-ui-bindings >= 2.17.3
-# changed patch/message callbacks
-Requires: yast2-pkg-bindings >= 2.17.1
+# changed GPG callbacks
+Requires: yast2-pkg-bindings >= 2.17.13
Requires: yast2_ui yast2-branding
# For Cron Agent, Module
Requires: perl-Config-Crontab
@@ -147,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.29
+%setup -n yast2-2.17.30
%build
%{prefix}/bin/y2tool y2autoconf
@@ -251,6 +251,14 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Thu Sep 25 2008 lslezak@suse.cz
+- reverted back the base product detection, fixed in pkg-bindings
+ (bnc#413444)
+- display the affected repository while importing a GPG key,
+ updated GPG callbacks (bnc#370223)
+- 2.17.30
+* Thu Sep 25 2008 locilka@suse.cz
+- Fixed VNC handling in Firewall Proposal (bnc #427708).
* Tue Sep 23 2008 locilka@suse.cz
- Fixed Popup::ErrorDetails (bnc #429068).
- 2.17.29
++++++ yast2-2.17.29.tar.bz2 -> yast2-2.17.30.tar.bz2 ++++++
++++ 5899 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.29/configure.in new/yast2-2.17.30/configure.in
--- old/yast2-2.17.29/configure.in 2008-09-24 13:02:20.000000000 +0200
+++ new/yast2-2.17.30/configure.in 2008-09-25 15:16:52.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.29, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.30, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.29"
+VERSION="2.17.30"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.29/library/modules/Version.ycp new/yast2-2.17.30/library/modules/Version.ycp
--- old/yast2-2.17.29/library/modules/Version.ycp 2008-09-24 13:02:28.000000000 +0200
+++ new/yast2-2.17.30/library/modules/Version.ycp 2008-09-25 15:17:07.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.29";
+global string yast2 = "2.17.30";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.29/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.17.30/library/network/src/SuSEFirewallProposal.ycp
--- old/yast2-2.17.29/library/network/src/SuSEFirewallProposal.ycp 2008-08-28 11:06:28.000000000 +0200
+++ new/yast2-2.17.30/library/network/src/SuSEFirewallProposal.ycp 2008-09-25 14:58:53.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Functional interface for SuSEFirewall installation proposal
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallProposal.ycp 49127 2008-07-15 16:32:01Z locilka $
+ * $Id: SuSEFirewallProposal.ycp 51504 2008-09-25 11:34:19Z locilka $
*
* This module provides a functional API for Installation proposal of SuSEfirewall2
*/
@@ -17,6 +17,7 @@
import "ProductFeatures";
import "Linuxrc";
import "Package";
+ import "SuSEFirewallServices";
# <!-- SuSEFirewall LOCAL VARIABLES //-->
@@ -31,7 +32,14 @@
/* warnings for this "turn" */
list <string> warnings_now = [];
-
+
+ list <string> vnc_fallback_ports = ["5801", "5901"];
+
+ // bnc #427708, yet another name of service
+ string vnc_service = "service:xorg-x11-server";
+
+ string ssh_service = "service:sshd";
+
# <!-- SuSEFirewall LOCAL VARIABLES //-->
# <!-- SuSEFirewall LOCAL FUNCTIONS //-->
@@ -188,7 +196,7 @@
/**
* Enables ports in zones.
*
- * @param list <string> fallback_ports
+ * @param list <string> fallback TCP ports
* @param list <string> zones
*/
void EnableFallbackPorts (list <string> fallback_ports, list <string> zones) {
@@ -207,7 +215,7 @@
* 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:sshd" or "service:xorg-x11-Xvnc"
+ * @param string service such as "service:koo" or "serice:boo"
*/
global define void OpenServiceOnNonDialUpInterfaces (string service, list <string> fallback_ports) {
list <string> non_dial_up_interfaces = SuSEFirewall::GetAllNonDialUpInterfaces();
@@ -216,36 +224,45 @@
// 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);
- 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 (! ServiceEnabled (service, non_dial_up_interfaces_zones))
+ 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);
+ }
// 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);
- 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 (! ServiceEnabled (service, 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);
+ }
// No network interfaces are known
} else if (size(known_interfaces) == 0) {
- if (
- SuSEFirewall::IsAnyNetworkInterfaceSupported() &&
- SuSEFirewall::IsServiceSupportedInZone (service, SuSEFirewall::special_all_interface_zone)
- ) {
- 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)
- );
+ 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]);
+ }
}
}
}
@@ -296,19 +313,19 @@
SetInterfacesToZone(non_dup_interfaces, "INT");
SetInterfacesToZone(dial_up_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["service:sshd"], ["INT","EXT"], true);
+ SuSEFirewall::SetServicesForZones([ssh_service], ["INT","EXT"], true);
// has non-dial-up and doesn't have dial-up interfaces
} else if (size(non_dup_interfaces)>0 && size(dial_up_interfaces)==0) {
SetInterfacesToZone(non_dup_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["service:sshd"], ["EXT"], true);
+ SuSEFirewall::SetServicesForZones([ssh_service], ["EXT"], true);
// doesn't have non-dial-up and has dial-up interfaces
} else if (size(non_dup_interfaces)==0 && size(dial_up_interfaces)>0) {
SetInterfacesToZone(dial_up_interfaces, "EXT");
if (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"))
- SuSEFirewall::SetServicesForZones(["service:sshd"], ["EXT"], true);
+ SuSEFirewall::SetServicesForZones([ssh_service], ["EXT"], true);
}
/*
@@ -323,13 +340,13 @@
y2milestone("This is an installation over VNC, opening VNC on all non-dial-up interfaces...");
// Try the service first, then ports
// bnc #398855
- OpenServiceOnNonDialUpInterfaces ("service:xorg-x11-Xvnc", ["5801", "5901"]);
+ OpenServiceOnNonDialUpInterfaces (vnc_service, vnc_fallback_ports);
}
if (Linuxrc::usessh()) {
y2milestone("This is an installation over SSH, opening SSH on all non-dial-up interfaces...");
// Try the service first, then ports
// bnc #398855
- OpenServiceOnNonDialUpInterfaces ("service:sshd", ["ssh"]);
+ OpenServiceOnNonDialUpInterfaces (ssh_service, ["ssh"]);
}
/*
@@ -473,7 +490,7 @@
foreach (string zone, used_zones, {
if (
- SuSEFirewall::IsServiceSupportedInZone ("service:sshd", zone)
+ SuSEFirewall::IsServiceSupportedInZone (ssh_service, zone)
||
SuSEFirewall::HaveService("ssh", "TCP", zone)
) {
@@ -495,7 +512,7 @@
// and ssh is enabled there
} else if (
SuSEFirewall::IsAnyNetworkInterfaceSupported() &&
- SuSEFirewall::IsServiceSupportedInZone ("service:sshd", SuSEFirewall::special_all_interface_zone)
+ SuSEFirewall::IsServiceSupportedInZone (ssh_service, SuSEFirewall::special_all_interface_zone)
) {
is_ssh_enabled = true;
// TRANSLATORS: Network proposal informative text with link around
@@ -516,8 +533,19 @@
boolean is_vnc_enabled = false;
if (size(known_interfaces)>0) {
foreach (string zone, SuSEFirewall::GetZonesOfInterfacesWithAnyFeatureSupported(known_interfaces), {
- if (SuSEFirewall::IsServiceSupportedInZone ("service:xorg-x11-Xvnc", zone))
+ if (SuSEFirewall::IsServiceSupportedInZone (vnc_service, zone) == true) {
is_vnc_enabled = true;
+ // checking also fallback ports
+ } else {
+ boolean set_vnc_enabled_to = true;
+ foreach (string one_port, vnc_fallback_ports, {
+ if (SuSEFirewall::HaveService (one_port, "TCP", zone) != true) {
+ set_vnc_enabled_to = false;
+ break;
+ }
+ if (set_vnc_enabled_to == true) is_vnc_enabled = true;
+ });
+ }
});
}
y2milestone("VNC port is " + (is_vnc_enabled ? "open":"blocked") + " in the firewall");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.29/library/packages/src/PackageCallbacks.ycp new/yast2-2.17.30/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.17.29/library/packages/src/PackageCallbacks.ycp 2008-09-17 16:13:56.000000000 +0200
+++ new/yast2-2.17.30/library/packages/src/PackageCallbacks.ycp 2008-09-25 15:06:34.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 51236 2008-09-17 14:02:01Z lslezak $
+ * $Id: PackageCallbacks.ycp 51517 2008-09-25 13:06:32Z lslezak $
*
*/
@@ -2899,7 +2899,7 @@
if (Mode::autoinst() != true) {
// Signature-related callbacks
Pkg::CallbackAcceptUnsignedFile (SignatureCheckCallbacks::AcceptUnsignedFile);
- Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey);
+// obsoleted Pkg::CallbackAcceptUnknownGpgKey (SignatureCheckCallbacks::AcceptUnknownGpgKey);
Pkg::CallbackImportGpgKey (SignatureCheckCallbacks::ImportGpgKey);
Pkg::CallbackAcceptNonTrustedGpgKey (SignatureCheckCallbacks::TrustGpgKey);
Pkg::CallbackAcceptVerificationFailed (SignatureCheckCallbacks::AcceptVerificationFailed);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.17.29/library/packages/src/Product.ycp new/yast2-2.17.30/library/packages/src/Product.ycp
--- old/yast2-2.17.29/library/packages/src/Product.ycp 2008-09-18 13:14:14.000000000 +0200
+++ new/yast2-2.17.30/library/packages/src/Product.ycp 2008-09-25 15:04:44.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Lukas Ocilka
*
- * $Id: Product.ycp 51268 2008-09-18 10:51:50Z lslezak $
+ * $Id: Product.ycp 51516 2008-09-25 13:04:43Z lslezak $
*/
{
@@ -84,17 +84,8 @@
y2milestone ("Looking for base products");
list