SPECS (RA-branch): pure-ftpd.spec - updated to 1.0.20 (merge from ...

Tue Aug 9 11:03:20 CEST 2005

Author: hawk                         Date: Tue Aug  9 09:03:20 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- updated to 1.0.20 (merge from HEAD)
- added fix for ipv6 socket binding
- release 7 for Ra

---- Files affected:
SPECS:
   pure-ftpd.spec (1.72.2.7 -> 1.72.2.8) 

---- Diffs:

================================================================
Index: SPECS/pure-ftpd.spec
diff -u SPECS/pure-ftpd.spec:1.72.2.7 SPECS/pure-ftpd.spec:1.72.2.8

--- SPECS/pure-ftpd.spec:1.72.2.7	Wed Nov  3 15:57:25 2004
+++ SPECS/pure-ftpd.spec	Tue Aug  9 11:03:15 2005
@@ -1,36 +1,57 @@
 # $Revision$, $Date$
-# 
+#
 # Conditional build:
-%bcond_with	mysql	# enables MySQL auth but disables PAM auth
-%bcond_with	ldap	# enables LDAP auth
+%bcond_with	extra		# with additional, maybe useful, but unmaintained features
+%bcond_without	ldap		# disable LDAP auth
+%bcond_without	longusername	# with username length = 128 (default 32)
+%bcond_without	mysql		# disable MySQL auth but disables PAM auth
+%bcond_without	pgsql		# disable PostgreSQL support
+%bcond_without	puredb		# disable pure-db support
+%bcond_without	tls		# disable SSL/TLS support
 #
 Summary:	Small, fast and secure FTP server
 Summary(pl):	Mały, szybki i bezpieczny serwer FTP
 Name:		pure-ftpd
-Version:	1.0.14
-Release:	2
+Version:	1.0.20
+Release:	7%{?with_extra:extra}
 Epoch:		0
-License:	GPL
+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:	b650c4d6f59ec0781b33876932ea2038
+# Source0-md5:	e928e9e15adf6b52bfe6183fdad20144
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	ftpusers.tar.bz2
 # Source3-md5:	76c80b6ec9f4d079a1e27316edddbe16
-Patch0:		%{name}-DoS.patch
+Source4:	http://twittner.host.sk/files/pure-config/pure-config-20041201.tar.gz
+# Source4-md5:	3f2ff6b00b5c38ee11ce588ee5af6cf6
+Patch0:		%{name}-config.patch
+Patch1:		%{name}-path_to_ssl_cert_in_config.patch
+Patch2:		%{name}-pure-pw_passwd.patch
+Patch3:		%{name}-userlength.patch
+Patch4:		%{name}-mysql_config.patch
+Patch5:		%{name}-nosymlinks-hideuidmismatch.patch
+Patch6:		%{name}-ipv6-fix.patch
 URL:		http://www.pureftpd.org/
+%{?with_extra:BuildRequires:	autoconf}
+%{?with_extra:BuildRequires:	automake}
 BuildRequires:	libcap-devel
-%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_extra:BuildRequires:	libcfg+-devel >= 0.6.2}
 %{?with_ldap:BuildRequires:	openldap-devel}
+%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_pgsql:BuildRequires:	postgresql-devel}
+%{?with_tls:BuildRequires:	openssl-devel}
 BuildRequires:	pam-devel
-Prereq:		rc-scripts
-Requires(post,preun):/sbin/chkconfig
+PreReq:		rc-scripts
+Requires(post,preun):	/sbin/chkconfig
+Requires:	pam >= 0.67
+%{!?with_extra:Requires:	perl-base}
 Provides:	ftpserver
 Obsoletes:	ftpserver
 Obsoletes:	anonftp
 Obsoletes:	bftpd
 Obsoletes:	ftpd-BSD
+Obsoletes:	glftpd
 Obsoletes:	heimdal-ftpd
 Obsoletes:	linux-ftpd
 Obsoletes:	muddleftpd
@@ -61,37 +82,60 @@
 FTP bazujący na Troll-FTPd. W przeciwieństwie do innych serwerów FTP
 nie ma znanych luk w bezpieczeństwie. Ponadto jest trywialny w
 konfiguracji i specjalnie zaprojektowany dla nowych kerneli Linuksa
