|
|
@@ -2,33 +2,37 @@
|
|
|
%define _localstatedir /var/run
|
|
|
%define _sysconfdir /etc
|
|
|
%define _rundir /var/run/proftpd
|
|
|
-%define tarballversion 1.3.3e
|
|
|
-%define origversion 1.3.3e
|
|
|
+%define tarballversion 1.3.4b
|
|
|
+%define origversion 1.3.4b
|
|
|
|
|
|
Summary: ProFTPd -- Professional FTP Server.
|
|
|
Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
|
|
|
Name: proftpd
|
|
|
Epoch: 1
|
|
|
Version: %{origversion}
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Daemons
|
|
|
URL: http://www.proftpd.org/
|
|
|
|
|
|
-Source0: ftp://ftp.proftpd.org/distrib/%{name}-%{origversion}.tar.bz2
|
|
|
+Source0: ftp://ftp.proftpd.org/distrib/%{name}-%{origversion}.tar.gz
|
|
|
Source1: proftpd.vine.conf
|
|
|
Source2: ftpusers.vine
|
|
|
Source3: proftpd.init
|
|
|
Source5: welcome.msg
|
|
|
|
|
|
# upstream bug fixes & security fixes
|
|
|
+Patch14: proftpd-1.3.4a-bug3720.patch
|
|
|
+Patch23: proftpd-1.3.4a-bug3744.patch
|
|
|
+Patch24: proftpd-1.3.4a-bug3745.patch
|
|
|
+Patch25: proftpd-1.3.4a-bug3746.patch
|
|
|
|
|
|
# auth
|
|
|
Patch201: proftpd-1.3.1-use-system-auth-instead-of-pam_pwdb.patch
|
|
|
|
|
|
# iconv patch (CharsetLocal/CharsetRemote)
|
|
|
# Patch300: http://www.hakusan.tsg.ne.jp/tjkawa/software/misc/proftpd-iconv/pack/proftpd-1.3.0-iconv.patch.gz
|
|
|
-Patch300: proftpd-1.3.3e-iconv.patch
|
|
|
+Patch300: proftpd-1.3.4b-iconv.patch
|
|
|
|
|
|
# fix build on recent kernel headers
|
|
|
# Patch400: proftpd-1.3.1-umode.patch
|
|
|
@@ -60,12 +64,45 @@ FTP サーバです。Apache に似た構文による設定や、複数の仮想
|
|
|
anonymous FTP, パーミッションベースのディレクトリ可視性のサポートを含む、
|
|
|
高度にカスタマイズ可能なサーバ・インターフェイスを特徴としています。
|
|
|
|
|
|
+
|
|
|
+%package utils
|
|
|
+Summary: ProFTPD - Additional utilities
|
|
|
+Group: System Environment/Daemons
|
|
|
+Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
|
+
|
|
|
+%description utils
|
|
|
+This package contains additional utilities for monitoring and configuring the
|
|
|
+ProFTPD server:
|
|
|
+
|
|
|
+* ftpasswd: generate passwd(5) files for use with AuthUserFile
|
|
|
+* ftpcount: show the current number of connections per server/virtualhost
|
|
|
+* ftpmail: monitor transfer log and send email when files uploaded
|
|
|
+* ftpquota: manipulate quota tables
|
|
|
+* ftptop: show the current status of FTP sessions
|
|
|
+* ftpwho: show the current process information for each FTP session
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q -n %{name}-%{tarballversion}
|
|
|
find . -type d -name CVS | xargs -r rm -frv
|
|
|
|
|
|
# upstream fixes
|
|
|
|
|
|
+# Various module logfile permissions are 0600 instead of 0640
|
|
|
+# http://bugs.proftpd.org/show_bug.cgi?id=3720
|
|
|
+%patch14 -p0
|
|
|
+
|
|
|
+# Support ls(1) -1 option for LIST command
|
|
|
+# http://bugs.proftpd.org/show_bug.cgi?id=3744
|
|
|
+%patch23 -p0
|
|
|
+
|
|
|
+# Reject PASV command if no IPv4 address available
|
|
|
+# http://bugs.proftpd.org/show_bug.cgi?id=3745
|
|
|
+%patch24 -p0
|
|
|
+
|
|
|
+# Support applying ListOptions only to NLST or to LIST commands
|
|
|
+# http://bugs.proftpd.org/show_bug.cgi?id=3746
|
|
|
+%patch25 -p0
|
|
|
+
|
|
|
## patches from mdk
|
|
|
# use system-auth instaed of pam_pwdb
|
|
|
%patch201 -p1
|
|
|
@@ -88,6 +125,7 @@ find . -type d -name CVS | xargs -r rm -frv
|
|
|
--enable-ctrls \
|
|
|
--enable-facl \
|
|
|
--enable-dso \
|
|
|
+ --enable-nls \
|
|
|
--enable-ipv6 \
|
|
|
--with-modules=mod_readme:mod_auth_pam:mod_tls:mod_codeconv:mod_df:\
|
|
|
mod_ban:mod_dynmasq:mod_load:mod_ratio:mod_rewrite \
|
|
|
@@ -163,11 +201,17 @@ rm -rf %{buildroot}
|
|
|
%doc contrib/README contrib/xferstats.holger-preiss
|
|
|
%doc sample-configurations/
|
|
|
%{_sbindir}/*
|
|
|
-%{_bindir}/*
|
|
|
-%{_mandir}/*/*
|
|
|
+%{_bindir}/ftpdctl
|
|
|
+%{_bindir}/prxs
|
|
|
+%{_mandir}/man5/xferlog.5*
|
|
|
+%{_mandir}/man8/ftpdctl.8*
|
|
|
+%{_mandir}/man8/ftpscrub.8*
|
|
|
+%{_mandir}/man8/ftpshut.8*
|
|
|
+%{_mandir}/man8/proftpd.8*
|
|
|
%{_var}/ftp/welcome.msg
|
|
|
%dir %{_libexecdir}/proftpd/
|
|
|
%{_libexecdir}/proftpd/mod_*
|
|
|
+%{_localedir}/*
|
|
|
%dir %{_rundir}
|
|
|
%dir %{_var}/ftp
|
|
|
%config %{_sysconfdir}/rc.d/init.d/proftpd
|
|
|
@@ -176,8 +220,33 @@ rm -rf %{buildroot}
|
|
|
%config(noreplace) %{_sysconfdir}/ftpusers
|
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
|
|
|
|
|
|
+%files utils
|
|
|
+%doc contrib/xferstats.holger-preiss
|
|
|
+%{_bindir}/ftpasswd
|
|
|
+%{_bindir}/ftpcount
|
|
|
+%{_bindir}/ftpmail
|
|
|
+%{_bindir}/ftpquota
|
|
|
+%{_bindir}/ftptop
|
|
|
+%{_bindir}/ftpwho
|
|
|
+%{_mandir}/man1/ftpasswd.1*
|
|
|
+%{_mandir}/man1/ftpcount.1*
|
|
|
+%{_mandir}/man1/ftpmail.1*
|
|
|
+%{_mandir}/man1/ftpquota.1*
|
|
|
+%{_mandir}/man1/ftptop.1*
|
|
|
+%{_mandir}/man1/ftpwho.1*
|
|
|
+
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.4b-2
|
|
|
+- fix util package dependency
|
|
|
+
|
|
|
+* Fri Oct 19 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.4b-1
|
|
|
+- new upstream release
|
|
|
+- util tools in util subpackage
|
|
|
+- update patch300 to fit new version
|
|
|
+- add patch14, 23, 24, 25 from fc18 (thanks to fc team)
|
|
|
+- add enable-nls in configure
|
|
|
+
|
|
|
* Sun Apr 24 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.3e-1
|
|
|
- new upstream release
|
|
|
- update patch300 to fit new version
|
iwamoto