Hello community,
here is the log from the commit of package yast2-instserver for openSUSE:Factory
checked in at Fri Dec 19 15:21:10 CET 2008.
--------
--- yast2-instserver/yast2-instserver.changes 2008-10-15 16:08:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-instserver/yast2-instserver.changes 2008-12-19 14:08:57.006414000 +0100
@@ -1,0 +2,7 @@
+Fri Dec 19 12:57:33 CET 2008 - lslezak@suse.cz
+
+- do not configure vsftpd in xinetd mode if it's set to standalone
+ mode in the config file (bnc#438694)
+- 2.17.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-instserver-2.17.3.tar.bz2
New:
----
yast2-instserver-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.L19345/_old 2008-12-19 15:20:52.000000000 +0100
+++ /var/tmp/diff_new_pack.L19345/_new 2008-12-19 15:20:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-instserver (Version 2.17.3)
+# spec file for package yast2-instserver (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,12 +20,12 @@
Url: http://www.suse.com/
Name: yast2-instserver
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-instserver-2.17.3.tar.bz2
+Source0: yast2-instserver-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
# ag_content agent
@@ -47,7 +47,7 @@
Anas Nashif
%prep
-%setup -n yast2-instserver-2.17.3
+%setup -n yast2-instserver-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -83,6 +83,10 @@
%dir /etc/apache2
%dir /etc/apache2/conf.d
%changelog
+* Fri Dec 19 2008 lslezak@suse.cz
+- do not configure vsftpd in xinetd mode if it's set to standalone
+ mode in the config file (bnc#438694)
+- 2.17.4
* Wed Oct 15 2008 lslezak@suse.cz
- fixed UI syntax error when asking for a CD (bnc#435658)
- minor code11 fixes - remove cut blanks from content file values,
@@ -299,5 +303,5 @@
- Support for SLES8/ SLES8 products
- Support for adding from ISO images
- HTTP/NFS/FTP support
-* Wed Feb 11 2004 nashif@suse.de
+* Tue Feb 10 2004 nashif@suse.de
- initial version
++++++ yast2-instserver-2.17.3.tar.bz2 -> yast2-instserver-2.17.4.tar.bz2 ++++++
++++ 3354 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-instserver-2.17.3/configure.in new/yast2-instserver-2.17.4/configure.in
--- old/yast2-instserver-2.17.3/configure.in 2008-10-15 16:02:57.000000000 +0200
+++ new/yast2-instserver-2.17.4/configure.in 2008-12-19 13:59:08.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-instserver
dnl
-dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-instserver, 2.17.3, http://bugs.opensuse.org/, yast2-instserver)
+AC_INIT(yast2-instserver, 2.17.4, 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.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-instserver"
MAINTAINER="Ladislav Slezak "
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-instserver-2.17.3/src/Instserver.ycp new/yast2-instserver-2.17.4/src/Instserver.ycp
--- old/yast2-instserver-2.17.3/src/Instserver.ycp 2008-10-15 13:45:49.000000000 +0200
+++ new/yast2-instserver-2.17.4/src/Instserver.ycp 2008-12-19 13:58:10.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Installation Server settings, input and output functions
* Authors: Anas Nashif
*
- * $Id: Instserver.ycp 49500 2008-07-30 07:18:00Z lslezak $
+ * $Id: Instserver.ycp 54292 2008-12-19 12:58:09Z lslezak $
*
* Representation of the configuration of Installation Server.
* Input and output routines.
@@ -106,6 +106,13 @@
}
+boolean vsftpd_is_standalone()
+{
+ boolean ret = SCR::Execute(.target.bash, "grep -q '^listen=YES$' /etc/vsftpd.conf") == 0;
+
+ y2milestone("vsftpd in standalone mode: %1", ret);
+ return ret;
+}
/**
* Create links
@@ -300,59 +307,78 @@
y2warning("not implemented");
}
- y2debug("configuring services");
- // read the current configuration
- map resource = (map)ReadServiceSettings("inetd_auto");
- list<map> netdconf = [];
-
- // replace vsftpd config
- boolean ftpdenabled = false;
- boolean servicefound = false;
- foreach(map conf, resource["netd_conf"]:[], {
- // the service is ftp with vsftpd server
- if (conf["service"]:"" == "ftp" && conf["script"]:"" == "vsftpd")
- {
- servicefound = true;
-
- // enable disabled service
- if (conf["enabled"]:false != true)
- {
- conf["enabled"] = true;
- }
- else
+ // check if vsftpd is configured in standalone mode (listen=YES) (bnc#438694)
+ // see 'man vsftpd.conf'
+ boolean vsftpd_standalone = vsftpd_is_standalone();
+
+ if (vsftpd_standalone)
+ {
+ y2milestone("Configuring FTP service in standalone mode");
+
+ // enable/start the service
+ Service::Enable("vsftpd");
+ if (Service::Status("vsftpd") == 0 )
+ Service::Reload("vsftpd");
+ else
+ Service::Start("vsftpd");
+ }
+ else
+ {
+ y2milestone("Configuring FTP service in xinetd mode");
+ // read the current configuration
+ map resource = (map)ReadServiceSettings("inetd_auto");
+ list<map> netdconf = [];
+
+ // replace vsftpd config
+ boolean ftpdenabled = false;
+ boolean servicefound = false;
+ foreach(map conf, resource["netd_conf"]:[], {
+ // the service is ftp with vsftpd server
+ if (conf["service"]:"" == "ftp" && conf["script"]:"" == "vsftpd")
{
- ftpdenabled = true;
+ servicefound = true;
+
+ // enable disabled service
+ if (conf["enabled"]:false != true)
+ {
+ conf["enabled"] = true;
+ }
+ else
+ {
+ ftpdenabled = true;
+ }
}
+
+ // add the configuration to the list
+ netdconf = add(netdconf, conf);
}
+ );
- // add the configuration to the list
- netdconf = add(netdconf, conf);
+ if (servicefound == false)
+ {
+ // the FTP service config was not found, add it
+ map vsftpdconf = $["protocol":"tcp", "script":"vsftpd", "server":"/usr/sbin/vsftpd", "service":"ftp"];
+ netdconf = add(netdconf, vsftpdconf);
}
- );
- if (servicefound == false)
- {
- // the FTP service config was not found, add it
- map vsftpdconf = $["protocol":"tcp", "script":"vsftpd", "server":"/usr/sbin/vsftpd", "service":"ftp"];
- netdconf = add(netdconf, vsftpdconf);
- }
+ // ftp service was not enabled/configured
+ if (ftpdenabled == false)
+ {
+ // update the configuration
+ resource["netd_conf"] = netdconf;
- // ftp service was not enabled/configured
- if (ftpdenabled == false)
- {
- // update the configuration
- resource["netd_conf"] = netdconf;
+ // write the configuration
+ ConfigureService("inetd_auto", resource);
+ }
- // write the configuration
- ConfigureService("inetd_auto", resource);
+ // enable/start the service
+ Service::Enable("xinetd");
+ if (Service::Status("xinetd") == 0 )
+ Service::Reload("xinetd");
+ else
+ Service::Start("xinetd");
}
- // enable/start the service
- Service::Enable("xinetd");
- if (Service::Status("xinetd") == 0 )
- Service::Reload("xinetd");
- else
- Service::Start("xinetd");
return true;
}
@@ -743,6 +769,15 @@
boolean FTPValid(map config)
{
+ if (vsftpd_is_standalone())
+ {
+ // is the service running?
+ boolean ret = (Service::Status("vsftpd") == 0 );
+ y2milestone("FTP (vsftpd) server running: %1", ret);
+
+ return ret;
+ }
+
// read the current configuration
map resource = (map)ReadServiceSettings("inetd_auto");
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-instserver-2.17.3/VERSION new/yast2-instserver-2.17.4/VERSION
--- old/yast2-instserver-2.17.3/VERSION 2008-10-15 16:02:00.000000000 +0200
+++ new/yast2-instserver-2.17.4/VERSION 2008-12-19 13:58:21.000000000 +0100
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
