X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=proftpd.spec;h=fd88b31945516c62d709ed807ec6e96552aa392e;hb=d0f71b71833974d0e6196c7da402dab3cd0d7177;hp=57b5472cbb9caa77f5adcc765233692e4d6fd73b;hpb=02a964e1cdebb373a4be446a8363f830c99f8c01;p=packages%2Fproftpd.git
diff --git a/proftpd.spec b/proftpd.spec
index 57b5472..fd88b31 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,31 +1,37 @@
# TODO
# - mod_caps uses uname -r for detection
+# - don't use internal libltdl
+#
# Conditional build:
%bcond_without pam # disable PAM support
%bcond_without ipv6 # disable IPv6 and TCPD support
%bcond_without ssl # disbale TLS/SSL support
-%bcond_without ldap # enable LDAP support
-%bcond_without mysql # enable MySQL support
-%bcond_without pgsql # enable PostgreSQL support
-%bcond_without quotafile # enable quota file support
-%bcond_without quotaldap # enable quota ldap support
-%bcond_without quotamysql # enable quota mysql support
-%bcond_without quotapgsql # enable quota pgsql support
+%bcond_without ldap # disable LDAP support
+%bcond_without mysql # disable MySQL support
+%bcond_without pgsql # disable PostgreSQL support
+%bcond_without quotafile # disable quota file support
+%bcond_without quotaldap # disable quota ldap support
+%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): Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
-Summary(pl): PROfesionalny serwer FTP
-Summary(pt_BR): Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
-Summary(zh_CN): Ò×ÓÚ¹ÜÀíµÄ,°²È«µÄ FTP ·þÎñÆ÷
+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.0
-Release: 0.26
-Epoch: 1
+Version: 1.3.3b
+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: fae47d01b52e035eb6b7190e74c17722
-Source1: %{name}.conf
+# Source0-md5: 721b8232fcac36317a6a1d29fa86250e
+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
@@ -35,100 +41,109 @@ Source7: ftpusers.tar.bz2
Source9: %{name}-mod_pam.conf
Source10: %{name}-mod_tls.conf
Source11: %{name}-anonftp.conf
-Patch0: %{name}-umode_t.patch
-Patch1: %{name}-glibc.patch
-Patch2: %{name}-paths.patch
-Patch3: %{name}-noautopriv.patch
-Patch4: %{name}-wtmp.patch
-Patch5: %{name}-sendfile64.patch
-Patch6: %{name}-configure.patch
+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
+Patch5: %{name}-link.patch
URL: http://www.proftpd.org/
+BuildRequires: acl-devel
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: libcap-devel
+BuildRequires: libstdc++-devel
BuildRequires: libwrap-devel
-%{?with_quotamysql:BuildRequires: mysql-devel}
+%if %{with mysql} || %{with quotamysql}
+BuildRequires: mysql-devel
+%endif
BuildRequires: ncurses-devel
-%{?with_quotaldap:BuildRequires: openldap-devel}
+%if %{with ldap} || %{with quotaldap}
+BuildRequires: openldap-devel
+%endif
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
%{?with_pam:BuildRequires: pam-devel}
-%{?with_quotapgsql:BuildRequires: postgresql-devel}
+%if %{with pgsql} || %{with quotapgsql}
+BuildRequires: postgresql-devel
+%endif
BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/ftpd
-%define _localstatedir /var/run
+%define _localstatedir /var/run
%define _libexecdir %{_prefix}/%{_lib}/%{name}
%description
-ProFTPD is a highly configurable FTP daemon for unix and unix-like
+ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
operating systems. ProFTPD is designed to be somewhat of a "drop-in"
replacement for wu-ftpd. Full online documentation is available at
, including a server configuration directive
reference manual.
-%description -l es
+%description -l es.UTF-8
ProFTPD es un servidor FTP altamente configurable para sistemas
-operativos unix. Está proyectado para ser un substituto directo al
-wu-ftpd. La documentación completa está disponible en
+operativos Unix. Está proyectado para ser un substituto directo al
+wu-ftpd. La documentación completa está disponible en
, incluido el manual de referencia para las
-directivas de configuración del servidor.
+directivas de configuración del servidor.
-%description -l pl
-ProFTPD jest wysoce konfigurowalnym serwerem FTP dla systemów Unix.
-ProFTPD jest robiony jako bezpo¶redni zamiennik wu-ftpd. Pe³na
-dokumentacja jest dostêpna on-line pod
-w³±cznie z dokumentacj± dotycz±c± konfigurowania.
+%description -l pl.UTF-8
+ProFTPD jest wysoce konfigurowalnym serwerem FTP dla systemów Unix.
+ProFTPD jest robiony jako bezpoÅredni zamiennik wu-ftpd. PeÅna
+dokumentacja jest dostÄpna on-line pod
+wÅÄ
cznie z dokumentacjÄ
dotyczÄ
cÄ
konfigurowania.
-%description -l pt_BR
-O ProFTPD é um servidor FTP altamente configurável para sistemas
-operacionais unix.
+%description -l pt_BR.UTF-8
+O ProFTPD é um servidor FTP altamente configurável para sistemas
+operacionais Unix.
-É projetado para ser um substituto direto para o wu-ftpd. A
-documentação completa está disponível em ,
-incluindo o manual de referência para as diretivas de configuração do
+Ã projetado para ser um substituto direto para o wu-ftpd. A
+documentação completa está disponÃvel em ,
+incluindo o manual de referência para as diretivas de configuração do
servidor.
%package common
Summary: PROfessional FTP Daemon with apache-like configuration syntax - common files
-Summary(pl): 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
%description common
-ProFTPD is a highly configurable FTP daemon for unix and unix-like
+ProFTPD is a highly configurable FTP daemon for Unix and Unix-like
operating systems. ProFTPD is designed to be somewhat of a "drop-in"
replacement for wu-ftpd. Full online documentation is available at
, including a server configuration directive
reference manual.
-%description common -l es
+%description common -l es.UTF-8
ProFTPD es un servidor FTP altamente configurable para sistemas
-operativos unix. Está proyectado para ser un substituto directo al
-wu-ftpd. La documentación completa está disponible en
+operativos Unix. Está proyectado para ser un substituto directo al
+wu-ftpd. La documentación completa está disponible en
, incluido el manual de referencia para las
-directivas de configuración del servidor.
+directivas de configuración del servidor.
-%description common -l pl
-ProFTPD jest wysoce konfigurowalnym serwerem FTP dla systemów Unix.
-ProFTPD jest robiony jako bezpo¶redni zamiennik wu-ftpd. Pe³na
-dokumentacja jest dostêpna on-line pod
-w³±cznie z dokumentacj± dotycz±c± konfigurowania.
+%description common -l pl.UTF-8
+ProFTPD jest wysoce konfigurowalnym serwerem FTP dla systemów Unix.
+ProFTPD jest robiony jako bezpoÅredni zamiennik wu-ftpd. PeÅna
+dokumentacja jest dostÄpna on-line pod
+wÅÄ
cznie z dokumentacjÄ
dotyczÄ
cÄ
konfigurowania.
-%description common -l pt_BR
-O ProFTPD é um servidor FTP altamente configurável para sistemas
-operacionais unix.
+%description common -l pt_BR.UTF-8
+O ProFTPD é um servidor FTP altamente configurável para sistemas
+operacionais Unix.
-É projetado para ser um substituto direto para o wu-ftpd. A
-documentação completa está disponível em ,
-incluindo o manual de referência para as diretivas de configuração do
+Ã projetado para ser um substituto direto para o wu-ftpd. A
+documentação completa está disponÃvel em ,
+incluindo o manual de referência para as diretivas de configuração do
servidor.
%package inetd
Summary: inetd configs for proftpd
-Summary(pl): Pliki konfiguracyjne do u¿ycia proftpd poprzez inetd
-Group: Daemons
+Summary(pl.UTF-8): Pliki konfiguracyjne do użycia proftpd poprzez inetd
+Group: Networking/Daemons
Requires(post): fileutils
Requires(post): grep
Requires(post): sed >= 4.0
@@ -143,6 +158,7 @@ Obsoletes: ftpd-BSD
Obsoletes: ftpserver
Obsoletes: glftpd
Obsoletes: heimdal-ftpd
+Obsoletes: krb5-ftpd
Obsoletes: linux-ftpd
Obsoletes: muddleftpd
Obsoletes: proftpd-standalone
@@ -156,13 +172,13 @@ Conflicts: rpm < 4.4.2-0.2
%description inetd
ProFTPD configs for running from inetd.
-%description inetd -l pl
+%description inetd -l pl.UTF-8
Pliki konfiguracyjna ProFTPD do startowania demona poprzez inetd.
%package standalone
Summary: Standalone daemon configs for proftpd
-Summary(pl): Pliki konfiguracyjne do startowania proftpd w trybie standalone
-Group: Daemons
+Summary(pl.UTF-8): Pliki konfiguracyjne do startowania proftpd w trybie standalone
+Group: Networking/Daemons
Requires(post): fileutils
Requires(post): grep
Requires(post): sed >= 4.0
@@ -178,6 +194,7 @@ Obsoletes: ftpd-BSD
Obsoletes: ftpserver
Obsoletes: glftpd
Obsoletes: heimdal-ftpd
+Obsoletes: krb5-ftpd
Obsoletes: linux-ftpd
Obsoletes: muddleftpd
Obsoletes: proftpd-inetd
@@ -191,49 +208,81 @@ Conflicts: rpm < 4.4.2-0.2
%description standalone
ProFTPD configs for running as a standalone daemon.
-%description standalone -l pl
+%description standalone -l pl.UTF-8
Pliki konfiguracyjne ProFTPD do startowania demona w trybie
standalone.
%package devel
Summary: Header files ProFTPD
+Summary(pl.UTF-8): Pliki nagÅówkowe ProFTPD
Group: Development/Libraries
+Requires: acl-devel
%description devel
This is the package containing the header files for ProFTPD.
+%description devel -l pl.UTF-8
+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: Networking/Daemons
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+
+%description anonftp
+Anonymous FTP config for ProFTPD.
+
+%description anonftp -l pl.UTF-8
+Konfiguracja anonimowego FTP dla ProFTPD.
+
%package mod_auth_pam
Summary: ProFTPD PAM auth module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ uwierzytelnienia PAM dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: pam >= 0.79.0
%description mod_auth_pam
PAM authentication method for ProFTPD.
+%description mod_auth_pam -l pl.UTF-8
+Metoda uwierzytelnienia PAM dla ProFTPD.
+
%package mod_ldap
Summary: ProFTPD OpenLDAP module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ OpenLDAP dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_ldap
-LDAP authentication support.
-
mod_ldap provides LDAP authentication support for ProFTPD. It supports
many features useful in "toaster" environments such as default UID/GID
and autocreation/autogeneration of home directories.
+%description mod_ldap -l pl.UTF-8
+mod_ldap dodaje obsÅugÄ uwierzytelnienia LDAP do ProFTPD. ObsÅuguje
+wiele cech przydatnych w Årodowiskach "tosterowych", takich jak
+domyÅlny UID/GID i automatyczne tworzenie/generowanie katalogów
+domowych.
+
%package mod_quotatab
Summary: ProFTPD quotatab module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ quotatab dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_quotatab
A module for managing FTP byte/file quotas via centralized tables.
+%description mod_quotatab -l pl.UTF-8
+ModuÅ do zarzÄ
dzania ograniczeniami bajtów/plików FTP poprzez
+scentralizowane tabele.
+
%package mod_quotatab_file
Summary: ProFTPD quotatab file module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ quotatab_file dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
@@ -241,9 +290,14 @@ Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
A mod_quotatab sub-module for managing quota data via file-based
tables.
+%description mod_quotatab_file -l pl.UTF-8
+PodmoduÅ mod_quotatab do zarzÄ
dzania danymi o ograniczeniach poprzez
+tabele zapisane w pliku.
+
%package mod_quotatab_ldap
Summary: ProFTPD quotatab ldap module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ quotatab_ldap dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_ldap = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
@@ -252,9 +306,14 @@ Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
A mod_quotatab sub-module for obtaining quota information from an LDAP
directory.
+%description mod_quotatab_ldap -l pl.UTF-8
+PodmoduÅ mod_quotatab do pobierania informacji o ograniczeniach z
+katalogu LDAP.
+
%package mod_quotatab_sql
Summary: ProFTPD quotatab sql module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ quotatab_sql dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
@@ -263,60 +322,102 @@ Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
A mod_quotatab sub-module for managing quota data via SQL-based
tables.
+%description mod_quotatab_sql -l pl.UTF-8
+PodmoduÅ mod_quotatab do zarzÄ
dzania danymi o ograniczeniach poprzez
+tabele SQL.
+
%package mod_ratio
-Summary: ProFTPD quotatab ratio module
-Group: Daemons
+Summary: ProFTPD ratio module
+Summary(pl.UTF-8): ModuÅ ratio dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_ratio
Support upload/download ratios.
+%description mod_ratio -l pl.UTF-8
+ObsÅuga wspóÅczynników upload/download.
+
%package mod_readme
Summary: ProFTPD readme module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ readme dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_readme
"README" file support.
+%description mod_readme -l pl.UTF-8
+ObsÅuga pliku "README".
+
+%package mod_rewrite
+Summary: ProFTPD rewrite module
+Summary(pl.UTF-8): ModuÅ rewrite dla ProFTPD
+Group: Networking/Daemons
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+
+%description mod_rewrite
+Runtime rewrite engine.
+
+%description mod_rewrite -l pl.UTF-8
+Silnik przepisujÄ
cy adresy w locie.
+
%package mod_sql
Summary: ProFTPD SQL support module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ obsÅugi SQL dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_sql
This module provides the necessary support for SQL based
authentication, logging and other features as required.
+%description mod_sql -l pl.UTF-8
+Ten moduÅ dodaje obsÅugÄ SQL potrzebnÄ
do uwierzytelniania, logowania
+i innych możliwoÅci opartych o SQL.
+
%package mod_sql_mysql
Summary: ProFTPD sql mysql module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ sql_mysql dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
%description mod_sql_mysql
Support for connecting to MySQL databases.
+%description mod_sql_mysql -l pl.UTF-8
+ObsÅuga ÅÄ
czenia siÄ z bazami danych MySQL.
+
%package mod_sql_postgres
Summary: ProFTPD sql postgres module
-Group: Daemons
+Summary(pl.UTF-8): ModuÅ sql_postgres dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
%description mod_sql_postgres
-Support for connecting to Postgres databases.
+Support for connecting to PostgreSQL databases.
+
+%description mod_sql_postgres -l pl.UTF-8
+ObsÅuga ÅÄ
czenia siÄ z bazami danych PostgreSQL.
%package mod_tls
Summary: ProFTPD TLS support
-Group: Daemons
+Summary(pl.UTF-8): ObsÅuga TLS dla ProFTPD
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
%description mod_tls
An RFC2228 SSL/TLS module for ProFTPD.
+%description mod_tls -l pl.UTF-8
+ModuÅ SSL/TLS zgodny z RFC2228 dla ProFTPD.
+
%package mod_wrap
-Summary: ProFTPD Interface to libwrap
-Group: Daemons
+Summary: ProFTPD interface to libwrap
+Summary(pl.UTF-8): Interfejs ProFTPD do libwrap
+Group: Networking/Daemons
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: libwrap
@@ -330,24 +431,47 @@ standalone mode to adapt as these entries are added. The portsentry
program does this, for example: when illegal access is attempted, it
will add hosts to the /etc/hosts.deny file.
+%description mod_wrap -l pl.UTF-8
+Ten pakiet pozwala demonowi używaÄ wspólnej biblioteki kontroli
+dostÄpu tcpwrappers w trybie samodzielnym w bardzo wygodny sposób.
+
+Wiele programów automatycznie dodaje wpisy we wspólnych plikach
+allow/deny, a użycie tego moduÅu pozwala demonowi ProFTPD dziaÅajÄ
cemu
+w trybie samodzielnym adaptowaÄ te wpisy w miarÄ dodawania. Robi tak
+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 CONFUSES mod_ls.c
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-#%patch5 -p1 NEEDS UPDATE
-%patch6 -p1
+%patch5 -p1
+
+# mod_clamav
+patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch
+cp -a mod_clamav-%{mod_clamav_version}/*.{c,h} contrib/
-%build
cp -f /usr/share/automake/config.sub .
+
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
+%build
%{__autoconf}
MODULES="
+mod_auth_file
+mod_ident
mod_ratio
mod_readme
+mod_rewrite
mod_wrap
+mod_facl
+mod_ifsession
+mod_lang
%{?with_ssl:mod_tls}
%{?with_pam:mod_auth_pam}
%{?with_ldap:mod_ldap}
@@ -355,29 +479,29 @@ mod_wrap
%{?with_quotaldap:mod_quotatab mod_quotatab_ldap}
%{?with_quotamysql:mod_quotatab mod_quotatab_sql}
%{?with_quotapgsql:mod_quotatab mod_quotatab_sql}
-%{?with_linuxprivs:mod_linuxprivs}
%{?with_mysql:mod_sql mod_sql_mysql}
%{?with_pgsql:mod_sql mod_sql_postgres}
"
MODARG=$(echo $MODULES | tr ' ' '\n' | sort -u | xargs | tr ' ' ':')
%configure \
- %{?with_mysql:--with-includes=%{_includedir}/mysql} \
+ --with-includes=/usr/include/ncurses%{?with_mysql::%{_includedir}/mysql} \
+ --disable-auth-file \
--enable-autoshadow \
--enable-ctrls \
--enable-dso \
- --enable-facl \
%{?with_ipv6:--enable-ipv6} \
--enable-sendfile \
%{!?with_ssl:--disable-tls} \
--with-shared=$MODARG \
+ --with-modules=mod_clamav
-%{__make}
+%{__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}
@@ -388,21 +512,29 @@ 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
-echo 'LoadModule mod_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ldap.conf
-echo 'LoadModule mod_quotatab.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab.conf
-echo 'LoadModule mod_quotatab_file.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_file.conf
-echo 'LoadModule mod_quotatab_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_ldap.conf
-echo 'LoadModule mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf
-echo 'LoadModule mod_ratio.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ratio.conf
-echo 'LoadModule mod_readme.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_readme.conf
-echo 'LoadModule mod_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql.conf
-echo 'LoadModule mod_sql_mysql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_mysql.conf
-echo 'LoadModule mod_sql_postgres.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_postgres.conf
+MODULES="
+mod_auth_file
+mod_ident
+mod_ratio
+mod_readme
+mod_rewrite
+mod_wrap
+%{?with_ldap:mod_ldap}
+%{?with_quotafile:mod_quotatab mod_quotatab_file}
+%{?with_quotaldap:mod_quotatab mod_quotatab_ldap}
+%{?with_quotamysql:mod_quotatab mod_quotatab_sql}
+%{?with_quotapgsql:mod_quotatab mod_quotatab_sql}
+%{?with_mysql:mod_sql mod_sql_mysql}
+%{?with_pgsql:mod_sql mod_sql_postgres}
+"
+for module in $MODULES; do
+ echo "LoadModule $module.c" > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/$module.conf
+done
install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
-echo 'LoadModule mod_wrap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_wrap.conf
-install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/anonftp.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
@@ -414,25 +546,23 @@ bzip2 -dc %{SOURCE7} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
:> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers.default
:> $RPM_BUILD_ROOT%{_sysconfdir}/ftpusers
-:> $RPM_BUILD_ROOT/var/log/xferlog
# only for -inetd package?
ln -sf proftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd
:> $RPM_BUILD_ROOT/etc/security/blacklist.ftp
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.a
+rm $RPM_BUILD_ROOT%{_libexecdir}/*.la
rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
-cp -a include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
+cp -aL include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post common
umask 027
-touch /var/log/xferlog
awk -F: '{ if (($3 < 500) && ($1 != "ftp")) print $1; }' < /etc/passwd >> %{_sysconfdir}/ftpusers.default
if [ ! -f %{_sysconfdir}/ftpusers ]; then
cp -f %{_sysconfdir}/ftpusers.default %{_sysconfdir}/ftpusers
@@ -500,63 +630,37 @@ fi
%module_scripts mod_quotatab_sql
%module_scripts mod_ratio
%module_scripts mod_readme
+%module_scripts mod_rewrite
%module_scripts mod_sql
%module_scripts mod_sql_mysql
%module_scripts mod_sql_postgres
%module_scripts mod_tls
%module_scripts mod_wrap
-%triggerpostun inetd -- %{name}-inetd <= 1:1.2.10
-echo "Changing deprecated config options"
-cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
-sed -i -e '
- s/AuthPAMAuthoritative\b/AuthPAM/
- s/TCPDServiceName/TCPServiceName/
- s/TlsRsaCertFile/TLSRSACertificateFile/
- s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
- s/TlsDsaCertFile/TLSDSACertificateFile/
- s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
- s/TlsCrlFile/TLSCARevocationFile/
- s/TlsDhParamFile/TLSDHParamFile/
- s/TlsCipherList/TLSCipherSuite/
- s/TlsCertsOk/TLSVerifyClient/
- /UseTCPD/d
-' %{_sysconfdir}/proftpd.conf
-
-%triggerpostun standalone -- %{name}-standalone <= 1:1.2.10
-echo "Changing deprecated config options"
-cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
-sed -i -e '
- s/AuthPAMAuthoritative\b/AuthPAM/
- s/TCPDServiceName/TCPServiceName/
- s/TlsRsaCertFile/TLSRSACertificateFile/
- s/TlsRsaKeyFile/TLSRSACertificateKeyFile/
- s/TlsDsaCertFile/TLSDSACertificateFile/
- s/TlsDsaKeyFile/TLSDSACertificateKeyFile/
- s/TlsCrlFile/TLSCARevocationFile/
- s/TlsDhParamFile/TLSDHParamFile/
- s/TlsCipherList/TLSCipherSuite/
- s/TlsCertsOk/TLSVerifyClient/
- /UseTCPD/d
-' %{_sysconfdir}/proftpd.conf
-
%files common
%defattr(644,root,root,755)
%doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES
%doc README README.capabilities README.classes README.controls README.IPv6
%doc README.modules
-%doc doc/*html
+%doc doc/*.html doc/contrib doc/howto doc/modules
%dir %attr(750,root,ftp) %dir %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
%attr(640,root,root) %{_sysconfdir}/ftpusers.default
%dir %attr(750,root,root) %{_sysconfdir}/conf.d
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/anonftp.conf
-%attr(640,root,root) %ghost /var/log/*
+%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}/*
-%dir %{_libdir}/%{name}
-%dir /var/run/proftpd
+%dir %{_libexecdir}
+%attr(755,root,root) %{_libexecdir}/mod_auth_file.so
+%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
%{_mandir}/man[18]/*
%dir /var/lib/ftp
%dir /var/lib/ftp/pub
@@ -584,7 +688,13 @@ sed -i -e '
%files devel
%defattr(644,root,root,755)
%{_includedir}/%{name}
+%{_pkgconfigdir}/%{name}.pc
+
+%files anonftp
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/anonftp.conf
+%if %{with pam}
%files mod_auth_pam
%defattr(644,root,root,755)
%doc README.PAM
@@ -592,35 +702,45 @@ sed -i -e '
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.ftp
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_auth_pam.conf
%attr(755,root,root) %{_libexecdir}/mod_auth_pam.so
+%endif
+%if %{with ldap}
%files mod_ldap
%defattr(644,root,root,755)
%doc README.LDAP
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_ldap.so
+%endif
%files mod_quotatab
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab.conf
%attr(755,root,root) %{_libexecdir}/mod_quotatab.so
+%if %{with quotafile}
%files mod_quotatab_file
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_file.conf
%attr(755,root,root) %{_libexecdir}/mod_quotatab_file.so
+%endif
+%if %{with quotaldap}
%files mod_quotatab_ldap
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_ldap.conf
%attr(755,root,root) %{_libexecdir}/mod_quotatab_ldap.so
+%endif
+%if %{with quotamysql} || %{with quotapgsql}
%files mod_quotatab_sql
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_quotatab_sql.conf
%attr(755,root,root) %{_libexecdir}/mod_quotatab_sql.so
+%endif
%files mod_ratio
%defattr(644,root,root,755)
+%doc contrib/README.ratio
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_ratio.conf
%attr(755,root,root) %{_libexecdir}/mod_ratio.so
@@ -629,20 +749,31 @@ sed -i -e '
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_readme.conf
%attr(755,root,root) %{_libexecdir}/mod_readme.so
+%files mod_rewrite
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_rewrite.conf
+%attr(755,root,root) %{_libexecdir}/mod_rewrite.so
+
+%if %{with mysql} || %{with pgsql}
%files mod_sql
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql.conf
%attr(755,root,root) %{_libexecdir}/mod_sql.so
+%endif
+%if %{with mysql}
%files mod_sql_mysql
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql_mysql.conf
%attr(755,root,root) %{_libexecdir}/mod_sql_mysql.so
+%endif
+%if %{with pgsql}
%files mod_sql_postgres
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql_postgres.conf
%attr(755,root,root) %{_libexecdir}/mod_sql_postgres.so
+%endif
%files mod_tls
%defattr(644,root,root,755)