Hello community,
here is the log from the commit of package yast2-ftp-server
checked in at Thu May 10 23:29:33 CEST 2007.
--------
--- yast2-ftp-server/yast2-ftp-server.changes 2007-05-03 15:58:52.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ftp-server/yast2-ftp-server.changes 2007-05-10 15:14:17.156652000 +0200
@@ -1,0 +2,8 @@
+Thu May 10 13:51:53 CEST 2007 - juhliarik@suse.cz
+
+- added corrections for starting daemon via "when booting"
+- added corrections for help text
+- changed UI for installing package (if missing)
+- V 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-ftp-server-2.15.3.tar.bz2
New:
----
yast2-ftp-server-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.rD6711/_old 2007-05-10 23:29:17.000000000 +0200
+++ /var/tmp/diff_new_pack.rD6711/_new 2007-05-10 23:29:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ftp-server (Version 2.15.3)
+# spec file for package yast2-ftp-server (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ftp-server
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ftp-server-2.15.3.tar.bz2
+Source0: yast2-ftp-server-2.15.4.tar.bz2
prefix: /usr
Requires: yast2 yast2-inetd
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite
@@ -34,7 +34,7 @@
Jozef Uhliarik
%prep
-%setup -n yast2-ftp-server-2.15.3
+%setup -n yast2-ftp-server-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,11 @@
%doc %{prefix}/share/doc/packages/yast2-ftp-server
%changelog
+* Thu May 10 2007 - juhliarik@suse.cz
+- added corrections for starting daemon via "when booting"
+- added corrections for help text
+- changed UI for installing package (if missing)
+- V 2.15.4
* Thu May 03 2007 - juhliarik@suse.cz
- added parsing of options from xinetd for pure-ftpd
- correction for changes ftp directories for ftp users
++++++ yast2-ftp-server-2.15.3.tar.bz2 -> yast2-ftp-server-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/config/ftp-server.rnc new/yast2-ftp-server-2.15.4/config/ftp-server.rnc
--- old/yast2-ftp-server-2.15.3/config/ftp-server.rnc 2007-04-17 11:03:24.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/config/ftp-server.rnc 2007-05-04 11:02:59.000000000 +0200
@@ -31,5 +31,9 @@
element StartDaemon { text }? &
element SSLv2 { text }? &
element SSLv3 { text }? &
- element PassiveMode { text }?
+ element PassiveMode { text }? &
+ element CertFile { text }? &
+ element VirtualUser { text }? &
+ element FTPUser { text }? &
+ element GuestUser { text }?
}
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/configure new/yast2-ftp-server-2.15.4/configure
--- old/yast2-ftp-server-2.15.3/configure 2007-05-03 16:00:42.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/configure 2007-05-10 15:16:28.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.3.
+# Generated by GNU Autoconf 2.60 for yast2-ftp-server 2.15.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ftp-server'
PACKAGE_TARNAME='yast2-ftp-server'
-PACKAGE_VERSION='2.15.3'
-PACKAGE_STRING='yast2-ftp-server 2.15.3'
+PACKAGE_VERSION='2.15.4'
+PACKAGE_STRING='yast2-ftp-server 2.15.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-ftp-server 2.15.3 to adapt to many kinds of systems.
+\`configure' configures yast2-ftp-server 2.15.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ftp-server 2.15.3:";;
+ short | recursive ) echo "Configuration of yast2-ftp-server 2.15.4:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ftp-server configure 2.15.3
+yast2-ftp-server configure 2.15.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-ftp-server $as_me 2.15.3, which was
+It was created by yast2-ftp-server $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-ftp-server'
- VERSION='2.15.3'
+ VERSION='2.15.4'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ftp-server $as_me 2.15.3, which was
+This file was extended by yast2-ftp-server $as_me 2.15.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ftp-server config.status 2.15.3
+yast2-ftp-server config.status 2.15.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/configure.in new/yast2-ftp-server-2.15.4/configure.in
--- old/yast2-ftp-server-2.15.3/configure.in 2007-05-03 16:00:36.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/configure.in 2007-05-10 15:16:23.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ftp-server, 2.15.3, http://bugs.opensuse.org/, yast2-ftp-server)
+AC_INIT(yast2-ftp-server, 2.15.4, http://bugs.opensuse.org/, yast2-ftp-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.3"
+VERSION="2.15.4"
RPMNAME="yast2-ftp-server"
MAINTAINER="Jozef Uhliarik "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/src/complex.ycp new/yast2-ftp-server-2.15.4/src/complex.ycp
--- old/yast2-ftp-server-2.15.3/src/complex.ycp 2007-04-17 16:15:37.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/src/complex.ycp 2007-05-10 13:43:44.000000000 +0200
@@ -67,12 +67,13 @@
UI::OpenDialog(
`RadioButtonGroup(`id("IntstallFTPd"),
`VBox(
- `Label("There isn't installed ftp daemon (vsftpd/pure-ftpd)!"),
- `Label("Choose daemon for installation?"),
+ `Heading ("No server package installed"),
+ `Left(`Label("Choose ftp daemon please.")),
+ `Left(`Label("If you want to cancel configuration of ftp you can push Cancel button.")),
`Left(`RadioButton(`id(0), `opt(`notify), "&vsftpd", true)),
`Left(`RadioButton(`id(1), `opt(`notify), "&pure-ftpd")),
`HBox(
- `PushButton(`id(`accept), "&Accept"),
+ `PushButton(`id(`accept), "&Install"),
`PushButton(`id(`cancel), "&Cancel")
)
) // end of `VBox(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/src/dialogs.ycp new/yast2-ftp-server-2.15.4/src/dialogs.ycp
--- old/yast2-ftp-server-2.15.3/src/dialogs.ycp 2007-05-02 17:02:46.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/src/dialogs.ycp 2007-05-10 09:52:46.000000000 +0200
@@ -383,7 +383,7 @@
map FirewallSettingsPure () {
map result = $[];
- result["services"] = [ "dns-server" ];
+ result["services"] = [ "service:pure-ftpd" ];
result["display_details"] = true;
return result;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/src/FtpServer.ycp new/yast2-ftp-server-2.15.4/src/FtpServer.ycp
--- old/yast2-ftp-server-2.15.3/src/FtpServer.ycp 2007-05-03 13:34:11.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/src/FtpServer.ycp 2007-05-10 13:49:57.000000000 +0200
@@ -180,7 +180,7 @@
"AntiWarez" : "YES",
"SSL" : "1",
"StartXinetd" : "NO",
- "StartDaemon" : "0", //0 = start manually, 1 = start via inetd, 2 = start via xinetd
+ "StartDaemon" : "0", //0 = start manually, 1 = start when booting, 2 = start via xinetd
"PassiveMode" : "YES",
"CertFile" : "", //cert file for SSL connections
"VirtualUser" : "NO",
@@ -318,6 +318,9 @@
boolean progress_orig = Progress::set (false);
SuSEFirewall::Read ();
Progress::set (progress_orig);
+
+
+
return result;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/src/helps.ycp new/yast2-ftp-server-2.15.4/src/helps.ycp
--- old/yast2-ftp-server-2.15.3/src/helps.ycp 2007-04-16 18:47:32.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/src/helps.ycp 2007-05-10 09:12:00.000000000 +0200
@@ -213,17 +213,17 @@
")+
-/* additional settings Disable SLL/TLS dialog help 3/5 */
-_("<p><b>Disable SLL/TLS</b><br>
+/* additional settings Disable SSL/TLS dialog help 3/5 */
+_("<p><b>Disable SSL/TLS</b><br>
Disable SSL/TLS encryption layer (default)</p>
")+
-/* additional settings Accept SLL and TLS dialog help 4/5 */
-_("<p><b>Accept SLL and TLS</b><br>
+/* additional settings Accept SSL and TLS dialog help 4/5 */
+_("<p><b>Accept SSL and TLS</b><br>
Accept both traditional and encrypted sessions.</p>
")+
-/* additional settings refuse without SLL and TLS dialog help 4/5 */
+/* additional settings refuse without SSL and TLS dialog help 4/5 */
_("<p><b>Refuse Connection without SSL/TLS</b><br>
Refuse connections that don't use SSL/TLS security
mechanisms, including anonymous sessions.</p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/src/write_load.ycp new/yast2-ftp-server-2.15.4/src/write_load.ycp
--- old/yast2-ftp-server-2.15.3/src/write_load.ycp 2007-05-03 14:49:38.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/src/write_load.ycp 2007-05-10 12:07:04.000000000 +0200
@@ -193,13 +193,17 @@
boolean InitStartViaXinetd () {
if (IdFTPXinetd ()) {
if (FtpServer::vsftpd_edit) {
- if (Inetd::netd_conf[FtpServer::vsftpd_xined_id,"enabled"]:nil == true)
+ if (Inetd::netd_conf[FtpServer::vsftpd_xined_id,"enabled"]:nil == true) {
FtpServer::EDIT_SETTINGS["StartDaemon"] = "2";
+ return true;
+ }
} else {
- if (Inetd::netd_conf[FtpServer::pureftpd_xined_id,"enabled"]:nil == true)
+ if (Inetd::netd_conf[FtpServer::pureftpd_xined_id,"enabled"]:nil == true) {
FtpServer::EDIT_SETTINGS["StartDaemon"] = "2";
+ return true;
+ }
}
- return true;
+
} else //end of if (IdFTPXined ())]
return false;
}
@@ -988,7 +992,7 @@
Service::Enable("pure-ftpd");
}
if (FtpServer::vsftpd_edit) {
- FtpServer::VS_SETTINGS["listen"]=nil;
+ FtpServer::VS_SETTINGS["listen"]="YES";
}
} else {
Service::Disable("vsftpd");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ftp-server-2.15.3/VERSION new/yast2-ftp-server-2.15.4/VERSION
--- old/yast2-ftp-server-2.15.3/VERSION 2007-05-03 15:22:54.000000000 +0200
+++ new/yast2-ftp-server-2.15.4/VERSION 2007-05-10 13:54:12.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org