- cleaning

[packages/proftpd.git] / proftpd.spec

diff --git a/proftpd.spec b/proftpd.spec
index c115dd1de06157a53938ecaca9d3b55444cca8ad..c15ba465c1b45654bbbd94512ceb7336d6e8ebdd 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,31 +1,32 @@
 # TODO
 # - mod_caps uses uname -r for detection
 # 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
 #
 # 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:       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
 Name:          proftpd

-Version:       1.3.0
-Release:       3
-Epoch:         1
+Version:       1.3.1
+Release:       4
+Epoch:         2

 License:       GPL v2+
 Group:         Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
 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
 Source1:       %{name}.conf
 Source3:       ftp.pamd
 Source4:       %{name}.inetd


@@ -37,16 +38,15 @@ Source9:    %{name}-mod_pam.conf
 Source10:      %{name}-mod_tls.conf
 Source11:      %{name}-anonftp.conf
 Patch0:                %{name}-umode_t.patch
 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
-Patch7:                %{name}-pool.patch
+Patch1:                %{name}-paths.patch
+Patch2:                %{name}-noautopriv.patch
+Patch3:                %{name}-wtmp.patch
+Patch4:                %{name}-configure.patch
+Patch5:                %{name}-pool.patch

 URL:           http://www.proftpd.org/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://www.proftpd.org/
 BuildRequires: autoconf
 BuildRequires: automake

+BuildRequires: libstdc++-devel

 BuildRequires: libwrap-devel
 %if %{with mysql} || %{with quotamysql}
 BuildRequires: mysql-devel
 BuildRequires: libwrap-devel
 %if %{with mysql} || %{with quotamysql}
 BuildRequires: mysql-devel


@@ -68,74 +68,74 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libexecdir             %{_prefix}/%{_lib}/%{name}
 
 %description
 %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
 <http://www.proftpd.org/>, including a server configuration directive
 reference manual.
 
 operating systems. ProFTPD is designed to be somewhat of a "drop-in"
 replacement for wu-ftpd. Full online documentation is available at
 <http://www.proftpd.org/>, including a server configuration directive
 reference manual.
 

-%description -l es
+%description -l es.UTF-8

 ProFTPD es un servidor FTP altamente configurable para sistemas
 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

 <http://www.proftpd.org/>, incluido el manual de referencia para las
 <http://www.proftpd.org/>, 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 <http://www.proftpd.org/>
-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 <http://www.proftpd.org/>
+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 <http://www.proftpd.org/>,
-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 <http://www.proftpd.org/>,
+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
 servidor.
 
 %package common
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax - common files

-Summary(pl):   PROfesionalny serwer FTP  - wspólne pliki
+Summary(pl.UTF-8):     PROfesionalny serwer FTP  - wspólne pliki

 Group:         Daemons
 Requires(post):        awk
 Requires(post):        fileutils
 Obsoletes:     proftpd < 0:1.2.2rc1-3
 
 %description common
 Group:         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
 <http://www.proftpd.org/>, including a server configuration directive
 reference manual.
 
 operating systems. ProFTPD is designed to be somewhat of a "drop-in"
 replacement for wu-ftpd. Full online documentation is available at
 <http://www.proftpd.org/>, 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
 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

 <http://www.proftpd.org/>, incluido el manual de referencia para las
 <http://www.proftpd.org/>, 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 <http://www.proftpd.org/>
-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 <http://www.proftpd.org/>
+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 <http://www.proftpd.org/>,
-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 <http://www.proftpd.org/>,
+incluindo o manual de referência para as diretivas de configuração do

 servidor.
 
 %package inetd
 Summary:       inetd configs for proftpd
 servidor.
 
 %package inetd
 Summary:       inetd configs for proftpd

-Summary(pl):   Pliki konfiguracyjne do u¿ycia proftpd poprzez inetd
+Summary(pl.UTF-8):     Pliki konfiguracyjne do użycia proftpd poprzez inetd

 Group:         Daemons
 Requires(post):        fileutils
 Requires(post):        grep
 Group:         Daemons
 Requires(post):        fileutils
 Requires(post):        grep


