Browse Source

2015-03-22 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* ftp, tftp: rebuilt without readline
	* gftp, lftp, lua, python, python3, sqlite, sqlite3: rebuilt
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9461 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 7 years ago
parent
commit
2b31951622

+ 59 - 5
f/ftp/ftp-vl.spec

@@ -1,14 +1,16 @@
+%bcond_with readline
+
 Name: ftp
+Version: 0.17
+Release: 36%{?_dist_release}
 Summary: The standard UNIX FTP (File Transfer Protocol) client.
 Summary(ja): 標準的な UNIX FTP (ファイル転送プロトコル) クライアント
-Version: 0.17
-Release: 35%{?_dist_release}
 
 Group: Applications/Internet
 License: BSD with advertising
 URL: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit
 
-Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2
+Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.bz2
 Patch1: netkit-ftp-0.17-pre20000412.pasv-security.patch
 Patch2: netkit-ftp-0.17-acct.patch
 Patch3: netkit-ftp.usagi-ipv6.patch
@@ -35,9 +37,21 @@ Patch23: netkit-ftp-0.17-arg_max.patch
 Patch24: netkit-ftp-0.17-case.patch
 Patch25: netkit-ftp-0.17-chkmalloc.patch
 Patch26: netkit-ftp-0.17-man.patch
