- update to 1.3.1

Changed files:
    proftpd-mysql-typo.patch -> 1.2
    proftpd-wtmp.patch -> 1.26
    proftpd.spec -> 1.248

diff --git a/proftpd-mysql-typo.patch b/proftpd-mysql-typo.patch
deleted file mode 100644 (file)
index 792dc6d..0000000
--- a/proftpd-mysql-typo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proftpd-1.3.1rc3/contrib/mod_sql_mysql.c~  2007-05-09 19:15:18.000000000 +0200
-+++ proftpd-1.3.1rc3/contrib/mod_sql_mysql.c   2007-08-20 15:49:54.000000000 +0200
-@@ -595,7 +595,7 @@
-   }
- 
-   if (!conn_pool) {
--    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been
-+    pr_log_pri(PR_LOG_WARNING, "warning: the mod_sql_mysql module has not been"
-       "properly intialized.  Please make sure your --with-modules configure "
-       "option lists mod_sql *before* mod_sql_mysql, and recompile.");
- 

diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
index 546ab5235ff8456a1d32dc1ba0353b2852b35005..2ebaae35c3e32a2c837833f8def9058bfc1022fc 100644 (file)
--- a/proftpd-wtmp.patch
+++ b/proftpd-wtmp.patch
@@ -1,3 +1,14 @@
+--- proftpd-1.3.1/src/log.c    2008-01-08 22:33:30.946409026 +0200
++++ proftpd-1.3.1rc3/src/log.c 2007-02-15 18:54:09.000000000 +0200
+@@ -117,7 +117,7 @@
+     utx.ut_exit.e_exit = 0;
+ #endif /* HAVE_UT_UT_EXIT */
+     if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
+-      (void) ftruncate(fdx, buf.st_size);
++      ftruncate(fdx, buf.st_size);
+ 
+   } else {
+     pr_log_debug(DEBUG0, "%s fstat(): %s", WTMPX_FILE, strerror(errno));
 diff -ur proftpd-1.3.1rc2/acconfig.h proftpd-1.3.1rc2.wtmpx/acconfig.h
 --- proftpd-1.3.1rc2/acconfig.h        2002-12-15 19:05:09.000000000 +0100
 +++ proftpd-1.3.1rc2.wtmpx/acconfig.h  2007-08-20 14:44:18.000000000 +0200
@@ -221,7 +232,7 @@ diff -ur proftpd-1.3.1rc2/src/log.c proftpd-1.3.1rc2.wtmpx/src/log.c
 -  if (fd < 0 &&
 -      (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
 +      if (write(fdx, (char *)&utx, sizeof(utx)) != sizeof(utx))
-+        ftruncate(fdx, buf.st_size);
++        (void )ftruncate(fdx, buf.st_size);
 +    } else {
 +      pr_log_debug(DEBUG0, "%s fstat(): %s", wtmpx_file, strerror(errno));
 +      res = -1;

diff --git a/proftpd.spec b/proftpd.spec
index 1dbb8ffa1eeffa19182df1c0faeff48f27c14822..78f068e136514c3d3aced82583936b0c397e5654 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,5 +1,6 @@
 # TODO
 # - mod_caps uses uname -r for detection
+# - don't use internal libltdl
 #
 # Conditional build:
 %bcond_without pam             # disable PAM support
@@ -13,7 +14,6 @@
 %bcond_without quotamysql      # disable quota mysql support
 %bcond_without quotapgsql      # disable quota pgsql support
 #
-%define        _rc     rc3
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es.UTF-8):     Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
 Summary(pl.UTF-8):     PROfesionalny serwer FTP
@@ -21,12 +21,12 @@ Summary(pt_BR.UTF-8):       Servidor FTP profissional, com sintaxe de configuração s
 Summary(zh_CN.UTF-8):  易于管理的,安全的 FTP 服务器
 Name:          proftpd
 Version:       1.3.1
-Release:       0.%{_rc}.2
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Daemons
-Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5: 485af3aee9ecebfeae1ae2003250a3a9
+Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
+# Source0-md5: 175958df8de92d5209b7b1e2e23a5a28
 Source1:       %{name}.conf
 Source3:       ftp.pamd
 Source4:       %{name}.inetd
@@ -43,7 +43,6 @@ Patch2:               %{name}-noautopriv.patch
 Patch3:                %{name}-wtmp.patch
 Patch4:                %{name}-configure.patch
 Patch5:                %{name}-pool.patch
-Patch6:                %{name}-mysql-typo.patch
 URL:           http://www.proftpd.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -54,7 +53,7 @@ BuildRequires:        mysql-devel
 %endif
 BuildRequires: ncurses-devel
 %if %{with ldap} || %{with quotaldap}
-BuildRequires: openldap-devel >= 2.4.6
+BuildRequires: openldap-devel
 %endif
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 %{?with_pam:BuildRequires:             pam-devel}
@@ -430,7 +429,6 @@ dodaje hosty do pliku /etc/hosts.deny.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 cp -f /usr/share/automake/config.sub .