pool/proftpd
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 92427 from home:computersalat:devel:network

Browse Source 
fix for bnc#731347

OBS-URL: https://build.opensuse.org/request/show/92427
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=10
This commit is contained in:
Christian Wittmer 2011-11-18 15:37:01 +00:00 committed by Git OBS Bridge
parent a5bdec49b4
commit 4b40c45a92
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proftpd-1.3.2a-basic.conf.patch → proftpd-1.3.3g-basic.conf.patch
View File

@ -1,6 +1,6 @@
diff -ruN proftpd-1.3.2a-orig/sample-configurations/basic.conf proftpd-1.3.2a/sample-configurations/basic.conf diff -ruN proftpd-1.3.3g-orig/sample-configurations/basic.conf proftpd-1.3.3g/sample-configurations/basic.conf
--- proftpd-1.3.2a-orig/sample-configurations/basic.conf 2008-01-21 18:44:06.000000000 +0100 --- proftpd-1.3.3g-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 +++ proftpd-1.3.3g/sample-configurations/basic.conf 2011-11-18 15:53:36.000000000 +0100
@@ -3,19 +3,29 @@ @@ -3,19 +3,29 @@
# and a single anonymous login. It assumes that you have a user/group # and a single anonymous login. It assumes that you have a user/group
# "nobody" and "ftp" for normal operation and anon. # "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" -ServerName "ProFTPD Default Installation"
-ServerType standalone -ServerType standalone
-DefaultServer on -DefaultServer on
+ServerName "ProFTPD on @HOST@" +ServerName "ProFTPD"
+ServerType standalone +ServerType standalone
+DefaultServer on +DefaultServer on

7
proftpd.changes
View File

@ -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 Fri Nov 11 13:13:57 UTC 2011 - chris@computersalat.de

10
proftpd.spec
View File

@ -32,7 +32,7 @@ Source1: %{name}.init
Source2: %{name}.passwd Source2: %{name}.passwd
#PATCH-FIX-UPSTREAM CVE-2009-3639 fix mod_tls security issue (bnc#549740) #PATCH-FIX-UPSTREAM CVE-2009-3639 fix mod_tls security issue (bnc#549740)
Patch100: %{name}-1.3.3-dist.patch 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 Patch102: %{name}-1.3.1-ftpasswd.patch
Patch103: %{name}-1.3.3-strip.patch Patch103: %{name}-1.3.3-strip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -176,10 +176,10 @@ export CXXFLAGS="$CFLAGS"
%post %post
# on `rpm -ivh` PARAM is 1 # on `rpm -ivh` PARAM is 1
# on `rpm -Uvh` PARAM is 2 # on `rpm -Uvh` PARAM is 2
if [ "$1" = "1" ]; then #if [ "$1" = "1" ]; then
#%{__sed} -i "s,\(.*disable.*=\ \)no,\1yes," %{_sysconfdir}/xinetd.d/%{name} # #%{__sed} -i "s,\(.*disable.*=\ \)no,\1yes," %{_sysconfdir}/xinetd.d/%{name}
%{__sed} -i -e "s/@HOST@/$(hostname -s)/" %{_sysconfdir}/%{name}/%{name}.conf # %{__sed} -i -e "s/@HOST@/$(hostname -s)/" %{_sysconfdir}/%{name}/%{name}.conf
fi #fi
%{fillup_and_insserv -f proftpd} %{fillup_and_insserv -f proftpd}
%postun %postun