- changed unsafe 755 ftp.ftp to safe 700 root.ftp on upload directory

- updated port information in descriptions, added upload dir note
- release 2, STBR

Changed files:
    ftpd-BSD.spec -> 1.40

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index df25d2cb0fd1f126d82e550796ee0aad3abfeb99..7cf746853c89e9dc089dda38672bc7d68b1d3469 100644 (file)
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -2,7 +2,7 @@ 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.3
 Summary(pl):   Port ftpd z OpenBSD dla Linuxa (z wsparciem do IPv6)
 Name:          ftpd-BSD
 Version:       0.3.3

-Release:       1
+Release:       2

 License:       BSD-like
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 License:       BSD-like
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server


@@ -15,7 +15,7 @@ Patch0:               %{name}-anonuser.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-username.patch
 Patch3:                %{name}-SA_LEN.patch
 Patch1:                %{name}-paths.patch
 Patch2:                %{name}-username.patch
 Patch3:                %{name}-SA_LEN.patch

-Patch4:                ftpd-BSD-no_libnsl.patch
+Patch4:                %{name}-no_libnsl.patch

 URL:           http://www.eleves.ens.fr:8080/home/madore/programs/#prog_ftpd-BSD
 Buildrequires: libwrap-devel
 Buildrequires: pam-devel
 URL:           http://www.eleves.ens.fr:8080/home/madore/programs/#prog_ftpd-BSD
 Buildrequires: libwrap-devel
 Buildrequires: pam-devel


@@ -37,9 +37,12 @@ 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).
 
 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/07/07 (this
+is after release 2.7). The ftpd version number is 6.5 and this port's
+version number is 0.3.2.
+
+Package comes with anonymous upload disabled. If you really want to
+enable it - chmod /home/ftp/upload to 0730.

 
 %description -l pl
 Pakiet ten zawiera linuksowy port serwera ftp BSD (ftpd). Nie zawiera
 
 %description -l pl
 Pakiet ten zawiera linuksowy port serwera ftp BSD (ftpd). Nie zawiera


@@ -47,8 +50,11 @@ on wszystkich wymy
 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
 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.
+CVS OpenBSD z dnia 2000/07/07 (tj. po wersji 2.7). Numer wersji ftpd
+to 6.5, za¶ numer wersji tego portu to 0.3.2.
+
+Pakiet przychodzi z wy³±czonym anonimowym uploadem. Je¶li naprawdê
+chcesz go w³±czyæ - zmieñ uprawnienia do /home/ftp/upload na 0730.

 
 %prep
 %setup -q -n ftpd-bsd-%{version}
 
 %prep
 %setup -q -n ftpd-bsd-%{version}


@@ -75,6 +81,9 @@ install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/ftpusers
 
 gzip -9nf README
 
 
 gzip -9nf README
 

+%clean
+rm -rf $RPM_BUILD_ROOT
+

 %post
 if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload 1>&2
 %post
 if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload 1>&2


@@ -87,9 +96,6 @@ if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload
 fi
 
        /etc/rc.d/init.d/rc-inetd reload
 fi
 

-%clean
-rm -rf $RPM_BUILD_ROOT
-

 %files
 %defattr(644,root,root,755)
 %doc README.gz
 %files
 %defattr(644,root,root,755)
 %doc README.gz


@@ -100,5 +106,5 @@ rm -rf $RPM_BUILD_ROOT
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/rc-inetd/ftpd
 %dir /home/ftp 
 %dir /home/ftp/pub 
 %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
+%attr(700,root,ftp) %verify(not mode) %dir /home/ftp/upload

 %{_mandir}/man8/*
 %{_mandir}/man8/*