Hello community,
here is the log from the commit of package yast2-instserver
checked in at Sat Aug 2 01:51:05 CEST 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-05-16 21:51:36.000000000 +0200
+++ yast2-instserver/yast2-instserver.changes 2008-07-30 09:20:58.572567000 +0200
@@ -1,0 +2,8 @@
+Wed Jul 30 09:13:55 CEST 2008 - lslezak@suse.cz
+
+- fixed service name in the firewallconfiguration, install the
+ needed packages before reading service files (bnc#403377)
+- added firewall config in the FTP server configuration dialog
+- 2.17.0
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-2.16.5.tar.bz2
New:
----
yast2-instserver-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.q28241/_old 2008-08-02 01:49:07.000000000 +0200
+++ /var/tmp/diff_new_pack.q28241/_new 2008-08-02 01:49:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.16.5)
+# spec file for package yast2-instserver (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,12 +13,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-Version: 2.16.5
-Release: 10
+Version: 2.17.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.16.5.tar.bz2
+Source0: yast2-instserver-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -40,7 +40,7 @@
Anas Nashif
%prep
-%setup -n yast2-instserver-2.16.5
+%setup -n yast2-instserver-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -76,6 +76,11 @@
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
+* Wed Jul 30 2008 lslezak@suse.cz
+- fixed service name in the firewallconfiguration, install the
+ needed packages before reading service files (bnc#403377)
+- added firewall config in the FTP server configuration dialog
+- 2.17.0
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
++++++ yast2-instserver-2.16.5.tar.bz2 -> yast2-instserver-2.17.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/configure new/yast2-instserver-2.17.0/configure
--- old/yast2-instserver-2.16.5/configure 2008-05-16 22:22:53.000000000 +0200
+++ new/yast2-instserver-2.17.0/configure 2008-07-30 09:20:05.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-instserver 2.16.5.
+# Generated by GNU Autoconf 2.61 for yast2-instserver 2.17.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-instserver'
PACKAGE_TARNAME='yast2-instserver'
-PACKAGE_VERSION='2.16.5'
-PACKAGE_STRING='yast2-instserver 2.16.5'
+PACKAGE_VERSION='2.17.0'
+PACKAGE_STRING='yast2-instserver 2.17.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-instserver 2.16.5 to adapt to many kinds of systems.
+\`configure' configures yast2-instserver 2.17.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-instserver 2.16.5:";;
+ short | recursive ) echo "Configuration of yast2-instserver 2.17.0:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-instserver configure 2.16.5
+yast2-instserver configure 2.17.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-instserver $as_me 2.16.5, which was
+It was created by yast2-instserver $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-instserver'
- VERSION='2.16.5'
+ VERSION='2.17.0'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.5"
+VERSION="2.17.0"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-instserver $as_me 2.16.5, which was
+This file was extended by yast2-instserver $as_me 2.17.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-instserver config.status 2.16.5
+yast2-instserver config.status 2.17.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/configure.in new/yast2-instserver-2.17.0/configure.in
--- old/yast2-instserver-2.16.5/configure.in 2008-05-16 22:22:50.000000000 +0200
+++ new/yast2-instserver-2.17.0/configure.in 2008-07-30 09:20:00.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-instserver
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - 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-instserver, 2.16.5, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.17.0, http://bugs.opensuse.org/, yast2-instserver)
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.5"
+VERSION="2.17.0"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/instserver_proof.pot new/yast2-instserver-2.17.0/instserver_proof.pot
--- old/yast2-instserver-2.16.5/instserver_proof.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-instserver-2.17.0/instserver_proof.pot 2008-04-15 13:48:21.000000000 +0200
@@ -0,0 +1,151 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: yast2 9.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-25 07:24+0100\n"
+"PO-Revision-Date: 2008-04-01 10:21+0200\n"
+"Last-Translator: proofreader\n"
+"Language-Team: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/Instserver.ycp:450
+msgid ""
+"Directory is already exported via NFS,\n"
+"Leave NFS exports unmodified?"
+msgstr ""
+"Directory is already exported via NFS.\n"
+"Leave NFS exports unmodified?"
+
+#. Progress stage 2/2
+#: src/Instserver.ycp:816
+msgid "Look for a new repository"
+msgstr "Search for a new repository"
+
+#. Progress step 2/2
+#: src/Instserver.ycp:821
+msgid "Looking for a new repository..."
+msgstr "Searching for a new repository..."
+
+#: src/dialogs.ycp:1131
+#, ycp-format
+msgid ""
+"Error while creating 'repository' directory.\n"
+"Verify that the directory \n"
+" %1 \n"
+"is writable and try again."
+msgstr ""
+"Error while creating <tt>repository</tt> directory.\n"
+"Verify that the directory \n"
+" %1 \n"
+"is writable and try again."
+
+#: src/helps.ycp:59
+msgid ""
+"<p>If the chosen software repository directory is outside\n"
+"the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>,\n"
+"which makes the software repository directory available under the\n"
+"FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>).\n"
+"</p>\n"
+msgstr ""
+"<p>If the chosen software repository directory is outside\n"
+"the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>.\n"
+"This makes the software repository directory available under the\n"
+"FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>).\n"
+"</p>\n"
+
+#: src/helps.ycp:87 src/helps.ycp:101
+msgid ""
+"<p><b><big>Configuration of the Repository</big></b><br>\n"
+"</p>\n"
+msgstr ""
+"<p><b>Configuration of the Repository</b><br>\n"
+"</p>\n"
+
+#: src/helps.ycp:91
+msgid ""
+"<p>The repository name is used to create a directory under which all product\n"
+"CDs are copied and managed. The repository is accessed using the\n"
+"configured protocol (NFS, FTP, or HTTP)</p> "
+msgstr ""
+"<p>The repository name is used to create a directory under which all product\n"
+"CDs are copied and managed. The repository is accessed using the\n"
+"configured protocol (NFS, FTP, or HTTP).</p> "
+
+#: src/helps.ycp:97
+msgid ""
+"<p>SLP (Service Location Protocol) makes finding an installation server easier. \n"
+"If checked, the repository will be announced on the network using SLP.</p>\n"
+msgstr ""
+"<p>SLP (Service Location Protocol) facilitates to find an installation server. \n"
+"If checked, the repository will be announced on the network using SLP.</p>\n"
+
+#. Write dialog help 1/2
+#: src/helps.ycp:131
+msgid ""
+"<p><b><big>Saving Repository Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
+msgstr ""
+"<p><b>Saving Repository Configuration</b><br>\n"
+"Please wait...<br></p>\n"
+
+#. Summary dialog help 1/3
+#: src/helps.ycp:143
+msgid ""
+"<p><b><big>Repository Configuration</big></b><br>\n"
+"Configure the installation server here.<br></p>\n"
+msgstr ""
+"<p><b>Repository Configuration</b><br>\n"
+"Configure the installation server here.<br></p>\n"
+
+#. Summary dialog help 2/3
+#: src/helps.ycp:148
+msgid ""
+"<p><b><big>Adding a Repository:</big></b><br>\n"
+"In the repository directory is searched for \n"
+"unconfigured directories, which are then made \n"
+"available for configuration.\n"
+"Choose a repository from the list of found repositories. \n"
+"Then press <b>Configure</b>.</p>\n"
+msgstr ""
+"<p><b>Adding a Repository:</b><br>\n"
+"Unconfigured directories are detected in the repository directory and then made \n"
+"available for configuration.\n"
+"To add a repository, select it from the list of unconfigured repositories and press <b>Configure</b>.</p>\n"
+
+#. Ovreview dialog help 1/3
+#: src/helps.ycp:163
+msgid ""
+"<p><b><big>Repositories Overview</big></b><br>\n"
+"Obtain an overview of configured repositories. Additionally\n"
+"edit their configuration.<br></p>\n"
+msgstr ""
+"<p><b>Repositories Overview</b><br>\n"
+"Here you get an overview of the configured repositories. Additionally,\n"
+"you are able to edit their configuration.<br></p>\n"
+
+#. Ovreview dialog help 2/3
+#: src/helps.ycp:169
+msgid ""
+"<p><b><big>Adding a Repository:</big></b><br>\n"
+"Press <b>Add</b> to configure a repository.</p>"
+msgstr ""
+"<p><b>Adding a Repository:</b><br>\n"
+"Press <b>Add</b> to configure a repository.</p>"
+
+#. Ovreview dialog help 3/3
+#: src/helps.ycp:173
+msgid ""
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
+"Choose a repository to change or remove.\n"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
+msgstr ""
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
+"Choose the repository you want to change or remove and\n"
+"press <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/src/dialogs.ycp new/yast2-instserver-2.17.0/src/dialogs.ycp
--- old/yast2-instserver-2.16.5/src/dialogs.ycp 2008-04-15 14:58:28.000000000 +0200
+++ new/yast2-instserver-2.17.0/src/dialogs.ycp 2008-07-30 09:18:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Anas Nashif
*
- * $Id: dialogs.ycp 46670 2008-04-15 12:58:28Z lslezak $
+ * $Id: dialogs.ycp 49500 2008-07-30 07:18:00Z lslezak $
*/
{
@@ -1306,7 +1306,7 @@
// firewall widget using CWM
map fw_settings = $[
- "services": [ "nfs-server" ],
+ "services": [ "service:nfs-kernel-server" ],
"display_details": true,
];
@@ -1382,6 +1382,13 @@
* @return dialog result
*/
any FtpDialog () {
+ // firewall widget using CWM
+ map fw_settings = $[
+ "services": [ "service:vsftpd" ],
+ "display_details": true,
+ ];
+
+ map fw_cwm_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget(fw_settings);
/* Instserver configure2 dialog caption */
string caption = _("Installation Server -- FTP");
@@ -1393,7 +1400,9 @@
`HVSquash(
`VBox(
`Left(`TextEntry(`id(`ftproot), _("&FTP Server Root Directory:"), ftproot )),
- `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias ))
+ `Left(`TextEntry(`id(`ftpalias), _("&Directory Alias:"), ftpalias )),
+ `VSpacing(1),
+ fw_cwm_widget["custom_widget"]:`Empty()
)
);
@@ -1401,10 +1410,24 @@
Wizard::SetContentsButtons(caption, contents, HELPS["ftp"]:"ftp",
Label::BackButton(), Label::NextButton());
+ // install packages before calling SuSEFirewall::Read()
+ // to read the service definition file
+ if (!Instserver::InstallFTPPackages())
+ {
+ y2error("FTP server package is not installed, cannot continue");
+ return `abort;
+ }
+
+ // initialize the firewall widget (set the current value)
+ CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
+
any ret = nil;
+ map event = $[];
+
while(true) {
- ret = UI::UserInput();
+ event = UI::WaitForEvent();
+ ret = event["ID"]:nil;
ftproot = (string)UI::QueryWidget(`id(`ftproot), `Value);
ftpalias = (string)UI::QueryWidget(`id(`ftpalias), `Value);
@@ -1423,6 +1446,8 @@
Instserver::ServerSettings["ftpalias"] = ftpalias;
if (!Instserver::ServerSettings["dry"]:false)
{
+ // store the firewall setting, (activation is in SetupFTP())
+ CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
r = Instserver::SetupFTP(Instserver::ServerSettings["directory"]:"" , ftproot , ftpalias);
if (!r)
{
@@ -1434,10 +1459,9 @@
Instserver::modified = true;
break;
}
- else {
- y2error("unexpected retcode: %1", ret);
- continue;
- }
+
+ // handle the events, enable/disable the button, show the popup if the firewall button has been clicked
+ CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", event);
}
return ret;
@@ -1454,7 +1478,7 @@
// firewall widget using CWM
map fw_settings = $[
- "services": [ "http" ],
+ "services": [ "service:apache2" ],
"display_details": true,
];
@@ -1481,6 +1505,14 @@
any ret = nil;
map event = $[];
+ // install packages before calling SuSEFirewall::Read()
+ // to read the service definition file
+ if (!Instserver::InstallHTTPPackages())
+ {
+ y2error("HTTP server package is not installed, cannot continue");
+ return `abort;
+ }
+
while(true) {
event = UI::WaitForEvent();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/src/Instserver.ycp new/yast2-instserver-2.17.0/src/Instserver.ycp
--- old/yast2-instserver-2.16.5/src/Instserver.ycp 2008-04-15 14:58:28.000000000 +0200
+++ new/yast2-instserver-2.17.0/src/Instserver.ycp 2008-07-30 09:18:01.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation Server settings, input and output functions
* Authors: Anas Nashif
*
- * $Id: Instserver.ycp 46670 2008-04-15 12:58:28Z lslezak $
+ * $Id: Instserver.ycp 49500 2008-07-30 07:18:00Z lslezak $
*
* Representation of the configuration of Installation Server.
* Input and output routines.
@@ -246,20 +246,18 @@
return ret;
}
-/**
- * Setup FTP server
- * @param string inst server root
- * @param string ftp server root
- * @return boolean
- */
-global boolean SetupFTP(string dir, string ftproot, string ftpalias) {
-
+global boolean InstallFTPPackages()
+{
string help = _("The FTP installation server requires an FTP server package. The vsftpd package
will now be installed.
");
if ( !Package::InstalledAll( [ "xinetd", "vsftpd", "openslp-server", "yast2-inetd" ] ) ) {
y2milestone("some packages are not installed");
}
+ else
+ {
+ return true;
+ }
if ( !Package::InstallAll( [ "xinetd", "vsftpd" , "openslp-server", "yast2-inetd"])) {
Report::Error( Message::CannotContinueWithoutPackagesInstalled() );
@@ -267,6 +265,22 @@
return false;
}
+ return true;
+}
+
+/**
+ * Setup FTP server
+ * @param string inst server root
+ * @param string ftp server root
+ * @return boolean
+ */
+global boolean SetupFTP(string dir, string ftproot, string ftpalias) {
+
+ if (!InstallFTPPackages())
+ {
+ return false;
+ }
+
// create repository directory if it doesn't exist
SCR::Execute(.target.bash, sformat("[ -d %1 ] || /bin/mkdir %1", dir));
@@ -360,15 +374,8 @@
}
}
-
-/**
- * Setup HTTP server
- * @param string inst server root
- * @param string alias
- * @return boolean
- */
-global boolean SetupHTTP(string dir, string alias) {
-
+global boolean InstallHTTPPackages()
+{
string help = _("The HTTP installation server requires an HTTP server package. The apache2 package
will now be installed.");
if ( !Package::InstalledAll( [ "apache2" , "openslp-server" ] ) ) {
@@ -382,6 +389,22 @@
}
}
+ return true;
+}
+
+/**
+ * Setup HTTP server
+ * @param string inst server root
+ * @param string alias
+ * @return boolean
+ */
+global boolean SetupHTTP(string dir, string alias) {
+
+ if (!InstallHTTPPackages())
+ {
+ return false;
+ }
+
if ((integer)SCR::Read(.target.size, "/etc/apache2/conf.d/inst_server.conf.in") > 0 )
{
string conf = (string)SCR::Read(.target.string, "/etc/apache2/conf.d/inst_server.conf.in");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-instserver-2.16.5/VERSION new/yast2-instserver-2.17.0/VERSION
--- old/yast2-instserver-2.16.5/VERSION 2008-04-30 07:20:00.000000000 +0200
+++ new/yast2-instserver-2.17.0/VERSION 2008-07-30 09:13:38.000000000 +0200
@@ -1 +1 @@
-2.16.5
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org