From: Adam Osuchowski <adwol@pld-linux.org>
Date: Fri, 3 Apr 2015 09:57:45 +0000 (+0200)
Subject: - up to 1.3.5
X-Git-Tag: auto/th/proftpd-1.3.5-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fproftpd.git;a=commitdiff_plain;h=c6226f4

- up to 1.3.5
---

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 363216f..57736e0 100644
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,12 +1,6 @@
 --- proftpd-1.2.0pre3/contrib/xferstats.holger-preiss	Sun Oct 18 04:24:41 1998
 +++ proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss	Fri May 28 10:49:08 1999
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl
- # ---------------------------------------------------------------------------
- #
- # USAGE: xferstats <options>
-@@ -40,7 +40,7 @@
+@@ -52,7 +52,7 @@
  # If you want to specify $mydom1 and $mydom2 manually you should edit the
  # next two lines to customize for your domain. This will allow your domain
  # to be separated in the domain listing.
diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
index 9aa7aef..fb84cbd 100644
--- a/proftpd-wtmp.patch
+++ b/proftpd-wtmp.patch
@@ -1,7 +1,7 @@
-diff -burNp proftpd-1.3.2.orig/src/log.c proftpd-1.3.2-dud/src/log.c
---- proftpd-1.3.2.orig/src/wtmp.c	2008-12-17 00:43:55.000000000 +0100
-+++ proftpd-1.3.2-dud/src/wtmp.c	2009-02-09 14:24:34.271689801 +0100
-@@ -129,9 +129,31 @@ int log_wtmp(char *line, const char *nam
+diff -ruNp proftpd-1.3.5.orig/src/wtmp.c proftpd-1.3.5/src/wtmp.c
+--- proftpd-1.3.5.orig/src/wtmp.c	2013-12-09 20:16:15.000000000 +0100
++++ proftpd-1.3.5/src/wtmp.c	2015-04-03 11:47:21.710554599 +0200
+@@ -136,11 +136,33 @@ int log_wtmp(const char *line, const cha
    struct utmp ut;
    static int fd = -1;
  
@@ -29,9 +29,11 @@ diff -burNp proftpd-1.3.2.orig/src/log.c proftpd-1.3.2-dud/src/log.c
 +#endif
    if (fd < 0 &&
 -      (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
--    pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
 +      (fd = open(wtmp_file, O_WRONLY|O_APPEND, 0)) < 0) {
-+    pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", wtmp_file, strerror(errno));
-     return -1;
-   }
+     int xerrno = errno;
  
+-    pr_log_pri(PR_LOG_WARNING, "failed to open wtmp %s: %s", WTMP_FILE,
++    pr_log_pri(PR_LOG_WARNING, "failed to open wtmp %s: %s", wtmp_file,
+       strerror(xerrno));
+ 
+     errno = xerrno;
diff --git a/proftpd.spec b/proftpd.spec
index a0c34ab..2b83354 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -23,13 +23,13 @@ Summary(pl.UTF-8):	PROfesionalny serwer FTP
 Summary(pt_BR.UTF-8):	Servidor FTP profissional, com sintaxe de configuração semelhante à do apache
 Summary(zh_CN.UTF-8):	易于管理的,安全的 FTP 服务器
 Name:		proftpd
-Version:	1.3.4d
+Version:	1.3.5
 Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
-# Source0-md5:	13c6fd7ce320886adc371c81a3e23f07
+# Source0-md5:	aff1bff40e675244d72c4667f203e5bb
 Source1:	https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-%{mod_clamav_version}.tar.gz
 # Source1-md5:	42e560ec0bd5964e13fad1b2bb7afe21
 Source2:	%{name}.conf