@@ -151,6 +151,7 @@ Obsoletes:  ftpd-BSD
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd

+Obsoletes:     krb5-ftpd

 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-standalone
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-standalone


@@ -164,12 +165,12 @@ Conflicts:        rpm < 4.4.2-0.2
 %description inetd
 ProFTPD configs for running from inetd.
 
 %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
 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
+Summary(pl.UTF-8):     Pliki konfiguracyjne do startowania proftpd w trybie standalone

 Group:         Daemons
 Requires(post):        fileutils
 Requires(post):        grep
 Group:         Daemons
 Requires(post):        fileutils
 Requires(post):        grep


@@ -186,6 +187,7 @@ Obsoletes:  ftpd-BSD
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd

+Obsoletes:     krb5-ftpd

 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-inetd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd-inetd


@@ -199,36 +201,37 @@ Conflicts:        rpm < 4.4.2-0.2
 %description standalone
 ProFTPD configs for running as a standalone daemon.
 
 %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
 Pliki konfiguracyjne ProFTPD do startowania demona w trybie
 standalone.
 
 %package devel
 Summary:       Header files ProFTPD

-Summary(pl):   Pliki nag³ówkowe ProFTPD
+Summary(pl.UTF-8):     Pliki nagłówkowe ProFTPD

 Group:         Development/Libraries
 Group:         Development/Libraries

+Requires:      acl-devel

 
 %description devel
 This is the package containing the header files for ProFTPD.
 
 
 %description devel
 This is the package containing the header files for ProFTPD.
 

-%description devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe ProFTPD
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe ProFTPD

 
 %package anonftp
 Summary:       Anonymous FTP config for ProFTPD
 
 %package anonftp
 Summary:       Anonymous FTP config for ProFTPD

-Summary(pl):   Konfiguracja anonimowego FTP dla ProFTPD
+Summary(pl.UTF-8):     Konfiguracja anonimowego FTP dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description anonftp
 Anonymous FTP config for ProFTPD.
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description anonftp
 Anonymous FTP config for ProFTPD.
 

-%description anonftp -l pl
+%description anonftp -l pl.UTF-8

 Konfiguracja anonimowego FTP dla ProFTPD.
 
 %package mod_auth_pam
 Summary:       ProFTPD PAM auth module
 Konfiguracja anonimowego FTP dla ProFTPD.
 
 %package mod_auth_pam
 Summary:       ProFTPD PAM auth module

-Summary(pl):   Modu³ uwierzytelnienia PAM dla ProFTPD
+Summary(pl.UTF-8):     Moduł uwierzytelnienia PAM dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.79.0
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      pam >= 0.79.0


@@ -236,12 +239,12 @@ Requires: pam >= 0.79.0
 %description mod_auth_pam
 PAM authentication method for ProFTPD.
 
 %description mod_auth_pam
 PAM authentication method for ProFTPD.
 

-%description mod_auth_pam -l pl
+%description mod_auth_pam -l pl.UTF-8

 Metoda uwierzytelnienia PAM dla ProFTPD.
 
 %package mod_ldap
 Summary:       ProFTPD OpenLDAP module
 Metoda uwierzytelnienia PAM dla ProFTPD.
 
 %package mod_ldap
 Summary:       ProFTPD OpenLDAP module

-Summary(pl):   Modu³ OpenLDAP dla ProFTPD
+Summary(pl.UTF-8):     Moduł OpenLDAP dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 


@@ -250,28 +253,28 @@ 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.
 
 many features useful in "toaster" environments such as default UID/GID
 and autocreation/autogeneration of home directories.
 

-%description mod_ldap -l pl
-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
+%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
 domowych.
 
 %package mod_quotatab
 Summary:       ProFTPD quotatab module

-Summary(pl):   Modu³ quotatab dla ProFTPD
+Summary(pl.UTF-8):     Moduł quotatab dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_quotatab
 A module for managing FTP byte/file quotas via centralized tables.
 
 Group:         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
