- up to 1.3.4

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index 1762546b5aaebb5ca72e2985c621a257f489e6f7..e0e75c64d3eb8000a94331ea9e70f5e986d31dfc 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.3b
-Release:       0.3
+Version:       1.3.4
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 721b8232fcac36317a6a1d29fa86250e
+# Source0-md5: 7734142c7fa7212ab9f188a617a4be87
 Source1:       https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
 # Source1-md5: 42e560ec0bd5964e13fad1b2bb7afe21
 Source2:       %{name}.conf
@@ -46,8 +47,7 @@ Patch0:               %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                %{name}-nostrip.patch
-Patch5:                %{name}-link.patch
+Patch4:                %{name}-link.patch
 URL:           http://www.proftpd.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -448,7 +448,6 @@ dodaje hosty do pliku /etc/hosts.deny.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # mod_clamav
 patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
@@ -486,6 +485,8 @@ 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 \
@@ -594,6 +595,13 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del proftpd
 fi
 
+%triggerin standalone -- pam
+# restart proftpd if pam is upgraded
+# (proftpd is linked with old libpam but tries to open modules linked with new libpam)
+if [ "$2" != 1 ]; then
+       %service -q proftpd restart
+fi
+
 # macro called at module post scriptlet
 %define        module_post \
 if [ "$1" = "1" ]; then \