- release 5

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

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 5aeaf3741359920d4b97f6251ff3395a56c5819c..3640935f50ddefef85ddb8f1adec96c8e75d75d8 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -9,28 +9,32 @@
 %bcond_without tls             # disable SSL/TLS support
 %bcond_without cap             # disable capabilities
 #
+%define        rel     5
 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:       5%{?with_extra:extra}
+Version:       1.0.29
+Release:       %{rel}%{?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: 12a074824b509f9e7684fab333ed6915
 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
+Patch4:                %{name}-allauth.patch
+Patch5:                %{name}-passwd_location.patch
+Patch6:                %{name}-additionalgid.patch
+Patch7:                audit_cap.patch
 URL:           http://www.pureftpd.org/
 %{?with_extra:BuildRequires:   autoconf}
 %{?with_extra:BuildRequires:   automake}
@@ -47,22 +51,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)
 
@@ -95,7 +83,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.
@@ -104,18 +92,20 @@ 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 -p1
+%patch7 -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 -DALWAYS_SHOW_RESOLVED_SYMLINKS=1" \
        --with-boring \
        --with-altlog \
        --with-cookie \
@@ -123,7 +113,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} \
@@ -160,6 +149,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}
@@ -168,11 +158,11 @@ install configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd
 %{!?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%{_sysconfdir}/ftpusers
+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}
@@ -211,7 +201,9 @@ fi
 %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/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}