From f252350736aec4730f457eec9b71eda3077f68ca Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 2 Jun 2014 11:35:59 +0000 Subject: [PATCH] - updated to 1.3.5, not tested yet --- proftpd-noautopriv.patch | 11 +++++---- proftpd-paths.patch | 49 +++++++++++++++++++--------------------- proftpd.spec | 10 ++++---- 3 files changed, 34 insertions(+), 36 deletions(-) diff --git a/proftpd-noautopriv.patch b/proftpd-noautopriv.patch index be965ea..9787950 100644 --- a/proftpd-noautopriv.patch +++ b/proftpd-noautopriv.patch @@ -1,8 +1,9 @@ ---- proftpd-1.2.0pre1/include/log.h.noauthpriv Thu Feb 11 12:10:38 1999 -+++ proftpd-1.2.0pre1/include/log.h Thu Feb 11 12:11:01 1999 -@@ -25,6 +25,7 @@ - #ifndef __LOG_H - #define __LOG_H +diff -ur proftpd-1.3.5.orig/include/log.h proftpd-1.3.5/include/log.h +--- proftpd-1.3.5.orig/include/log.h 2013-10-07 01:29:05.000000000 +0000 ++++ proftpd-1.3.5/include/log.h 2014-06-02 11:06:19.649846522 +0000 +@@ -33,6 +33,7 @@ + #ifndef PR_LOG_H + #define PR_LOG_H +#undef LOG_AUTHPRIV #ifndef LOG_AUTHPRIV diff --git a/proftpd-paths.patch b/proftpd-paths.patch index 363216f..44d1673 100644 --- a/proftpd-paths.patch +++ b/proftpd-paths.patch @@ -1,22 +1,30 @@ ---- 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 -@@ -40,7 +40,7 @@ +diff -ur proftpd-1.3.5.orig/configure.in proftpd-1.3.5/configure.in +--- proftpd-1.3.5.orig/configure.in 2014-01-17 18:04:19.000000000 +0000 ++++ proftpd-1.3.5/configure.in 2014-06-02 11:03:41.577869556 +0000 +@@ -2970,7 +2970,7 @@ + locale_dir="`eval echo ${locale_dir}`" + AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") + +-AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") ++AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") + AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") + AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") + +diff -ur proftpd-1.3.5.orig/contrib/xferstats.holger-preiss proftpd-1.3.5/contrib/xferstats.holger-preiss +--- proftpd-1.3.5.orig/contrib/xferstats.holger-preiss 2013-09-17 21:53:59.000000000 +0000 ++++ proftpd-1.3.5/contrib/xferstats.holger-preiss 2014-06-02 11:03:41.576869727 +0000 +@@ -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. -# $mydom1 = "debian"; -+# $mydom1 = "pld"; ++# $mydom1 = "tld"; # $mydom2 = "org"; # edit the next line to customize for your default log file ---- proftpd-1.3.0/include/default_paths.h~ 2006-04-29 14:05:26.906490255 +0300 -+++ proftpd-1.3.0/include/default_paths.h 2006-04-29 14:06:53.778425641 +0300 +diff -ur proftpd-1.3.5.orig/include/default_paths.h proftpd-1.3.5/include/default_paths.h +--- proftpd-1.3.5.orig/include/default_paths.h 2011-05-23 20:35:35.000000000 +0000 ++++ proftpd-1.3.5/include/default_paths.h 2014-06-02 11:03:41.576869727 +0000 @@ -57,7 +57,7 @@ * overriden at runtime with the '-c' switch */ @@ -34,20 +42,9 @@ +#define PR_FTPUSERS_PATH "/etc/ftpd/ftpusers" #endif /* PROFTPD_PATHS_H */ ---- proftpd-1.3.3b/configure.in~ 2010-09-15 11:59:14.956175001 +0200 -+++ proftpd-1.3.3b/configure.in 2010-09-15 12:05:20.368863997 +0200 -@@ -2276,7 +2276,7 @@ - locale_dir="`eval echo ${locale_dir}`" - AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") - --AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") -+AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}/proftpd"`") - AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") - AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") - -diff -ur proftpd-1.3.2e/Make.rules.in proftpd-1.3.3b/Make.rules.in ---- proftpd-1.3.2e/Make.rules.in 2008-11-19 04:51:38.000000000 +0100 -+++ proftpd-1.3.3b/Make.rules.in 2009-11-18 22:48:25.000000000 +0100 +diff -ur proftpd-1.3.5.orig/Make.rules.in proftpd-1.3.5/Make.rules.in +--- proftpd-1.3.5.orig/Make.rules.in 2013-02-06 06:51:04.000000000 +0000 ++++ proftpd-1.3.5/Make.rules.in 2014-06-02 11:03:41.578869373 +0000 @@ -11,6 +11,7 @@ localedir=@localedir@ localstatedir=@localstatedir@ diff --git a/proftpd.spec b/proftpd.spec index a0c34ab..0e9f97f 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 -Release: 1 +Version: 1.3.5 +Release: 0.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 @@ -445,8 +445,8 @@ dodaje hosty do pliku /etc/hosts.deny. %setup -q -n %{name}-%{version}%{?_rc} -a1 %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 +#%patch2 -p1 +#%patch3 -p1 # mod_clamav patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch -- 2.46.0