X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ftpd-BSD.spec;h=e09cf508c6ab8f63cb9b572583390a23e53465be;hb=7a4fbb658115f5024ad212b1bcbbb469eceef0f1;hp=ec42f32e69ac75d2eda3b5a6c02f09bcba677baf;hpb=c7041e63731645210eca132d7532c26f341333ca;p=packages%2Fftpd-BSD.git

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index ec42f32..e09cf50 100644
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -1,60 +1,71 @@
 Summary:	OpenBSD's ftpd ported to Linux (with IPv6 support)
+Summary(pl):	Port ftpd z OpenBSD dla Linuxa (z wsparciem do IPv6)
 Name:		ftpd-BSD
-Version:	0.3.0
-Release:	1
+Version:	0.3.2
+Release:	7
 License:	BSD-like
 Group:		Networking/Daemons
+Group(de):	Netzwerkwesen/Server
+Group(pl):	Sieciowe/Serwery
 Source0:	ftp://quatramaran.ens.fr/pub/madore/ftpd-BSD/%{name}-%{version}.tar.gz
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
 Source3:	%{name}-ftpusers
+Patch0:		%{name}-anonuser.patch
+Patch1:		%{name}-paths.patch
+Patch2:		%{name}-username.patch
 Buildrequires:	libwrap-devel
 Buildrequires:	pam-devel
 Requires:	rc-inetd
 Requires:	inetdaemon
-Requires:	anonftp
 Provides:	ftpserver
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	wu-ftpd
 Obsoletes:	proftpd
 Obsoletes:	heimdal-ftpd
+Obsoletes:	linux-ftpd
 
 %description
-This is a Linux port of the BSD ftp server (ftpd). It doesn't have all the
-bells and whistles of wu-ftpd, but it is also probably less buggy and more
-secure (at least, it was certainly so before I ported it, and I hope I
-didn't mess things up *too* much).
+This is a Linux port of the BSD ftp server (ftpd). It doesn't have all
+the bells and whistles of wu-ftpd, but it is also probably less buggy
+and more secure (at least, it was certainly so before I ported it, and
+I hope I didn't mess things up *too* much).
 
-The source code was taken from the OpenBSD CVS as of 2000/01/23 (this is
-between releases 2.6 and 2.7). The ftpd version number is 6.4 and this
-port's version number is 0.3.0.
+The source code was taken from the OpenBSD CVS as of 2000/01/23 (this
+is between releases 2.6 and 2.7). The ftpd version number is 6.4 and
+this port's version number is 0.3.0.
 
 %description -l pl
-Pakiet ten zawiera linuksowy port serwera ftp BSD (ftpd). Nie zawiera on 
-wszystkich wymy¶lnych elementów wu-ftpd, jest jednak prawdopodobniej mniej
-zapluskwiony i bardziej bezpieczny (w kazdym razie by³ takim zanim go
-przenios³em na Linuksa, i mam nadziejê, ¿e nie naba³agani³em *za bardzo*).
-Kod ¼ród³owy pochodzi z repozytorium CVS OpenBSD z dnia 2000/01/23 (tj.
-miêdzy wersj± 2.6 a 2.7). Numer wersji ftpd to 6.4, za¶ numer wersji
-tego portu to 0.3.0.
+Pakiet ten zawiera linuksowy port serwera ftp BSD (ftpd). Nie zawiera
+on wszystkich wymy¶lnych elementów wu-ftpd, jest jednak
+prawdopodobniej mniej zapluskwiony i bardziej bezpieczny (w kazdym
+razie by³ takim zanim go przenios³em na Linuksa, i mam nadziejê, ¿e
+nie naba³agani³em *za bardzo*). Kod ¼ród³owy pochodzi z repozytorium
+CVS OpenBSD z dnia 2000/01/23 (tj. miêdzy wersj± 2.6 a 2.7). Numer
+wersji ftpd to 6.4, za¶ numer wersji tego portu to 0.3.0.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-make
+%{__make} -C ftpd OPT_CFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{%{_sbindir},%{_mandir}/man8,etc/{pam.d,sysconfig/rc-inetd}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{ftpd,pam.d,sysconfig/rc-inetd} \
+	$RPM_BUILD_ROOT/home/ftp/{upload,pub}
 
-install -s ftpd 	$RPM_BUILD_ROOT%{_sbindir}/ftpd-BSD
-install ftpd.8		$RPM_BUILD_ROOT%{_mandir}/man8/
-install %{SOURCE1} 	$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
-install %{SOURCE2} 	$RPM_BUILD_ROOT/etc/pam.d/ftp
-install %{SOURCE3} 	$RPM_BUILD_ROOT/etc/ftpusers
+install ftpd/ftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd-BSD
+install ftpd/ftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/ftp
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/ftpusers
 
-gzip -9nf README $RPM_BUILD_ROOT%{_mandir}/man8/*
+gzip -9nf README
 
 %post
 if [ -f /var/lock/subsys/rc-inetd ]; then
@@ -75,7 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.gz
 %attr(755,root,root) %{_sbindir}/ftpd-BSD
-%attr(640,root,root) %{_mandir}/man8/*
-%attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/ftp
-%attr(640,root,root) /etc/ftpusers
-%attr(640,root,root) /etc/sysconfig/rc-inetd/ftpd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pam.d/ftp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpd/ftpusers
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/rc-inetd/ftpd
+%dir /home/ftp 
+%dir /home/ftp/pub 
+%attr(755,ftp,ftp) %dir /home/ftp/upload
+%{_mandir}/man8/*