Hello community, here is the log from the commit of package tnftp.3134 for openSUSE:13.1:Update checked in at 2014-11-10 17:11:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/tnftp.3134 (Old) and /work/SRC/openSUSE:13.1:Update/.tnftp.3134.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tnftp.3134" Changes: -------- New Changes file: --- /dev/null 2014-10-24 22:03:51.036034256 +0200 +++ /work/SRC/openSUSE:13.1:Update/.tnftp.3134.new/tnftp.changes 2014-11-10 17:11:24.000000000 +0100 @@ -0,0 +1,30 @@ +------------------------------------------------------------------- +Thu Oct 30 13:38:59 UTC 2014 - tchva...@suse.com + +- Apply fix for bnc#903011 CVE-2014-8517 + * tnftp-cve-2014-8517.patch + +------------------------------------------------------------------- +Mon Apr 29 08:21:42 UTC 2013 - mvysko...@suse.com + +- verify tarball using gpg-offline +- remove obsoleted PreReq and reformat spec + +------------------------------------------------------------------- +Wed Apr 11 22:40:33 UTC 2012 - andreas.stie...@gmx.de + +- fix openSUSE builds +- add autoconf, automake, libtool build requirements +- remove INSTALL file from package + +------------------------------------------------------------------- +Mon Aug 1 21:06:10 UTC 2011 - crrodrig...@opensuse.org + +- There is no need to check for ncurses, not directly used + by this package but by libedit for which we use the system version. + +------------------------------------------------------------------- +Sun Jul 31 19:33:57 UTC 2011 - crrodrig...@opensuse.org + +- First package version, this is the segue from lukemftp + New: ---- tnftp-20100108-am_and_libedit.patch tnftp-20100108.tar.gz tnftp-20100108.tar.gz.asc tnftp-cve-2014-8517.patch tnftp.changes tnftp.keyring tnftp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tnftp.spec ++++++ # # spec file for package tnftp # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: tnftp Version: 20100108 Release: 0 Summary: Enhanced FTP Client License: BSD-3-Clause Group: Productivity/Networking/Ftp/Clients Url: ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/ Patch0: tnftp-20100108-am_and_libedit.patch Patch1: tnftp-cve-2014-8517.patch Source0: ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/%{name}-%{version}.tar.gz Source1: ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/%{name}-%{version}.tar.gz.asc Source2: tnftp.keyring BuildRequires: autoconf BuildRequires: automake BuildRequires: libedit-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: update-alternatives %if 0%{?suse_version} >= 1230 BuildRequires: gpg-offline %endif Conflicts: ftp Provides: lukemftp = 1.6 Provides: nkitb:/usr/bin/ftp Obsoletes: lukemftp <= 1.5 Requires(pre): update-alternatives Requires(pre): coreutils Requires(post): update-alternatives Requires(post): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %description %prep %if 0%{?suse_version} >= 1230 %gpg_verify %{SOURCE1} %endif %setup -q %patch0 %patch1 -p1 %build #axe bundled library %__rm -rf libedit autoreconf -fiv %configure %__make %{?_smp_mflags} %install %makeinstall touch ${RPM_BUILD_ROOT}%{_bindir}/ftp %post test -L %{_bindir}/ftp || rm -f %{_bindir}/ftp update-alternatives --install %{_bindir}/ftp ftp %{_bindir}/%{name} 10 \ --slave %{_mandir}/man1/ftp.1.gz ftp.1 %{_mandir}/man1/%{name}.1.gz update-alternatives --auto ftp %preun if [ $1 -eq 0 ]; then update-alternatives --remove ftp %{_bindir}/%{name} fi %clean %__rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING ChangeLog NEWS README THANKS %ghost %attr(0755,root,root) %{_bindir}/ftp %{_bindir}/%{name} %{_mandir}/man1/* %changelog ++++++ tnftp-20100108-am_and_libedit.patch ++++++ Index: configure.ac =================================================================== --- configure.ac.orig +++ configure.ac @@ -62,10 +62,16 @@ AH_TEMPLATE([USE_SOCKS], # # Checks for programs. # -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +AM_PROG_AR +AM_PROG_CC_C_O AC_PROG_AWK AC_PROG_LIBTOOL +PKG_CHECK_MODULES([LIBEDIT], [libedit]) + # # Checks for tool features. # @@ -86,13 +92,6 @@ AS_CASE([$target_os], # # Checks for libraries. # -AS_IF([test "$opt_editcomplete" = yes], - [AC_SEARCH_LIBS([tgetent], - [termcap termlib curses ncurses tinfo], - [], - [AC_MSG_ERROR( - [no relevant library found containing tgetent])]) - ]) AC_SEARCH_LIBS([gethostbyname], [nsl]) AC_SEARCH_LIBS([socket], @@ -230,7 +229,6 @@ AC_CHECK_MEMBERS([struct sockaddr.sa_len [], [], [$accheck_includes]) AC_CHECK_TYPES([in_port_t, sa_family_t, socklen_t, struct addrinfo], [], [], [$accheck_includes]) -AC_SYS_LARGEFILE # If IPv6 is enabled, check for necessary items. # @@ -346,7 +344,7 @@ exit(!res); # Use local libedit if editcomplete is requested # AS_IF([test "$opt_editcomplete" = yes], - [AC_MSG_NOTICE([--enable-editcomplete; using internal libedit])], + [AC_MSG_NOTICE([--enable-editcomplete; using system libedit])], [CFLAGS="-DNO_EDITCOMPLETE $CFLAGS"]) # Replace sl_init() (et al) if it provides the older API. @@ -385,8 +383,6 @@ AM_CONDITIONAL([USE_LIBEDIT], [test "$op # AC_CONFIG_FILES([ Makefile - libedit/Makefile - libedit/makelist libnetbsd/Makefile src/Makefile ]) Index: src/Makefile.am =================================================================== --- src/Makefile.am.orig +++ src/Makefile.am @@ -28,10 +28,10 @@ tnftp_LDADD = \ if USE_LIBEDIT tnftp_CPPFLAGS += \ - -I$(top_srcdir)/libedit + $(LIBEDIT_CFLAGS) tnftp_LDADD += \ - ../libedit/libedit.la + $(LIBEDIT_LIBS) endif Index: Makefile.am =================================================================== --- Makefile.am.orig +++ Makefile.am @@ -2,10 +2,6 @@ SUBDIRS = libnetbsd -if USE_LIBEDIT -SUBDIRS += libedit -endif - SUBDIRS += src EXTRA_DIST = \ Index: libnetbsd/Makefile.am =================================================================== --- libnetbsd/Makefile.am.orig +++ libnetbsd/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la libnetbsd_la_SOURCES = -CPPFLAGS = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir) \ -I$(top_builddir) ++++++ tnftp-cve-2014-8517.patch ++++++ diff -urN tnftp-20130505.old/src/fetch.c tnftp-20130505/src/fetch.c --- tnftp-20130505.old/src/fetch.c 2014-10-30 10:55:11.381328347 +0100 +++ tnftp-20130505/src/fetch.c 2014-10-30 13:57:04.404327045 +0100 @@ -571,7 +571,7 @@ url_decode(decodedpath); if (outfile) - savefile = ftp_strdup(outfile); + savefile = outfile; else { cp = strrchr(decodedpath, '/'); /* find savefile */ if (cp != NULL) @@ -595,8 +595,7 @@ rangestart = rangeend = entitylen = -1; mtime = -1; if (restartautofetch) { - if (strcmp(savefile, "-") != 0 && *savefile != '|' && - stat(savefile, &sb) == 0) + if (stat(savefile, &sb) == 0) restart_point = sb.st_size; } if (urltype == FILE_URL_T) { /* file:// URLs */ @@ -1139,19 +1138,26 @@ goto cleanup_fetch_url; } } /* end of ftp:// or http:// specific setup */ + /* Open the output file. */ - /* Open the output file. */ - if (strcmp(savefile, "-") == 0) { - fout = stdout; - } else if (*savefile == '|') { - oldintp = xsignal(SIGPIPE, SIG_IGN); - fout = popen(savefile + 1, "w"); - if (fout == NULL) { - warn("Can't execute `%s'", savefile + 1); - goto cleanup_fetch_url; + /* + * Only trust filenames with special meaning if they came from + * the command line + */ + if (outfile == savefile) { + if (strcmp(savefile, "-") == 0) { + fout = stdout; + } else if (*savefile == '|') { + oldintp = xsignal(SIGPIPE, SIG_IGN); + fout = popen(savefile + 1, "w"); + if (fout == NULL) { + warn("Can't execute `%s'", savefile + 1); + goto cleanup_fetch_url; + } + closefunc = pclose; } - closefunc = pclose; - } else { + } + if (fout == NULL) { if ((rangeend != -1 && rangeend <= restart_point) || (rangestart == -1 && filesize != -1 && filesize <= restart_point)) { /* already done */ @@ -1362,7 +1368,8 @@ (*closefunc)(fout); if (res0) freeaddrinfo(res0); - FREEPTR(savefile); + if (savefile != outfile) + FREEPTR(savefile); FREEPTR(uuser); if (pass != NULL) memset(pass, 0, strlen(pass)); ++++++ tnftp.keyring ++++++ pub 1024D/7F332472 2003-11-25 uid Luke Mewburn <l...@mewburn.net> uid Luke Mewburn <lu...@netbsd.org> sub 2048g/13C8798D 2003-11-25 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBD/CpH8RBACY4nvw3KAu89VG6myQxvdUKclYg+xDIdAj0QFDBqHN454bWMJg IeJOQ4w4U59WNTz/x6nwbGx/Z8WAGwnax9xZZRtikDKHa90oFpNptoyqfZkyFiZb zwthFoCXDZnjEQJVwacibx7xT/Mgq8oiHSqQTuUVmPpNWkx2z0YjECNPiwCg2Ptp DTfHhiFHTkUDAUZZHLztWGkD/AoVq1nuJj62axD2W/bqfAGveZd+a1ycu58XXd92 2rBzNMTx8+T6v+eqne8ptU3v5x+MdfHcbOBeRS9p+vRYIAUVuehYYy5m0diplPkG Zyj4iEbabvDVIQeHi2BhqAeDZTJ8oK7jJGtv/oAonBwa6hkOjEXPfuge44cJSuEF 3eh1A/9REF3xN639yMzgg/ITtt1lWcwDKKnVPkSdEoenHcH2SitqCqWt9UpkmBfB E4DAYUyA2RRF94DTz42wErQtkxvTmvzzAkQvEVeP2dPqfI6jQI1quz3zg6dmj9+8 0t8Nb4z/nNE1Fqc5/yv5RQZXsA+jYawtCQ8bkjnblIanRPorYrQfTHVrZSBNZXdi dXJuIDxsdWtlQG1ld2J1cm4ubmV0PohqBBMRAgAiAhsDBwsJCAcDAgEDFQIDAxYC AQIeAQIXgAUCP8KnkwIZAQASCRCkGG2afzMkcgdlR1BHAAEB8QgAoIaO/pLLoQ11 w2/CpobUanr/vJS4AKC7SobOrP5k25suoC2rp2cLuMuX2LQfTHVrZSBNZXdidXJu IDxsdWtlbUBOZXRCU0Qub3JnPohnBBMRAgAfBQI/wqTXAhsDBwsJCAcDAgEDFQID AxYCAQIeAQIXgAASCRCkGG2afzMkcgdlR1BHAAEBABEAoM5Xt354Uqn8f4FupaNN Dji3blJBAJ9F4J9SXk0fGKVyVVK8ulnXNzAN1LkCDQQ/wqSWEAgAxPEnAL1WtHvX LZrnmSnuagZdlexi0Xo5fiioeA/CbkBku3R67uUgbPU+yCXbP1aJxc4WYWfPHLQp FJeidGf6q/MvoW5gb+gRjMJRJ2/cuMW6RQg4xzTn1nsrAUk/Jf6Fmpcw4zNGAHn7 dbiH4tvUJK5lPvwMlg3ZK4uqO3ziB4hSjQ+ThAd69uxfufae1sCNTSEza2EXVYIs XvcwEwzNUMKNSLTFQAdn+UmdcEQC57nnn299wXSTXylrublVl4tZILJeTqzNf0Pv 6MoWfgJjNLWqNjf5ifMtoOzXKojVzmLUeHtoIyHBKpcJuuZLiGW/WhU3lnJXAs31 ybkOtqO/OwADBQf/bmnISNzbOQWY/+GTzuio18O7/B1UiT61tZgyPSV42/CH1r7k Qyk6fKIR8soYBDDLC68CC1/+br9o+rrCTdc4E9DBJrjr0ys+xzkAbs1JnWEkedQR 4qmKyMgmcsfdsH7KsII2rX2m/VlPenJA11OGXgvwEkRaWpppdWVk8AbXEJ0oO0LO QJHOeo9bj2NnwUFBCz+ZZ7BnDCJqF0RtbmfhY0+WkJPpTXhbhmEuDJhP6a961z3B NLWWF7nzjudKAi1Ikrg9Xp+rZimq9ormeV9sGJ9I64d+BS1e+q8y82kxB025yxV7 tb6Ei9Qs7t88QEb1ETo2OKRCHgU09dIfo4bwU4hRBBgRAgAJBQI/wqSWAhsMABIJ EKQYbZp/MyRyB2VHUEcAAQHB9ACgi0O0Xk/REYNnpRuGzeZPQIx52bEAnioUvHFS NOuqOy+LP02Je6BJl21Y =ve/U -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org