- up to 1.0.31

Changed files:
    pure-ftpd-additionalgid.patch -> 1.2
    pure-ftpd-mysql.patch -> 1.2
    pure-ftpd.spec -> 1.198

diff --git a/pure-ftpd-additionalgid.patch b/pure-ftpd-additionalgid.patch
index 47e3c5444dab63c22e1d3258911a5889fb7200cb..a2e52626fb15bb37d8e74944a1700493747ce807 100644 (file)
--- a/pure-ftpd-additionalgid.patch
+++ b/pure-ftpd-additionalgid.patch
@@ -86,11 +86,12 @@ diff -ur pure-ftpd-1.0.21/src/globals.h pure-ftpd-1.0.21.new/src/globals.h
  GLOBAL0(signed char debug);                        /* don't give debug output */
 --- pure/configuration-file/pure-config.pl.in~ 2009-02-03 15:47:24.346020364 +0100
 +++ pure/configuration-file/pure-config.pl.in  2009-02-03 15:48:34.678184463 +0100
-@@ -64,6 +64,7 @@
+@@ -65,6 +65,7 @@
  my %numeric_switch_for = (
-       MaxIdleTime             => "-I",
-       MaxDiskUsage            => "-k",
-+      AdditionalGID           => "-2",
-       TrustedGID              => "-a",
-       MaxClientsNumber        => "-c",
-       MaxClientsPerIP         => "-C",
+         MaxIdleTime             => "-I",
+         MaxDiskUsage            => "-k",
++        AdditionalGID           => "-2",
+         TrustedGID              => "-a",
+         MaxClientsNumber        => "-c",
+         MaxClientsPerIP         => "-C",
+

diff --git a/pure-ftpd-mysql.patch b/pure-ftpd-mysql.patch
deleted file mode 100644 (file)
index 07dd5c7..0000000
--- a/pure-ftpd-mysql.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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) {

diff --git a/pure-ftpd.spec b/pure-ftpd.spec
index a4fd548e92ecbf6e5e9ee46abca80d7cefc64fb4..290b4986de0b57fb67f2a414ca1c996eef5777e4 100644 (file)
--- a/pure-ftpd.spec
+++ b/pure-ftpd.spec
@@ -13,13 +13,13 @@
 Summary:       Small, fast and secure FTP server
 Summary(pl.UTF-8):     Mały, szybki i bezpieczny serwer FTP
 Name:          pure-ftpd
-Version:       1.0.30
+Version:       1.0.31
 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: 865a9020dbe48d30913c796ac3ec1f32
+Source0:       http://download.pureftpd.org/pub/pure-ftpd/releases/%{name}-%{version}.tar.bz2
+# Source0-md5: fba0d592a6316f45b5c312a78789ad97
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -35,7 +35,6 @@ Patch4:               %{name}-allauth.patch
 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}
@@ -100,7 +99,6 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %{?with_extra:%patch1 -p1}
 %{?with_extra:%patch2 -p1}