[pure-ftpd] Changing MinUID from 500 to 1000

[Jaromír Cápík]

commit 67a98c6cc1b972a8670d66436d478c6e43d1e35d
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Tue Mar 13 16:57:23 2012 +0100

    Changing MinUID from 500 to 1000

 pure-ftpd-1.0.35-config.patch |  127 +++++++++++++++++++++++++++++++++++++++++
 pure-ftpd.spec                |   10 +++-
 2 files changed, 135 insertions(+), 2 deletions(-)
---
diff --git a/pure-ftpd-1.0.35-config.patch b/pure-ftpd-1.0.35-config.patch
new file mode 100644
index 0000000..76863d4
--- /dev/null
+++ b/pure-ftpd-1.0.35-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                      1000
++
++
++
++# Do not use the /etc/ftpusers file to disable accounts. We're already
++# using MinUID to block users with uid < 1000
++
++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 38a1733..d151c22 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -14,10 +14,12 @@ 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.27-config.patch
+#Patch0:     pure-ftpd-1.0.27-config.patch
 #Patch1:     pure-ftpd-1.0.20-libdir.patch
 Patch2:     pure-ftpd-paminclude.patch
 #Patch3:     pure-ftpd-mysql-password.patch
+Patch4:     pure-ftpd-1.0.35-config.patch
+
 Provides:   ftpserver
 BuildRequires:  pam-devel, perl, python, libcap-devel
 %{!?_without_ldap:BuildRequires:  openldap-devel}
@@ -72,10 +74,11 @@ Pure-FTPd to be protected in the same way other FTP servers are in Fedora
 
 %prep
 %setup -q
-%patch0 -p0 -b .config
+#%%patch0 -p0 -b .config
 #%%patch1 -p0 -b .libdir
 %patch2 -p0 -b .paminclude
 #%%patch3 -p1 -b .mysql-password
+%patch4 -p0 -b .config
 install -pm 644 %{SOURCE6} README.SELinux
 mkdir selinux
 cp -p %{SOURCE7} selinux/pureftpd.te
@@ -261,6 +264,9 @@ fi
 
 
 %changelog
+* Tue Mar 13 2012 Jaromir Capik <jcapik at redhat.com> - 1.0.35-2
+- Changing MinUID from 500 to 1000
+
 * Fri Jan 13 2012 Jaromir Capik <jcapik at redhat.com> - 1.0.35-1
 - Update to 1.0.35