Hello community,
here is the log from the commit of package yast2-ftp-server for openSUSE:Factory
checked in at Wed Dec 2 12:58:51 CET 2009.
--------
--- yast2-ftp-server/yast2-ftp-server.changes 2009-02-11 16:16:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ftp-server/yast2-ftp-server.changes 2009-11-30 09:48:05.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Nov 30 09:36:55 CET 2009 - juhliarik@suse.cz
+
+- added fix for typo (bnc#525007)
+- added fir parsing port range in pure-ftpd (bnc#541557)
+- 2.18.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ftp-server-2.18.0.tar.bz2
New:
----
yast2-ftp-server-2.18.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ftp-server.spec ++++++
--- /var/tmp/diff_new_pack.yo9ozq/_old 2009-12-02 12:57:07.000000000 +0100
+++ /var/tmp/diff_new_pack.yo9ozq/_new 2009-12-02 12:57:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ftp-server (Version 2.18.0)
+# spec file for package yast2-ftp-server (Version 2.18.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-ftp-server
-Version: 2.18.0
+Version: 2.18.1
Release: 1
-License: GPL v2 or later
-Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ftp-server-2.18.0.tar.bz2
+Source0: yast2-ftp-server-2.18.1.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
@@ -35,14 +35,8 @@
This package contains the YaST2 component for FTP configuration. It can
to configure two daemons: pure-ftpd and vsftpd.
-
-
-Authors:
---------
- Jozef Uhliarik
-
%prep
-%setup -n yast2-ftp-server-2.18.0
+%setup -n yast2-ftp-server-2.18.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -52,7 +46,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
@@ -76,5 +72,4 @@
/usr/share/YaST2/schema/autoyast/rnc/ftp-server.rnc
/usr/share/YaST2/scrconf/*.scr
%doc %{prefix}/share/doc/packages/yast2-ftp-server
-
%changelog
++++++ yast2-ftp-server-2.18.0.tar.bz2 -> yast2-ftp-server-2.18.1.tar.bz2 ++++++
++++ 3521 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.18.0/autodocs-ycp.ami new/yast2-ftp-server-2.18.1/autodocs-ycp.ami
--- old/yast2-ftp-server-2.18.0/autodocs-ycp.ami 2009-02-03 13:05:57.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/autodocs-ycp.ami 2009-11-30 09:39:10.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
done
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.18.0/configure.in new/yast2-ftp-server-2.18.1/configure.in
--- old/yast2-ftp-server-2.18.0/configure.in 2009-02-03 13:05:57.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/configure.in 2009-11-30 09:39:10.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ftp-server
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+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.17.3, http://bugs.opensuse.org/, yast2-ftp-server)
+AC_INIT(yast2-ftp-server, 2.18.1, 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.17.3"
+VERSION="2.18.1"
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.18.0/Makefile.am new/yast2-ftp-server-2.18.1/Makefile.am
--- old/yast2-ftp-server-2.18.0/Makefile.am 2009-02-03 13:05:57.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/Makefile.am 2009-11-30 09:39:10.000000000 +0100
@@ -32,10 +32,10 @@
# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
-# where devtools instal m4 snippets
+# where devtools install m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
-ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
+ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
cmp -s $< $@ || cp -f $< $@
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.18.0/missing new/yast2-ftp-server-2.18.1/missing
--- old/yast2-ftp-server-2.18.0/missing 2009-02-03 13:06:02.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/missing 2009-11-30 09:39:16.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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.18.0/src/ftp-server.ycp new/yast2-ftp-server-2.18.1/src/ftp-server.ycp
--- old/yast2-ftp-server-2.18.0/src/ftp-server.ycp 2009-02-03 11:24:23.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/src/ftp-server.ycp 2009-11-30 09:35:38.000000000 +0100
@@ -383,7 +383,7 @@
FtpServer::EDIT_SETTINGS["FtpDirAnon"] = value;
} else {
CommandLine::Error(_("Option is empty."));
- CommandLine::Print(_("Example of correct imput set_anon_dir=/srv/ftp"));
+ CommandLine::Print(_("Example of correct input set_anon_dir=/srv/ftp"));
CommandLine::Print("");
}
}
@@ -408,7 +408,7 @@
FtpServer::EDIT_SETTINGS["FtpDirLocal"] = value;
} else {
CommandLine::Error(_("Option is empty."));
- CommandLine::Print(_("Example of correct imput set_authen_dir=/srv/ftp"));
+ CommandLine::Print(_("Example of correct input set_authen_dir=/srv/ftp"));
CommandLine::Print("");
}
}
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.18.0/src/write_load.ycp new/yast2-ftp-server-2.18.1/src/write_load.ycp
--- old/yast2-ftp-server-2.18.0/src/write_load.ycp 2009-02-03 11:24:23.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/src/write_load.ycp 2009-11-30 09:32:45.000000000 +0100
@@ -509,7 +509,7 @@
ports = add(ports, FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil);
if (size(ports) == 2) {
string val = ports[0]:nil;
- val = val+" ";
+ val = val+":";
val = val+ports[1]:nil;
FtpServer::PURE_SETTINGS["PassivePortRange"] = val;
}
@@ -519,7 +519,7 @@
}
else {
if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) {
- ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," ");
+ ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":");
if (size(ports)==2)
return ports[0]:"";
} else {
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.18.0/VERSION new/yast2-ftp-server-2.18.1/VERSION
--- old/yast2-ftp-server-2.18.0/VERSION 2009-02-11 14:39:48.000000000 +0100
+++ new/yast2-ftp-server-2.18.1/VERSION 2009-11-30 09:38:57.000000000 +0100
@@ -1 +1 @@
-2.18.0
+2.18.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org