- release 4 (by relup.sh)

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index ac90ff11589d001f4e889ca9487c3b019df13e77..9e842a5700d192a0f1c5c4c2294142af09d6a660 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,6 +1,7 @@
 # TODO
 # - mod_caps uses uname -r for detection
 # - don't use internal libltdl
+# - package contrib/ftp* perl scripts.
 #
 # Conditional build:
 %bcond_without pam             # disable PAM support
@@ -22,13 +23,13 @@ Summary(pl.UTF-8):  PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):  Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
-Version:       1.3.3d
-Release:       1
+Version:       1.3.5b
+Release:       4
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
-Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 69650e91e05b3a10fa3ac54ee261679b
+Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
+# Source0-md5: f7b8e3a383b34a894c2502db74ccccde
 Source1:       https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
 # Source1-md5: 42e560ec0bd5964e13fad1b2bb7afe21
 Source2:       %{name}.conf
@@ -42,12 +43,11 @@ Source9:    %{name}-mod_pam.conf
 Source10:      %{name}-mod_tls.conf
 Source11:      %{name}-anonftp.conf
 Source12:      %{name}-mod_clamav.conf
+Source13:      %{name}.tmpfiles
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                %{name}-nostrip.patch
-Patch5:                %{name}-link.patch
 URL:           http://www.proftpd.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -74,6 +74,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _localstatedir          /var/run
 %define                _libexecdir             %{_prefix}/%{_lib}/%{name}
 
+%define         filterout               -flto
+
 %description
 ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
 operating systems. ProFTPD is designed to be somewhat of a "drop-in"
@@ -447,8 +449,6 @@ dodaje hosty do pliku /etc/hosts.deny.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 # mod_clamav
 patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
@@ -471,7 +471,6 @@ mod_rewrite
 mod_wrap
 mod_facl
 mod_ifsession
-mod_lang
 %{?with_ssl:mod_tls}
 %{?with_pam:mod_auth_pam}
 %{?with_ldap:mod_ldap}
@@ -486,10 +485,12 @@ mod_lang
 MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
 %configure \
        --with-includes=/usr/include/ncurses%{?with_mysql::%{_includedir}/mysql} \
+       --disable-strip \
        --enable-buffer-size=4096 \
        --disable-auth-file \
        --enable-autoshadow \
        --enable-ctrls \
+       --enable-nls \
        --enable-dso \
        %{?with_ipv6:--enable-ipv6} \
        --enable-sendfile \
@@ -504,7 +505,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
        $RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log,run/proftpd} \
        $RPM_BUILD_ROOT%{_sysconfdir}/conf.d \
-       $RPM_BUILD_ROOT%{_includedir}/%{name}
+       $RPM_BUILD_ROOT%{_includedir}/%{name} \
+       $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -548,6 +550,8 @@ bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
 :> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
 
+install %{SOURCE13} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+
 # only for -inetd package?
 ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
 
@@ -667,8 +671,13 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_facl.so
 %attr(755,root,root) %{_libexecdir}/mod_ident.so
 %attr(755,root,root) %{_libexecdir}/mod_ifsession.so
-%attr(755,root,root) %{_libexecdir}/mod_lang.so
 %dir %{_localstatedir}/proftpd
+/usr/lib/tmpfiles.d/%{name}.conf
+%{_mandir}/man5/*
+%lang(ja) %{_mandir}/ja/man5/ftpusers*
+%lang(pl) %{_mandir}/pl/man5/ftpusers*
+%lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
+%lang(ru) %{_mandir}/ru/man5/ftpusers*
 %{_mandir}/man[18]/*
 %dir /var/lib/ftp
 %dir /var/lib/ftp/pub
@@ -677,21 +686,11 @@ fi
 %files inetd
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ftpd
-%{_mandir}/man5/*
-%lang(ja) %{_mandir}/ja/man5/ftpusers*
-%lang(pl) %{_mandir}/pl/man5/ftpusers*
-%lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
-%lang(ru) %{_mandir}/ru/man5/ftpusers*
 
 %files standalone
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/proftpd
 %attr(754,root,root) /etc/rc.d/init.d/proftpd
-%{_mandir}/man5/*
-%lang(ja) %{_mandir}/ja/man5/ftpusers*
-%lang(pl) %{_mandir}/pl/man5/ftpusers*
-%lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
-%lang(ru) %{_mandir}/ru/man5/ftpusers*
 
 %files devel
 %defattr(644,root,root,755)