From patchwork Sun Nov 5 16:22:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Zwing?= X-Patchwork-Id: 834361 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=dawncrow.de header.i=@dawncrow.de header.b="zIlkTl/1"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yVLZd4dfFz9t1G for ; Mon, 6 Nov 2017 03:22:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C50962F234; Sun, 5 Nov 2017 16:22:46 +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 4UK-zZIjxBfy; Sun, 5 Nov 2017 16:22:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 0F9512E967; Sun, 5 Nov 2017 16:22:45 +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 D08381C21E2 for ; Sun, 5 Nov 2017 16:22:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CC00A8815C for ; Sun, 5 Nov 2017 16:22:43 +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 qiaKxrrSixql for ; Sun, 5 Nov 2017 16:22:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.161]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 99CBD8813F for ; Sun, 5 Nov 2017 16:22:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1509898958; s=domk; d=dawncrow.de; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Date:Subject:To: From; bh=aYE71VQn4uWuofXMszt5ZbUXfcyiPFvrQGYIcgly2AY=; b=zIlkTl/13IcRt0BaXGY+WLRVI40WQK6o16VXz/jnYP6BvYLEIp+dtixHWdcLYTIALe iWJbPmpdg9m6R5UpvJzJoB29VZbcr89i+etNwCgtEmoNURZQ9h0yn7NVOdO0lPKBq4VS 23WOAbxMe7gzlwdcqeebmV/mQ4foWbZsbM2uU= X-RZG-AUTH: :ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZmAjYK0yNZLTB/MvFIxHCMtY9Cz0MN6dAjZYg== X-RZG-CLASS-ID: mo00 Received: from tesla.fritz.box ([93.113.209.81]) by smtp.strato.de (RZmta 42.8 AUTH) with ESMTPSA id x07bcatA5GMcXFN (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Sun, 5 Nov 2017 17:22:38 +0100 (CET) From: =?utf-8?q?Andr=C3=A9_Hentschel?= To: buildroot@buildroot.org Date: Sun, 5 Nov 2017 17:22:34 +0100 Message-Id: <1509898955-17124-1-git-send-email-nerv@dawncrow.de> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] libkrb5: New package 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: André Hentschel --- DEVELOPERS | 1 + package/Config.in | 1 + package/libkrb5/0001-cross-compile.patch | 39 ++++++++++++++++++++++++++++++++ package/libkrb5/Config.in | 11 +++++++++ package/libkrb5/libkrb5.hash | 2 ++ package/libkrb5/libkrb5.mk | 16 +++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 package/libkrb5/0001-cross-compile.patch create mode 100644 package/libkrb5/Config.in create mode 100644 package/libkrb5/libkrb5.hash create mode 100644 package/libkrb5/libkrb5.mk diff --git a/DEVELOPERS b/DEVELOPERS index c651bf2..b43d867 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -101,6 +101,7 @@ F: package/ktap/ N: André Hentschel F: package/azure-iot-sdk-c/ +F: package/libkrb5/ F: package/openal/ F: package/p7zip/ F: package/wine/ diff --git a/package/Config.in b/package/Config.in index fe5ccc4..c37ff1b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1345,6 +1345,7 @@ menu "Networking" source "package/libhttpparser/Config.in" source "package/libidn/Config.in" source "package/libiscsi/Config.in" + source "package/libkrb5/Config.in" source "package/libldns/Config.in" source "package/libmaxminddb/Config.in" source "package/libmbus/Config.in" diff --git a/package/libkrb5/0001-cross-compile.patch b/package/libkrb5/0001-cross-compile.patch new file mode 100644 index 0000000..13a29bb --- /dev/null +++ b/package/libkrb5/0001-cross-compile.patch @@ -0,0 +1,39 @@ +Add sane assumptions about cross-compiling + +Signed-off-by: André Hentschel + +diff --git a/src/aclocal.m4 b/src/aclocal.m4 +index 9c46da4..eb1a8a6 100644 +--- a/src/aclocal.m4 ++++ b/src/aclocal.m4 +@@ -729,7 +729,7 @@ AC_TRY_RUN([ + #include + regex_t x; regmatch_t m; + int main() { return regcomp(&x,"pat.*",0) || regexec(&x,"pattern",1,&m,0); } +-], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no, AC_MSG_ERROR([Cannot test regcomp when cross compiling]))]) ++], ac_cv_func_regcomp=yes, ac_cv_func_regcomp=no, AC_MSG_WARN([Cannot test regcomp when cross compiling]); ac_cv_func_regcomp=yes)]) + AC_MSG_RESULT($ac_cv_func_regcomp) + test $ac_cv_func_regcomp = yes && AC_DEFINE(HAVE_REGCOMP,1,[Define if regcomp exists and functions]) + dnl +@@ -1593,7 +1593,7 @@ void foo2() __attribute__((destructor)); + void foo2() { unlink("conftest.2"); } + int main () { return 0; }], + [test -r conftest.1 || a=yes +-test -r conftest.2 || b=yes], , AC_MSG_ERROR(Cannot test for constructor/destructor support when cross compiling)) ++test -r conftest.2 || b=yes], , AC_MSG_WARN(Cannot test for constructor/destructor support when cross compiling); a=yes; b=yes) + case $krb5_cv_host in + *-*-aix4.*) + # Under AIX 4.3.3, at least, shared library destructor functions +diff --git a/src/configure.in b/src/configure.in +index 037c9f3..e6990c0 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -892,7 +892,7 @@ int main () { + }], + ac_cv_printf_positional=yes, + ac_cv_printf_positional=no, +- AC_MSG_ERROR([Cannot test for printf positional argument support when cross compiling]))]) ++ AC_MSG_WARN([Cannot test for printf positional argument support when cross compiling]); ac_cv_printf_positional=yes)]) + # Nothing for autoconf.h for now. + AC_MSG_RESULT($ac_cv_printf_positional) + diff --git a/package/libkrb5/Config.in b/package/libkrb5/Config.in new file mode 100644 index 0000000..b2cb873 --- /dev/null +++ b/package/libkrb5/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBKRB5 + bool "libkrb5" + help + Kerberos is a system for authenticating users and services + on a network. Kerberos is a trusted third-party service. + That means that there is a third party (the Kerberos server) + that is trusted by all the entities on the network + (users and services, usually called "principals"). + This is the MIT reference implementation of Kerberos V5. + + https://web.mit.edu/kerberos/ diff --git a/package/libkrb5/libkrb5.hash b/package/libkrb5/libkrb5.hash new file mode 100644 index 0000000..4ba59fa --- /dev/null +++ b/package/libkrb5/libkrb5.hash @@ -0,0 +1,2 @@ +# Locally calculated after checking pgp signature +sha256 1639e392edf25e3b6cfec2ae68f97eb53e07c2dbe74bfeede0108465d5d1c87e krb5-1.15.2.tar.gz diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk new file mode 100644 index 0000000..84ded3c --- /dev/null +++ b/package/libkrb5/libkrb5.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libkrb5 +# +################################################################################ + +LIBKRB5_VERSION = 1.15.2 +LIBKRB5_SITE = https://web.mit.edu/kerberos/dist/krb5/1.15 +LIBKRB5_SOURCE = krb5-$(LIBKRB5_VERSION).tar.gz +LIBKRB5_SUBDIR = src +LIBKRB5_LICENSE = MIT +LIBKRB5_LICENSE_FILES = NOTICE +LIBKRB5_INSTALL_STAGING = YES +LIBKRB5_AUTORECONF = YES + +$(eval $(autotools-package)) From patchwork Sun Nov 5 16:22:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Zwing?= X-Patchwork-Id: 834360 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=dawncrow.de header.i=@dawncrow.de header.b="i3/yc/Z/"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yVLZc1mRGz9sPt for ; Mon, 6 Nov 2017 03:22:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 83E97881B5; Sun, 5 Nov 2017 16:22:45 +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 o3RyU4vYYF3t; Sun, 5 Nov 2017 16:22:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A7D888143; Sun, 5 Nov 2017 16:22:43 +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 5F7741C21E2 for ; Sun, 5 Nov 2017 16:22:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 52D5788D28 for ; Sun, 5 Nov 2017 16:22:42 +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 CdOSoJKxjzyE for ; Sun, 5 Nov 2017 16:22:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.160]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5E80C88CE2 for ; Sun, 5 Nov 2017 16:22:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1509898958; s=domk; d=dawncrow.de; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Date:Subject:To:From; bh=bjxFzXFS6Vf2PhJuJWS0rMuCIBDV3pVByKVztkr1KrE=; b=i3/yc/Z/zGhqQSS2wynp69As4MV/2pst9r7qiYOUPUvfWC7jdsdv66pbvUPgufWdr7 bhPkO4J4Lj/vlNeKOnt4UkdTIeIYgBhTsUZS8wvIF9p4XziM3hvccoJm2A7UoIu2bvwf fC00z2g8IYDcADcR13x8q7EkHIgI8lQK/ugDc= X-RZG-AUTH: :ImkWY2CseuihIZy6ZWWciR6unPhpN+aXzZmAjYK0yNZLTB/MvFIxHCMtY9Cz0MN6dAjZYg== X-RZG-CLASS-ID: mo00 Received: from tesla.fritz.box ([93.113.209.81]) by smtp.strato.de (RZmta 42.8 AUTH) with ESMTPSA id x07bcatA5GMcXFO (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Sun, 5 Nov 2017 17:22:38 +0100 (CET) From: =?utf-8?q?Andr=C3=A9_Hentschel?= To: buildroot@buildroot.org Date: Sun, 5 Nov 2017 17:22:35 +0100 Message-Id: <1509898955-17124-2-git-send-email-nerv@dawncrow.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1509898955-17124-1-git-send-email-nerv@dawncrow.de> References: <1509898955-17124-1-git-send-email-nerv@dawncrow.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] squid: Add libkrb5 dependency check 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: André Hentschel --- package/squid/squid.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index d334d14..3b3649a 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ --enable-removal-policies="lru,heap" \ --with-filedescriptors=1024 \ --disable-ident-lookups \ - --without-mit-krb5 \ --enable-auth-basic="fake getpwnam" \ --enable-auth-digest="file" \ --enable-auth-negotiate="wrapper" \ @@ -50,6 +49,13 @@ else SQUID_CONF_ENV += squid_cv_gnu_atomics=no endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +SQUID_CONF_OPTS += --without-krb5 +SQUID_DEPENDENCIES += libkrb5 +else +SQUID_CONF_OPTS += --without-mit-krb5 +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPTS += --with-openssl SQUID_DEPENDENCIES += openssl