From patchwork Tue Oct 9 14:40:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rasmussen X-Patchwork-Id: 190344 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 537D22C00E7 for ; Wed, 10 Oct 2012 01:41:02 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 17BC13F867 for ; Tue, 9 Oct 2012 16:41:01 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 34AC63FC33 for ; Tue, 9 Oct 2012 16:40:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2917; q=dns/txt; s=ironport2; t=1349793657; x=1381329657; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=0xqMkk9qnbH/wkMbb/RiV55BLd2NV6QvmtKi4Sx8aHQ=; b=BQDr45RFydK874bpnBmYeIMbsj+lSe+Pl474e1JKg/XeEHswzEJAUW+1 GE4Y0AlySzx4iNrK9IsIuhrGjO7dHVB32n76a5ZdVemy0mLHEgbfL/E+m A7ZkcTbjadVlcpR; X-IronPort-AV: E=Sophos;i="4.80,560,1344204000"; d="scan'208";a="1710873" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 09 Oct 2012 16:40:57 +0200 Received: from chor-laptop.prevas.se (172.16.6.106) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.318.1; Tue, 9 Oct 2012 16:40:56 +0200 From: Christian Rasmussen To: Subject: [PATCH 9/9] vsftpd: Upgrade to vsftpd 3.0.2 Date: Tue, 9 Oct 2012 16:40:48 +0200 Message-ID: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- recipes/vsftpd/vsftpd-2.3.4/nopam.patch | 12 ------------ recipes/vsftpd/vsftpd.inc | 6 +++--- recipes/vsftpd/vsftpd_2.3.4.oe.sig | 1 - .../vsftpd/{vsftpd_2.3.4.oe => vsftpd_3.0.2.oe} | 2 -- recipes/vsftpd/vsftpd_3.0.2.oe.sig | 1 + 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 recipes/vsftpd/vsftpd-2.3.4/nopam.patch delete mode 100644 recipes/vsftpd/vsftpd_2.3.4.oe.sig rename recipes/vsftpd/{vsftpd_2.3.4.oe => vsftpd_3.0.2.oe} (54%) create mode 100644 recipes/vsftpd/vsftpd_3.0.2.oe.sig diff --git a/recipes/vsftpd/vsftpd-2.3.4/nopam.patch b/recipes/vsftpd/vsftpd-2.3.4/nopam.patch deleted file mode 100644 index 8e0559c..0000000 --- a/recipes/vsftpd/vsftpd-2.3.4/nopam.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h ---- vsftpd-2.0.1_org/builddefs.h 2004-07-02 16:36:59.000000000 +0200 -+++ vsftpd-2.0.1_patch/builddefs.h 2004-07-21 09:34:49.044900488 +0200 -@@ -2,7 +2,7 @@ - #define VSF_BUILDDEFS_H - - #undef VSF_BUILD_TCPWRAPPERS --#define VSF_BUILD_PAM -+#undef VSF_BUILD_PAM - #undef VSF_BUILD_SSL - - #endif /* VSF_BUILDDEFS_H */ diff --git a/recipes/vsftpd/vsftpd.inc b/recipes/vsftpd/vsftpd.inc index 775fb44..f9c6e92 100644 --- a/recipes/vsftpd/vsftpd.inc +++ b/recipes/vsftpd/vsftpd.inc @@ -30,9 +30,9 @@ do_configure() { # Configure CFLAGS and hardcode LIBS mv Makefile.new Makefile cat Makefile \ - | sed -e 's:^\(CC.*=\).*:\1 ${CC}:g' \ - | sed -e 's:^\(CFLAGS.*=\).*:\1 ${CFLAGS}:g' \ - | sed -e 's:^\(LIBS.*=\).*:\1 -lnsl -lresolv -lcrypt:g' \ + | sed -e 's:^\(CC\s*=\).*:\1 ${CC}:g' \ + | sed -e 's:^\(CFLAGS\s*=\)\(.*\):\1 ${CFLAGS} \2:g' \ + | sed -e 's:^\(LIBS\s*=\).*:\1 -lnsl -lresolv -lcrypt:g' \ > Makefile.new mv Makefile.new Makefile } diff --git a/recipes/vsftpd/vsftpd_2.3.4.oe.sig b/recipes/vsftpd/vsftpd_2.3.4.oe.sig deleted file mode 100644 index dd39255..0000000 --- a/recipes/vsftpd/vsftpd_2.3.4.oe.sig +++ /dev/null @@ -1 +0,0 @@ -b774cc6b4c50e20f4fe9ca7f6aa74169ce7fe5ea vsftpd-2.3.4.tar.gz diff --git a/recipes/vsftpd/vsftpd_2.3.4.oe b/recipes/vsftpd/vsftpd_3.0.2.oe similarity index 54% rename from recipes/vsftpd/vsftpd_2.3.4.oe rename to recipes/vsftpd/vsftpd_3.0.2.oe index 7edfe44..9393fd2 100644 --- a/recipes/vsftpd/vsftpd_2.3.4.oe +++ b/recipes/vsftpd/vsftpd_3.0.2.oe @@ -1,5 +1,3 @@ LICENSE = "GPL-2.0" require ${PN}.inc - -SRC_URI += "file://nopam.patch" diff --git a/recipes/vsftpd/vsftpd_3.0.2.oe.sig b/recipes/vsftpd/vsftpd_3.0.2.oe.sig new file mode 100644 index 0000000..ba8dfe6 --- /dev/null +++ b/recipes/vsftpd/vsftpd_3.0.2.oe.sig @@ -0,0 +1 @@ +f36976bb1c5df25ac236d8a29e965ba2b825ccd0 vsftpd-3.0.2.tar.gz