- fix pureftpd.passwd and pureftpd.pdb location in manuals

[packages/pure-ftpd.git] / pure-ftpd.spec

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index c6da7d1dffece59f21136acc2d17f259378b22a4..e9dd280805affe10510d34c42ba2b1d829e6ddfe 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -13,7 +13,7 @@ Summary:      Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
 Version:       1.0.21
-Release:       4%{?with_extra:extra}
+Release:       12%{?with_extra:extra}
 Epoch:         0
 License:       BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ license}
 Group:         Daemons
@@ -21,23 +21,29 @@ Source0:    ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz
 # Source0-md5: ca8a8dbec0cd9c8ea92fc4c37ea9c410
 Source1:       %{name}.pamd
 Source2:       %{name}.init
-Source3:       ftpusers.tar.bz2
-# Source3-md5: 76c80b6ec9f4d079a1e27316edddbe16
-Source4:       http://twittner.host.sk/files/pure-config/pure-config-20041201.tar.gz
-# Source4-md5: 3f2ff6b00b5c38ee11ce588ee5af6cf6
+Source3:       %{name}.sysconfig
+Source4:       ftpusers.tar.bz2
+# Source4-md5: 76c80b6ec9f4d079a1e27316edddbe16
+Source5:       http://twittner.host.sk/files/pure-config/pure-config-20041201.tar.gz
+# Source5-md5: 3f2ff6b00b5c38ee11ce588ee5af6cf6
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-path_to_ssl_cert_in_config.patch
 Patch2:                %{name}-pure-pw_passwd.patch
 Patch3:                %{name}-mysql_config.patch
 Patch4:                %{name}-nosymlinks-hideuidmismatch.patch
 Patch5:                %{name}-auth-can-delete-pure.patch
+Patch6:                %{name}-nonssl-die.patch
+Patch7:                %{name}-del-log-path.patch
+Patch8:                %{name}-anonymous.patch
+Patch9:                %{name}-sleep.patch
+Patch10:       %{name}-passwd_location.patch
 URL:           http://www.pureftpd.org/
 %{?with_extra:BuildRequires:   autoconf}
 %{?with_extra:BuildRequires:   automake}
 %{?with_cap:BuildRequires:     libcap-devel}
 %{?with_extra:BuildRequires:   libcfg+-devel >= 0.6.2}
 %{?with_mysql:BuildRequires:   mysql-devel}
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
 %{?with_tls:BuildRequires:     openssl-devel}
 BuildRequires: pam-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
@@ -53,6 +59,7 @@ Obsoletes:    ftpd-BSD
 Obsoletes:     ftpserver
 Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
+Obsoletes:     krb5-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
 Obsoletes:     proftpd
@@ -90,7 +97,7 @@ połączeń...
 
 %package -n openldap-schema-pureftpd
 Summary:       Pure-FTPd LDAP schema
-Summary(pl.UTF-8):     Schemat LDAP Pure-FTPd'a
+Summary(pl.UTF-8):     Schemat LDAP dla Pure-FTPd
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
@@ -103,11 +110,16 @@ This package contains an Pure-FTPd openldap schema.
 Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 
 %prep
-%setup -q -a 4
+%setup -q -a 5
 %patch0 -p0
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 %{?with_extra:%patch1 -p1}
 %{?with_extra:%patch2 -p1}
 
@@ -159,6 +171,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,sysconfig,security,rc.d/init.d} \
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 %{?with_ldap:install pureftpd-ldap.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-ldap.conf}
 %{?with_mysql:install pureftpd-mysql.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-mysql.conf}
@@ -166,11 +179,12 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd.conf
 %{!?with_extra:install configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}}
 install pureftpd.schema $RPM_BUILD_ROOT%{schemadir}/pureftpd.schema
-touch $RPM_BUILD_ROOT/etc/security/blacklist.ftp
+
+touch $RPM_BUILD_ROOT%{_sysconfdir}/{ftpusers,pureftpd-dir-aliases}
 
 ln -s vhosts $RPM_BUILD_ROOT%{_sysconfdir}/pure-ftpd
 
-bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff
 
 %if %{with extra}
@@ -204,12 +218,14 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog CONTACT FAQ HISTORY NEWS README* THANKS pure*.conf pureftpd.schema
+%doc AUTHORS ChangeLog CONTACT COPYING FAQ HISTORY NEWS README* THANKS pure*.conf pureftpd.schema
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
-%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) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpusers
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-dir-aliases
 %{?with_ldap:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-ldap.conf}
 %{?with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-mysql.conf}
 %{?with_pgsql:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd-pgsql.conf}
@@ -225,4 +241,5 @@ fi
 %lang(ru) %{_mandir}/ru/man5/ftpusers*
 
 %files -n openldap-schema-pureftpd
-%defattr(644,root,root,755) %{schemadir}/pureftpd.schema
+%defattr(644,root,root,755)
+%{schemadir}/pureftpd.schema