Hello community,
here is the log from the commit of package yast2-ftp-server for openSUSE:Factory
checked in at Tue Feb 15 16:56:51 CET 2011.
--------
--- yast2-ftp-server/yast2-ftp-server.changes 2010-04-23 16:35:27.000000000 +0200
+++ yast2-ftp-server/yast2-ftp-server.changes 2011-02-15 11:25:34.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Feb 15 11:18:37 CET 2011 - jsrain@suse.cz
+
+- fixed command line interface - not polling UI while reading the
+ settings (bnc#660821)
+- 2.20.0
+
+-------------------------------------------------------------------
+Thu Nov 18 09:30:14 CEST 2010 - jsrain@suse.cz
+
+- remove listen_ipv6 from vsftp.conf - it was preventing from
+ running in standalone mode (bnc#632543)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ftp-server-2.19.0.tar.bz2
New:
----
yast2-ftp-server-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.jf4p5n/_old 2011-02-15 16:55:34.000000000 +0100
+++ /var/tmp/diff_new_pack.jf4p5n/_new 2011-02-15 16:55:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-ftp-server (Version 2.19.0)
+# spec file for package yast2-ftp-server
#
-# Copyright (c) 2010 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
@@ -19,11 +19,11 @@
Name: yast2-ftp-server
-Version: 2.19.0
+Version: 2.20.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ftp-server-2.19.0.tar.bz2
+Source0: yast2-ftp-server-2.20.0.tar.bz2
Prefix: /usr
@@ -41,7 +41,7 @@
to configure two daemons: pure-ftpd and vsftpd.
%prep
-%setup -n yast2-ftp-server-2.19.0
+%setup -n yast2-ftp-server-2.20.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ftp-server-2.19.0.tar.bz2 -> yast2-ftp-server-2.20.0.tar.bz2 ++++++
++++ 5633 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-ftp-server-2.19.0/VERSION new/yast2-ftp-server-2.20.0/VERSION
--- old/yast2-ftp-server-2.19.0/VERSION 2010-04-23 16:31:17.000000000 +0200
+++ new/yast2-ftp-server-2.20.0/VERSION 2011-02-15 11:22:55.000000000 +0100
@@ -1 +1 @@
-2.19.0
+2.20.0
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-ftp-server-2.19.0/configure.in new/yast2-ftp-server-2.20.0/configure.in
--- old/yast2-ftp-server-2.19.0/configure.in 2009-11-30 09:39:10.000000000 +0100
+++ new/yast2-ftp-server-2.20.0/configure.in 2011-02-15 11:25:11.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ftp-server, 2.18.1, http://bugs.opensuse.org/, yast2-ftp-server)
+AC_INIT(yast2-ftp-server, 2.20.0, http://bugs.opensuse.org/, yast2-ftp-server)
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.18.1"
+VERSION="2.20.0"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
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-ftp-server-2.19.0/src/FtpServer.ycp new/yast2-ftp-server-2.20.0/src/FtpServer.ycp
--- old/yast2-ftp-server-2.19.0/src/FtpServer.ycp 2009-02-17 13:42:47.000000000 +0100
+++ new/yast2-ftp-server-2.20.0/src/FtpServer.ycp 2011-02-15 11:15:50.000000000 +0100
@@ -851,6 +851,8 @@
* @return boolean true if abort confirmed
*/
global boolean PollAbort() {
+ if (Mode::commandline())
+ return false;
if (UI::PollInput() == `abort)
return Abort();
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-ftp-server-2.19.0/src/ftp-server.ycp new/yast2-ftp-server-2.20.0/src/ftp-server.ycp
--- old/yast2-ftp-server-2.19.0/src/ftp-server.ycp 2009-11-30 09:35:38.000000000 +0100
+++ new/yast2-ftp-server-2.20.0/src/ftp-server.ycp 2011-02-15 11:17:42.000000000 +0100
@@ -252,6 +252,7 @@
CommandLine::Print("");
+ 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-ftp-server-2.19.0/src/wid_functions.ycp new/yast2-ftp-server-2.20.0/src/wid_functions.ycp
--- old/yast2-ftp-server-2.19.0/src/wid_functions.ycp 2009-02-17 13:42:47.000000000 +0100
+++ new/yast2-ftp-server-2.20.0/src/wid_functions.ycp 2010-11-18 09:23:10.000000000 +0100
@@ -159,6 +159,7 @@
if ((FtpServer::EDIT_SETTINGS["StartDaemon"]:nil == "2") && (Service::Status("pure-ftpd") != 0)) {
SCR::Write(add(.vsftpd, "listen"), nil);
+ SCR::Write(add(.vsftpd, "listen_ipv6"), nil);
SCR::Write(.vsftpd, nil);
FtpServer::stop_daemon_xinetd = false;
result = AskStartXinetd ();
@@ -180,6 +181,7 @@
} else {
SCR::Write(add(.vsftpd, "listen"), "YES");
+ SCR::Write(add(.vsftpd, "listen_ipv6"), nil);
SCR::Write(.vsftpd, nil);
string command = "rcvsftpd start";
map options = (map)SCR::Execute (.target.bash_output, command);
@@ -1434,4 +1436,4 @@
}
}
-}
\ No newline at end of file
+}
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-ftp-server-2.19.0/src/write_load.ycp new/yast2-ftp-server-2.20.0/src/write_load.ycp
--- old/yast2-ftp-server-2.19.0/src/write_load.ycp 2010-04-23 16:27:44.000000000 +0200
+++ new/yast2-ftp-server-2.20.0/src/write_load.ycp 2010-11-18 09:24:24.000000000 +0100
@@ -1096,6 +1096,7 @@
Service::Disable("pure-ftpd");
if (FtpServer::vsftpd_edit) {
FtpServer::VS_SETTINGS["listen"]=nil;
+ FtpServer::VS_SETTINGS["listen_ipv6"]=nil;
} else {
FtpServer::PURE_SETTINGS["Daemonize"]="NO";
}
@@ -1112,6 +1113,7 @@
}
if (FtpServer::vsftpd_edit) {
FtpServer::VS_SETTINGS["listen"]="YES";
+ FtpServer::VS_SETTINGS["listen_ipv6"]=nil;
} else {
FtpServer::PURE_SETTINGS["Daemonize"]="YES";
}
@@ -1120,6 +1122,7 @@
Service::Disable("pure-ftpd");
if (FtpServer::vsftpd_edit) {
FtpServer::VS_SETTINGS["listen"]="YES";
+ FtpServer::VS_SETTINGS["listen_ipv6"]=nil;
} else {
FtpServer::PURE_SETTINGS["Daemonize"]="YES";
}
@@ -1154,4 +1157,4 @@
}
-}
\ No newline at end of file
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org