X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=proftpd.spec;h=3ee723009a1c35b264da5adccc550eb108b33463;hb=ad5d09c9c741b1916dbb90734a2265b00f6253c1;hp=4aa32f48c79aea7ff11ef7943f32190df905fe7d;hpb=8529003f43f571a80cda3dda52da580d8ec01995;p=packages%2Fproftpd.git diff --git a/proftpd.spec b/proftpd.spec index 4aa32f4..3ee7230 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,17 +1,18 @@ # 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 # 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 @@ -19,13 +20,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.0 +Version: 1.3.1 Release: 4 -Epoch: 1 +Epoch: 2 License: GPL v2+ Group: Daemons Source0: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2 -# Source0-md5: fae47d01b52e035eb6b7190e74c17722 +# Source0-md5: 175958df8de92d5209b7b1e2e23a5a28 Source1: %{name}.conf Source3: ftp.pamd Source4: %{name}.inetd @@ -42,12 +43,10 @@ Patch2: %{name}-noautopriv.patch Patch3: %{name}-wtmp.patch Patch4: %{name}-configure.patch Patch5: %{name}-pool.patch -Patch6: %{name}-CVE-2006-5815.patch -Patch7: %{name}-ctrls-reqarglen.patch -Patch8: %{name}-CVE-2006-6170.patch URL: http://www.proftpd.org/ BuildRequires: autoconf BuildRequires: automake +BuildRequires: libstdc++-devel BuildRequires: libwrap-devel %if %{with mysql} || %{with quotamysql} BuildRequires: mysql-devel @@ -69,7 +68,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 @@ -77,7 +76,7 @@ reference manual. %description -l es.UTF-8 ProFTPD es un servidor FTP altamente configurable para sistemas -operativos unix. Está proyectado para ser un substituto directo al +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. @@ -90,7 +89,7 @@ włącznie z dokumentacją dotyczącą konfigurowania. %description -l pt_BR.UTF-8 O ProFTPD é um servidor FTP altamente configurável para sistemas -operacionais unix. +operacionais Unix. É projetado para ser um substituto direto para o wu-ftpd. A documentação completa está disponível em , @@ -106,7 +105,7 @@ 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 @@ -114,7 +113,7 @@ reference manual. %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 +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. @@ -127,7 +126,7 @@ włącznie z dokumentacją dotyczącą konfigurowania. %description common -l pt_BR.UTF-8 O ProFTPD é um servidor FTP altamente configurável para sistemas -operacionais unix. +operacionais Unix. É projetado para ser um substituto direto para o wu-ftpd. A documentação completa está disponível em , @@ -152,6 +151,7 @@ Obsoletes: ftpd-BSD Obsoletes: ftpserver Obsoletes: glftpd Obsoletes: heimdal-ftpd +Obsoletes: krb5-ftpd Obsoletes: linux-ftpd Obsoletes: muddleftpd Obsoletes: proftpd-standalone @@ -187,6 +187,7 @@ Obsoletes: ftpd-BSD Obsoletes: ftpserver Obsoletes: glftpd Obsoletes: heimdal-ftpd +Obsoletes: krb5-ftpd Obsoletes: linux-ftpd Obsoletes: muddleftpd Obsoletes: proftpd-inetd @@ -208,6 +209,7 @@ standalone. 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. @@ -341,6 +343,15 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release} %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: Daemons +Requires: %{name}-common = %{epoch}:%{version}-%{release} + +%description mod_rewrite +Runtime rewrite engine. + %package mod_sql Summary: ProFTPD SQL support module Summary(pl.UTF-8): Moduł obsługi SQL dla ProFTPD @@ -428,9 +439,6 @@ dodaje hosty do pliku /etc/hosts.deny. %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p0 -%patch8 -p1 cp -f /usr/share/automake/config.sub . @@ -443,6 +451,7 @@ find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f MODULES=" mod_ratio mod_readme +mod_rewrite mod_wrap %{?with_ssl:mod_tls} %{?with_pam:mod_auth_pam} @@ -492,6 +501,7 @@ echo 'LoadModule mod_quotatab_file.c' > $RPM_BUILD_ROOT%{_sysconfdir}/con %{?with_quotaldap:echo 'LoadModule mod_quotatab_ldap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_ldap.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_rewrite.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_rewrite.conf %if %{with mysql} || %{with pgsql} echo 'LoadModule mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf echo 'LoadModule mod_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql.conf @@ -596,46 +606,13 @@ 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 @@ -647,6 +624,7 @@ sed -i -e ' %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) %ghost /var/log/* %attr(755,root,root) %{_bindir}/* %attr(755,root,root) %{_sbindir}/* %dir %{_libdir}/%{name} @@ -737,6 +715,11 @@ 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)