|
|
@@ -2,15 +2,15 @@
|
|
|
%define _localstatedir /var/run
|
|
|
%define _sysconfdir /etc
|
|
|
%define _rundir /var/run/proftpd
|
|
|
-%define tarballversion 1.3.2e
|
|
|
-%define origversion 1.3.2e
|
|
|
+%define tarballversion 1.3.3e
|
|
|
+%define origversion 1.3.3e
|
|
|
|
|
|
Summary: ProFTPd -- Professional FTP Server.
|
|
|
Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
|
|
|
Name: proftpd
|
|
|
Epoch: 1
|
|
|
Version: %{origversion}
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPL
|
|
|
Group: System Environment/Daemons
|
|
|
URL: http://www.proftpd.org/
|
|
|
@@ -28,17 +28,18 @@ 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.1-iconv.patch.bz2
|
|
|
+Patch300: proftpd-1.3.3e-iconv.patch
|
|
|
|
|
|
# fix build on recent kernel headers
|
|
|
# Patch400: proftpd-1.3.1-umode.patch
|
|
|
|
|
|
# security fix
|
|
|
-Patch1000: proftpd/proftpd-1.3.2e-CVE-2010-4221.patch
|
|
|
+# nothing..
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: pam-devel, openldap-devel, openssl-devel
|
|
|
BuildRequires: ncurses-devel, libcap-devel, libacl-devel
|
|
|
+BuildRequires: e2fsprogs-devel
|
|
|
Requires: pam > 0.59
|
|
|
Obsoletes: wu-ftpd, anonftp
|
|
|
Provides: ftpserver
|
|
|
@@ -76,7 +77,6 @@ find . -type d -name CVS | xargs -r rm -frv
|
|
|
# %patch400 -p0
|
|
|
|
|
|
# security fixes
|
|
|
-%patch1000 -p1 -b .ZDI-CAN-925
|
|
|
|
|
|
%build
|
|
|
# Disable stripping in order to get useful debuginfo packages
|
|
|
@@ -84,7 +84,7 @@ find . -type d -name CVS | xargs -r rm -frv
|
|
|
|
|
|
%configure \
|
|
|
--libexecdir="%{_libexecdir}/proftpd" \
|
|
|
- --localstatedir="%{_var}/run" \
|
|
|
+ --localstatedir="%{_var}/run/proftpd" \
|
|
|
--enable-ctrls \
|
|
|
--enable-facl \
|
|
|
--enable-dso \
|
|
|
@@ -178,6 +178,12 @@ rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Apr 24 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 1.3.3e-1
|
|
|
+- new upstream release
|
|
|
+- update patch300 to fit new version
|
|
|
+- drop patch1000 (is included in new release)
|
|
|
+- add BR: e2fsprogs-devel
|
|
|
+
|
|
|
* Wed Jan 12 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.2e-2
|
|
|
- rebuild with openssl-1.0.0c
|
|
|
|
iwamoto