From patchwork Thu Aug 5 17:42:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1514033 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=smtp1.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.a=rsa-sha256 header.s=20161025 header.b=VthHsUEk; dkim-atps=neutral Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GgbYX5Q3Fz9s5R for ; Fri, 6 Aug 2021 03:43:12 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8349983B09; Thu, 5 Aug 2021 17:43:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZjLK6Juat9uR; Thu, 5 Aug 2021 17:43:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7CB3F83B0A; Thu, 5 Aug 2021 17:43:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 53C481BF3D7 for ; Thu, 5 Aug 2021 17:43:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4217A60A3B for ; Thu, 5 Aug 2021 17:43:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pmu39rfQF0hQ for ; Thu, 5 Aug 2021 17:43:06 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by smtp3.osuosl.org (Postfix) with ESMTPS id D78FD60783 for ; Thu, 5 Aug 2021 17:43:05 +0000 (UTC) Received: by mail-wr1-x429.google.com with SMTP id z4so7600728wrv.11 for ; Thu, 05 Aug 2021 10:43:05 -0700 (PDT) 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=PLD1OhG9zsrNAtvtZxh5+7MM9xlqcbQ+hgCEqJdccxc=; b=VthHsUEk7+IGJZWoJ4BBEIWKU9LZAlRebgd6jwTg6kxjqMo3aKs7DawEh80S0jLLH0 z7EaX3UIE8B/mKCRw+r3fOK15KdPUNqcYfes4QfkLKLDfenwMQVHE/CYfwTVdeNpevm8 iZBfpjuY3XsqShe5NvgaA8uW2YmRei1g1AUI/MkpVdevjssPxAj/VBJh+yjY2G6FI9ic wLHBhN6OQ6mLwIocgGCjhZC9nXR1ogMlZqZPhgUE+zMdnAjjNHzStqnZIPiSkjowJ8DL WsXIhLjzLLLx/aYYouoHGLQxKhE5uc5vzZCT1S74g7HwqOMQPyBQbL/E9cHJyorzZNky qfGA== 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=PLD1OhG9zsrNAtvtZxh5+7MM9xlqcbQ+hgCEqJdccxc=; b=VedlXRUFwCavFBI7cc8bPTunQck2+JDVMzzK5LVld8YDKJr1N4533hwY1AXGK5DVxa iIsCdsDn54xJzyLi5/BU3IEQhKL34VynzGe+1431hpXS42GpGgn6KZMmSGdCwC6bjCpE z26uwWXDnYTinNEbE8Ka0fO5B4BXOrldbFh8bAZYlRoP6hdcu/X7n5Wdi07Zs7RolVjL ZAkI9BEETCYwUl+8BtkcMik7Db8lvN5eCLKCgKU07/FdSKsoZtlbtGY6jzEH6ySUkf9/ W3nr/zta/RG+LC9tTl5BWHFnTSHakn2nScd7gyjkdnSmyb+4ngkZQGXDPHmumw1iSs/e XhFw== X-Gm-Message-State: AOAM532gx4AwM7aPasm92AntYC2eoeQMrNQXTDxxTF9zOtHcZhsaBdX9 kQ1UA62p42S4EPe0HmdE3AljIKDoeTFGlQ== X-Google-Smtp-Source: ABdhPJzY+JvCtJcp590/RVWMlWVwa4GPp0MOfc/NfXamTcLtRoj7oFPggeMRPM8+SsrwrcVlEReAiA== X-Received: by 2002:adf:fe44:: with SMTP id m4mr6515742wrs.133.1628185383811; Thu, 05 Aug 2021 10:43:03 -0700 (PDT) Received: from kali.home (pop.92-184-97-187.mobile.abo.orange.fr. [92.184.97.187]) by smtp.gmail.com with ESMTPSA id w10sm6547308wrr.23.2021.08.05.10.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 10:43:03 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 5 Aug 2021 19:42:51 +0200 Message-Id: <20210805174252.2661314-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/mcrypt: drop package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop mcrypt which is not maintained anymore (no release since 2008). Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 ++ package/Config.in | 1 - package/mcrypt/0001-CVE-2012-4409.patch | 25 ------- package/mcrypt/0002-CVE-2012-4426.patch | 35 --------- package/mcrypt/0003-CVE-2012-4527.patch | 99 ------------------------- package/mcrypt/0004-no-rpath.patch | 17 ----- package/mcrypt/Config.in | 12 --- package/mcrypt/mcrypt.hash | 3 - package/mcrypt/mcrypt.mk | 24 ------ 9 files changed, 7 insertions(+), 216 deletions(-) delete mode 100644 package/mcrypt/0001-CVE-2012-4409.patch delete mode 100644 package/mcrypt/0002-CVE-2012-4426.patch delete mode 100644 package/mcrypt/0003-CVE-2012-4527.patch delete mode 100644 package/mcrypt/0004-no-rpath.patch delete mode 100644 package/mcrypt/Config.in delete mode 100644 package/mcrypt/mcrypt.hash delete mode 100644 package/mcrypt/mcrypt.mk diff --git a/Config.in.legacy b/Config.in.legacy index 54476acf9a..1d34f81815 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.08" +config BR2_PACKAGE_MCRYPT + bool "mcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2008). + config BR2_PACKAGE_PHP_EXT_MCRYPT bool "PHP mcrypt extension removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index 436bf2f56a..ab0f74b0e3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2066,7 +2066,6 @@ menu "Miscellaneous" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" source "package/linux-syscall-support/Config.in" - source "package/mcrypt/Config.in" source "package/mobile-broadband-provider-info/Config.in" source "package/netdata/Config.in" source "package/proj/Config.in" diff --git a/package/mcrypt/0001-CVE-2012-4409.patch b/package/mcrypt/0001-CVE-2012-4409.patch deleted file mode 100644 index 97c658bb2d..0000000000 --- a/package/mcrypt/0001-CVE-2012-4409.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 22 Dec 2012 22:37:06 +0200 -Subject: [PATCH] cleanup: buffer overflow - ---- - src/extra.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/extra.c b/src/extra.c -index 3082f82..c7a1ac0 100644 ---- a/src/extra.c -+++ b/src/extra.c -@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode, - if (m_getbit(6, flags) == 1) { /* if the salt bit is set */ - if (m_getbit(0, sflag) != 0) { /* if the first bit is set */ - *salt_size = m_setbit(0, sflag, 0); -+ if (*salt_size > sizeof(tmp_buf)) -+ err_quit(_("Salt is too long\n")); - if (*salt_size > 0) { - fread(tmp_buf, 1, *salt_size, - fstream); --- -1.7.8.6 - diff --git a/package/mcrypt/0002-CVE-2012-4426.patch b/package/mcrypt/0002-CVE-2012-4426.patch deleted file mode 100644 index 708d4a579e..0000000000 --- a/package/mcrypt/0002-CVE-2012-4426.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch taken from gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/src/errors.c -+++ b/src/errors.c -@@ -25,24 +25,24 @@ - - void err_quit(char *errmsg) - { -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - exit(-1); - } - - void err_warn(char *errmsg) - { - if (quiet <= 1) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_info(char *errmsg) - { - if (quiet == 0) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_crit(char *errmsg) - { - if (quiet <= 2) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } diff --git a/package/mcrypt/0003-CVE-2012-4527.patch b/package/mcrypt/0003-CVE-2012-4527.patch deleted file mode 100644 index a8cf6f449a..0000000000 --- a/package/mcrypt/0003-CVE-2012-4527.patch +++ /dev/null @@ -1,99 +0,0 @@ -Fix for CVE-2012-4527. -Authored by Attila Bogar and Jean-Michel Vourgère - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/src/mcrypt.c mcrypt-2.6.8/src/mcrypt.c ---- mcrypt-2.6.8.orig/src/mcrypt.c 2013-01-14 19:15:49.465925072 -0300 -+++ mcrypt-2.6.8/src/mcrypt.c 2013-01-14 19:28:13.711478000 -0300 -@@ -44,7 +44,9 @@ - static char rcsid[] = - "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $"; - --char tmperr[128]; -+/* Temporary error message can contain one file name and 1k of text */ -+#define ERRWIDTH ((PATH_MAX)+1024) -+char tmperr[ERRWIDTH]; - unsigned int stream_flag = FALSE; - char *keymode = NULL; - char *mode = NULL; -@@ -482,7 +484,7 @@ - #ifdef HAVE_STAT - if (stream_flag == FALSE) { - if (is_normal_file(file[i]) == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: %s is not a regular file. Skipping...\n"), - program_name, file[i]); -@@ -501,7 +503,7 @@ - dinfile = file[i]; - if ((isatty(fileno((FILE *) (stdin))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be read from a terminal.\n"), - program_name); -@@ -520,7 +522,7 @@ - einfile = file[i]; - if ((isatty(fileno((FILE *) (stdout))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be written to a terminal.\n"), - program_name); -@@ -544,7 +546,7 @@ - strcpy(outfile, einfile); - /* if file has already the .nc ignore it */ - if (strstr(outfile, ".nc") != NULL) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: file %s has the .nc suffix... skipping...\n"), - program_name, outfile); -@@ -590,10 +592,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was decrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -610,7 +612,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT decrypted successfully.\n"), - dinfile); -@@ -636,10 +638,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was encrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -655,7 +657,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT encrypted successfully.\n"), - einfile); diff --git a/package/mcrypt/0004-no-rpath.patch b/package/mcrypt/0004-no-rpath.patch deleted file mode 100644 index a0813bcf00..0000000000 --- a/package/mcrypt/0004-no-rpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch out rpath hardcoding since it completely ignores --disable-rpath -and other configure ways. - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/config.rpath mcrypt-2.6.8/config.rpath ---- mcrypt-2.6.8.orig/config.rpath 2013-01-07 13:05:22.626883480 -0300 -+++ mcrypt-2.6.8/config.rpath 2013-01-07 13:12:47.196090608 -0300 -@@ -153,7 +153,7 @@ - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec= - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken diff --git a/package/mcrypt/Config.in b/package/mcrypt/Config.in deleted file mode 100644 index e3b9541f04..0000000000 --- a/package/mcrypt/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_MCRYPT - bool "mcrypt" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBMCRYPT - select BR2_PACKAGE_LIBMHASH - help - MCrypt is a replacement for the old crypt() package and - crypt(1) command, with extensions. - It allows developers to use a wide range of encryption - functions, without making drastic changes to their code. - - http://mcrypt.sourceforge.net/ diff --git a/package/mcrypt/mcrypt.hash b/package/mcrypt/mcrypt.hash deleted file mode 100644 index c6c8871f4f..0000000000 --- a/package/mcrypt/mcrypt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 mcrypt-2.6.8.tar.gz -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/mcrypt/mcrypt.mk b/package/mcrypt/mcrypt.mk deleted file mode 100644 index a04b973750..0000000000 --- a/package/mcrypt/mcrypt.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# mcrypt -# -################################################################################ - -MCRYPT_VERSION = 2.6.8 -MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VERSION) -MCRYPT_DEPENDENCIES = libmcrypt libmhash \ - $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(TARGET_NLS_DEPENDENCIES) -MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr -MCRYPT_LICENSE = GPL-3.0 -MCRYPT_LICENSE_FILES = COPYING - -# 0001-CVE-2012-4409.patch -MCRYPT_IGNORE_CVES += CVE-2012-4409 -# 0002-CVE-2012-4426.patch -MCRYPT_IGNORE_CVES += CVE-2012-4426 -# 0003-CVE-2012-4527.patch -MCRYPT_IGNORE_CVES += CVE-2012-4527 - -$(eval $(autotools-package)) From patchwork Thu Aug 5 17:42:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1514038 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::136; helo=smtp3.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.a=rsa-sha256 header.s=20161025 header.b=DPYB5Ni8; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GgbYq6V2Nz9sRf for ; Fri, 6 Aug 2021 03:43:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 3E2C260A68; Thu, 5 Aug 2021 17:43:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wt981vmrcFgu; Thu, 5 Aug 2021 17:43:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 5EDCD60A3B; Thu, 5 Aug 2021 17:43:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D310E1BF3D7 for ; Thu, 5 Aug 2021 17:43:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C24D8405AF for ; Thu, 5 Aug 2021 17:43:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oCarXCm0yKdk for ; Thu, 5 Aug 2021 17:43:08 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp4.osuosl.org (Postfix) with ESMTPS id D79EB4056C for ; Thu, 5 Aug 2021 17:43:07 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id h13so7632966wrp.1 for ; Thu, 05 Aug 2021 10:43:07 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=JGPQeiY/VnAviA9H2KZwQ1vEhsSEnrmzmyL/mbI1PJg=; b=DPYB5Ni8c1b9R+QhdGY/hbnGJh/Rur3/UZkAyEmr+KVp1RSeAStaELEOXJCEoQOVTJ xwUPW9usAs344hibz9ZXpUNWzoWA+XROpj4EGts0eCxft7nIydwnMR1ds553M4R0Qqfi Mt060YP5bm0QU8bD7TvVGEXC0iXzDCQp8XWT5KUfbZEzSJMoPKbzOgD1f2l63uMNK8uB /kvlKSaZOqJ4c/USqMCd/I6f+emlJOnWbpbk1G/wGDkIZR/zXeqGSjZFBBL1+tkItdy2 FH4DBC62BKKxjW6O9C8XtJkOtNyw80DmzuNmI2fR4MwfF0XLPwNhpzxm300G7adhTjV3 lkqQ== 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:mime-version:content-transfer-encoding; bh=JGPQeiY/VnAviA9H2KZwQ1vEhsSEnrmzmyL/mbI1PJg=; b=f8KVX7mFqEE5v5Vgf0/GIjEActuGaX2DDrEUHBu9KCmgE5qtYz6lNRQuvzcIQDzR3+ UBDOsc5D5CtvZYuFaokngB7Y5cscKaALIOkfATS8jHZP+ZglOsDW5dBGU3vZj4oEcKPk ZSXjN4gk3bcBx4jPCn4X/eJnpj5F78Y8FBISb+Y/hMgNKDRwXoUiN4xeZ7GPccONKgYQ AYt3YKyMVU5QsiC10VIeGmhEU4P71bEL4KORbILYNr+Smpj1GZylv1m1xZf9n/QvK5BA 4nEafWUwSOV+8E4rBu1BvQytjNI8aMtxYp44nboZxTvFjNJpO5yOjOdnniQWEuhE9A/W N2KA== X-Gm-Message-State: AOAM530MndkP9/e3QIGuH4R+b/EEiP+kL+oBgUEAp3p2uUqtL65E6GdU MeY0DnlapfwYwBbtWnhtYUu4Fw0a0RLqXw== X-Google-Smtp-Source: ABdhPJwHxon4E/0zH0b5c/2m2629PoBUW6rd8T6/pPVj2seDVQC6W5Mf+p2p+oYpY8S8DhzN2f3jTQ== X-Received: by 2002:adf:f90e:: with SMTP id b14mr4267735wrr.28.1628185385902; Thu, 05 Aug 2021 10:43:05 -0700 (PDT) Received: from kali.home (pop.92-184-97-187.mobile.abo.orange.fr. [92.184.97.187]) by smtp.gmail.com with ESMTPSA id w10sm6547308wrr.23.2021.08.05.10.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Aug 2021 10:43:05 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 5 Aug 2021 19:42:52 +0200 Message-Id: <20210805174252.2661314-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210805174252.2661314-1-fontaine.fabrice@gmail.com> References: <20210805174252.2661314-1-fontaine.fabrice@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/libmcrypt: drop package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop libmcrypt which is not maintained anymore (no release since 2007). Signed-off-by: Fabrice Fontaine --- Config.in.legacy | 7 +++++++ package/Config.in | 1 - package/libmcrypt/0001-nocxx.patch | 15 --------------- package/libmcrypt/Config.in | 7 ------- package/libmcrypt/libmcrypt.hash | 3 --- package/libmcrypt/libmcrypt.mk | 15 --------------- 6 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 package/libmcrypt/0001-nocxx.patch delete mode 100644 package/libmcrypt/Config.in delete mode 100644 package/libmcrypt/libmcrypt.hash delete mode 100644 package/libmcrypt/libmcrypt.mk diff --git a/Config.in.legacy b/Config.in.legacy index 1d34f81815..b127a5b976 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2021.08" +config BR2_PACKAGE_LIBMCRYPT + bool "libmcrypt package was removed" + select BR2_LEGACY + help + This package has been removed as it is not maintained anymore + (no release since 2007). + config BR2_PACKAGE_MCRYPT bool "mcrypt package was removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index ab0f74b0e3..55f4947e65 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1376,7 +1376,6 @@ menu "Crypto" source "package/libgpgme/Config.in" source "package/libkcapi/Config.in" source "package/libksba/Config.in" - source "package/libmcrypt/Config.in" source "package/libmd/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" diff --git a/package/libmcrypt/0001-nocxx.patch b/package/libmcrypt/0001-nocxx.patch deleted file mode 100644 index b1c28713a1..0000000000 --- a/package/libmcrypt/0001-nocxx.patch +++ /dev/null @@ -1,15 +0,0 @@ -libmcrypt doesn't use C++ so remove the check. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmcrypt-2.5.8.orig/configure.in libmcrypt-2.5.8/configure.in ---- libmcrypt-2.5.8.orig/configure.in 2013-01-07 12:20:44.332200669 -0300 -+++ libmcrypt-2.5.8/configure.in 2013-01-07 12:20:50.405390565 -0300 -@@ -19,7 +19,6 @@ - - AC_PROG_MAKE_SET - --AC_PROG_CXX - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL diff --git a/package/libmcrypt/Config.in b/package/libmcrypt/Config.in deleted file mode 100644 index 784d2c2af6..0000000000 --- a/package/libmcrypt/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBMCRYPT - bool "libmcrypt" - help - libmcrypt is a library that provides uniform interface to - access several encryption algorithms. - - http://mcrypt.sourceforge.net/ diff --git a/package/libmcrypt/libmcrypt.hash b/package/libmcrypt/libmcrypt.hash deleted file mode 100644 index 30b57522b8..0000000000 --- a/package/libmcrypt/libmcrypt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e libmcrypt-2.5.8.tar.gz -sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libmcrypt/libmcrypt.mk b/package/libmcrypt/libmcrypt.mk deleted file mode 100644 index e93f0136b3..0000000000 --- a/package/libmcrypt/libmcrypt.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmcrypt -# -################################################################################ - -LIBMCRYPT_VERSION = 2.5.8 -LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION) -LIBMCRYPT_AUTORECONF = YES -LIBMCRYPT_INSTALL_STAGING = YES -LIBMCRYPT_LICENSE = LGPL-2.1 -LIBMCRYPT_LICENSE_FILES = COPYING.LIB -LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config - -$(eval $(autotools-package))