From patchwork Fri Apr 1 15:36:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 604901 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]) by ozlabs.org (Postfix) with ESMTP id 3qc58h5zWjz9s9G for ; Sat, 2 Apr 2016 02:36:52 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=jaXMZ+kc; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 1960891F6F; Fri, 1 Apr 2016 15:36:52 +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 jxklSG8SBgXc; Fri, 1 Apr 2016 15:36:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DFBAE91F55; Fri, 1 Apr 2016 15:36:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 30AF11C1038 for ; Fri, 1 Apr 2016 15:36:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2A8EC91F4D for ; Fri, 1 Apr 2016 15:36:45 +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 B1lU1jtzlMDG for ; Fri, 1 Apr 2016 15:36:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C83C91E41 for ; Fri, 1 Apr 2016 15:36:35 +0000 (UTC) Received: by mail-wm0-f54.google.com with SMTP id f198so30964184wme.0 for ; Fri, 01 Apr 2016 08:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EV/swmcV6bhxf+VdFpIg10VEf3lqSWPBcVSDZ/u3Ebk=; b=jaXMZ+kc5TlzM8h06ajh5Rb5AIDDkQWIqXC6zw/Zn490siTPOLAzlps9Hs3ru6WJym SHsPi63NqIB7hzBax8Bt82O+LHCJ5L/lwUGtQFNzcD3//+CT+mCZRexk0J/Eoc4+p9xW TP13XBqnphI0l259BLYqKeW+4OS8FFPMJ3QMbVtv7t60++0V4LhxIaG1ZFBPpldc9Pge zCm8C2CSa4Ho3pJtBoAtXq+MQiej4aXXd2l90Iy569ag+RX1ApHQtLWKIGPnlvoua1Ur PhmBwTlIgmIGE+hP/d22D6jIBVLHK+GCC7Iln2+TBiEovpmWgrcUjqqFOoZxxJI/jVov NlBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EV/swmcV6bhxf+VdFpIg10VEf3lqSWPBcVSDZ/u3Ebk=; b=VqlhaWHtDNufKBxObmf6moKB74GF89VhW4GGJ487T6mvkV0ReYmPDhSYNnqM5XRdtw RvLFtjEGTtjimzifcS6eWI47fnFxKmz5e6w1PijxP+UKV/FP+tn1EwIQtlXEaeBFEiX9 KxrsB2BWQr40RKTbwHQEfS2viAaE26Pc2ejTtSWIJa3fZxY8fQtsYqE24Dhnu9eT8jl8 FBpcZIns+e1+rJd20Ennn2bpR10ligBsjbszzsTppTa0QX4j7x8XA6GWTeC6GobG1u/h Xel7rL94XZDv64CUOm8R0cIwOVOB3qZMCZ1AoLaNQ6jgQa8XcBSqwpCTMd0Ct/3U9duo Azng== X-Gm-Message-State: AD7BkJKXWK2LYiahrVdCoDiRpsDat+UDJYPObYY7TQv9OqhCwD2kwB8jpqtb9s7L6C/Lmg== X-Received: by 10.194.205.138 with SMTP id lg10mr5471964wjc.153.1459524994181; Fri, 01 Apr 2016 08:36:34 -0700 (PDT) Received: from localhost.localdomain (146.167.87.79.rev.sfr.net. [79.87.167.146]) by smtp.gmail.com with ESMTPSA id e190sm12185701wma.15.2016.04.01.08.36.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 08:36:33 -0700 (PDT) From: Francois Perrad X-Google-Original-From: Francois Perrad To: buildroot@busybox.net Date: Fri, 1 Apr 2016 17:36:12 +0200 Message-Id: <1459524973-26730-2-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459524973-26730-1-git-send-email-francois.perrad@gadz.org> References: <1459524973-26730-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [V2 2/3] libtomcrypt: new package 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" Signed-off-by: Francois Perrad Reviewed-by: Yegor Yefremov --- package/Config.in | 1 + .../0001-install-without-USER-and-GROUP.patch | 61 ++++++++++++++++++++++ package/libtomcrypt/Config.in | 11 ++++ package/libtomcrypt/libtomcrypt.hash | 2 + package/libtomcrypt/libtomcrypt.mk | 23 ++++++++ 5 files changed, 98 insertions(+) create mode 100644 package/libtomcrypt/0001-install-without-USER-and-GROUP.patch create mode 100644 package/libtomcrypt/Config.in create mode 100644 package/libtomcrypt/libtomcrypt.hash create mode 100644 package/libtomcrypt/libtomcrypt.mk diff --git a/package/Config.in b/package/Config.in index 84df812..b38b24b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -839,6 +839,7 @@ menu "Crypto" source "package/libsodium/Config.in" source "package/libssh/Config.in" source "package/libssh2/Config.in" + source "package/libtomcrypt/Config.in" source "package/libuecc/Config.in" source "package/mbedtls/Config.in" source "package/nettle/Config.in" diff --git a/package/libtomcrypt/0001-install-without-USER-and-GROUP.patch b/package/libtomcrypt/0001-install-without-USER-and-GROUP.patch new file mode 100644 index 0000000..325d04b --- /dev/null +++ b/package/libtomcrypt/0001-install-without-USER-and-GROUP.patch @@ -0,0 +1,61 @@ +install without USER and GROUP + +see https://github.com/libtom/libtomcrypt/pull/115 + +Signed-off-by: Francois Perrad + +diff --git a/makefile b/makefile +index f650ea1..b346bed 100644 +--- a/makefile ++++ b/makefile +@@ -300,19 +300,19 @@ install: library docs + else + install: library + endif +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(DATAPATH) +- install -g $(GROUP) -o $(USER) $(LIBNAME) $(DESTDIR)$(LIBPATH) +- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) ++ install -d $(DESTDIR)$(LIBPATH) ++ install -d $(DESTDIR)$(INCPATH) ++ install -d $(DESTDIR)$(DATAPATH) ++ install -m 644 $(LIBNAME) $(DESTDIR)$(LIBPATH) ++ install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH) + ifndef NODOCS +- install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH) ++ install -m 644 doc/crypt.pdf $(DESTDIR)$(DATAPATH) + endif + + install_test: testprof/$(LIBTEST) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) +- install -g $(GROUP) -o $(USER) testprof/$(LIBTEST) $(DESTDIR)$(LIBPATH) ++ install -d $(DESTDIR)$(LIBPATH) ++ install -d $(DESTDIR)$(INCPATH) ++ install -m 644 testprof/$(LIBTEST) $(DESTDIR)$(LIBPATH) + + profile: + CFLAGS="$(CFLAGS) -fprofile-generate" $(MAKE) timing EXTRALIBS="$(EXTRALIBS) -lgcov" +diff --git a/makefile.shared b/makefile.shared +index dd575d9..c5e97af 100644 +--- a/makefile.shared ++++ b/makefile.shared +@@ -252,11 +252,11 @@ $(LIBNAME): $(OBJECTS) testprof/$(LIBTEST) + libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) + + install: $(LIBNAME) +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) +- cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install ++ install -d $(DESTDIR)$(LIBPATH) ++ cd testprof ; CFLAGS="$(CFLAGS)" VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install + libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la +- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) +- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) ++ install -d $(DESTDIR)$(INCPATH) ++ install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH) + + #This rule makes the hash program included with libtomcrypt + hashsum: library +-- + diff --git a/package/libtomcrypt/Config.in b/package/libtomcrypt/Config.in new file mode 100644 index 0000000..6678b30 --- /dev/null +++ b/package/libtomcrypt/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBTOMCRYPT + bool "libtomcrypt" + select BR2_PACKAGE_LIBTOMMATH + help + LibTomCrypt is a fairly comprehensive, modular and portable + cryptographic toolkit that provides developers with a vast array + of well known published block ciphers, one-way hash functions, + chaining modes, pseudo-random number generators, public key + cryptography and a plethora of other routines. + + http://www.libtom.net diff --git a/package/libtomcrypt/libtomcrypt.hash b/package/libtomcrypt/libtomcrypt.hash new file mode 100644 index 0000000..562016d --- /dev/null +++ b/package/libtomcrypt/libtomcrypt.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116 crypt-1.17.tar.bz2 diff --git a/package/libtomcrypt/libtomcrypt.mk b/package/libtomcrypt/libtomcrypt.mk new file mode 100644 index 0000000..073d6e7 --- /dev/null +++ b/package/libtomcrypt/libtomcrypt.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# libtomcrypt +# +################################################################################ + +LIBTOMCRYPT_VERSION = 1.17 +LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/$(LIBTOMCRYPT_VERSION) +LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.bz2 +LIBTOMCRYPT_LICENSE = WTFPL +LIBTOMCRYPT_LICENSE_FILES = LICENSE +LIBTOMCRYPT_INSTALL_STAGING = YES +LIBTOMCRYPT_DEPENDENCIES = libtommath + +define LIBTOMCRYPT_BUILD_CMDS + $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC" +endef + +define LIBTOMCRYPT_INSTALL_STAGING_CMDS + $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" NODOCS=1 install +endef + +$(eval $(generic-package))