From patchwork Mon Jun 23 14:47:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 362966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id E6E4F1400AA for ; Tue, 24 Jun 2014 00:55:27 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7043288149; Mon, 23 Jun 2014 14:55:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fsuzOqYG1eSC; Mon, 23 Jun 2014 14:55:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D03FC87329; Mon, 23 Jun 2014 14:55:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6C48D1BFA14 for ; Mon, 23 Jun 2014 14:55:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 690CA2506A for ; Mon, 23 Jun 2014 14:55:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vAL2Mmad1+c2 for ; Mon, 23 Jun 2014 14:55:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com [205.175.225.240]) by silver.osuosl.org (Postfix) with ESMTPS id E04FC27A5B for ; Mon, 23 Jun 2014 14:55:16 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO crulimr01.rockwellcollins.com) ([131.198.26.129]) by mail-virt.rockwellcollins.com with ESMTP; 23 Jun 2014 09:48:00 -0500 Received: from localhost.localdomain (crp23381.rockwellcollins.com [131.199.238.79]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id A0D00601B8; Mon, 23 Jun 2014 09:47:57 -0500 (CDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Mon, 23 Jun 2014 09:47:48 -0500 Message-Id: <1403534868-3731-1-git-send-email-ryan.barnett@rockwellcollins.com> X-Mailer: git-send-email 1.7.9.5 Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH v3 1/1] atftp: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: Ryan Barnett CC: Thomas Petazzoni --- Changes v1 -> v2: - Added dependancies to IPv6 and threads (suggested by Thomas P.) - Added more config options along with else cases for pcr and readline (suggested by Thomas P.) - Fixed pure static builds (suggested by Thomas P.) Patch submitted upstream at https://sourceforge.net/p/atftp/bugs/3/ Changes v2 -> v3: - Fixed package/Config.in alphabetical order --- package/Config.in | 1 + ...file.am-link-against-libpthread-for-atftp.patch | 26 +++++++++++++++++++ package/atftp/Config.in | 15 +++++++++++ package/atftp/atftp.mk | 27 ++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch create mode 100644 package/atftp/Config.in create mode 100644 package/atftp/atftp.mk diff --git a/package/Config.in b/package/Config.in index 498630f..c46c0ec 100644 --- a/package/Config.in +++ b/package/Config.in @@ -897,6 +897,7 @@ menu "Networking applications" source "package/aircrack-ng/Config.in" source "package/argus/Config.in" source "package/arptables/Config.in" + source "package/atftp/Config.in" source "package/autossh/Config.in" source "package/avahi/Config.in" source "package/axel/Config.in" diff --git a/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch b/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch new file mode 100644 index 0000000..e879df5 --- /dev/null +++ b/package/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch @@ -0,0 +1,26 @@ +Makefile.am: link against libpthread for atftp + +atftp client needs to link against libpthread as static builds do not +work otherwise. + +Signed-off-by: Ryan Barnett +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index e59592f..200829a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,7 +28,7 @@ noinst_HEADERS = argz.h logger.h options.h stats.h tftp.h tftp_def.h tftp_io.h + tftpd.h tftpd_pcre.h tftpd_mtftp.h + + bin_PROGRAMS = atftp +-atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) ++atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) $(LIBPTHREAD) + atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ + argz.c tftp_mtftp.c + +-- +1.9.1 + diff --git a/package/atftp/Config.in b/package/atftp/Config.in new file mode 100644 index 0000000..23acf6f --- /dev/null +++ b/package/atftp/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_ATFTP + bool "atftp" + depends on BR2_INET_IPV6 + depends on BR2_TOOLCHAIN_HAS_THREADS + help + atftp is a client/server implementation of the TFTP + protocol that implements RFCs 1350, 2090, 2347, 2348, + and 2349. The server is multi-threaded and the client + presents a friendly interface using libreadline. + + http://sourceforge.net/projects/atftp/ + +comment "atftp needs a toolchain w/ threads, IPv6" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 + diff --git a/package/atftp/atftp.mk b/package/atftp/atftp.mk new file mode 100644 index 0000000..1d6a7c3 --- /dev/null +++ b/package/atftp/atftp.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# atftp +# +################################################################################ + +ATFTP_VERSION = 0.7.1 +ATFTP_SITE = http://sourceforge.net/projects/atftp/files/ +ATFTP_LICENSE = GPLv2+ +ATFTP_LICENSE_FILES = LICENSE +ATFTP_CONF_OPT = --disable-libwrap --disable-mtftp + +ifeq ($(BR2_PACKAGE_READLINE),y) +ATFTP_DEPENDENCIES += readline +ATFTP_CONF_OPT += --enable-libreadline +else +ATFTP_CONF_OPT += --disable-libreadline +endif + +ifeq ($(BR2_PACKAGE_PCRE),y) +ATFTP_DEPENDENCIES += pcre +ATFTP_CONF_OPT += --enable-libpcre +else +ATFTP_CONF_OPT += --disable-libpcre +endif + +$(eval $(autotools-package))