+Patch27: netkit-ftp-0.17-acct_ovl.patch
+Patch28: netkit-ftp-0.17-remove-nested-include.patch
+Patch29: netkit-ftp-0.17-linelen.patch
+Patch30: netkit-ftp-0.17-active-mode-option.patch
+Patch31: netkit-ftp-0.17-commands-leaks.patch
+Patch32: netkit-ftp-0.17-lsn-timeout.patch
+Patch33: netkit-ftp-0.17-getlogin.patch
+Patch34: netkit-ftp-0.17-token.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl
+BuildRequires: glibc-devel
+BuildRequires: ncurses-devel
+%if %{with readline}
+BuildRequires: readline-devel
+%endif
 
 %description
 The ftp package provides the standard UNIX command-line FTP (File
@@ -84,9 +98,24 @@ file transfers.
 %patch24 -p1 -b .case
 %patch25 -p1 -b .chkmalloc
 %patch26 -p1 -b .man
+%patch27 -p1 -b .acct_ovl
+%patch28 -p1
+%patch29 -p1 -b .linelen
+%patch30 -p1 -b .activemode
+%patch31 -p1 -b .cmds-leaks
+%patch32 -p1 -b .lsn-timeout
+%patch33 -p1 -b .getlogin
+%patch34 -p1 -b .token
 
 %build
-sh configure --with-c-compiler=gcc --enable-ipv6
+./configure \
+    --with-c-compiler=gcc \
+    --enable-ipv6 \
+%if %{without readline}
+    --without-readline \
+%endif
+    ;
+
 perl -pi -e '
     s,^CC=.*$,CC=cc,;
     s,-O2,\$(RPM_OPT_FLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,;
@@ -119,6 +148,31 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.17-36
+- built without readline to avoid GPL infection
+- added Patch27-34 from Fedora
+  * Tue Oct 30 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-63
+  - Fix buffer overflow in token parsing
+  - Resolves: #871296
+  * Tue Oct 30 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-62
+  - Fix linelen patch
+  - Resolves: #871290
+  * Wed Oct 03 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-61
+  - Fix: FTP client does not expand home directory correctly after sudo or su
+  - Resolves: #861113
+  * Tue Sep 25 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-60
+  - Plug leaks in "put", "send", "append"
+  - Add listening timeout
+  * Tue Aug 28 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-59
+  - Add active mode option
+  * Fri Aug 03 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-58
+  - Extend the input line buffer and the argument storage buffer
+  - Prettify spec some more and remove trailing space
+  * Fri Jul 20 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-57
+  - Remove nested include (fix compilation in rawhide)
+  * Fri Sep 09 2011 Jiri Skala <jskala@redhat.com> - 0.17-54
+  - fixes #737016 - ftp: off-by-one in account command parsing
+
 * Thu Dec 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.17-35
 - rebuild with VineSeed environment
 

+ 7 - 4
g/gftp/gftp-vl.spec

@@ -3,8 +3,8 @@ Summary: A multi-threaded FTP client for the X Window System.
 Summary(ja): X ウィンドウ用マルチスレッド FTP クライアント
 Name: gftp
 Version: 2.0.19
-Release: 4%{?_dist_release}
-License: GPL
+Release: 5%{?_dist_release}
+License: GPLv2+
 Group: Applications/Internet
 URL: http://www.gftp.org/
 Source: http://www.gftp.org/%{name}-%{version}.tar.bz2
@@ -15,12 +15,12 @@ Source2: gftp-2.0.19.ja.po
 Patch1: gftp-2.0.18-user-dirs.patch
 Patch2: gftp-2.0.19-stropts.patch
 
-Requires: gtk2 >= 2.2.4
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel >= 2.2.4
 BuildRequires: openssl-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Requires: gtk2 >= 2.2.4
 
 Vendor:	Project Vine
 Distribution: Vine Linux
@@ -71,6 +71,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_mandir}/man1/gftp.1*
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.0.19-5
+- rebuilt with readline 6.3
+
 * Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.19-4
 - rebuild with VineSeed environment
 

+ 29 - 36
l/lftp/lftp-vl.spec

@@ -1,21 +1,20 @@
-%define name lftp
-%define version 4.5.4
-%define release 1%{?_dist_release}
-
-Summary: The lftp command line ftp/http client
-Summary(ja): lftp - コマンドライン ftp/http クライアント
-Name: %{name}
-Version: %{version}
-Release: %{release}
-License: GPL3
+Summary: A sophisticated file transfer program
+Summary(ja): 洗練された ftp/http クライアント
+Name: lftp
+Version: 4.6.1
+Release: 1%{?_dist_release}
+License: GPLv3
 Group: Applications/Internet
-Source: http://ftp.yars.free.net/pub/source/lftp/lftp-%{version}.tar.xz
-# Source10: lftp-3.0.9-0vl1-ja.po
-# Source10: lftp-3.7.4-ja.po
 URL: http://lftp.yar.ru/
+
+Source: http://ftp.yars.free.net/pub/source/lftp/lftp-%{version}.tar.xz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ncurses-devel, openssl-devel, pkgconfig, readline-devel
 BuildRequires: expat-devel
+BuildRequires: ncurses-devel
+BuildRequires: openssl-devel
+BuildRequires: pkgconfig
+BuildRequires: readline-devel
 BuildRequires: zlib-devel
 
 Packager: iwamoto
@@ -23,30 +22,20 @@ Vendor: Project Vine
 Distribution: Vine Linux
 
 %description
-LFTP is a shell-like command line ftp client. It is
-reliable: can retry operations and does reget automatically.
-It can do several transfers simultaneously in background.
-You can start a transfer in background and continue browsing
-the ftp site or another one. This all is done in one process.
-Background jobs will be completed in nohup mode if you exit
-or close modem connection. Lftp has reput, mirror, reverse
-mirror among its features. Since version 2.0 it also supports
-http protocol.
+LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
+control and uses the readline library for input. It has bookmarks, built-in
+mirroring, and can transfer several files in parallel. It is designed with
+reliability in mind.
 
 %description -l ja
-LFTP は、shell ライクなコマンドライン ftp クライアントです。
-リトライ機能の実装や自動的な再取得を行うため信頼性が高いです。
-バックグラウンドで複数の転送を同時に行うことができます。
-バックグラウンドでの転送を開始し、その ftp サイトや別の ftp 
-サイトを閲覧し続けることができます。これらは全て 1 つのプロセス
-で実行されます。
-もし、モデムの接続が exit や close された場合、バックグラウンド
-ジョブは、nohup モードで終了します。lftp の特徴は、reput やミラー、
-逆ミラーなどです。バージョン 2.0 以降では、HTTP もサポートしています。
+LFTP は洗練された ftp/http ファイル転送プログラムです.Bash のように、ジョブ制御
+機能を有し、入力には Readline ライブラリを使用します。ブックマーク機能や、ミラー
+リング機能も組み込まれており、複数のファイルを並列して転送することも可能です。 
+もちろん、信頼性を念頭に設計されています。
 
 %package scripts
 Summary:	Scripts for lftp
-Summary(ja): 	lftp のユーティリティスクリプト
+Summary(ja): 	LFTP のユーティリティスクリプト
 Group:		Applications/Internet
 Requires:	lftp = %{version}-%{release}
 Requires:	perl(DBD::SQLite)
@@ -56,7 +45,7 @@ BuildArch:	noarch
 Utility scripts for use with lftp.
 
 %description scripts -l ja
-lftp のユーティリティスクリプトです。
+LFTP のユーティリティスクリプトです。
 
 %prep
 %setup -q
@@ -93,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README README.modules FAQ THANKS COPYING
-%doc  TODO lftp.lsm NEWS INSTALL FEATURES
+%doc TODO lftp.lsm NEWS FEATURES
 %config(noreplace) %{_sysconfdir}/lftp.conf
 %{_bindir}/*
 %{_mandir}/*/*
@@ -113,7 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/lftp
 
 %changelog
-* Fri Aug 008 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 4.5.4-1
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.6.1-1
+- new upstream release
+- built with readline 6.3
+
+* Fri Aug 08 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 4.5.4-1
 - new upstream release
 
 * Tue Jun 17 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.5.2-1

+ 18 - 17
l/lua/lua-vl.spec

@@ -1,23 +1,24 @@
 %define name lua
 %define version 5.1.4
-%define release 6%{?_dist_release}
+%define release 7%{?_dist_release}
 
 Summary: Lua is a powerful, light-weight programming language designed for extending applications.
 Summary(ja): アプリケーション拡張向けに設計された強力かつ軽量なプログラミング言語
 Name: %{name}
 Version: %{version}
 Release: %{release}
-Source0: http://www.lua.org/ftp/%{name}-%{version}.tar.gz
-Patch0: lua-5.1.4-autotoolize.patch
-License: MIT (Lua 5.0 license)
+
+License: MIT
 Group: Development/Languages
 URL: http://www.lua.org/
 
-#Requires: 
+Source0: http://www.lua.org/ftp/%{name}-%{version}.tar.gz
+Patch0: lua-5.1.4-autotoolize.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 # apt-get remove readline-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Provides: lua = 5.1
 
@@ -32,15 +33,14 @@ Lua is implemented as a library, written in clean C
 (that is, in the common subset of ANSI C and C++).
 
 %description -l ja
-Luaは拡張プログラミング言語である。データ記述機能を持ち、
-汎用の手続き型プログラミングをサポートするようデザインされた。
-オブジェクト指向プログラミング、関数型プログラミング、
-データ駆動型プログラミングもサポートしている。 
-Luaは、パワフルで軽いコンフィギュレーション言語としての意図もあり、
-コンフィギュレーションが必要なあらゆるプログラムに使うことができる。 
-Luaはクリーンな C (つまり、ANSI C と C++ の共通のサブセット) で書かれ、
-ライブラリとして実装されている。
-
+Lua は、データ記述機能を備え、汎用の手続き型プログラミングをサポート
+するようデザインされた拡張プログラミング言語です。
+オブジェクト指向プログラミング、関数型プログラミング、データ駆動型
+プログラミングもサポートしています。
+Lua は、コンフィギュレーションが必要なあらゆるプログラムのための、
+パワフルかつ軽いコンフィギュレーション言語としての使用を意図しています。
+Lua は、クリーンな C (つまり、ANSI C と C++ の共通のサブセット) で
+書かれたライブラリとして実装されています。
 
 %package devel
 Summary: Libraries and include files for Lua.
@@ -64,8 +64,6 @@ This package contains the static version of liblua for %{name}.
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup  -q
 %patch0 -p1 -E
 # fix perms on auto files
@@ -123,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.1.4-7
+- rebuilt with readline 6.3
+
 * Mon Dec 30 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 5.1.4-6
 - added Japanese summary
 - moved devel and static subpackages to Development/Libraries Group 

+ 9 - 6
p/python/python-vl.spec

@@ -12,7 +12,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
 Version: %{pybasever}.9
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: PSF
 Group: Development/Languages
 URL: http://www.python.org/%{pybasever}/
@@ -40,7 +40,6 @@ Patch41: 00121-add-Modules-to-build-path.patch
 Patch42: 00125-less-verbose-COUNT_ALLOCS.patch
 Patch43: 00133-skip-test_dl.patch
 Patch44: 00137-skip-distutils-tests-that-fail-in-rpmbuild.patch
-Patch45: 00199-alter-tests-to-reflect-sslv3-disabled.patch
 
 ## for lib64
 Patch100: python-2.7-lib64-Makefile.patch
@@ -64,7 +63,7 @@ Provides: Distutils
 Obsoletes: pysqlite <= 2.6.1-1vl6
 Provides: pysqlite
 
-BuildRequires: db4-devel >= 4.8
+BuildRequires: libdb-devel
 BuildRequires: readline-devel
 #BuildRequires: libtermcap-devel
 BuildRequires: openssl-devel
@@ -78,7 +77,8 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: libX11-devel
 BuildRequires: libffi-devel
 BuildRequires: sqlite3-devel
-BuildRequires: tk
+BuildRequires: tcl-devel
+BuildRequires: tk-devel
 BuildRequires: tix
 BuildRequires: findutils
 BuildRequires: pkgconfig
@@ -162,7 +162,6 @@ Summary: A graphical user interface for the Python scripting language.
 Summary(ja): Python スクリプト言語のグラフィカルインターフェイス
 Group: Development/Languages
 Obsoletes: tkinter2
-BuildRequires: tcl, tk
 Requires: %{name} = %{version}-%{release}
 Requires: tix
 Obsoletes: python27-tkinter < %{version}-%{release}
@@ -467,10 +466,14 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.7.9-2
+- rebuilt with readline 6.3
+- changed BuildRequires: tcl-devel, tk-devel instead of tcl, tk respectively
+- changed BuildRequires: libdb-devel instead of db4-devel
+
 * Sun Dec 28 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.7.9-1
 - new upstream release
 - included %%{python_lib}/ensurepip (ignore _bundled*)
-- added Patch45 fron fedora to disable SSLv3 in test_ssl.py
 
 * Sun Jul 06 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.7.7-2
 - rebuild with libffi-3.0.13

+ 9 - 4
p/python3/python3-vl.spec

@@ -8,7 +8,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Version: 3.4.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: PSF
 Group: Development/Languages
 URL: http://www.python.org/download/releases/%{version}
@@ -17,7 +17,7 @@ Source1: http://docs.python.org/py3k/archives/python-%{version}-docs-html.tar.bz
 Patch1: python-3.4.2-lib64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: expat-devel
-BuildRequires: db4-devel
+BuildRequires: libdb-devel
 BuildRequires: gdbm-devel
 BuildRequires: sqlite3-devel
 BuildRequires: gzip tar gcc-c++ pkgconfig sed findutils
@@ -74,7 +74,7 @@ Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
 Requires: tcl, tk, tix
 Requires: libX11, libxcb, libXau, libXdmcp
-BuildRequires: tcl, tk, tix
+BuildRequires: tcl-devel, tk-devel, tix
 BuildRequires: libX11-devel, libxcb-devel, libXau-devel, libXdmcp-devel
 
 %description tkinter
@@ -96,6 +96,7 @@ to build python programs.
 
 %package docs
 Summary: Documentation for the Python programming language.
+Summary(ja): Python プログラミング言語のドキュメント
 Group: Documentation
 
 %description docs
@@ -121,7 +122,6 @@ for the Python language.
 	--enable-shared \
 	--enable-ipv6 \
 	--with-fpectl \
-	--with-wide-unicode \
 	--with-doc-strings \
 	--with-pymalloc \
 	--with-signal-module \
@@ -272,6 +272,11 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.4.2-2
+- rebuilt with readline 6.3
+- changed BuildRequires: tcl-devel, tk-devel instead of tcl, tk respectively
+- changed BuildRequires: libdb-devel instead of db4-devel
+
 * Sun Jan 11 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.4.2-1
 - new upstream release
 - update Patch1 (python-3.4.2-lib64.patch)

+ 11 - 5
s/sqlite/sqlite-vl.spec

@@ -1,21 +1,23 @@
 %define name sqlite
 %define version 2.8.17
-%define release 3%{?_dist_release}
+%define release 4%{?_dist_release}
 
 Name: %{name}
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
 Version: %{version}
 Release: %{release}
+Group: System Environment/Libraries
+URL: http://www.sqlite.org
+License: Public Domain
+
 Source: %{name}-%{version}.tar.gz
 Patch0: %{name}-2.8.15-ja-patch
 Patch1: %{name}-2.8.14-lib64.patch.bz2
 Patch2: %{name}-64bit-fixes.patch.bz2
-Group: System Environment/Libraries
-URL: http://www.sqlite.org
-License: Public Domain
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: tcl, chrpath, ncurses-devel, readline-devel
+BuildRequires: tcl-devel, chrpath, ncurses-devel, readline-devel
 
 %description
 SQLite is a C library that implements an embeddable SQL database engine.
@@ -131,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 2.8.17-4
+- rebuilt with readline 6.3
+- changed BuildRequires: tcl-devel instead of tcl
+
 * Mon Jan 12 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.8.17-3
 - rebuild with VineSeed environment
 

+ 5 - 5
s/sqlite3/sqlite3-vl.spec

@@ -14,7 +14,7 @@ Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
 Name: %{packagename}
 Version: %{rpmver}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
 URL: http://www.sqlite.org
 License: Public Domain
@@ -27,7 +27,6 @@ Patch1: sqlite-3.6.23-lemon-system-template.patch
 # Temporary workaround for failed percentile test, see patch for details
 Patch4: sqlite-3.8.0-percentile-test.patch
 
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl-devel, readline-devel, ncurses-devel
 
@@ -48,7 +47,7 @@ SQLiteライブラリにリンクされたプログラムではSQLデータベ
  
 %package -n %{name}-devel
 Summary: Header files and libraries for developing apps which will use sqlite3
-Summary(ja): sqlite3の開発用ヘッダファイル及びライブラリ
+Summary(ja): sqlite3 の開発用ヘッダファイル及びライブラリ
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -60,7 +59,6 @@ to develop programs that use the SQLite database library.
 sqlite3-develはSQLiteデータベースライブラリを用いるプログラムの開発に
 必要なヘッダファイル及びライブラリを含むパッケージです。
 
-
 %package -n lemon
 Summary: A parser generator
 Summary(ja): パーザジェネレータ
@@ -215,7 +213,6 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 %defattr(-, root, root)
 %{_libdir}/*.so.*
 
-
 %files -n compat32-%{name}-devel
 %defattr(-, root, root)
 %{_libdir}/*.so
@@ -223,6 +220,9 @@ install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.8.8.2-2
+- rebuilt with readline 6.3
+
 * Sun Feb 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.8.8.2-1
 - new upstream release
 - remove Patch2,3

+ 34 - 9
t/tftp/tftp-vl.spec

@@ -1,13 +1,17 @@
+%bcond_with readline
+
+Name: tftp
+Version: 5.2
+Release: 1%{?_dist_release}
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Summary(ja): TFTP (Trivial File Transfer Protocol) クライアント
-Name: tftp
-Version: 0.49
-Release: 2%{?_dist_release}
+
 License: BSD
 Group: Applications/Internet
-Source: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
 URL: http://www.kernel.org/pub/software/network/tftp/
 
+Source: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{version}.tar.bz2
+
 Patch0: tftp-0.40-remap.patch
 Patch2: tftp-hpa-0.39-tzfix.patch
 Patch3: tftp-0.42-tftpboot.patch
@@ -15,9 +19,16 @@ Patch4: tftp-0.49-chk_retcodes.patch
 Patch5: tftp-hpa-0.49-fortify-strcpy-crash.patch
 Patch6: tftp-0.49-cmd_arg.patch
 Patch7: tftp-hpa-0.49-stats.patch
+Patch8: tftp-hpa-5.2-pktinfo.patch
+Patch9: tftp-doc.patch
 
-BuildRequires: tcp_wrappers readline-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: autoconf
+%if %{with readline}
+BuildRequires: readline-devel
+%endif
+BuildRequires: sed
+BuildRequires: tcp_wrappers
 
 %description
 The Trivial File Transfer Protocol (TFTP) is normally used only for
@@ -41,7 +52,6 @@ Summary: The server for the Trivial File Transfer Protocol (TFTP).
 Summary(ja): TFTP (Trivial File Transfer Protocol) サーバ
 Requires: xinetd
 
-
 %description server
 The Trivial File Transfer Protocol (TFTP) is normally used only for
 booting diskless workstations.  The tftp-server package provides the
@@ -69,11 +79,17 @@ tftp-server パッケージには TFTP のサーバプログラムが収めら
 %patch5 -p1 -b .fortify-strcpy-crash
 %patch6 -p1 -b .cmd_arg
 %patch7 -p1 -b .stats
-
+%patch8 -p1 -b .pktinfo
+%patch9 -p1 -b .doc
 
 %build
 autoreconf
-%configure
+%configure \
+    %if %{without readline}
+    --without-readline \
+%endif
+    ;
+    
 make %{?_smp_mflags}
 
 
@@ -87,7 +103,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
 make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} INSTALL='install -p' install
 install -m755 -d -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
 sed -e 's:/var:%{_localstatedir}:' -e 's:/usr/sbin:%{_sbindir}:' \
- tftp-xinetd > ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
+    tftp-xinetd > ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
 touch -r tftp-xinetd ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
 
 
@@ -122,6 +138,15 @@ fi
 
 
 %changelog
+* Sun Mar 22 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.2-1
+- updated to 5.2
+- built without readline to avoid GPL infection
+- added Patch8 and 9 from Fedora
+  * Fri Apr 19 2013 Jan Synáček <jsynacek@redhat.com> - 5.2-8
+  - documentation fixes
+  * Wed Jan 04 2012 Jiri Skala <jskala@redhat.com> - 5.2-2
+  - fixes #739534 - TFTP to an IP alias of FC15 tftp server failed
+
 * Sat Mar 19 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.49-2
 - Fixed Requires on server subpackage (s/inetd/xinetd)