From patchwork Thu Oct 31 08:48:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 2004596 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XfHjf1pkyz1xwF for ; Thu, 31 Oct 2024 19:49:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8CE21606CF; Thu, 31 Oct 2024 08:49:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id c_okgK2oDpDo; Thu, 31 Oct 2024 08:49:16 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 40C06606C8 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 40C06606C8; Thu, 31 Oct 2024 08:49:16 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) by lists1.osuosl.org (Postfix) with ESMTP id 34BB45E4F for ; Thu, 31 Oct 2024 08:49:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1434040111 for ; Thu, 31 Oct 2024 08:49:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LyE4AiVImr5P for ; Thu, 31 Oct 2024 08:49:13 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::134; helo=mail-lf1-x134.google.com; envelope-from=dario.binacchi@amarulasolutions.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 2E70E40B1F DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2E70E40B1F Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2E70E40B1F for ; Thu, 31 Oct 2024 08:49:13 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-53b13ea6b78so1151290e87.2 for ; Thu, 31 Oct 2024 01:49:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730364551; x=1730969351; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TtaEPLVGfDlP7FjzRTwJ6c7mpsUQ0t9fq0/3ehv/9uc=; b=jzbJpq2RLRvxpiNeYYPi4JFghZ/RLFkoTKxUo6TwcC3CDNQhkQ6k8QzrnZH2XImhaM Egs+MRnUDI3qq7mqjf5CxCTN+UDFwz2NVoceeBdM2AxYICaEGu3B/hvirMmIulCuYoUB DpnpXbcHjSsLpW5ehwOS4ORC/55NNufLlYKKg1s8thJhRw6P6o1yjV8PFAiBdKTJe5Mb dDauQk6tuVruK5Yq7j2tslahREfKbVeKklWC0uG7cR3oLraoRQSXT71Ls2m5l6fA4v2s kJ+Kgg1ss4Fs3uFkR7Y9qisI6izqLih7J2IhurBKcGbfYeiAC1Obv0TteAmaXtSzm1T8 ZujA== X-Gm-Message-State: AOJu0Yxes9VX1DPdmJehlcxjmINzYonZnp5CB3kzungY3Jss4IYDHGW5 TBB5kT4RLyNrPsjVZgYazOdRojxEDVH3+/6k7+DI5V69QG8vz7U6vQJSWKv/x8pb1AZMKwAH7zS L X-Google-Smtp-Source: AGHT+IF4OIZvzMEXXnJuLqSJJ8bid5QgXeB4yxfnZr1ev9IHo1voRYwRsv//ygFQ6G7zBYhaOX6r6w== X-Received: by 2002:a05:6512:a93:b0:535:6925:7a82 with SMTP id 2adb3069b0e04-53b3491e2c7mr15671931e87.41.1730364550750; Thu, 31 Oct 2024 01:49:10 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.. ([2.196.40.36]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9e565df8f6sm42638666b.140.2024.10.31.01.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Oct 2024 01:49:10 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Thomas Petazzoni , Dario Binacchi Date: Thu, 31 Oct 2024 09:48:40 +0100 Message-ID: <20241031084852.634238-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1730364551; x=1730969351; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=TtaEPLVGfDlP7FjzRTwJ6c7mpsUQ0t9fq0/3ehv/9uc=; b=NYI3Wq27+uXbDOwbLhPNbMWoS4lNBdI4c+e0xa6VU/PRllxVA8peqDCFgcZ+qbxRvY NJZX5HL9FgxKHNN5IRTYwcdsv6JyaNesBFe9+qN2B2sJn9D5+Pp2lEwA6gsMZSGDDzXR DAeJ/KmrYravmQeWDqP2Kp5klOtorwaK8tD1g= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=NYI3Wq27 Subject: [Buildroot] [PATCH 1/1] package/bsdiff: drop package X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" As advocated by Thomas Petazzoni [1], drop bsdiff as it is not maintained anymore. Meanwhile, autobuild also detected that the package was no longer downloadable from the URL, and indeed, Colin Percival, the maintainer, confirmed that he intentionally disabled the package download due to the presence of some security bugs that he doesn't have time to fix. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20241004215451.1198861-2-dario.binacchi@amarulasolutions.com/ Fixes: - http://autobuild.buildroot.org/results/21bb827d3dbf553c79f49d7c184099c75df3d45d Suggested-by: Thomas Petazzoni Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - Config.in.legacy | 7 +++++ package/Config.in | 1 - .../0001-Add-missing-header-for-u_char.patch | 17 ------------ package/bsdiff/Config.in | 8 ------ package/bsdiff/bsdiff.hash | 4 --- package/bsdiff/bsdiff.mk | 26 ------------------- 7 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 package/bsdiff/0001-Add-missing-header-for-u_char.patch delete mode 100644 package/bsdiff/Config.in delete mode 100644 package/bsdiff/bsdiff.hash delete mode 100644 package/bsdiff/bsdiff.mk diff --git a/.checkpackageignore b/.checkpackageignore index 91e31eebc58b..eceea28f0c54 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -335,7 +335,6 @@ package/brickd/S70brickd Shellcheck lib_sysv.Indent lib_sysv.Variables package/bridge-utils/0001-fix-build-on-musl.patch lib_patch.Upstream package/brltty/0001-Fix-linking-error-on-mips64el.patch lib_patch.Upstream package/brltty/S10brltty Shellcheck lib_sysv.Indent lib_sysv.Variables -package/bsdiff/0001-Add-missing-header-for-u_char.patch lib_patch.Upstream package/bustle/0001-Makefile-fix-pcap-config-call.patch lib_patch.Upstream package/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch lib_patch.Upstream package/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 30179add233b..63360b42b878 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.11" +config BR2_PACKAGE_BSDIFF + bool "bsdiff has been removed" + select BR2_LEGACY + help + The bsdiff package was removed as it is not maintained + anymore (no commit since 2014). + config BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP bool "BR2_PACKAGE_PROCPS_NS_ORIGINAL_TOP has been renamed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index b1e999a63b18..876b340a8a67 100644 --- a/package/Config.in +++ b/package/Config.in @@ -172,7 +172,6 @@ menu "Development tools" source "package/bats-core/Config.in" source "package/binutils/Config.in" source "package/bitwise/Config.in" - source "package/bsdiff/Config.in" source "package/bustle/Config.in" source "package/check/Config.in" source "package/cmake/Config.in" diff --git a/package/bsdiff/0001-Add-missing-header-for-u_char.patch b/package/bsdiff/0001-Add-missing-header-for-u_char.patch deleted file mode 100644 index 56affb4102ce..000000000000 --- a/package/bsdiff/0001-Add-missing-header-for-u_char.patch +++ /dev/null @@ -1,17 +0,0 @@ -bspatch: Fix missing header for u_char - -Fixes http://autobuild.buildroot.net/results/31a/31a837cf6e34b02dce498f2b12e40d6d16a5a8e6/ - -Signed-off-by: Jörg Krause - -diff -purN bsdiff-4.3.orig/bspatch.c bsdiff-4.3/bspatch.c ---- bsdiff-4.3.orig/bspatch.c 2015-04-30 13:47:26.485903359 +0200 -+++ bsdiff-4.3/bspatch.c 2015-04-30 13:48:14.808908672 +0200 -@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/b - #include - #include - #include -+#include - - static off_t offtin(u_char *buf) - { diff --git a/package/bsdiff/Config.in b/package/bsdiff/Config.in deleted file mode 100644 index 11fd8b9d3523..000000000000 --- a/package/bsdiff/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BSDIFF - bool "bsdiff" - select BR2_PACKAGE_BZIP2 - help - Binary patch/diff like xdelta but creates smaller diffs. - Needs bzip2 support. - - http://www.daemonology.net/bsdiff/ diff --git a/package/bsdiff/bsdiff.hash b/package/bsdiff/bsdiff.hash deleted file mode 100644 index 102086b9fc04..000000000000 --- a/package/bsdiff/bsdiff.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.daemonology.net/bsdiff/: -md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz -# locally computed -sha256 fc0a6e634ef77dcf14bf36c7b6d1e57ba1ac5c4809073dfaacb3b5f7ab277eb7 bsdiff.c diff --git a/package/bsdiff/bsdiff.mk b/package/bsdiff/bsdiff.mk deleted file mode 100644 index 97a1b3921df4..000000000000 --- a/package/bsdiff/bsdiff.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# bsdiff -# -################################################################################ - -BSDIFF_VERSION = 4.3 -BSDIFF_SITE = http://www.daemonology.net/bsdiff -BSDIFF_DEPENDENCIES = bzip2 -BSDIFF_LICENSE = BSD-2-Clause -BSDIFF_LICENSE_FILES = bsdiff.c -BSDIFF_CPE_ID_VENDOR = daemonology - -define BSDIFF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bspatch.c -lbz2 -o $(@D)/bspatch -endef - -define BSDIFF_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff - $(INSTALL) -D -m 755 $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch -endef - -$(eval $(generic-package))