From patchwork Wed Nov 8 13:04:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 835801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WZSi++MC"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yX63g4NKZz9sP9 for ; Thu, 9 Nov 2017 00:05:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CB623886B1; Wed, 8 Nov 2017 13:05:30 +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 HenHraEBf8h4; Wed, 8 Nov 2017 13:05:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CD7E48A570; Wed, 8 Nov 2017 13:05:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id DB9251BFBD2 for ; Wed, 8 Nov 2017 13:05:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D2BF28923E for ; Wed, 8 Nov 2017 13:05:25 +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 7hq8zkSQRwfF for ; Wed, 8 Nov 2017 13:05:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f193.google.com (mail-io0-f193.google.com [209.85.223.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B12868923C for ; Wed, 8 Nov 2017 13:05:24 +0000 (UTC) Received: by mail-io0-f193.google.com with SMTP id p186so5824830ioe.12 for ; Wed, 08 Nov 2017 05:05:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=69c+xqd6kwPCfg3vjP/3gGCHDsz6qMLLW1cNfXnQHSE=; b=WZSi++MCi6KZwqYevtAgArcWuiVnBzI3zlwRKmrsxYqAetmrQylYog1O8TkfoL6uOe DGXFEISjmoKsAPHVeOWoFlEQpbF4jzeYwrOGj1GtuFtRChsp9BMIOqSPcPMm9gQPalWD 3GrZwX1xO6/bIFPjFLY4ftpQhHyYL+UTbkbgMGMNf+80BlDkUtBMuOH81R5em4FxyymM KPHPKOJIDXHHCOvinwZWpd9hidUKf2wgwm0z6+HO6R4dY0srrJnFxQbS/o0eN/35uH3y RAXNR2H8HsUpG2iWj4C6WIiDnl3hORtNUUb0wHKMu+h4IDFb0UW6Qj6f9BYzfXlZGMpn 1rmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=69c+xqd6kwPCfg3vjP/3gGCHDsz6qMLLW1cNfXnQHSE=; b=SLQVAtWi4nmCgbqWwxwEuxfEi6IA+B18mUEN2bJBGRO37pWA8s9hhZvo745dL3VpSu Hku5hHWC+CamJoP1Fbyn6hSDcfaaTvjczkIrG8NjshciEUwvPfQkgxEly+6bLFE8Hf+M rvmnID6G54TDtWGYO2w2hktS3yq4NkhPWQiMtaeqxWhuohRIxiQvLDtdzcBHeZx6O9g3 SxYBWpRclWoFCV2iScAuUeN2c0liSWJe2dghwfWY/sZSg+kTMID4e9F5Wr7I9omGfKc8 RNqmaLz4kENbhH/MiaZSGoeKNTRWa+FX4dQmCCRED9fBA8bjg68oY+CormWZdtSYtbI6 vXHA== X-Gm-Message-State: AJaThX68+BuaMosCphGScqON2KN6YbRr6yXe4xrwvAWaRLPGlv2WER62 UJUxfCoAYPGLIri11dWHxd4BBXmn X-Google-Smtp-Source: ABhQp+RhLuE4QL6IvI7EKhHHA9hP2o4VhwOQf6ls9cnz6Xh62TJrNn55n3DJkqL5vaRBeMzAN/GlZw== X-Received: by 10.107.47.69 with SMTP id j66mr518958ioo.244.1510146323567; Wed, 08 Nov 2017 05:05:23 -0800 (PST) Received: from localhost.localdomain (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id y198sm1898431iod.50.2017.11.08.05.05.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Nov 2017 05:05:22 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 8 Nov 2017 08:04:58 -0500 Message-Id: <20171108130459.25412-1-aduskett@gmail.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] openntpd: update to 6.2p3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Other changes: - Remove upstream patch. - change locally computed hash to hash from the SHA256 URL. - Add sha256sum for license file. Signed-off-by: Adam Duskett --- ...-Revert-use-__dead-macro-from-sys-cdefs.h.patch | 91 ---------------------- .../{0002-fix-musl.patch => 0001-fix-musl.patch} | 0 package/openntpd/openntpd.hash | 5 +- package/openntpd/openntpd.mk | 2 +- 4 files changed, 5 insertions(+), 93 deletions(-) delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%) diff --git a/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch b/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch deleted file mode 100644 index 418f7a2098..0000000000 --- a/package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 17aa5d98191c4dc85d0645443fc97a12601ae8da Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 26 Sep 2017 14:55:31 +0300 -Subject: [PATCH] Revert "use __dead macro from sys/cdefs.h" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This partially reverts commit a7577667d673f49800e15461fe384817a1572eae. - -The musl C library does not use an internal cdefs.h header. As a result, -the definitions in sys/cdefs.h have no effect. This breads the build as -follows: - -In file included from adjfreq_linux.c:23:0: -../src/ntpd.h:448:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’ - __dead void fatal(const char *, ...) - ^~~~ -../src/ntpd.h:450:8: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘void’ - __dead void fatalx(const char *, ...) - ^~~~ - -Refer the related musl FAQ about cdefs.h: - - http://wiki.musl-libc.org/wiki/FAQ#Q:_I.27m_trying_to_compile_something_against_musl_and_I_get_error_messages_about_sys.2Fcdefs.h - -Keep the compiler attribute definition. - -Remove also from noinst_HEADERS. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/openntpd-portable/openntpd-portable/pull/45 - - include/Makefile.am | 1 - - include/sys/cdefs.h | 16 ---------------- - include/sys/types.h | 4 ++++ - 3 files changed, 4 insertions(+), 17 deletions(-) - delete mode 100644 include/sys/cdefs.h - -diff --git a/include/Makefile.am b/include/Makefile.am -index a552026e8f25..3a5a01620d82 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -1,6 +1,5 @@ - noinst_HEADERS = - noinst_HEADERS += machine/endian.h --noinst_HEADERS += sys/cdefs.h - noinst_HEADERS += sys/queue.h - noinst_HEADERS += sys/socket.h - noinst_HEADERS += sys/types.h -diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h -deleted file mode 100644 -index 3dec43deec28..000000000000 ---- a/include/sys/cdefs.h -+++ /dev/null -@@ -1,16 +0,0 @@ --/* -- * Public domain -- * sys/cdefs.h compatibility shim -- */ -- --#include_next -- --#ifndef LIBCOMPAT_SYS_CDEFS_H --#define LIBCOMPAT_SYS_CDEFS_H -- --#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) --#define __dead __attribute__((__noreturn__)) --#define __pure __attribute__((__const__)) --#endif -- --#endif -diff --git a/include/sys/types.h b/include/sys/types.h -index 56aef0b61af8..86821c732ec3 100644 ---- a/include/sys/types.h -+++ b/include/sys/types.h -@@ -14,6 +14,10 @@ - #include <_bsd_types.h> - #endif - -+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead) -+#define __dead __attribute__((__noreturn__)) -+#endif -+ - #if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__) - # define __bounded__(x, y, z) - #endif --- -2.14.1 - diff --git a/package/openntpd/0002-fix-musl.patch b/package/openntpd/0001-fix-musl.patch similarity index 100% rename from package/openntpd/0002-fix-musl.patch rename to package/openntpd/0001-fix-musl.patch diff --git a/package/openntpd/openntpd.hash b/package/openntpd/openntpd.hash index 1a73e8dc0b..4d00b7bb9d 100644 --- a/package/openntpd/openntpd.hash +++ b/package/openntpd/openntpd.hash @@ -1,2 +1,5 @@ +# from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256 +sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a openntpd-6.2p3.tar.gz + # Locally computed -sha256 5808a4137b008a4db20907e1a482f474734b120f254e3c5feb90db15e0820fb2 openntpd-6.2p2.tar.gz +sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index 308a1b1258..b5a2559008 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENNTPD_VERSION = 6.2p2 +OPENNTPD_VERSION = 6.2p3 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause OPENNTPD_LICENSE_FILES = COPYING From patchwork Wed Nov 8 13:04:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 835802 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ND1Vq5c1"; dkim-atps=neutral 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 3yX63p4BCKz9sMN for ; Thu, 9 Nov 2017 00:05:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BA4BC89DE0; Wed, 8 Nov 2017 13:05:38 +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 9eIJivTzTYi8; Wed, 8 Nov 2017 13:05:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7373789DAC; Wed, 8 Nov 2017 13:05:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 9F4C91BFBD2 for ; Wed, 8 Nov 2017 13:05:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9B5432FCAA for ; Wed, 8 Nov 2017 13:05:34 +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 2HgzvUxkEBZX for ; Wed, 8 Nov 2017 13:05:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by silver.osuosl.org (Postfix) with ESMTPS id A72402CF0A for ; Wed, 8 Nov 2017 13:05:33 +0000 (UTC) Received: by mail-io0-f194.google.com with SMTP id h70so5845156ioi.4 for ; Wed, 08 Nov 2017 05:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CWNTVbEIFOKO4l92ryQE6UvMoVkM1FRUPffr3SBuvGw=; b=ND1Vq5c1W2Xq9JQ8tEQGmXYn/yVpoPx+IjGmS9wTe1LvZ0XJbeIFDahAFqwUEsPofI GgumP4wlRjj4waFQbzdoRQDhGihvgSqPZBMcW/76Ie3ZP6jSqwfkhQ9NlBCdvRilmmzW nX6wXNPgTxozTEYfJ4ZnIffqyTrJhAbV32yhF0Wjja4kCNryX1v5KOUaz4b4+X1CppF+ sHbZu+ERnJIm+OIoxTeiuOPS9QwLDi+kLyaTlpUgA1MT4R7nqfM17WGEEviDwH0Cu4yR 9F7fTCZZHN82WESyqs51mLTa7gocHKLmkKF58qtUn13iRGLfPA7IPRrSMy93/Bdb7zH6 bNSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CWNTVbEIFOKO4l92ryQE6UvMoVkM1FRUPffr3SBuvGw=; b=o2vW/KeK3pVTkg0yFAZOB+NqjaZ8M2bT0GPIi9sDbY8dX+5PLh6DzMLMplvd3TSSzf msCudc7QhWJ76+zmu3IzpicYWqWtIuBphrT1C6zbuX7SRLG0047maYOAAJe/VSna7gYM vTvRsLJmVawUUis5t5CwN5pfp5cCX1s99zugKitDDsRe1/DUIMTLPLhqdOGDf1YDPnAj xcuypF9xjqdtc0XxwxCafeS+QxU/jogKoLWjSkVPE+MYU5znbpbuQN8cHzNqrlV5IIlm 5rJoS8uGH9DiLJlsD/S5ee3D+kxCqE9MDBnMfazOvsUX3kpPB1SPpfSjq4Azn2XrQl+W qLrQ== X-Gm-Message-State: AJaThX4EfdgqQ+zsIKN1ku6LTGjMVhKcm0vaseb3tLk0/9dFzbOZHE9Q Qsrplqdkbj/dObV5zNJJuSKC8gVs X-Google-Smtp-Source: AGs4zMbCbVhUno/yir7lrlamFw8oBuWkIzQ27I82RknJVRgy+nLbIB6C4Y772OTHL3YPuMQL0fEqqw== X-Received: by 10.107.40.68 with SMTP id o65mr552991ioo.120.1510146332558; Wed, 08 Nov 2017 05:05:32 -0800 (PST) Received: from localhost.localdomain (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id y198sm1898431iod.50.2017.11.08.05.05.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Nov 2017 05:05:31 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Wed, 8 Nov 2017 08:04:59 -0500 Message-Id: <20171108130459.25412-2-aduskett@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171108130459.25412-1-aduskett@gmail.com> References: <20171108130459.25412-1-aduskett@gmail.com> Subject: [Buildroot] [PATCH 2/2] openntpd: add check for LibreSSL. X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Openntp looks for a crypto library with tls_config_set_ca_mem, which is available in LibreSSL but not OpenSSL. If tls_config_set_ca_mem is found, crypto support is added to the build. Because this is not currently checked, crypto support might not be added due to the order of the build. Add a small check to see if BR2_PACKAGE_LIBRESSL is selected, and if so, add a dependency for it. Also add a note about this in the Config.in help section. Signed-off-by: Adam Duskett --- package/openntpd/Config.in | 3 +++ package/openntpd/openntpd.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in index 1b856c03b8..5f8c9e8549 100644 --- a/package/openntpd/Config.in +++ b/package/openntpd/Config.in @@ -9,6 +9,9 @@ config BR2_PACKAGE_OPENNTPD to remote NTP servers and can act as NTP server itself, redistributing the local clock. It just works. + Note: Cryto support is only available with the LibreSSL ssl + library. + http://www.openntpd.org/ comment "openntpd needs a toolchain w/ NPTL" diff --git a/package/openntpd/openntpd.mk b/package/openntpd/openntpd.mk index b5a2559008..d53eed29de 100644 --- a/package/openntpd/openntpd.mk +++ b/package/openntpd/openntpd.mk @@ -11,6 +11,12 @@ OPENNTPD_LICENSE_FILES = COPYING # Patching include/Makefile.am OPENNTPD_AUTORECONF = YES +# Openntpd searches for tls_config_set_ca_mem which is only available +# in LibreSSL +ifeq ($(BR2_PACKAGE_LIBRESSL),y) +OPENNTPD_DEPENDENCIES += openssl +endif + # openntpd uses pthread functions for arc4random emulation but forgets # to use -pthread OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread"