X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pure-ftpd.spec;h=0b683ee88c6f743e386c9797c7f1118364990a59;hb=6a4b56ab7dd8026f22dd7d1923133ce80e4c87a4;hp=86e730df5a849646e09727c8e767cf0948860c44;hpb=e495e2031669b419f8d52ba3754bb944200d3876;p=packages%2Fpure-ftpd.git

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index 86e730d..0b683ee 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -8,17 +8,18 @@
 %bcond_without	puredb		# disable pure-db support
 %bcond_without	tls		# disable SSL/TLS support
 %bcond_without	cap		# disable capabilities
-#
+
+%define	rel	1
 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.41
+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:	http://download.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
+# Source0-md5:	76c2364591418f153ed815034621d058
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
@@ -30,16 +31,22 @@ 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
+
+Patch5:		%{name}-passwd_location.patch
+Patch6:		%{name}-additionalgid.patch
+Patch7:		audit_cap.patch
+Patch8:		pure-ftpd-apparmor.patch
+Patch9:		pure-ftpd-mysql-utf8.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}
+BuildRequires:	libsodium-devel
 %{?with_mysql:BuildRequires:	mysql-devel}
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
 %{?with_tls:BuildRequires:	openssl-devel}
+BuildRequires:	libapparmor-devel
 BuildRequires:	pam-devel
 %{?with_pgsql:BuildRequires:	postgresql-devel}
 BuildRequires:	rpmbuild(macros) >= 1.304
@@ -48,22 +55,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)
 
@@ -96,7 +87,10 @@ 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
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description -n openldap-schema-pureftpd
 This package contains an Pure-FTPd openldap schema.
@@ -108,15 +102,22 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %setup -q -a 5
 %patch0 -p0
 %patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
 %{?with_extra:%patch1 -p1}
 %{?with_extra:%patch2 -p1}
 
 %build
-# drop --without-cork for Th
+%{__aclocal} -Im4
+%{__autoconf}
+%{__autoheader}
 %configure \
-	--without-cork \
+	CFLAGS="%{rpmcflags} %{rpmcppflags} -DALLOW_DELETION_OF_TEMPORARY_FILES=1 -DALWAYS_SHOW_RESOLVED_SYMLINKS=1" \
 	--with-boring \
 	--with-altlog \
 	--with-cookie \
@@ -124,12 +125,12 @@ 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} \
 	--with-pam \
 	--with-peruserlimits \
+	--with-rfc2640 \
 	%{?with_pgsql:--with-pgsql} \
 	--with-privsep \
 	%{?with_puredb:--with-puredb} \
@@ -139,7 +140,8 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 	%{?with_tls:--with-tls --with-certfile=%{_sharedstatedir}/openssl/certs/ftpd.pem} \
 	--with-uploadscript \
 	--with-virtualchroot \
-	--with-virtualhosts
+	--with-virtualhosts \
+	--with-apparmor
 
 %if %{with extra}
 cd pure-config
@@ -170,7 +172,7 @@ 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
 
@@ -205,6 +207,10 @@ if [ "$1" = "0" ]; then
 	%service -q ldap restart
 fi
 
+%triggerpostun -- pure-ftpd < 1.0.40-1
+%{?with_mysql:sed -i -e 's#MYSQLCrypt[\t ]\+all#MYSQLCrypt    any#gi' $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-mysql.conf}
+%{?with_pgsql:sed -i -e 's#PgSQLCrypt[\t ]\+all#PgSQLCrypt    any#gi' $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-pgsql.conf}
+exit 0
 
 %files
 %defattr(644,root,root,755)
@@ -215,6 +221,7 @@ fi
 %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}