From f45fbc8b5d4e489e0a6aad2a7a78a33672dfb315 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Jun 15 2015 14:51:46 +0000 Subject: - Updating to 1.0.40 (#1231498) --- diff --git a/.gitignore b/.gitignore index 9b97272..8c91658 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ pure-ftpd-1.0.29.tar.bz2 /pure-ftpd-1.0.36.tar.bz2 /pure-ftpd-1.0.37.tar.bz2 /pure-ftpd-1.0.39.tar.bz2 +/pure-ftpd-1.0.40.tar.bz2 diff --git a/pure-ftpd-1.0.20-libdir.patch b/pure-ftpd-1.0.20-libdir.patch deleted file mode 100644 index 77b6c86..0000000 --- a/pure-ftpd-1.0.20-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./configure.libdir 2004-06-20 19:41:54.000000000 +0200 -+++ ./configure 2005-01-31 12:33:03.901660331 +0100 -@@ -19781,8 +19781,8 @@ - LDFLAGS="$LDFLAGS -L${withval}/lib -L${withval}/lib/mysql -L${withval}/mysql/lib" - CPPFLAGS="$CPPFLAGS -I${withval}/include -I${withval}/include/mysql -I${withval}/mysql/include" - else -- LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:/usr/lib/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}" -- LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql" -+ LD_RUN_PATH="/usr/local/mysql/lib:/usr/local/mysql/lib/mysql:${libdir}/mysql:/usr/mysql/lib:/usr/mysql/lib/mysql:/usr/local/lib/mysql:${LD_RUN_PATH:+:}${LD_RUN_PATH}" -+ LDFLAGS="$LDFLAGS -L/usr/local/mysql/lib -L${libdir}/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql" - CPPFLAGS="$CPPFLAGS -I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql" - fi - diff --git a/pure-ftpd-1.0.27-config.patch b/pure-ftpd-1.0.27-config.patch deleted file mode 100644 index a67d164..0000000 --- a/pure-ftpd-1.0.27-config.patch +++ /dev/null @@ -1,127 +0,0 @@ -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-1.0.40-paminclude.patch b/pure-ftpd-1.0.40-paminclude.patch new file mode 100644 index 0000000..83bcf70 --- /dev/null +++ b/pure-ftpd-1.0.40-paminclude.patch @@ -0,0 +1,21 @@ +diff -Naur pure-ftpd-1.0.40.orig/pam/pure-ftpd pure-ftpd-1.0.40/pam/pure-ftpd +--- pure-ftpd-1.0.40.orig/pam/pure-ftpd 2015-06-13 12:26:37.000000000 +0200 ++++ pure-ftpd-1.0.40/pam/pure-ftpd 2015-06-01 16:36:31.000000000 +0200 +@@ -4,12 +4,14 @@ + # Install it in /etc/pam.d/pure-ftpd or add to /etc/pam.conf + + auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed ++auth include password-auth + auth required pam_shells.so + auth required pam_nologin.so + +-account required pam_stack.so service=system-auth ++account include password-auth + +-password required pam_stack.so service=system-auth ++password include password-auth + +-session required pam_stack.so service=system-auth ++session required pam_loginuid.so ++session include password-auth + diff --git a/pure-ftpd-mysql-password.patch b/pure-ftpd-mysql-password.patch deleted file mode 100644 index a3468fa..0000000 --- a/pure-ftpd-mysql-password.patch +++ /dev/null @@ -1,17 +0,0 @@ -Use my_make_scrambled_password() rather than the deprecated equivalent -make_scrambled_password(). As of Fedora 15 the latter is not exported -by libmysqlclient.so. - - ---- pure-ftpd-1.0.30.orig/src/log_mysql.c 2011-03-26 19:14:20.492368416 +0100 -+++ pure-ftpd-1.0.30/src/log_mysql.c 2011-03-26 19:16:51.110255978 +0100 -@@ -451,7 +451,8 @@ - # if MYSQL_VERSION_ID >= 40100 && MYSQL_VERSION_ID < 40101 - make_scrambled_password(scrambled_password, password, 1, NULL); - # else -- make_scrambled_password(scrambled_password, password); -+ my_make_scrambled_password(scrambled_password, password, -+ strlen(password)); - # endif - #endif - if (strcmp(scrambled_password, spwd) == 0) { diff --git a/pure-ftpd-paminclude.patch b/pure-ftpd-paminclude.patch deleted file mode 100644 index e8ace75..0000000 --- a/pure-ftpd-paminclude.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ./pam/pure-ftpd.paminclude 2006-10-27 09:28:40.000000000 +0200 -+++ ./pam/pure-ftpd 2006-10-27 09:37:22.000000000 +0200 -@@ -4,13 +4,14 @@ - # Install it in /etc/pam.d/pure-ftpd or add to /etc/pam.conf - - auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed --auth required pam_stack.so service=system-auth -+auth include password-auth - auth required pam_shells.so - auth required pam_nologin.so - --account required pam_stack.so service=system-auth -+account include password-auth - --password required pam_stack.so service=system-auth -+password include password-auth - --session required pam_stack.so service=system-auth -+session required pam_loginuid.so -+session include password-auth - diff --git a/pure-ftpd.spec b/pure-ftpd.spec index 006af13..54c900b 100644 --- a/pure-ftpd.spec +++ b/pure-ftpd.spec @@ -1,5 +1,5 @@ Name: pure-ftpd -Version: 1.0.39 +Version: 1.0.40 Release: 1%{?dist} Summary: Lightweight, fast and secure FTP server @@ -14,11 +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.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 +Patch0: pure-ftpd-1.0.35-config.patch +Patch1: pure-ftpd-1.0.40-paminclude.patch Provides: ftpserver BuildRequires: pam-devel, perl, python, libcap-devel @@ -26,12 +23,7 @@ BuildRequires: pam-devel, perl, python, libcap-devel %{!?_without_mysql:BuildRequires: mysql-devel} %{!?_without_pgsql:BuildRequires: postgresql-devel} %{!?_without_tls:BuildRequires: openssl-devel} -# SELinux module -%if 0%{?fedora} == 5 -BuildRequires: checkpolicy, selinux-policy >= 2.2.40, m4 -%else BuildRequires: checkpolicy, selinux-policy-devel -%endif BuildRequires: systemd-units Requires(post): systemd-sysv Requires(post): systemd-units @@ -74,11 +66,8 @@ 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 -%patch2 -p0 -b .paminclude -#%%patch3 -p1 -b .mysql-password -%patch4 -p0 -b .config +%patch0 -p0 -b .config +%patch1 -p1 -b .paminclude install -pm 644 %{SOURCE6} README.SELinux mkdir selinux cp -p %{SOURCE7} selinux/pureftpd.te @@ -254,6 +243,9 @@ fi %changelog +* Mon Jun 15 2015 Jaromir Capik - 1.0.40-1 +- Updating to 1.0.40 (#1231498) + * Mon Jun 01 2015 Jaromir Capik - 1.0.39-1 - Updating to 1.0.39 (#1224479) diff --git a/sources b/sources index 1872437..be1dbdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -901b8e9a6e0ab355ef0bcbd566477bab pure-ftpd-1.0.39.tar.bz2 +33a503343a0f960332156387cc2dde55 pure-ftpd-1.0.40.tar.bz2