- updated to 0.3.3,

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

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index 76dd97e9da1443ee43cd50fe276ed79493c546a8..3a7ccb3e595a05bc5c3e1efbac225c3c4432a56d 100644 (file)
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -1,20 +1,22 @@
 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.2
-Release:       9
+Version:       0.3.3
+Release:       1
 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
+Source0:       ftp://quatramaran.ens.fr/pub/madore/ftpd-BSD/contrib/%{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
-Patch3:                %{name}-overflow.patch
+Patch3:                %{name}-SA_LEN.patch
+Patch4:                ftpd-BSD-no_libnsl.patch
+URL:           http://www.eleves.ens.fr:8080/home/madore/programs/#prog_ftpd-BSD
 Buildrequires: libwrap-devel
 Buildrequires: pam-devel
 Requires:      rc-inetd
@@ -27,6 +29,7 @@ Obsoletes:    linux-ftpd
 Obsoletes:     proftpd
 Obsoletes:     pure-ftpd
 Obsoletes:     wu-ftpd
+Obsoletes:     muddleftpd
 
 %description
 This is a Linux port of the BSD ftp server (ftpd). It doesn't have all
@@ -48,13 +51,15 @@ CVS OpenBSD z dnia 2000/01/23 (tj. mi
 wersji ftpd to 6.4, za¶ numer wersji tego portu to 0.3.0.
 
 %prep
-%setup -q
+%setup -q -n ftpd-bsd-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+
 %build
-%{__make} -C ftpd OPT_CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS}"
+%{__make} OPT_CFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,8 +67,8 @@ 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 ftpd/ftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd-BSD
-install ftpd/ftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install 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%{_sysconfdir}/ftpd/ftpusers
@@ -89,6 +94,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.gz
 %attr(755,root,root) %{_sbindir}/ftpd-BSD
+%dir %{_sysconfdir}/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