--- /dev/null
+commit 63b772af295acf572b25118c0bd62735a3eb09b9
+Author: Frank DENIS <github@pureftpd.org>
+Date: Sat Apr 2 17:40:53 2011 +0200
+
+ Use my_make_scrambled_password() instead of make_scrambled_password()
+ if available.
+ make_scrambled_password() is not exported anymore in Fedora, but as
+ Arkadiusz Miskiewicz pointed out, my_make_scrambled_password() recently is.
+
+diff --git a/configure.ac b/configure.ac
+index 4b7afe7..937c15f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1216,10 +1216,10 @@ AC_ARG_WITH(mysql,
+ }
+ ]])],[],[
+ AC_MSG_RESULT(no)
+- AC_MSG_ERROR(Your MySQL client libraries aren't properly installed)
++ AC_MSG_ERROR(Your MySQL client libraries aren't properly installed)
+ ],[])
+ AC_MSG_RESULT(yes)
+- AC_CHECK_FUNCS(mysql_real_escape_string)
++ AC_CHECK_FUNCS(mysql_real_escape_string my_make_scrambled_password)
+ fi ])
+
+ AC_ARG_WITH(pgsql,
+diff --git a/src/log_mysql.c b/src/log_mysql.c
+index c6202fe..2d9eafd 100644
+--- a/src/log_mysql.c
++++ b/src/log_mysql.c
+@@ -451,7 +451,12 @@ void pw_mysql_check(AuthResult * const result,
+ # if MYSQL_VERSION_ID >= 40100 && MYSQL_VERSION_ID < 40101
+ make_scrambled_password(scrambled_password, password, 1, NULL);
+ # else
++# ifdef HAVE_MY_MAKE_SCRAMBLED_PASSWORD
++ my_make_scrambled_password(scrambled_password, password,
++ strlen(password));
++# else
+ make_scrambled_password(scrambled_password, password);
++# endif
+ # endif
+ #endif
+ if (strcmp(scrambled_password, spwd) == 0) {
%bcond_without tls # disable SSL/TLS support
%bcond_without cap # disable capabilities
#
-%define rel 5
+%define rel 1
Summary: Small, fast and secure FTP server
Summary(pl.UTF-8): Mały, szybki i bezpieczny serwer FTP
Name: pure-ftpd
-Version: 1.0.29
+Version: 1.0.30
Release: %{rel}%{?with_extra:extra}
Epoch: 0
License: BSD-like%{?with_extra:, GLPv2 for pure-config due to libcfg+ license}
Group: Daemons
Source0: ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 12a074824b509f9e7684fab333ed6915
+# Source0-md5: 865a9020dbe48d30913c796ac3ec1f32
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}.sysconfig
Patch5: %{name}-passwd_location.patch
Patch6: %{name}-additionalgid.patch
Patch7: audit_cap.patch
+Patch8: %{name}-mysql.patch
URL: http://www.pureftpd.org/
%{?with_extra:BuildRequires: autoconf}
%{?with_extra:BuildRequires: automake}
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%{?with_extra:%patch1 -p1}
%{?with_extra:%patch2 -p1}
%build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
%configure \
CFLAGS="%{rpmcflags} %{rpmcppflags} -DALLOW_DELETION_OF_TEMPORARY_FILES=1 -DALWAYS_SHOW_RESOLVED_SYMLINKS=1" \
--with-boring \