-Modu³ do zarz±dzania ograniczeniami bajtów/plików FTP poprzez
+%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
 scentralizowane tabele.
 
 %package mod_quotatab_file
 Summary:       ProFTPD quotatab file module

-Summary(pl):   Modu³ quotatab_file dla ProFTPD
+Summary(pl.UTF-8):     Moduł quotatab_file dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}


@@ -280,13 +283,13 @@ Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 A mod_quotatab sub-module for managing quota data via file-based
 tables.
 
 A mod_quotatab sub-module for managing quota data via file-based
 tables.
 

-%description mod_quotatab_file -l pl
-Podmodu³ mod_quotatab do zarz±dzania danymi o ograniczeniach poprzez
+%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
 tabele zapisane w pliku.
 
 %package mod_quotatab_ldap
 Summary:       ProFTPD quotatab ldap module

-Summary(pl):   Modu³ quotatab_ldap dla ProFTPD
+Summary(pl.UTF-8):     Moduł quotatab_ldap dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_ldap = %{epoch}:%{version}-%{release}
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_ldap = %{epoch}:%{version}-%{release}


@@ -296,13 +299,13 @@ Requires: %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 A mod_quotatab sub-module for obtaining quota information from an LDAP
 directory.
 
 A mod_quotatab sub-module for obtaining quota information from an LDAP
 directory.
 

-%description mod_quotatab_ldap -l pl
-Podmodu³ mod_quotatab do pobierania informacji o ograniczeniach z
+%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
 katalogu LDAP.
 
 %package mod_quotatab_sql
 Summary:       ProFTPD quotatab sql module

-Summary(pl):   Modu³ quotatab_sql dla ProFTPD
+Summary(pl.UTF-8):     Moduł quotatab_sql dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_quotatab = %{epoch}:%{version}-%{release}


@@ -312,37 +315,46 @@ Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
 A mod_quotatab sub-module for managing quota data via SQL-based
 tables.
 
 A mod_quotatab sub-module for managing quota data via SQL-based
 tables.
 

-%description mod_quotatab_sql -l pl
-Podmodu³ mod_quotatab do zarz±dzania danymi o ograniczeniach poprzez
+%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 ratio module
 tabele SQL.
 
 %package mod_ratio
 Summary:       ProFTPD ratio module

-Summary(pl):   Modu³ ratio dla ProFTPD
+Summary(pl.UTF-8):     Moduł ratio dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_ratio
 Support upload/download ratios.
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_ratio
 Support upload/download ratios.
 

-%description mod_ratio -l pl
-Obs³uga wspó³czynników upload/download.
+%description mod_ratio -l pl.UTF-8
+Obsługa współczynników upload/download.

 
 %package mod_readme
 Summary:       ProFTPD readme module
 
 %package mod_readme
 Summary:       ProFTPD readme module

-Summary(pl):   Modu³ readme dla ProFTPD
+Summary(pl.UTF-8):     Moduł readme dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_readme
 "README" file support.
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_readme
 "README" file support.
 

-%description mod_readme -l pl
-Obs³uga pliku "README".
+%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
 
 %package mod_sql
 Summary:       ProFTPD SQL support module

-Summary(pl):   Modu³ obs³ugi SQL dla ProFTPD
+Summary(pl.UTF-8):     Moduł obsługi SQL dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 


@@ -350,13 +362,13 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
 This module provides the necessary support for SQL based
 authentication, logging and other features as required.
 
 This module provides the necessary support for SQL based
 authentication, logging and other features as required.
 

-%description mod_sql -l pl
-Ten modu³ dodaje obs³ugê SQL potrzebn± do uwierzytelniania, logowania
-i innych mo¿liwo¶ci opartych o SQL.
+%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
 
 %package mod_sql_mysql
 Summary:       ProFTPD sql mysql module

-Summary(pl):   Modu³ sql_mysql dla ProFTPD
+Summary(pl.UTF-8):     Moduł sql_mysql dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}


