- up to 1.0.24

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

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 7746b0f8f069fc83d62cdc4d0026219697bc5727..b8052731ce09901624b0279cebba0b072fc2a8d9 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -12,13 +12,13 @@
 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:       11%{?with_extra:extra}
+Version:       1.0.24
+Release:       1%{?with_extra:extra}
 Epoch:         0
 License:       BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ license}
 Group:         Daemons
 Source0:       ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: ca8a8dbec0cd9c8ea92fc4c37ea9c410
+# Source0-md5: 2f0869166ddb3a9cbe5e4887eae6e74d
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -31,18 +31,15 @@ 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
+Patch5:                %{name}-passwd_location.patch
+Patch6:                %{name}-additionalgid.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.4.6}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 %{?with_tls:BuildRequires:     openssl-devel}
 BuildRequires: pam-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
@@ -52,22 +49,6 @@ Requires:    pam >= 0.79.0
 %{!?with_extra:Requires:       perl-base}
 Requires:      rc-scripts
 Provides:      ftpserver
-Obsoletes:     anonftp
-Obsoletes:     bftpd
-Obsoletes:     ftpd-BSD
-Obsoletes:     ftpserver
-Obsoletes:     glftpd
-Obsoletes:     heimdal-ftpd
-Obsoletes:     krb5-ftpd
-Obsoletes:     linux-ftpd
-Obsoletes:     muddleftpd
-Obsoletes:     proftpd
-Obsoletes:     proftpd-common
-Obsoletes:     proftpd-inetd
-Obsoletes:     proftpd-standalone
-Obsoletes:     troll-ftpd
-Obsoletes:     vsftpd
-Obsoletes:     wu-ftpd
 Conflicts:     man-pages < 1.51
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,7 +81,7 @@ Summary(pl.UTF-8):   Schemat LDAP dla Pure-FTPd
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
-Requires:      sed >= 4.0 
+Requires:      sed >= 4.0
 
 %description -n openldap-schema-pureftpd
 This package contains an Pure-FTPd openldap schema.
@@ -114,17 +95,14 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch6 -p1
+
 %{?with_extra:%patch1 -p1}
 %{?with_extra:%patch2 -p1}
 
 %build
-# drop --without-cork for Th
 %configure \
-       --without-cork \
+       CFLAGS="%{rpmcflags} %{rpmcppflags} -DALLOW_DELETION_OF_TEMPORARY_FILES=1" \
        --with-boring \
        --with-altlog \
        --with-cookie \
@@ -132,7 +110,6 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
        --with-extauth \
        --with-ftpwho \
        --with-language=english \
-       --with-largefile \
        %{!?with_cap:--without-capabilities} \
        %{?with_ldap:--with-ldap} \
        %{?with_mysql:CPPFLAGS="-I%{_includedir}/mysql" --with-mysql} \