- up to 1.2.9rc2

Changed files:
    proftpd-port-65535.patch -> 1.5
    proftpd-wtmp.patch -> 1.14
    proftpd.spec -> 1.160

diff --git a/proftpd-port-65535.patch b/proftpd-port-65535.patch
deleted file mode 100644 (file)
index fd2c0ff..0000000
--- a/proftpd-port-65535.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./include/proftpd.h.org    Mon Oct 22 01:32:03 2001
-+++ ./include/proftpd.h        Mon Oct 22 01:33:00 2001
-@@ -95,7 +95,7 @@
-   volatile int sp_flags;              /* Session/Protection flags */
- 
-   p_in_addr_t data_addr;              /* Remote data address */
--  short data_port;                    /* Remote data port */
-+  unsigned short data_port;           /* Remote data port */
- 
-   unsigned char ident_lookups;                /* Is RFC931 (ident) protocol used? */
-   char *ident_user;                   /* User identified by ident protocol */

diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
index 2a5196cb55df1e3e622b20c2822df0783e52b164..fda3a94d2818d4b8f384afa0bbc946539359519e 100644 (file)
--- a/proftpd-wtmp.patch
+++ b/proftpd-wtmp.patch
@@ -1,9 +1,9 @@
 --- ./src/log.c.org    Sun Oct 21 21:11:04 2001
 +++ ./src/log.c        Sun Oct 21 21:20:07 2001
-@@ -132,26 +132,16 @@
-  */
+@@ -131,26 +131,16 @@
  
- int log_wtmp(char *line, const char *name, const char *host, p_in_addr_t *ip) {
+ int log_wtmp(char *line, const char *name, const char *host,
+     pr_netaddr_t *ip) {
 -  struct stat buf;
    struct utmp ut;
    int res = 0;
@@ -33,7 +33,7 @@
  
    /* Unfortunately, utmp string fields are terminated by '\0' if they are
     * shorter than the size of the field, but if they are exactly the size of
-@@ -159,43 +149,7 @@
+@@ -158,43 +148,7 @@
     * Insane if you ask me.  Unless there's massive uproar, I prefer to err on
     * the side of caution and always null-terminate our strings.
     */
@@ -77,7 +77,7 @@
      memset(&ut,0,sizeof(ut));
  #ifdef HAVE_UTMAXTYPE
  #ifdef LINUX
-@@ -228,13 +182,12 @@
+@@ -227,13 +181,12 @@
  #endif /* HAVE_UT_UT_HOST */
  
      time(&ut.ut_time);

diff --git a/proftpd.spec b/proftpd.spec
index f1f9782dd3ce9f22822f023604f039b82004a273..7103db6b5b0ab75307e065d60069f5a029b95afe 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -8,7 +8,7 @@
 # _without_ipv6                - disable IPv6 and TCPD support
 # _without_ssl         - disbale TLS/SSL support
 #
-%define        _rc     rc1
+%define        _rc     rc2
 Summary:       PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es):   Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
 Summary(pl):   PROfesionalny serwer FTP
@@ -16,12 +16,12 @@ Summary(pt_BR):     Servidor FTP profissional, com sintaxe de configura
 Summary(zh_CN):        Ò×ÓÚ¹ÜÀíµÄ,°²È«µÄ FTP ·þÎñÆ÷
 Name:          proftpd
 Version:       1.2.9
-Release:       0.%{_rc}.2
+Release:       0.%{_rc}.1
 Epoch:         1
 License:       GPL v2+
 Group:         Daemons
 Source0:       ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5: 5b6291a5c92687c5b697202369f71466
+# Source0-md5: 81beb7c8b418db1725781329921328a5
 Source1:       %{name}.conf
 Source2:       %{name}.logrotate
 Source3:       ftp.pamd
@@ -35,9 +35,8 @@ Patch1:               %{name}-glibc.patch
 Patch2:                %{name}-paths.patch
 Patch3:                %{name}-noautopriv.patch
 Patch4:                %{name}-wtmp.patch
-Patch5:                %{name}-port-65535.patch
-Patch6:                %{name}-vmail.patch
-Patch7:                %{name}-IPv6.patch
+Patch5:                %{name}-vmail.patch
+Patch6:                %{name}-IPv6.patch
 URL:           http://www.proftpd.org/
 BuildRequires: autoconf
 BuildRequires: libwrap-devel
@@ -173,10 +172,9 @@ standalone.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
-%patch6 -p1
+%patch5 -p1
 # IPv6 support needs major update
-#%%patch7 -p1
+#patch6 -p1
 
 %build
 %{__autoconf}