@@ -364,12 +376,12 @@ Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
 %description mod_sql_mysql
 Support for connecting to MySQL databases.
 
 %description mod_sql_mysql
 Support for connecting to MySQL databases.
 

-%description mod_sql_mysql -l pl
-Obs³uga ³±czenia siê z bazami danych MySQL.
+%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
 
 %package mod_sql_postgres
 Summary:       ProFTPD sql postgres module

-Summary(pl):   Modu³ sql_postgres dla ProFTPD
+Summary(pl.UTF-8):     Moduł sql_postgres dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-mod_sql = %{epoch}:%{version}-%{release}


@@ -377,24 +389,24 @@ Requires: %{name}-mod_sql = %{epoch}:%{version}-%{release}
 %description mod_sql_postgres
 Support for connecting to PostgreSQL databases.
 
 %description mod_sql_postgres
 Support for connecting to PostgreSQL databases.
 

-%description mod_sql_postgres -l pl
-Obs³uga ³±czenia siê z bazami danych PostgreSQL.
+%description mod_sql_postgres -l pl.UTF-8
+Obsługa łączenia się z bazami danych PostgreSQL.

 
 %package mod_tls
 Summary:       ProFTPD TLS support
 
 %package mod_tls
 Summary:       ProFTPD TLS support

-Summary(pl):   Obs³uga TLS dla ProFTPD
+Summary(pl.UTF-8):     Obsługa TLS dla ProFTPD

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_tls
 An RFC2228 SSL/TLS module for ProFTPD.
 
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
 %description mod_tls
 An RFC2228 SSL/TLS module for ProFTPD.
 

-%description mod_tls -l pl
-Modu³ SSL/TLS zgodny z RFC2228 dla ProFTPD.
+%description mod_tls -l pl.UTF-8
+Moduł SSL/TLS zgodny z RFC2228 dla ProFTPD.

 
 %package mod_wrap
 Summary:       ProFTPD interface to libwrap
 
 %package mod_wrap
 Summary:       ProFTPD interface to libwrap

-Summary(pl):   Interfejs ProFTPD do libwrap
+Summary(pl.UTF-8):     Interfejs ProFTPD do libwrap

 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      libwrap
 Group:         Daemons
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      libwrap


@@ -409,26 +421,24 @@ 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.
 
 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
-Ten pakiet pozwala demonowi u¿ywaæ wspólnej biblioteki kontroli
-dostêpu tcpwrappers w trybie samodzielnym w bardzo wygodny sposób.
+%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
+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}
 %patch0 -p1
 dodaje hosty do pliku /etc/hosts.deny.
 
 %prep
 %setup -q -n %{name}-%{version}%{?_rc}
 %patch0 -p1

-#%patch1 -p1 CONFUSES mod_ls.c
+%patch1 -p1

 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

-#%patch5 -p1 NEEDS UPDATE
-%patch6 -p1
-%patch7 -p1
+%patch5 -p1

 
 cp -f /usr/share/automake/config.sub .
 
 
 cp -f /usr/share/automake/config.sub .
 


@@ -441,6 +451,7 @@ find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 MODULES="
 mod_ratio
 mod_readme
 MODULES="
 mod_ratio
 mod_readme

+mod_rewrite

 mod_wrap
 %{?with_ssl:mod_tls}
 %{?with_pam:mod_auth_pam}
 mod_wrap
 %{?with_ssl:mod_tls}
 %{?with_pam:mod_auth_pam}


@@ -490,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
 %{?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_readme.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
 %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


@@ -594,46 +606,13 @@ fi
 %module_scripts mod_quotatab_sql
 %module_scripts mod_ratio
 %module_scripts mod_readme
 %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
 
 %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
 %files common
 %defattr(644,root,root,755)
 %doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES


@@ -645,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) %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}
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_libdir}/%{name}


@@ -735,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
 
 %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)
 %if %{with mysql} || %{with pgsql}
 %files mod_sql
 %defattr(644,root,root,755)