From patchwork Wed Apr 26 06:48:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 755229 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wCVzD62k9z9s7h for ; Wed, 26 Apr 2017 16:48:40 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="L5M0XZkj"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C870E896B7; Wed, 26 Apr 2017 06:48:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wxbSXS7JdcRz; Wed, 26 Apr 2017 06:48:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D679F8963C; Wed, 26 Apr 2017 06:48:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 626DD1C0190 for ; Wed, 26 Apr 2017 06:48:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5CC648A1BB for ; Wed, 26 Apr 2017 06:48:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AWf+a4EKFSy1 for ; Wed, 26 Apr 2017 06:48:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 543AB8A180 for ; Wed, 26 Apr 2017 06:48:30 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id d79so30656803wmi.2 for ; Tue, 25 Apr 2017 23:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=udjqmtovVJzktis0gxzyDRWYlX4nEYBba5D0SfimGGc=; b=L5M0XZkjbw6x4pLxVfcpXaQTdPr/02BCiFMHWMM9gBYi5sfnzupkwRutfchjGnIXq9 siAfpvdgmu75gz7JVu82Jwas4AB2+BrUXcUnT0R7QvqjiRv95exXSSMghID/mkgIWsLo dIi/tuzmFQGjMN7wm/p7XuxhBt6YEUzpuK7GC5Gr6L+qpy1LJyFb3M/m7xfa5pGV0yMo ytc5N8bONGCSvmW/OcBfDDj5xnQTjAd+kQprwL6SI0ItiAYUfyUO49kZVPU2yykx0Sk0 dU+uhWNWZmpNWoO6Bbhmvo2Xmi3tmJn4/xcrIXPyqC8U9A9+N9AnH+xB8PWW7OFKINdK Dw4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=udjqmtovVJzktis0gxzyDRWYlX4nEYBba5D0SfimGGc=; b=TdQvoJWCvcMC5CEw4PjufMKaIHIXzqENVTGpdhL6Ck285w3alCcUEnTBZ53bCQMxqU f/cPN9Z9epFHvvRBoCv/hVQCp0k7gRZbFFAsBRQtAsTtaeVsNRi1BX19A5a2HawH3WRF vyGUEgwXz54vtz09K6JQQFeBsiv93vstEn3+8R2+91WMAuE3E9PMiit3GBw9CqpSlTkl L3coZa/lmZdA+3rpiCeytzcuJSNf8jCnoxU3xD1qrsZV9tLvZeY6wOiEcHs0P1VKs9Wg il+CmH9Xl86YRW8iezF+1P1K3+nPeVWNcBgMo2iavLrb84KVieNs+PNiNEscY4yO8wOZ bq+Q== X-Gm-Message-State: AN3rC/5vwU698JQh3jq1BUfCysa32Vcg1hlUAjyF8yzurKpA6yN0WghP tNvcGreKCDLjVzDM0TU= X-Received: by 10.80.142.188 with SMTP id w57mr8429937edw.11.1493189308379; Tue, 25 Apr 2017 23:48:28 -0700 (PDT) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id w29sm701086edb.33.2017.04.25.23.48.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Apr 2017 23:48:27 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.88) (envelope-from ) id 1d3GkU-0004hz-L4; Wed, 26 Apr 2017 08:48:26 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Wed, 26 Apr 2017 08:48:24 +0200 Message-Id: <20170426064824.18049-1-peter@korsgaard.com> X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] ncftp: use tar.gz to workaround upstream changing tarball post-release X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" As explained here: http://lists.busybox.net/pipermail/buildroot/2017-March/185550.html Upstream has silently updated their 3.2.6 tarball some time between our version bump in late November and December 4th. The changed tarball also contains a significant amount of source changes: libncftp/c_opennologin.c | 4 libncftp/ftp.c | 31 libncftp/ftw.c | 2 libncftp/io_getmem.c | 2 libncftp/io_list.c | 6 libncftp/io_sendfile.c | 4 libncftp/io_util.c | 4 libncftp/ncftp.h | 2 libncftp/open.c | 4 libncftp/rftw.c | 2 libncftp/rglobr.c | 2 libncftp/u_decodehost.c | 2 libncftp/u_decodeurl.c | 2 libncftp/u_getpass.c | 2 libncftp/u_misc.c | 2 libncftp/u_pathcat.c | 4 libncftp/u_scram.c | 2 libncftp/wincfg.h | 1 ncftp/cmds.c | 38 - ncftp/gl_getline.c | 26 ncftp/ls.c | 9 ncftp/ls.h | 9 ncftp/progress.c | 9 ncftp/readln.c | 4 ncftp/shell.h | 10 ncftp/spoolutil.c | 8 ncftp/version.c | 2 sh/mksrctar.sh | 1 sh_util/gpshare.c | 12 sh_util/ncftpbatch.c | 110 -- sh_util/ncftpget.c | 6 sh_util/ncftpls.c | 5 sh_util/ncftpput.c | 14 sio/DNSUtil.c | 4 sio/Makefile.in | 16 sio/SBind.c | 35 sio/SConnect.c | 9 sio/SNew.c | 115 --- sio/SRead.c | 6 sio/StrAddr.c | 6 sio/config.h.in | 24 sio/configure.in | 8 sio/sio.h | 18 sio/wincfg.h | 1 vis/bmed.c | 13 vis/wgets.c | 12 vis/wgets.h | 7 vis/wutil.c | 6 vis/wutil.h | 6 Upstream has been contacted to verify if this change was intentional and the reason why. From the mail: > Is this update intentional? Why was the tarball regenerated? Yes. The old hash was unfortunately already used in the 2017.02 (and .1) releases, so just changing the hash and updating the tarball on sources.buildroot.org would break ncftp for users of those releases. Instead change to use the .tar.gz tarball as suggested by Arnout. Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- package/ncftp/ncftp.hash | 2 +- package/ncftp/ncftp.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/ncftp/ncftp.hash b/package/ncftp/ncftp.hash index 0a7c26c9b..f6f731015 100644 --- a/package/ncftp/ncftp.hash +++ b/package/ncftp/ncftp.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d ncftp-3.2.6-src.tar.xz +sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23 ncftp-3.2.6-src.tar.gz diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index 11bfccaa2..816e0f1d4 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -5,7 +5,9 @@ ################################################################################ NCFTP_VERSION = 3.2.6 -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz +# use .gz as upstream .xz tarball has changed after the hash was added for +# 2017.02. Can be changed back to .xz when version is bumped +NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz NCFTP_SITE = ftp://ftp.ncftp.com/ncftp NCFTP_TARGET_BINS = ncftp NCFTP_LICENSE = Clarified Artistic License