Hello community, here is the log from the commit of package yast2-ftp-server for openSUSE:Factory checked in at Sun Apr 25 18:45:28 CEST 2010. -------- --- yast2-ftp-server/yast2-ftp-server.changes 2009-11-30 09:48:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ftp-server/yast2-ftp-server.changes 2010-04-23 16:35:27.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Apr 23 16:30:14 CEST 2010 - juhliarik@suse.cz + +- added fix for parsing options from xinetd (bnc#597842) +- 2.19.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova@suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ftp-server-2.18.1.tar.bz2 New: ---- yast2-ftp-server-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ftp-server.spec ++++++ --- /var/tmp/diff_new_pack.Nwx1Hl/_old 2010-04-25 18:44:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Nwx1Hl/_new 2010-04-25 18:44:35.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-ftp-server (Version 2.18.1) +# spec file for package yast2-ftp-server (Version 2.19.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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,16 +19,21 @@ Name: yast2-ftp-server -Version: 2.18.1 +Version: 2.19.0 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ftp-server-2.18.1.tar.bz2 +Source0: yast2-ftp-server-2.19.0.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ Requires: yast2 yast2-inetd BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-inetd yast2-testsuite + BuildArch: noarch + Summary: YaST2 - FTP configuration %description @@ -36,14 +41,16 @@ to configure two daemons: pure-ftpd and vsftpd. %prep -%setup -n yast2-ftp-server-2.18.1 +%setup -n yast2-ftp-server-2.19.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) ++++++ yast2-ftp-server-2.18.1.tar.bz2 -> yast2-ftp-server-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/VERSION new/yast2-ftp-server-2.19.0/VERSION --- old/yast2-ftp-server-2.18.1/VERSION 2009-11-30 09:38:57.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/VERSION 2010-04-23 16:31:17.000000000 +0200 @@ -1 +1 @@ -2.18.1 +2.19.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/src/ftp-server.desktop new/yast2-ftp-server-2.19.0/src/ftp-server.desktop --- old/yast2-ftp-server-2.18.1/src/ftp-server.desktop 2009-02-17 13:42:47.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/src/ftp-server.desktop 2010-03-03 16:07:00.000000000 +0100 @@ -19,9 +19,8 @@ X-SuSE-YaST-AutoInstSchema=ftp-server.rnc Icon=yast-ftp-server -Exec=/sbin/yast2 ftp-server +Exec=xdg-su -c "/sbin/yast2 ftp-server" Name=FTP Server GenericName=Module for configuration FTP daemon (vsftpd or pure-ftpd) -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ftp-server-2.18.1/src/write_load.ycp new/yast2-ftp-server-2.19.0/src/write_load.ycp --- old/yast2-ftp-server-2.18.1/src/write_load.ycp 2009-11-30 09:32:45.000000000 +0100 +++ new/yast2-ftp-server-2.19.0/src/write_load.ycp 2010-04-23 16:27:44.000000000 +0200 @@ -53,7 +53,14 @@ string option = ""; y2milestone("---------------boolean SettingsXinetdPure (list <string> server_args)-----------------"); y2milestone("----------------------------------------------------"); - + + //bnc#597842 Yast2-ftp-server module losses the chroot everyone (chroot-local-user) setting + if ((FtpServer::vsftpd_edit) || (size(pure_ftpd_xinet_conf) == 0)) + { + y2milestone("skip SettingsXinetdPure() -> vsftpd is used or pure_ftpd_xinet_conf is empty"); + return true; + } + //ChrootEnable option = find(string opt, pure_ftpd_xinet_conf, ``(opt == "-A")); if (option != nil) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org