- up to 1.3.4

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index 6c0ac74b0ce250cf43fd479ffda765376767de9d..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
@@ -14,20 +15,24 @@
 %bcond_without quotamysql      # disable quota mysql support
 %bcond_without quotapgsql      # disable quota pgsql support
 #
+%define                mod_clamav_version      0.11rc
+
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es.UTF-8):     Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
 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.2e
+Version:       1.3.4
 Release:       1
 Epoch:         2
 License:       GPL v2+
-Group:         Daemons
+Group:         Networking/Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5: 018e0eb1757d9cea2a0e17f2c9b1ca2d
-Source1:       %{name}.conf
+# 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
 Source3:       ftp.pamd
 Source4:       %{name}.inetd
 Source5:       %{name}.sysconfig
@@ -37,11 +42,12 @@ Source7:    ftpusers.tar.bz2
 Source9:       %{name}-mod_pam.conf
 Source10:      %{name}-mod_tls.conf
 Source11:      %{name}-anonftp.conf
+Source12:      %{name}-mod_clamav.conf
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                %{name}-nostrip.patch
+Patch4:                %{name}-link.patch
 URL:           http://www.proftpd.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -99,8 +105,8 @@ servidor.
 
 %package common
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax - common files
-Summary(pl.UTF-8):     PROfesionalny serwer FTP  - wspólne pliki
-Group:         Daemons
+Summary(pl.UTF-8):     PROfesionalny serwer FTP - wspólne pliki
+Group:         Networking/Daemons
 Requires(post):        awk
 Requires(post):        fileutils
 Obsoletes:     proftpd < 0:1.2.2rc1-3
@@ -137,7 +143,7 @@ servidor.
 %package inetd
 Summary:       inetd configs for proftpd
 Summary(pl.UTF-8):     Pliki konfiguracyjne do użycia proftpd poprzez inetd
-Group:         Daemons
+Group:         Networking/Daemons
 Requires(post):        fileutils
 Requires(post):        grep
 Requires(post):        sed >= 4.0
@@ -172,7 +178,7 @@ Pliki konfiguracyjna ProFTPD do startowania demona poprzez inetd.
 %package standalone
 Summary:       Standalone daemon configs for proftpd
 Summary(pl.UTF-8):     Pliki konfiguracyjne do startowania proftpd w trybie standalone
-Group:         Daemons
+Group:         Networking/Daemons
 Requires(post):        fileutils
 Requires(post):        grep
 Requires(post):        sed >= 4.0
@@ -221,7 +227,7 @@ Ten pakiet zawiera pliki nagłówkowe ProFTPD
 %package anonftp
 Summary:       Anonymous FTP config for ProFTPD
 Summary(pl.UTF-8):     Konfiguracja anonimowego FTP dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description anonftp
@@ -233,7 +239,7 @@ Konfiguracja anonimowego FTP dla ProFTPD.
 %package mod_auth_pam
 Summary:       ProFTPD PAM auth module
 Summary(pl.UTF-8):     Moduł uwierzytelnienia PAM dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.79.0
 
@@ -246,7 +252,7 @@ Metoda uwierzytelnienia PAM dla ProFTPD.
 %package mod_ldap
 Summary:       ProFTPD OpenLDAP module
 Summary(pl.UTF-8):     Moduł OpenLDAP dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_ldap
@@ -263,7 +269,7 @@ domowych.
 %package mod_quotatab
 Summary:       ProFTPD quotatab module
 Summary(pl.UTF-8):     Moduł quotatab dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_quotatab
@@ -276,7 +282,7 @@ scentralizowane tabele.
 %package mod_quotatab_file
 Summary:       ProFTPD quotatab file module
 Summary(pl.UTF-8):     Moduł quotatab_file dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 
@@ -291,7 +297,7 @@ tabele zapisane w pliku.
 %package mod_quotatab_ldap
 Summary:       ProFTPD quotatab ldap module
 Summary(pl.UTF-8):     Moduł quotatab_ldap dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_ldap = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
@@ -307,7 +313,7 @@ katalogu LDAP.
 %package mod_quotatab_sql
 Summary:       ProFTPD quotatab sql module
 Summary(pl.UTF-8):     Moduł quotatab_sql dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}
@@ -323,7 +329,7 @@ tabele SQL.
 %package mod_ratio
 Summary:       ProFTPD ratio module
 Summary(pl.UTF-8):     Moduł ratio dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_ratio
@@ -335,7 +341,7 @@ Obsługa współczynników upload/download.
 %package mod_readme
 Summary:       ProFTPD readme module
 Summary(pl.UTF-8):     Moduł readme dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_readme
@@ -347,7 +353,7 @@ Obsługa pliku "README".
 %package mod_rewrite
 Summary:       ProFTPD rewrite module
 Summary(pl.UTF-8):     Moduł rewrite dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_rewrite
@@ -359,7 +365,7 @@ Silnik przepisujący adresy w locie.
 %package mod_sql
 Summary:       ProFTPD SQL support module
 Summary(pl.UTF-8):     Moduł obsługi SQL dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_sql
@@ -373,7 +379,7 @@ i innych możliwości opartych o SQL.
 %package mod_sql_mysql
 Summary:       ProFTPD sql mysql module
 Summary(pl.UTF-8):     Moduł sql_mysql dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}
 
@@ -386,7 +392,7 @@ Obsługa łączenia się z bazami danych MySQL.
 %package mod_sql_postgres
 Summary:       ProFTPD sql postgres module
 Summary(pl.UTF-8):     Moduł sql_postgres dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}
 
@@ -399,7 +405,7 @@ Obsługa łączenia się z bazami danych PostgreSQL.
 %package mod_tls
 Summary:       ProFTPD TLS support
 Summary(pl.UTF-8):     Obsługa TLS dla ProFTPD
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_tls
@@ -411,7 +417,7 @@ Moduł SSL/TLS zgodny z RFC2228 dla ProFTPD.
 %package mod_wrap
 Summary:       ProFTPD interface to libwrap
 Summary(pl.UTF-8):     Interfejs ProFTPD do libwrap
-Group:         Daemons
+Group:         Networking/Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      libwrap
 
@@ -436,13 +442,17 @@ na przykład program portsentry: przy próbie niedozwolonego dostępu
 dodaje hosty do pliku /etc/hosts.deny.
 
 %prep
-%setup -q -n %{name}-%{version}%{?_rc}
+%setup -q -n %{name}-%{version}%{?_rc} -a1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
+# mod_clamav
+patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
+cp -a mod_clamav-%{mod_clamav_version}/*.{c,h} contrib/
+
 cp -f /usr/share/automake/config.sub .
 
 # cleanup backups after patching
@@ -475,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 \
@@ -483,13 +495,14 @@ MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
        --enable-sendfile \
        %{!?with_ssl:--disable-tls} \
        --with-shared=$MODARG \
+       --with-modules=mod_clamav
 
 %{__make} -j1
 
 %install
 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} \
+       $RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log,run/proftpd} \
        $RPM_BUILD_ROOT%{_sysconfdir}/conf.d \
        $RPM_BUILD_ROOT%{_includedir}/%{name}
 
@@ -500,7 +513,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
 
 rm $RPM_BUILD_ROOT%{_sbindir}/in.proftpd
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_auth_pam.conf
 MODULES="
 mod_auth_file
@@ -522,6 +535,7 @@ for module in $MODULES; do
 done
 install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
 install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.conf
+install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_clamav.conf
 
 %{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
@@ -581,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 \
@@ -637,6 +658,7 @@ fi
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_file.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ident.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_clamav.conf
 #%attr(640,root,root) %ghost /var/log/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*