-(setfsuid, sendfile, capabilibies). Możliwości to wsparcie dla PAMa,
+(setfsuid, sendfile, capabilibies). Możliwości to wsparcie dla PAM-a,
 IPv6, chroot()owanych katalogów domowych, virtualne domeny, wbudowany
 LS, system anty-warezowy, ograniczanie portów dla pasywnych
 połączeń...
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -q -a 4
+%patch0 -p0
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%{?with_longusername:%patch3 -p1}
+%{?with_extra:%patch1 -p1}
+%{?with_extra:%patch2 -p1}
 
 %build
 %configure \
-	%{?with_mysql:CPPFLAGS="-I%{_includedir}/mysql" --with-mysql} \
+	--with-boring \
 	--with-altlog \
-	--with-puredb \
-	%{!?with_mysql:--with-pam} \
 	--with-cookie \
-	--with-throttling \
-	--with-ratios \
-	--with-quotas \
+	--with-diraliases \
+	--with-extauth \
 	--with-ftpwho \
+	--with-language=english \
 	--with-largefile \
+	%{?with_ldap:--with-ldap} \
+	%{?with_mysql:CPPFLAGS="-I%{_includedir}/mysql" --with-mysql} \
+	--with-pam \
+	--with-peruserlimits \
+	%{?with_pgsql:--with-pgsql} \
+	--with-privsep \
+	%{?with_puredb:--with-puredb} \
+	--with-quotas \
+	--with-ratios \
+	--with-throttling \
+	%{?with_tls:--with-tls --with-certfile=%{_sharedstatedir}/openssl/certs/ftpd.pem} \
 	--with-uploadscript \
-	--with-virtualhosts \
-	--with-language=english \
 	--with-virtualchroot \
-	%{?with_ldap:--with-ldap}
+	--with-virtualhosts
+
+%if %{with extra}
+cd pure-config
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure
+%{__make}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,sysconfig,security,rc.d/init.d} \
-	$RPM_BUILD_ROOT{%{_sysconfdir}/vhosts,%{_ftpdir}/Incoming}
+	$RPM_BUILD_ROOT{%{_sysconfdir}/vhosts,%{_ftpdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -99,22 +143,31 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
-%{?with_mysql:cat pureftpd-mysql.conf >> configuration-file/pure-ftpd.conf}
-install configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/pure-ftpd.conf
-install configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}
+%{?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}
+%{?with_pgsql:install pureftpd-pgsql.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd-pgsql.conf}
+install configuration-file/pure-ftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/pureftpd.conf
+%{!?with_extra:install configuration-file/pure-config.pl $RPM_BUILD_ROOT%{_sbindir}}
 touch $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
+ln -s vhosts $RPM_BUILD_ROOT%{_sysconfdir}/pure-ftpd
+
 bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
+%if %{with extra}
+cd pure-config
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
 if [ -f %{_var}/lock/subsys/%{name} ]; then
-        /etc/rc.d/init.d/%{name} restart 1>&2
+	/etc/rc.d/init.d/%{name} restart 1>&2
 else
-        echo "Run \"/etc/rc.d/init.d/%{name} start\" to start PureFTPD daemon."
+	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start PureFTPD daemon."
 fi
 
 %preun
@@ -127,17 +180,20 @@
 
 %files
 %defattr(644,root,root,755)
-%doc README* AUTHORS ChangeLog HISTORY NEWS THANKS pure*.conf
+%doc AUTHORS ChangeLog CONTACT 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}
-%{!?with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*}
-%{!?with_mysql:%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.ftp}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pure-ftpd.conf
-%attr(740,root,root) %dir %{_sysconfdir}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.ftp
+%{?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}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pureftpd.conf
+%attr(710,root,ftp) %dir %{_sysconfdir}
 %dir %{_sysconfdir}/vhosts
-%dir %{_ftpdir}/
-%attr(775,root,ftp) %dir %{_ftpdir}/Incoming
+%dir %{_sysconfdir}/pure-ftpd
+%dir %{_ftpdir}
 %{_mandir}/man?/*
 %lang(ja) %{_mandir}/ja/man5/ftpusers*
 %lang(pl) %{_mandir}/pl/man5/ftpusers*
@@ -150,6 +206,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72.2.8  2005/08/09 09:03:15  hawk
+- updated to 1.0.20 (merge from HEAD)
+- added fix for ipv6 socket binding
+- release 7 for Ra
+
 Revision 1.72.2.7  2004/11/03 14:57:25  qboosh
 - added DoS patch (backports from 1.0.19, includes CAN-2004-0656 fix)
 - cleanups, release 2 (not for RA-security due to changed config format...)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pure-ftpd.spec?r1=1.72.2.7&r2=1.72.2.8&f=u


