diff --git a/.cvsignore b/.cvsignore index a84f40b..b2f43f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -pure-ftpd-1.0.22.tar.bz2 +pure-ftpd-1.0.27.tar.bz2 diff --git a/pure-ftpd-1.0.21-config.patch b/pure-ftpd-1.0.21-config.patch deleted file mode 100644 index d98ba8b..0000000 --- a/pure-ftpd-1.0.21-config.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ./configuration-file/pure-ftpd.conf.in.config 2006-02-15 14:15:47.000000000 +0100 -+++ ./configuration-file/pure-ftpd.conf.in 2006-04-09 17:31:03.000000000 +0200 -@@ -9,7 +9,7 @@ - # instead of command-line options, please run the - # following command : - # --# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf -+# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf - # - # Please don't forget to have a look at documentation at - # http://www.pureftpd.org/documentation.shtml for a complete list of -@@ -107,23 +107,23 @@ - - # LDAP configuration file (see README.LDAP) - --# LDAPConfigFile /etc/pureftpd-ldap.conf -+# LDAPConfigFile @sysconfdir@/pureftpd-ldap.conf - - - - # MySQL configuration file (see README.MySQL) - --# MySQLConfigFile /etc/pureftpd-mysql.conf -+# MySQLConfigFile @sysconfdir@/pureftpd-mysql.conf - - - # Postgres configuration file (see README.PGSQL) - --# PGSQLConfigFile /etc/pureftpd-pgsql.conf -+# PGSQLConfigFile @sysconfdir@/pureftpd-pgsql.conf - - - # PureDB user database (see README.Virtual-Users) - --# PureDB /etc/pureftpd.pdb -+# PureDB @sysconfdir@/pureftpd.pdb - - - # Path to pure-authd socket (see README.Authentication-Modules) -@@ -134,7 +134,7 @@ - - # If you want to enable PAM authentication, uncomment the following line - --# PAMAuthentication yes -+PAMAuthentication yes - - - -@@ -158,7 +158,7 @@ - # 'ls' recursion limits. The first argument is the maximum number of - # files to be displayed. The second one is the max subdirectories depth - --LimitRecursion 2000 8 -+LimitRecursion 7500 8 - - - -@@ -237,7 +237,14 @@ - - # Minimum UID for an authenticated user to log in. - --MinUID 100 -+MinUID 500 -+ -+ -+ -+# Do not use the /etc/ftpusers file to disable accounts. We're already -+# using MinUID to block users with uid < 500 -+ -+UseFtpUsers no - - - -@@ -276,7 +283,7 @@ - - # Disallow anonymous users to upload new files (no = upload is allowed) - --AnonymousCantUpload no -+AnonymousCantUpload yes - - - -@@ -301,7 +308,7 @@ - # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338 - # This log file can then be processed by www traffic analyzers. - --# AltLog clf:/var/log/pureftpd.log -+AltLog clf:@localstatedir@/log/pureftpd.log - - - ---- ./pureftpd-mysql.conf.config 2006-04-09 17:33:04.000000000 +0200 -+++ ./pureftpd-mysql.conf 2006-04-09 17:33:27.000000000 +0200 -@@ -19,7 +19,7 @@ - - # Optional : define the location of mysql.sock if the server runs on this host. - --MYSQLSocket /tmp/mysql.sock -+MYSQLSocket /var/lib/mysql/mysql.sock - - - # Mandatory : user to bind the server as. diff --git a/pure-ftpd-1.0.27-config.patch b/pure-ftpd-1.0.27-config.patch new file mode 100644 index 0000000..a67d164 --- /dev/null +++ b/pure-ftpd-1.0.27-config.patch @@ -0,0 +1,127 @@ +diff -up ./configuration-file/pure-ftpd.conf.in.config ./configuration-file/pure-ftpd.conf.in +--- ./configuration-file/pure-ftpd.conf.in.config 2009-11-20 14:15:01.000000000 +0100 ++++ ./configuration-file/pure-ftpd.conf.in 2009-12-04 22:09:21.461504212 +0100 +@@ -9,7 +9,7 @@ + # instead of command-line options, please run the + # following command : + # +-# @prefix@/sbin/pure-config.pl @prefix@/etc/pure-ftpd.conf ++# @sbindir@/pure-config.pl @sysconfdir@/pure-ftpd.conf + # + # Please don't forget to have a look at documentation at + # http://www.pureftpd.org/documentation.shtml for a complete list of +@@ -107,34 +107,34 @@ MaxIdleTime 15 + + # LDAP configuration file (see README.LDAP) + +-# LDAPConfigFile /etc/pureftpd-ldap.conf ++# LDAPConfigFile @sysconfdir@/pureftpd-ldap.conf + + + + # MySQL configuration file (see README.MySQL) + +-# MySQLConfigFile /etc/pureftpd-mysql.conf ++# MySQLConfigFile @sysconfdir@/pureftpd-mysql.conf + + + # Postgres configuration file (see README.PGSQL) + +-# PGSQLConfigFile /etc/pureftpd-pgsql.conf ++# PGSQLConfigFile @sysconfdir@/pureftpd-pgsql.conf + + + # PureDB user database (see README.Virtual-Users) + +-# PureDB /etc/pureftpd.pdb ++# PureDB @sysconfdir@/pureftpd.pdb + + + # Path to pure-authd socket (see README.Authentication-Modules) + +-# ExtAuth /var/run/ftpd.sock ++# ExtAuth @localstatedir@/run/ftpd.sock + + + + # If you want to enable PAM authentication, uncomment the following line + +-# PAMAuthentication yes ++PAMAuthentication yes + + + +@@ -237,7 +237,14 @@ Umask 133:022 + + # Minimum UID for an authenticated user to log in. + +-MinUID 100 ++MinUID 500 ++ ++ ++ ++# Do not use the /etc/ftpusers file to disable accounts. We're already ++# using MinUID to block users with uid < 500 ++ ++UseFtpUsers no + + + +@@ -276,7 +283,7 @@ AutoRename no + + # Disallow anonymous users to upload new files (no = upload is allowed) + +-AnonymousCantUpload no ++AnonymousCantUpload yes + + + +@@ -301,21 +308,21 @@ AnonymousCantUpload no + # fw.c9x.org - jedi [13/Dec/1975:19:36:39] "GET /ftp/linux.tar.bz2" 200 21809338 + # This log file can then be processed by www traffic analyzers. + +-# AltLog clf:/var/log/pureftpd.log ++AltLog clf:@localstatedir@/log/pureftpd.log + + + + # Create an additional log file with transfers logged in a format optimized + # for statistic reports. + +-# AltLog stats:/var/log/pureftpd.log ++# AltLog stats:@localstatedir@/log/pureftpd.log + + + + # Create an additional log file with transfers logged in the standard W3C + # format (compatible with most commercial log analyzers) + +-# AltLog w3c:/var/log/pureftpd.log ++# AltLog w3c:@localstatedir@/log/pureftpd.log + + + +@@ -346,9 +353,9 @@ AnonymousCantUpload no + + + # If your pure-ftpd has been compiled with standalone support, you can change +-# the location of the pid file. The default is /var/run/pure-ftpd.pid ++# the location of the pid file. The default is @localstatedir@/run/pure-ftpd.pid + +-#PIDFile /var/run/pure-ftpd.pid ++#PIDFile @localstatedir@/run/pure-ftpd.pid + + + +diff -up ./pureftpd-mysql.conf.config ./pureftpd-mysql.conf +--- ./pureftpd-mysql.conf.config 2009-10-20 12:17:56.000000000 +0200 ++++ ./pureftpd-mysql.conf 2009-12-04 22:05:35.350755132 +0100 +@@ -19,7 +19,7 @@ + + # Optional : define the location of mysql.sock if the server runs on this host. + +-MYSQLSocket /tmp/mysql.sock ++MYSQLSocket /var/lib/mysql/mysql.sock + + + # Mandatory : user to bind the server as. diff --git a/pure-ftpd.spec b/pure-ftpd.spec index b697d38..c6355da 100644 --- a/pure-ftpd.spec +++ b/pure-ftpd.spec @@ -1,12 +1,12 @@ Name: pure-ftpd -Version: 1.0.22 +Version: 1.0.27 Release: 1%{?dist} Summary: Lightweight, fast and secure FTP server Group: System Environment/Daemons License: BSD URL: http://www.pureftpd.org -Source0: http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.22.tar.bz2 +Source0: http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-%{version}.tar.bz2 Source1: pure-ftpd.init Source2: pure-ftpd.logrotate Source3: pure-ftpd.xinetd @@ -14,8 +14,8 @@ Source4: pure-ftpd.pure-ftpwho.pam Source5: pure-ftpd.pure-ftpwho.consoleapp Source6: pure-ftpd.README.SELinux Source7: pure-ftpd.pureftpd.te -Patch0: pure-ftpd-1.0.21-config.patch -Patch1: pure-ftpd-1.0.20-libdir.patch +Patch0: pure-ftpd-1.0.27-config.patch +#Patch1: pure-ftpd-1.0.20-libdir.patch Patch2: pure-ftpd-paminclude.patch Provides: ftpserver BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,7 +72,7 @@ Pure-FTPd to be protected in the same way other FTP servers are in Fedora %prep %setup -q %patch0 -p0 -b .config -%patch1 -p0 -b .libdir +#%%patch1 -p0 -b .libdir %patch2 -p0 -b .paminclude install -pm 644 %{SOURCE6} README.SELinux mkdir selinux @@ -254,6 +254,18 @@ fi %changelog +* Fri Dec 04 2009 Aurelien Bompard - 1.0.27-1 +- version 1.0.27 + +* Wed Sep 16 2009 Tomas Mraz - 1.0.22-4 +- use password-auth common PAM configuration instead of system-auth + +* Fri Aug 21 2009 Tomas Mraz - 1.0.22-3 +- rebuilt with new openssl + +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Apr 27 2009 Aurelien Bompard 1.0.22-1 - version 1.0.22 diff --git a/sources b/sources index 2273e50..f63f0e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f9ceefafaf9eb8fca757d7358f474fa pure-ftpd-1.0.22.tar.bz2 +7d18544384aa1649d483ba86518ed34e pure-ftpd-1.0.27.tar.bz2