Mailinglist Archive: opensuse-commit (2130 mails)
| < Previous | Next > |
commit yast2
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 24 Apr 2008 01:58:00 +0200
- Message-id: <20080423235800.BE647678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2
checked in at Thu Apr 24 01:58:00 CEST 2008.
--------
--- yast2/yast2.changes 2008-04-21 13:30:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-04-23
15:47:52.000000000 +0200
@@ -1,0 +2,28 @@
+Wed Apr 23 14:59:43 CEST 2008 - locilka@xxxxxxx
+
+- Fixing CWMFirewallInterfaces to appropriately handle interfaces
+ in unprotected internal zone (bnc #382686).
+- 2.16.56
+
+-------------------------------------------------------------------
+Wed Apr 23 13:27:18 CEST 2008 - mvidner@xxxxxxx
+
+- Make the yast2 script work even with trailing slashes in $PATH
+ (bnc#382216).
+
+-------------------------------------------------------------------
+Wed Apr 23 11:50:23 CEST 2008 - lslezak@xxxxxxx
+
+- PackageSystem.ycp - do not initialize the package callbacks,
+ they are already initialized in PackageCallbacks constructor
+- Product.ycp - do not initialize the package manager, read the
+ installed product from /etc/SuSE-relase file instead (bnc#380652)
+- 2.16.55
+
+-------------------------------------------------------------------
+Tue Apr 22 15:15:59 CEST 2008 - jsrain@xxxxxxx
+
+- rename MODLIST variable to YAST_MODLIST to prevent conflicts
+ with zypper (bnc #382097)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.54.tar.bz2
New:
----
yast2-2.16.56.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.pA6468/_old 2008-04-24 01:57:48.000000000 +0200
+++ /var/tmp/diff_new_pack.pA6468/_new 2008-04-24 01:57:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.54)
+# spec file for package yast2 (Version 2.16.56)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2
-Version: 2.16.54
+Version: 2.16.56
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.54.tar.bz2
+Source0: yast2-2.16.56.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
yast2-perl-bindings yast2-testsuite
@@ -136,7 +136,7 @@
Steffen Winterfeldt <snwint@xxxxxxx>
%prep
-%setup -n yast2-2.16.54
+%setup -n yast2-2.16.56
%build
%{prefix}/bin/y2tool y2autoconf
@@ -240,6 +240,22 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Wed Apr 23 2008 locilka@xxxxxxx
+- Fixing CWMFirewallInterfaces to appropriately handle interfaces
+ in unprotected internal zone (bnc #382686).
+- 2.16.56
+* Wed Apr 23 2008 mvidner@xxxxxxx
+- Make the yast2 script work even with trailing slashes in $PATH
+ (bnc#382216).
+* Wed Apr 23 2008 lslezak@xxxxxxx
+- PackageSystem.ycp - do not initialize the package callbacks,
+ they are already initialized in PackageCallbacks constructor
+- Product.ycp - do not initialize the package manager, read the
+ installed product from /etc/SuSE-relase file instead (bnc#380652)
+- 2.16.55
+* Tue Apr 22 2008 jsrain@xxxxxxx
+- rename MODLIST variable to YAST_MODLIST to prevent conflicts
+ with zypper (bnc #382097)
* Mon Apr 21 2008 jsrain@xxxxxxx
- fixed CWM testsuite
- 2.16.54
++++++ yast2-2.16.54.tar.bz2 -> yast2-2.16.56.tar.bz2 ++++++
++++ 5829 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.16.54/configure.in new/yast2-2.16.56/configure.in
--- old/yast2-2.16.54/configure.in 2008-04-21 12:28:10.000000000 +0200
+++ new/yast2-2.16.56/configure.in 2008-04-23 15:51:20.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.54, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.56, 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.16.54"
+VERSION="2.16.56"
RPMNAME="yast2"
MAINTAINER="Jiri Srain <jsrain@xxxxxxx>"
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.16.54/library/modules/SuSERelease.ycp
new/yast2-2.16.56/library/modules/SuSERelease.ycp
--- old/yast2-2.16.54/library/modules/SuSERelease.ycp 2007-05-18
10:05:53.000000000 +0200
+++ new/yast2-2.16.56/library/modules/SuSERelease.ycp 2008-04-23
14:58:33.000000000 +0200
@@ -6,7 +6,7 @@
* Purpose: Responsible for getting information from the /etc/SuSE-release
* (and similar for other system) file
*
- * $Id: SuSERelease.ycp 34025 2006-11-03 14:41:22Z locilka $
+ * $Id: SuSERelease.ycp 46978 2008-04-23 11:19:48Z lslezak $
*/
{
@@ -78,7 +78,6 @@
* @return string the release information
*/
global string ReleaseName () {
-{
if (Stage::initial ())
{
return (string)SCR::Read (.content.PRODUCT);
@@ -108,6 +107,40 @@
}
}
+/**
+ * Get information about the release
+ * Is limited for the currently running product
+ * @param directory containing the installed system (/ in installed system)
+ * @return string the release information
+ */
+global string ReleaseVersion()
+{
+ if (Stage::initial ())
+ {
+ return (string)SCR::Read (.content.VERSION);
+ }
+
+ string contents = ReleaseFileContents ("/");
+ string version = "";
+
+ if (contents != "?")
+ {
+ list<string> lines = splitstring (contents, "\n");
+ lines = filter (string l, lines, {return l != "";});
+
+ list<string> components = splitstring (lines[0]:"", " ");
+
+ foreach(string c, components,
+ {
+ if (version == "" && regexpmatch (c, "^[0-9\\.]+$"))
+ {
+ version = c;
+ }
+ }
+ );
+ }
+
+ return version;
}
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.16.54/library/modules/Version.ycp
new/yast2-2.16.56/library/modules/Version.ycp
--- old/yast2-2.16.54/library/modules/Version.ycp 2008-04-21
12:28:24.000000000 +0200
+++ new/yast2-2.16.56/library/modules/Version.ycp 2008-04-23
15:51:35.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.54";
+global string yast2 = "2.16.56";
/* 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.16.54/library/network/src/CWMFirewallInterfaces.ycp
new/yast2-2.16.56/library/network/src/CWMFirewallInterfaces.ycp
--- old/yast2-2.16.54/library/network/src/CWMFirewallInterfaces.ycp
2008-04-09 11:50:13.000000000 +0200
+++ new/yast2-2.16.56/library/network/src/CWMFirewallInterfaces.ycp
2008-04-23 15:00:05.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Routines for selecting interfaces opened in firewall
* Authors: Jiri Srain <jsrain@xxxxxxx>
*
- * $Id: CWMFirewallInterfaces.ycp 43882 2008-01-24 14:18:42Z mzugec $
+ * $Id: CWMFirewallInterfaces.ycp 46982 2008-04-23 12:57:28Z locilka $
*
* WARNING: If you want to use this functionality of this module
* you should allways call 'SuSEFirewall::Read()' in the
@@ -32,6 +32,7 @@
//import "NetworkService";
import "Popup";
import "SuSEFirewall";
+import "Report";
// used only for (Mode::installation() || Mode::update())
import "SuSEFirewallProposal";
@@ -332,6 +333,16 @@
}
}
+ // Check the INT zone, it's not protected by default
+ // See bnc #382686
+ list <string> internal_interfaces = SuSEFirewall::GetInterfacesInZone
("INT");
+ if (size (internal_interfaces) > 0 &&
SuSEFirewall::GetProtectFromInternalZone() == false) {
+ y2milestone ("Unprotected internal interfaces: %1",
internal_interfaces);
+ allowed_interfaces = (list <string>) union (allowed_interfaces,
internal_interfaces);
+ } else {
+ y2milestone ("Internal zone is protected or there are no interfaces in
it");
+ }
+
//if (contains(all_interfaces, special_all_nm_interfaces)) {
// boolean special_all_nm_enabled = size(services) > 0;
// foreach (string sr, services, {
@@ -470,14 +481,43 @@
UI::QueryWidget (`id ("_cwm_interface_list"), `SelectedItems);
ifaces = toset (ifaces);
y2milestone("Selected ifaces: %1", ifaces);
- if (size (ifaces) == 0)
- {
+
+ // Check the INT zone, it's not protected by default
+ // See bnc #382686
+ list <string> internal_interfaces = SuSEFirewall::GetInterfacesInZone
("INT");
+
+ if (size (internal_interfaces) > 0 &&
SuSEFirewall::GetProtectFromInternalZone() == false) {
+ list <string> int_not_selected = [];
+ foreach (string one_internal, internal_interfaces, {
+ if (! contains (ifaces, one_internal)) {
+ int_not_selected = add (int_not_selected, one_internal);
+ }
+ });
+
+ if (size (int_not_selected) > 0) {
+ y2warning ("Unprotected internal interfaces not selected: %1",
int_not_selected);
+
+ Report::Message (
+ sformat (
+ _("These network interfaces assigned to internal network
cannot be unselected:
+%1"),
+ mergestring (int_not_selected, "\n")
+ )
+ );
+
+ ifaces = (list <string>) union (ifaces, int_not_selected);
+ y2milestone ("Selected interfaces: %1", ifaces);
+ UI::ChangeWidget (`id ("_cwm_interface_list"), `SelectedItems,
ifaces);
+ return false;
+ }
+ }
+
+ if (size (ifaces) == 0) {
// question popup
if (! Popup::YesNo (_("No interface is selected. Service will not
be available for other computers.
-Continue?")))
- {
+Continue?"))) {
return false;
}
}
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.16.54/library/network/src/yast2-services-translations.ycp
new/yast2-2.16.56/library/network/src/yast2-services-translations.ycp
--- old/yast2-2.16.54/library/network/src/yast2-services-translations.ycp
2008-04-18 16:35:51.000000000 +0200
+++ new/yast2-2.16.56/library/network/src/yast2-services-translations.ycp
1970-01-01 01:00:00.000000000 +0100
@@ -1,274 +0,0 @@
-{
- /**
- * This file contains only translations for
- * FATE #300687: Ports for SuSEfirewall added via packages
- *
- * Translations are grabbed when 'make pot' is called.
- */
-
- textdomain "firewall-services";
-
- string tmpstring = nil;
-
- // TRANSLATORS: Name of Service (File name: apache2, RPM: apache2), can be
used as check box, item in multiple selection box...
- tmpstring = _("Apache 2");
-
- // TRANSLATORS: Description of a Service (File name: apache2, RPM: apache2),
used as a common label or an item in table
- tmpstring = _("Opens ports for Apache Web Server.");
-
- // TRANSLATORS: Name of Service (File name: apache2-ssl, RPM: apache2), can
be used as check box, item in multiple selection box...
- tmpstring = _("Apache 2");
-
- // TRANSLATORS: Description of a Service (File name: apache2-ssl, RPM:
apache2), used as a common label or an item in table
- tmpstring = _("Opens ports for Apache Web Server.");
-
- // TRANSLATORS: Name of Service (File name: avahi, RPM: avahi), can be used
as check box, item in multiple selection box...
- tmpstring = _("Zeroconf/Bonjour Multicast DNS");
-
- // TRANSLATORS: Description of a Service (File name: avahi, RPM: avahi),
used as a common label or an item in table
- tmpstring = _("Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service
Discovery (DNS-SD)");
-
- // TRANSLATORS: Description of a Service (File name: bacula-dir, RPM:
bacula-server), used as a common label or an item in table
- tmpstring = _("Bacula Director ");
-
- // TRANSLATORS: Description of a Service (File name: bacula-fd, RPM:
bacula), used as a common label or an item in table
- tmpstring = _("Bacula File Daemon ");
-
- // TRANSLATORS: Description of a Service (File name: bacula-sd, RPM:
bacula-server), used as a common label or an item in table
- tmpstring = _("Bacula Storage Daemon ");
-
- // TRANSLATORS: Name of Service (File name: bind, RPM: bind ypbind), can be
used as check box, item in multiple selection box...
- tmpstring = _("bind DNS server");
-
- // TRANSLATORS: Description of a Service (File name: bind, RPM: bind
ypbind), used as a common label or an item in table
- tmpstring = _("Open ports for the bind DNS server");
-
- // TRANSLATORS: Name of Service (File name: courier-imap, RPM:
courier-imap), can be used as check box, item in multiple selection box...
- tmpstring = _("courier-imapd");
-
- // TRANSLATORS: Description of a Service (File name: courier-imap, RPM:
courier-imap), used as a common label or an item in table
- tmpstring = _("Opens ports for courier-imapd.");
-
- // TRANSLATORS: Name of Service (File name: courier-imap-ssl, RPM:
courier-imap), can be used as check box, item in multiple selection box...
- tmpstring = _("courier-imapd");
-
- // TRANSLATORS: Description of a Service (File name: courier-imap-ssl, RPM:
courier-imap), used as a common label or an item in table
- tmpstring = _("Opens ports for courier-imapd.");
-
- // TRANSLATORS: Name of Service (File name: cups, RPM: cups-libs), can be
used as check box, item in multiple selection box...
- tmpstring = _("cups");
-
- // TRANSLATORS: Description of a Service (File name: cups, RPM: cups-libs),
used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for printing service CUPS");
-
- // TRANSLATORS: Name of Service (File name: cyrus-imapd, RPM: cyrus-imapd),
can be used as check box, item in multiple selection box...
- tmpstring = _("cyrus-imapd Server");
-
- // TRANSLATORS: Description of a Service (File name: cyrus-imapd, RPM:
cyrus-imapd), used as a common label or an item in table
- tmpstring = _("Opens ports for the cyrus-imapd Server.");
-
- // TRANSLATORS: Name of Service (File name: dhcp-server, RPM: dhcp), can be
used as check box, item in multiple selection box...
- tmpstring = _("DHCP Server");
-
- // TRANSLATORS: Description of a Service (File name: dhcp-server, RPM:
dhcp), used as a common label or an item in table
- tmpstring = _("Opens ports for ISC DHCP Server.");
-
- // TRANSLATORS: Name of Service (File name: dnsmasq-dhcp, RPM: dnsmasq), can
be used as check box, item in multiple selection box...
- tmpstring = _("dnsmasq");
-
- // TRANSLATORS: Description of a Service (File name: dnsmasq-dhcp, RPM:
dnsmasq), used as a common label or an item in table
- tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
-
- // TRANSLATORS: Name of Service (File name: dnsmasq-dns, RPM: dnsmasq), can
be used as check box, item in multiple selection box...
- tmpstring = _("dnsmasq");
-
- // TRANSLATORS: Description of a Service (File name: dnsmasq-dns, RPM:
dnsmasq), used as a common label or an item in table
- tmpstring = _("Open ports for the dnsmasq DNS/DHCP server");
-
- // TRANSLATORS: Name of Service (File name: finger-server, RPM:
finger-server), can be used as check box, item in multiple selection box...
- tmpstring = _("Finger Server");
-
- // TRANSLATORS: Description of a Service (File name: finger-server, RPM:
finger-server), used as a common label or an item in table
- tmpstring = _("Opens ports for Finger Server.");
-
- // TRANSLATORS: Name of Service (File name: iceccd, RPM: icecream), can be
used as check box, item in multiple selection box...
- tmpstring = _("icecream daemon");
-
- // TRANSLATORS: Description of a Service (File name: iceccd, RPM: icecream),
used as a common label or an item in table
- tmpstring = _("opens socket for the icecream compilation daemon");
-
- // TRANSLATORS: Name of Service (File name: icecream-scheduler, RPM:
icecream), can be used as check box, item in multiple selection box...
- tmpstring = _("icecream scheduler");
-
- // TRANSLATORS: Description of a Service (File name: icecream-scheduler,
RPM: icecream), used as a common label or an item in table
- tmpstring = _("opens ports for the Icecream scheduler");
-
- // TRANSLATORS: Name of Service (File name: imap, RPM: courier-imap
imap-lib), can be used as check box, item in multiple selection box...
- tmpstring = _("imap Server");
-
- // TRANSLATORS: Description of a Service (File name: imap, RPM: courier-imap
imap-lib), used as a common label or an item in table
- tmpstring = _("Opens ports for imap Server.");
-
- // TRANSLATORS: Name of Service (File name: iscsitarget, RPM: tgt), can be
used as check box, item in multiple selection box...
- tmpstring = _("iSCSI Target Daemon");
-
- // TRANSLATORS: Description of a Service (File name: iscsitarget, RPM: tgt),
used as a common label or an item in table
- tmpstring = _("Opens ports for iSCSI Target Daemon with broadcast allowed.");
-
- // TRANSLATORS: Name of Service (File name: isns, RPM: isns), can be used as
check box, item in multiple selection box...
- tmpstring = _("iSNS Daemon");
-
- // TRANSLATORS: Description of a Service (File name: isns, RPM: isns), used
as a common label or an item in table
- tmpstring = _("Opens ports for iSNS daemon with broadcast allowed.");
-
- // TRANSLATORS: Name of Service (File name: kadmind, RPM: krb5-server), can
be used as check box, item in multiple selection box...
- tmpstring = _("Kerberos Admin Server");
-
- // TRANSLATORS: Description of a Service (File name: kadmind, RPM:
krb5-server), used as a common label or an item in table
- tmpstring = _("Open ports for kadmind Server");
-
- // TRANSLATORS: Name of Service (File name: kdc, RPM: krb5-server), can be
used as check box, item in multiple selection box...
- tmpstring = _("Key Distribution Center");
-
- // TRANSLATORS: Description of a Service (File name: kdc, RPM: krb5-server),
used as a common label or an item in table
- tmpstring = _("Open ports for the Key Distribution Center");
-
- // TRANSLATORS: Name of Service (File name: lighttpd, RPM: lighttpd), can be
used as check box, item in multiple selection box...
- tmpstring = _("lighttpd");
-
- // TRANSLATORS: Description of a Service (File name: lighttpd, RPM:
lighttpd), used as a common label or an item in table
- tmpstring = _("Open the http port for lighttpd.");
-
- // TRANSLATORS: Name of Service (File name: lighttpd-ssl, RPM: lighttpd),
can be used as check box, item in multiple selection box...
- tmpstring = _("lighttpd");
-
- // TRANSLATORS: Description of a Service (File name: lighttpd-ssl, RPM:
lighttpd), used as a common label or an item in table
- tmpstring = _("Open the https port for lighttpd.");
-
- // TRANSLATORS: Name of Service (File name: mysql, RPM: mysql), can be used
as check box, item in multiple selection box...
- tmpstring = _("MySQL server");
-
- // TRANSLATORS: Description of a Service (File name: mysql, RPM: mysql),
used as a common label or an item in table
- tmpstring = _("opens ports for MySQL in order to allow other hosts connect
to it");
-
- // TRANSLATORS: Name of Service (File name: nfs-client, RPM: nfs-client),
can be used as check box, item in multiple selection box...
- tmpstring = _("NFS Client");
-
- // TRANSLATORS: Description of a Service (File name: nfs-client, RPM:
nfs-client), used as a common label or an item in table
- tmpstring = _("Firewall Configuration for nfs client. opens ports for NFS
client in order to allow to connect to a NFS server");
-
- // TRANSLATORS: Name of Service (File name: nfs-kernel-server, RPM:
nfs-kernel-server), can be used as check box, item in multiple selection box...
- tmpstring = _("NFS Server Service");
-
- // TRANSLATORS: Description of a Service (File name: nfs-kernel-server, RPM:
nfs-kernel-server), used as a common label or an item in table
- tmpstring = _("Firewall Configuration for nfs kernel server. opens ports for
NFS in order to allow other hosts connect to it");
-
- // TRANSLATORS: Name of Service (File name: ntp, RPM: ntp), can be used as
check box, item in multiple selection box...
- tmpstring = _("xntp Server");
-
- // TRANSLATORS: Description of a Service (File name: ntp, RPM: ntp), used as
a common label or an item in table
- tmpstring = _("Opens ports for xntp.");
-
- // TRANSLATORS: Name of Service (File name: nut, RPM: nut), can be used as
check box, item in multiple selection box...
- tmpstring = _("Network UPS Tools");
-
- // TRANSLATORS: Description of a Service (File name: nut, RPM: nut), used as
a common label or an item in table
- tmpstring = _("Opens ports for remote UPS signalling for Network UPS
Tools.");
-
- // TRANSLATORS: Name of Service (File name: openldap, RPM: openldap2), can
be used as check box, item in multiple selection box...
- tmpstring = _("OpenLDAP Server");
-
- // TRANSLATORS: Description of a Service (File name: openldap, RPM:
openldap2), used as a common label or an item in table
- tmpstring = _("Opens ports for the OpenLDAP Server (slapd).");
-
- // TRANSLATORS: Description of a Service (File name: postfix, RPM: postfix),
used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for postfix");
-
- // TRANSLATORS: Name of Service (File name: postgresql, RPM:
postgresql-server), can be used as check box, item in multiple selection box...
- tmpstring = _("PostgreSQL Server");
-
- // TRANSLATORS: Description of a Service (File name: postgresql, RPM:
postgresql-server), used as a common label or an item in table
- tmpstring = _("Opens TCP port 5432 to allow remote connections to the
PostgreSQL server.");
-
- // TRANSLATORS: Name of Service (File name: pure-ftpd, RPM: pure-ftpd), can
be used as check box, item in multiple selection box...
- tmpstring = _("pureftpd");
-
- // TRANSLATORS: Description of a Service (File name: pure-ftpd, RPM:
pure-ftpd), used as a common label or an item in table
- tmpstring = _("Opens ports for pureftpd with broadcast allowed.");
-
- // TRANSLATORS: Description of a Service (File name: sendmail, RPM:
sendmail), used as a common label or an item in table
- tmpstring = _("Firewall Configuration file for postfix");
-
- // TRANSLATORS: Name of Service (File name: squid, RPM: yast2-squid), can be
used as check box, item in multiple selection box...
- tmpstring = _("Squid Service");
-
- // TRANSLATORS: Description of a Service (File name: squid, RPM:
yast2-squid), used as a common label or an item in table
- tmpstring = _("Opens ports for Squid");
-
- // TRANSLATORS: Name of Service (File name: sshd, RPM: openssh), can be used
as check box, item in multiple selection box...
- tmpstring = _("Secure Shell Server");
-
- // TRANSLATORS: Description of a Service (File name: sshd, RPM: openssh),
used as a common label or an item in table
- tmpstring = _("Open ports for Secure Shell Server");
-
- // TRANSLATORS: Name of Service (File name: svnserve, RPM: subversion), can
be used as check box, item in multiple selection box...
- tmpstring = _("svnserve");
-
- // TRANSLATORS: Description of a Service (File name: svnserve, RPM:
subversion), used as a common label or an item in table
- tmpstring = _("Open ports for svnserve");
-
- // TRANSLATORS: Name of Service (File name: talkd, RPM: talk-server), can be
used as check box, item in multiple selection box...
- tmpstring = _("Talk Server");
-
- // TRANSLATORS: Description of a Service (File name: talkd, RPM:
talk-server), used as a common label or an item in table
- tmpstring = _("Open ports for Talk Server");
-
- // TRANSLATORS: Name of Service (File name: telnet-server, RPM:
telnet-server), can be used as check box, item in multiple selection box...
- tmpstring = _("Telnet Server");
-
- // TRANSLATORS: Description of a Service (File name: telnet-server, RPM:
telnet-server), used as a common label or an item in table
- tmpstring = _("Opens ports for Telnet Server.");
-
- // TRANSLATORS: Name of Service (File name: tetrinet-server, RPM:
tetrinet-server), can be used as check box, item in multiple selection box...
- tmpstring = _("Tetrinet Server");
-
- // TRANSLATORS: Description of a Service (File name: tetrinet-server, RPM:
tetrinet-server), used as a common label or an item in table
- tmpstring = _("Opens ports in firewall to make possible to connect clients
to your server. ");
-
- // TRANSLATORS: Name of Service (File name: vnc-httpd, RPM: tightvnc), can
be used as check box, item in multiple selection box...
- tmpstring = _("VNC mini-HTTP server");
-
- // TRANSLATORS: Description of a Service (File name: vnc-httpd, RPM:
tightvnc), used as a common label or an item in table
- tmpstring = _("Opens the VNC HTTP ports so that browsers can connect.");
-
- // TRANSLATORS: Name of Service (File name: vnc-server, RPM: tightvnc), can
be used as check box, item in multiple selection box...
- tmpstring = _("VNC");
-
- // TRANSLATORS: Description of a Service (File name: vnc-server, RPM:
tightvnc), used as a common label or an item in table
- tmpstring = _("Opens VNC server ports so that viewers can connect.");
-
- // TRANSLATORS: Name of Service (File name: vsftpd, RPM: vsftpd), can be
used as check box, item in multiple selection box...
- tmpstring = _("vsftpd Server");
-
- // TRANSLATORS: Description of a Service (File name: vsftpd, RPM: vsftpd),
used as a common label or an item in table
- tmpstring = _("Opens ports for vsftpd Server.");
-
- // TRANSLATORS: Name of Service (File name: xdmcp, RPM: xorg-x11), can be
used as check box, item in multiple selection box...
- tmpstring = _("xdmcp");
-
- // TRANSLATORS: Description of a Service (File name: xdmcp, RPM: xorg-x11),
used as a common label or an item in table
- tmpstring = _("allow other hosts to access your display manager via XDMCP");
-
- // TRANSLATORS: Name of Service (File name: ypbind, RPM: ypbind), can be
used as check box, item in multiple selection box...
- tmpstring = _("NIS Client");
-
- // TRANSLATORS: Description of a Service (File name: ypbind, RPM: ypbind),
used as a common label or an item in table
- tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain");
-
- // TRANSLATORS: Name of Service (File name: ypserv, RPM: ypserv), can be
used as check box, item in multiple selection box...
- tmpstring = _("NIS Server");
-
- // TRANSLATORS: Description of a Service (File name: ypserv, RPM: ypserv),
used as a common label or an item in table
- tmpstring = _("Configuration for a NIS master/slave server");
-
-}
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.16.54/library/packages/src/PackageSystem.ycp
new/yast2-2.16.56/library/packages/src/PackageSystem.ycp
--- old/yast2-2.16.54/library/packages/src/PackageSystem.ycp 2008-04-09
14:57:09.000000000 +0200
+++ new/yast2-2.16.56/library/packages/src/PackageSystem.ycp 2008-04-23
14:58:33.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec <msvec@xxxxxxx>
* Flags: Stable
*
- * $Id: PackageSystem.ycp 46209 2008-04-08 10:16:29Z lslezak $
+ * $Id: PackageSystem.ycp 46978 2008-04-23 11:19:48Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -55,7 +55,6 @@
*/
global void EnsureTargetInit() {
PackageLock::Check ();
- PackageCallbacks::InitPackageCallbacks ();
// always initizalize target, it should be cheap according to #45356
target_initialized = Pkg::TargetInit ("/", false);
}
@@ -75,8 +74,6 @@
return;
}
- PackageCallbacks::InitPackageCallbacks ();
-
if(! target_initialized)
{
// make sure we have the RPM keys imported
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.16.54/library/packages/src/Product.ycp
new/yast2-2.16.56/library/packages/src/Product.ycp
--- old/yast2-2.16.54/library/packages/src/Product.ycp 2008-04-18
16:35:52.000000000 +0200
+++ new/yast2-2.16.56/library/packages/src/Product.ycp 2008-04-23
14:58:33.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf <kkaempf@xxxxxxx>
* Lukas Ocilka <locilka@xxxxxxx>
*
- * $Id: Product.ycp 46577 2008-04-14 12:42:54Z lslezak $
+ * $Id: Product.ycp 46978 2008-04-23 11:19:48Z lslezak $
*/
{
@@ -13,8 +13,7 @@
import "Mode";
import "Stage";
- import "PackageLock";
- import "PackageSystem";
+ import "SuSERelease";
/**
* General product name and version
@@ -73,46 +72,6 @@
*/
global string shortlabel = "";
-global list<map<string,any> > FindBaseProducts() {
- // bugzilla #238556
- if (! PackageLock::Check()) {
- y2error ("Locked!");
- return [];
- }
-
- // the target at the sources must be initialized
- PackageSystem::EnsureTargetInit();
- PackageSystem::EnsureSourceInit();
-
- // installed products are computed by the solver
- Pkg::PkgSolve(true);
-
- y2milestone ("Looking for base products");
- list<map<string,any> > products = (list<map<string,any> >)
- Pkg::TargetProducts ();
-
- y2milestone ("All found products: %1", products);
- products = filter (map<string,any> p, products, {
- // bug 165314, relnotes_url needn't be defined (or empty string)
- if (p["relnotes_url"]:"" != "") {
- string rn_url = (string) p["relnotes_url"]:"";
- relnotesurl_all = add (relnotesurl_all, rn_url);
- // bug 180581, relnotes should be identified by name
- product_of_relnotes[rn_url] = p["display_name"]:"";
- }
- return p["category"]:"" == "base";
- });
-
- y2milestone ("Found base products: %1", products);
- if (size (products) == 0)
- y2error ("No base product found");
- else if (size (products) > 1)
- y2warning ("More than one base product found");
- return products;
-}
-
-
-
// -----------------------------------------------
/**
@@ -162,37 +121,9 @@
}
else if (!Mode::config ())
{
- // bugzilla #238556
- if (! PackageLock::Check()) {
- y2error ("Locked!");
- return;
- }
- Pkg::TargetInitialize ("/");
-// list all_products = Pkg::TargetProducts(); // get all
products
-
-// map last_product = all_products[0]:$[]; // get last
installed product
-
-// name = last_product["name"]:"";
-// version = last_product["version"]:"";
-// vendor = last_product["vendor"]:"";
-// TODO distproduct = last_product["distproduct"]:"";
-// TODO distversion = last_product["distversion"]:"";
-// TODO baseproduct = last_product["baseproduct"]:"";
-// TODO if (baseproduct == "") baseproduct = name;
-// TODO baseversion = last_product["baseversion"]:"";
-
-// relnotesurl = last_product["relnotesurl"]:"";
-
-// flags = splitstring (last_product["flags"]:"", " ");
-
- list<map<string,any> > base_products = FindBaseProducts();
- map<string,any> base_product = base_products[0]:$[];// there should
be only one - hopefuly
- name =
base_product["display_name"]:base_product["summary"]:base_product["name"]:"";
- short_name = base_product["short_name"]:name;
- version = base_product["version"]:"";
- vendor = base_product["vendor"]:"";
- relnotesurl = base_product["relnotes_url"]:"";
- flags = base_product["flags"]:[];
+ name = SuSERelease::ReleaseName();
+ short_name = name;
+ version = SuSERelease::ReleaseVersion();
}
if(distproduct == nil) distproduct = "";
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.16.54/scripts/yast2 new/yast2-2.16.56/scripts/yast2
--- old/yast2-2.16.54/scripts/yast2 2008-03-10 13:12:16.000000000 +0100
+++ new/yast2-2.16.56/scripts/yast2 2008-04-23 14:58:33.000000000 +0200
@@ -17,7 +17,7 @@
# allow for a different prefix
mydir=${0%/[YyZz]a[Ss][Tt]*}
-if [ -z "$mydir" -o "$mydir" = "/sbin" ]; then
+if [[ -z "$mydir" || "$mydir" =~ /sbin/* ]]; then
YAST_PREFIX=/usr
else
YAST_PREFIX=${mydir%/sbin}
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.16.54/scripts/yast2-completion.sh
new/yast2-2.16.56/scripts/yast2-completion.sh
--- old/yast2-2.16.54/scripts/yast2-completion.sh 2008-01-08
13:02:24.000000000 +0100
+++ new/yast2-2.16.56/scripts/yast2-completion.sh 2008-04-23
11:57:35.000000000 +0200
@@ -2,15 +2,15 @@
# A Christmas gift from Carsten Hoeger
YAST=/sbin/yast
-MODLIST=()
+YAST_MODLIST=()
_yast2 ()
{
local cur prevprev prev len idx mod MODOPTS line opt rest
MODOPTS=()
- if test ${#MODLIST[*]} = 0; then
+ if test ${#YAST_MODLIST[*]} = 0; then
# build a list of know yast modules
- MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v
"Available"))
+ YAST_MODLIST=($(LC_ALL=C $YAST -l| grep '^[a-z]' | grep -v
"Available"))
fi
if [[ ${#COMP_WORDS[@]} -gt 4 ]]; then
@@ -36,7 +36,7 @@
fi
# iterate through all yast modules
- for mod in ${MODLIST[@]}; do
+ for mod in ${YAST_MODLIST[@]}; do
# if argument before last argument is a yast module,
# check it's available options
if [[ -n $prevprev && $prevprev == $mod ]]; then
@@ -102,7 +102,7 @@
len=${#cur}
idx=0
- for pval in ${MODLIST[@]}; do
+ for pval in ${YAST_MODLIST[@]}; do
if [[ "$cur" == "${pval:0:$len}" ]]; then
COMPREPLY[$idx]=$pval
idx=$[$idx+1]
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.16.54/VERSION new/yast2-2.16.56/VERSION
--- old/yast2-2.16.54/VERSION 2008-04-21 12:24:29.000000000 +0200
+++ new/yast2-2.16.56/VERSION 2008-04-23 15:47:38.000000000 +0200
@@ -1 +1 @@
-2.16.54
+2.16.56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |