From 0208e116546876c4c3ce208b6bcaa2f57d19ab2b Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 18 Apr 2007 18:28:59 +0000 Subject: [PATCH] * added to wu-ftpd three security fixes from upstream * changed wu-ftpd to be disabled by default, conflicts with proftpd which is prefered because it's alive and wu-ftpd seems to be dead. git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20860 10447126-35f2-4685-b0cf-6dd780d3921f --- network/wu-ftpd/wu-ftpd.conf | 15 ++++++++++++--- network/wu-ftpd/wu-ftpd.desc | 7 +++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/network/wu-ftpd/wu-ftpd.conf b/network/wu-ftpd/wu-ftpd.conf index 94888be1b..0e2389dee 100644 --- a/network/wu-ftpd/wu-ftpd.conf +++ b/network/wu-ftpd/wu-ftpd.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../wu-ftpd/wu-ftpd.conf +# Filename: package/.../wu-ftpd/wu-ftpd.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -10,7 +11,15 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- [ "$arch" = "x86-64" ] && autogen=1 +hook_add prepatch 5 "wuftpd_upstream_patches" +wuftpd_upstream_patches() { + ln -sv . $pkg-$ver + for p in $( match_source_file -p patch ); do + patch ${patchopt/1/0} < $p + done +} + diff --git a/network/wu-ftpd/wu-ftpd.desc b/network/wu-ftpd/wu-ftpd.desc index 7d268f757..e734ddd8b 100644 --- a/network/wu-ftpd/wu-ftpd.desc +++ b/network/wu-ftpd/wu-ftpd.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../wu-ftpd/wu-ftpd.desc -[COPY] Copyright (C) 2006 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -36,7 +36,10 @@ [L] OpenSource [S] Stable [V] 2.6.2 -[P] X -----5---9 189.300 +[P] O -----5---9 189.300 [D] 649693295 wu-ftpd-2.6.2.tar.gz ftp://ftp.wu-ftpd.org/pub/wu-ftpd/ +[D] 1728182700 realpath.patch ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.2/ +[D] 884891924 connect-dos.patch ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.2/ +[D] 1939302741 skeychallenge.patch ftp://ftp.wu-ftpd.org/pub/wu-ftpd/patches/apply_to_2.6.2/