rpms/pure-ftpd/F-11 pure-ftpd-1.0.27-config.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 pure-ftpd.spec, 1.25, 1.26 sources, 1.4, 1.5 pure-ftpd-1.0.21-config.patch, 1.2, NONE

Aurelien Bompard abompard at fedoraproject.org
Sat Dec 5 06:29:48 UTC 2009 

Author: abompard

Update of /cvs/pkgs/rpms/pure-ftpd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2916/F-11

Modified Files:
	.cvsignore pure-ftpd.spec sources 
Added Files:
	pure-ftpd-1.0.27-config.patch 
Removed Files:
	pure-ftpd-1.0.21-config.patch 
Log Message:
* Fri Dec 04 2009 Aurelien Bompard <abompard at fedoraproject.org> -  1.0.27-1
- version 1.0.27


pure-ftpd-1.0.27-config.patch:
 configuration-file/pure-ftpd.conf.in |   35 +++++++++++++++++++++--------------
 pureftpd-mysql.conf                  |    2 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

--- NEW FILE pure-ftpd-1.0.27-config.patch ---
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.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	27 Apr 2009 10:35:45 -0000	1.4
+++ .cvsignore	5 Dec 2009 06:29:45 -0000	1.5
@@ -1 +1 @@
-pure-ftpd-1.0.22.tar.bz2
+pure-ftpd-1.0.27.tar.bz2


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/pure-ftpd.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- pure-ftpd.spec	27 Apr 2009 10:35:45 -0000	1.25
+++ pure-ftpd.spec	5 Dec 2009 06:29:46 -0000	1.26
@@ -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 wa
 %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 <abompard at fedoraproject.org> -  1.0.27-1
+- version 1.0.27
+
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-4
+- use password-auth common PAM configuration instead of system-auth
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.0.22-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Apr 27 2009 Aurelien Bompard <abompard at fedoraproject.org> 1.0.22-1
 - version 1.0.22
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pure-ftpd/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	27 Apr 2009 10:35:45 -0000	1.4
+++ sources	5 Dec 2009 06:29:47 -0000	1.5
@@ -1 +1 @@
-7f9ceefafaf9eb8fca757d7358f474fa  pure-ftpd-1.0.22.tar.bz2
+7d18544384aa1649d483ba86518ed34e  pure-ftpd-1.0.27.tar.bz2


--- pure-ftpd-1.0.21-config.patch DELETED ---

More information about the scm-commits mailing list