diff --git a/proftpd-1.3.2a-basic.conf.patch b/proftpd-1.3.3g-basic.conf.patch similarity index 95% rename from proftpd-1.3.2a-basic.conf.patch rename to proftpd-1.3.3g-basic.conf.patch index 2040530..3ee908d 100644 --- a/proftpd-1.3.2a-basic.conf.patch +++ b/proftpd-1.3.3g-basic.conf.patch @@ -1,6 +1,6 @@ -diff -ruN proftpd-1.3.2a-orig/sample-configurations/basic.conf proftpd-1.3.2a/sample-configurations/basic.conf ---- proftpd-1.3.2a-orig/sample-configurations/basic.conf 2008-01-21 18:44:06.000000000 +0100 -+++ proftpd-1.3.2a/sample-configurations/basic.conf 2009-09-16 13:39:34.000000000 +0200 +diff -ruN proftpd-1.3.3g-orig/sample-configurations/basic.conf proftpd-1.3.3g/sample-configurations/basic.conf +--- proftpd-1.3.3g-orig/sample-configurations/basic.conf 2008-01-21 18:44:06.000000000 +0100 ++++ proftpd-1.3.3g/sample-configurations/basic.conf 2011-11-18 15:53:36.000000000 +0100 @@ -3,19 +3,29 @@ # and a single anonymous login. It assumes that you have a user/group # "nobody" and "ftp" for normal operation and anon. @@ -8,7 +8,7 @@ diff -ruN proftpd-1.3.2a-orig/sample-configurations/basic.conf proftpd-1.3.2a/sa -ServerName "ProFTPD Default Installation" -ServerType standalone -DefaultServer on -+ServerName "ProFTPD on @HOST@" ++ServerName "ProFTPD" +ServerType standalone +DefaultServer on diff --git a/proftpd.changes b/proftpd.changes index 672f8a5..7ef28a7 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 18 14:56:41 UTC 2011 - chris@computersalat.de + +- fix for bnc#731347 + * no (hostname -s) in post section + * reworked basic conf patch + ------------------------------------------------------------------- Fri Nov 11 13:13:57 UTC 2011 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index 9944ae3..5557a95 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -32,7 +32,7 @@ Source1: %{name}.init Source2: %{name}.passwd #PATCH-FIX-UPSTREAM CVE-2009-3639 fix mod_tls security issue (bnc#549740) Patch100: %{name}-1.3.3-dist.patch -Patch101: %{name}-1.3.2a-basic.conf.patch +Patch101: %{name}-1.3.3g-basic.conf.patch Patch102: %{name}-1.3.1-ftpasswd.patch Patch103: %{name}-1.3.3-strip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -176,10 +176,10 @@ export CXXFLAGS="$CFLAGS" %post # on `rpm -ivh` PARAM is 1 # on `rpm -Uvh` PARAM is 2 -if [ "$1" = "1" ]; then - #%{__sed} -i "s,\(.*disable.*=\ \)no,\1yes," %{_sysconfdir}/xinetd.d/%{name} - %{__sed} -i -e "s/@HOST@/$(hostname -s)/" %{_sysconfdir}/%{name}/%{name}.conf -fi +#if [ "$1" = "1" ]; then +# #%{__sed} -i "s,\(.*disable.*=\ \)no,\1yes," %{_sysconfdir}/xinetd.d/%{name} +# %{__sed} -i -e "s/@HOST@/$(hostname -s)/" %{_sysconfdir}/%{name}/%{name}.conf +#fi %{fillup_and_insserv -f proftpd} %postun