[pure-ftpd/f15/master: 2/4] bug fix for mysql passwords #690346
ksyz
ksyz at fedoraproject.org
Sun Mar 27 00:05:30 UTC 2011
commit fe103918633dc8ce0e8f829738113f3b9bde9e9b
Author: Michal Ingeli <mi at v3.sk>
Date: Sun Mar 27 00:54:10 2011 +0100
bug fix for mysql passwords #690346
pure-ftpd-mysql-password.patch | 17 +++++++++++++++++
pure-ftpd.spec | 14 ++++++++++----
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/pure-ftpd-mysql-password.patch b/pure-ftpd-mysql-password.patch
new file mode 100644
index 0000000..a3468fa
--- /dev/null
+++ b/pure-ftpd-mysql-password.patch
@@ -0,0 +1,17 @@
+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.spec b/pure-ftpd.spec
index 5538f3a..7a03abe 100644
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -1,6 +1,6 @@
Name: pure-ftpd
-Version: 1.0.29
-Release: 3%{?dist}
+Version: 1.0.30
+Release: 2%{?dist}
Summary: Lightweight, fast and secure FTP server
Group: System Environment/Daemons
@@ -17,6 +17,7 @@ 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
Provides: ftpserver
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pam-devel, perl, python, libcap-devel
@@ -74,6 +75,7 @@ Pure-FTPd to be protected in the same way other FTP servers are in Fedora
%patch0 -p0 -b .config
#%%patch1 -p0 -b .libdir
%patch2 -p0 -b .paminclude
+%patch3 -p1 -b .mysql-password
install -pm 644 %{SOURCE6} README.SELinux
mkdir selinux
cp -p %{SOURCE7} selinux/pureftpd.te
@@ -254,8 +256,12 @@ fi
%changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.29-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sat Mar 26 2011 Michal Ingeli <mi at v3.sk> - 1.0.30-2
+- bug fix for mysql passwords #690346
+
+* Mon Mar 14 2011 Michal Ingeli <mi at v3.sk> - 1.0.30-1
+- version 1.0.30
+- security bug fix #683221 by upstream
* Wed Apr 28 2010 Aurelien Bompard <abompard at fedoraproject.org> - 1.0.29-2
- fix bug #586513
More information about the scm-commits
mailing list