From patchwork Sun Dec 26 14:52:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1573227 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.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=20210112 header.b=TsDw3RhM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JMP1S6jcnz9ssD for ; Mon, 27 Dec 2021 01:53:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 89BE960ACD; Sun, 26 Dec 2021 14:53:14 +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 piGN-9ZzOnIh; Sun, 26 Dec 2021 14:53:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 70FDE60B8C; Sun, 26 Dec 2021 14:53:12 +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 0B7E21BF2F4 for ; Sun, 26 Dec 2021 14:53:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 08E2240895 for ; Sun, 26 Dec 2021 14:53:11 +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 EmRhy0V4YcjQ for ; Sun, 26 Dec 2021 14:53:07 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3FA78404CA for ; Sun, 26 Dec 2021 14:53:07 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id s1so27342159wra.6 for ; Sun, 26 Dec 2021 06:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j1cKR69oFr5LPM7pnxrLQm/x9MCY9dseQLgQG3oS8yA=; b=TsDw3RhMk17iUFa5l4rkSizCe1q0/EaE2U03ZTvt1adfB/ISob5xDwbLJ3Ngy7pJl6 EW98GjvZ55WgsF0/mgp9Rec9UlEVQw1TTYjBKMlKcnYlZzoNc/rPRxXNukVQRLvXQgDk R0mH6HawrKea9xlg6wKSiNAJVdXgnj2ctN/XpkBJ2ljhvkJL19NSL5JjcUrXUw8pwigj v2IuCmuQe+7FHTEKEgMEpMqJtQvBenxsAhZ3sBsO2rTvaHOL4E8yjlf/QI4Ypw7Ks8nX 0jhV46NcENqtezE2PoC+YNz7FSS9SoEpg3d7UYC9gKKKKcuJX/RbeeMqZZ8ZY7ByU+xe a9/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=j1cKR69oFr5LPM7pnxrLQm/x9MCY9dseQLgQG3oS8yA=; b=DKY4hh5EDU3ky0b6wrEmdfxjxKCMOvvrnIV9p1v+YfiyhUIW1F1Lk2LFtgdIWncKdG B03fGUQQuIdWkZF137K7sIpSrMmpJtcXyJqTdlybNe9IOKf4bGUU6cppG+eslkJu2TSE Z3O7i6+Gj6JDJJ57n/i1pHqL5maMp91+ChnOzNNJheA3vfEhUeJEe8Fq1kHMcTu6kSxx 5ekuW+KLhkLkj7Xnps0cz/aH3aUABFEDrNDTwHk3aE4u7b4dVsRlYrBD4Cz8/2yTnDHc NL6ARGdXWK1jpESUtRoWkaJcPSq6s7FpTieEYyKUrZ1fq/6uW65n22cDH6t1IxPbpWSo LoKg== X-Gm-Message-State: AOAM5338K5MK2f/u6OVBqfp5FH0bUgkmSUXNrWPnC3IaC8wX94S4jzpz HeSAYFJ5j0bc1ETdQ2AJsO0Np3Bmvpidlw== X-Google-Smtp-Source: ABdhPJzX+oQ/TuFMaDQTMHUuIh8R2eW7A2nmNtAU7jaMpuOJQmyQDH5E7OYdhYAdtEPgGS5q54WXgg== X-Received: by 2002:a05:6000:1548:: with SMTP id 8mr9540061wry.489.1640530385120; Sun, 26 Dec 2021 06:53:05 -0800 (PST) Received: from kali.home (lfbn-ren-1-2129-201.w92-167.abo.wanadoo.fr. [92.167.208.201]) by smtp.gmail.com with ESMTPSA id s1sm15985888wmh.35.2021.12.26.06.53.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Dec 2021 06:53:04 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 26 Dec 2021 15:52:18 +0100 Message-Id: <20211226145218.672996-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/fakeroot: bump to version 1.26 X-BeenThere: buildroot@buildroot.org 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@buildroot.org Sender: "buildroot" - Drop first patch (not needed anymore) - Drop second to fifth patches (already in version) - Drop autoreconf https://salsa.debian.org/clint/fakeroot/-/blob/debian/1.26-1/debian/changelog Signed-off-by: Fabrice Fontaine --- package/fakeroot/0001-skip-doc-subdirs.patch | 14 ---- ...fine-_STAT_VER-if-not-already-define.patch | 45 ----------- ...d-wrappers-for-new-glibc-2.33-symbol.patch | 80 ------------------- ....ac-fix-__xmknod-at-pointer-argument.patch | 66 --------------- .../0005-fix-build-regression-on-macOS.patch | 63 --------------- package/fakeroot/fakeroot.hash | 4 +- package/fakeroot/fakeroot.mk | 6 +- 7 files changed, 4 insertions(+), 274 deletions(-) delete mode 100644 package/fakeroot/0001-skip-doc-subdirs.patch delete mode 100644 package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch delete mode 100644 package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch delete mode 100644 package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch delete mode 100644 package/fakeroot/0005-fix-build-regression-on-macOS.patch diff --git a/package/fakeroot/0001-skip-doc-subdirs.patch b/package/fakeroot/0001-skip-doc-subdirs.patch deleted file mode 100644 index 91663fb64d..0000000000 --- a/package/fakeroot/0001-skip-doc-subdirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -For some reason, version 1.25 and up is missing all localized doc, -and thus fails on the install stage. - -Skip the directories. - -Signed-off-by: Norbert Lange ---- fakeroot-1.25.1.org/doc/Makefile.am 2020-09-22 23:52:20.000000000 +0200 -+++ fakeroot-1.25.1/doc/Makefile.am 2020-09-24 11:05:27.611298673 +0200 -@@ -1,5 +1,4 @@ - AUTOMAKE_OPTIONS=foreign --SUBDIRS = de es fr nl pt sv - - man_MANS = faked.1 fakeroot.1 - diff --git a/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch b/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch deleted file mode 100644 index 574e55e33a..0000000000 --- a/package/fakeroot/0002-libfakeroot.c-define-_STAT_VER-if-not-already-define.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 03bc0ee07fb6e293d081ffd8af1654788b434f6a Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Thu, 11 Feb 2021 20:59:25 -0800 -Subject: [PATCH] libfakeroot.c: define _STAT_VER if not already defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -glibc 2.33 does does declare `_STAT_VER` anymore. - -Based on patch from Jan Pazdziora: -https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/SMQ3RYXEYTVZH6PLQMKNB3NM4XLPMNZO/ - -Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7 - -Signed-off-by: Ilya Lipnitskiy -Signed-off-by: Jörg Krause ---- - libfakeroot.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libfakeroot.c b/libfakeroot.c -index 3e80e38..14cdbc4 100644 ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -90,6 +90,16 @@ - #define SEND_GET_XATTR64(a,b,c) send_get_xattr64(a,b) - #endif - -+#ifndef _STAT_VER -+ #if defined (__aarch64__) -+ #define _STAT_VER 0 -+ #elif defined (__x86_64__) -+ #define _STAT_VER 1 -+ #else -+ #define _STAT_VER 3 -+ #endif -+#endif -+ - /* - These INT_* (which stands for internal) macros should always be used when - the fakeroot library owns the storage of the stat variable. --- -2.30.1 - diff --git a/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch b/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch deleted file mode 100644 index 8115598d64..0000000000 --- a/package/fakeroot/0003-libfakeroot.c-add-wrappers-for-new-glibc-2.33-symbol.patch +++ /dev/null @@ -1,80 +0,0 @@ -From feda578ca3608b7fc9a28a3a91293611c0ef47b7 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Thu, 11 Feb 2021 21:00:04 -0800 -Subject: [PATCH] libfakeroot.c: add wrappers for new glibc 2.33+ symbols -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch add wrappers for newly exported symbols in glibc 2.33. - -Backported from: feda578ca3608b7fc9a28a3a91293611c0ef47b7 - -Signed-off-by: Ilya Lipnitskiy -Signed-off-by: Jörg Krause ---- - libfakeroot.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 48 insertions(+) - -diff --git a/libfakeroot.c b/libfakeroot.c -index 14cdbc4..d75c51f 100644 ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -1352,6 +1352,54 @@ int renameat(int olddir_fd, const char *oldpath, - #endif /* HAVE_FSTATAT */ - - -+#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) -+/* Glibc 2.33 exports symbols for these functions in the shared lib */ -+ int lstat(const char *file_name, struct stat *statbuf) { -+ return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); -+ } -+ int stat(const char *file_name, struct stat *st) { -+ return WRAP_STAT STAT_ARG(_STAT_VER, file_name, st); -+ } -+ int fstat(int fd, struct stat *st) { -+ return WRAP_FSTAT FSTAT_ARG(_STAT_VER, fd, st); -+ } -+ -+ #ifdef HAVE_FSTATAT -+ int fstatat(int dir_fd, const char *path, struct stat *st, int flags) { -+ return WRAP_FSTATAT FSTATAT_ARG(_STAT_VER, dir_fd, path, st, flags); -+ } -+ #endif -+ -+ #ifdef STAT64_SUPPORT -+ int lstat64(const char *file_name, struct stat64 *st) { -+ return WRAP_LSTAT64 LSTAT64_ARG(_STAT_VER, file_name, st); -+ } -+ int stat64(const char *file_name, struct stat64 *st) { -+ return WRAP_STAT64 STAT64_ARG(_STAT_VER, file_name, st); -+ } -+ int fstat64(int fd, struct stat64 *st) { -+ return WRAP_FSTAT64 FSTAT64_ARG(_STAT_VER, fd, st); -+ } -+ -+ #ifdef HAVE_FSTATAT -+ int fstatat64(int dir_fd, const char *path, struct stat64 *st, int flags) { -+ return WRAP_FSTATAT64 FSTATAT64_ARG(_STAT_VER, dir_fd, path, st, flags); -+ } -+ #endif -+ #endif -+ -+ int mknod(const char *pathname, mode_t mode, dev_t dev) { -+ return WRAP_MKNOD MKNOD_ARG(_STAT_VER, pathname, mode, &dev); -+ } -+ -+ #if defined(HAVE_FSTATAT) && defined(HAVE_MKNODAT) -+ int mknodat(int dir_fd, const char *pathname, mode_t mode, dev_t dev) { -+ return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); -+ } -+ #endif -+#endif /* GLIBC_PREREQ */ -+ -+ - #ifdef FAKEROOT_FAKENET - pid_t fork(void) - { --- -2.30.1 - diff --git a/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch b/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch deleted file mode 100644 index 38dfea868b..0000000000 --- a/package/fakeroot/0004-configure.ac-fix-__xmknod-at-pointer-argument.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 432dd46e662772020306a2ce8b1be38321697e69 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Sat, 13 Feb 2021 19:32:08 -0800 -Subject: [PATCH] configure.ac: fix __xmknod{,at} pointer argument -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Switch default to assume * and not the absence of *. - -On glibc 2.33+, there is no definition for these functions in header -files, so the compile test doesn't work. But, we can default to using -the pointer (as is the case with newer glibc), and use the header file -on older platforms to fail the test and use no pointer. - -Backported from: c3eebec293e35b997bb46c22fb5a4e114afb5e7f - -Signed-off-by: Ilya Lipnitskiy -Signed-off-by: Jörg Krause ---- - configure.ac | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 73415d2..d85566f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -183,13 +183,13 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) - ]], [[ - int __xmknod ( int ver, - const char *pathname , -- mode_t mode , dev_t dev); -+ mode_t mode , dev_t *dev); - ]])],[ -- AC_DEFINE(XMKNOD_FRTH_ARG,) -- AC_MSG_RESULT([no extra *]) -- ],[ - AC_DEFINE(XMKNOD_FRTH_ARG,[*]) - AC_MSG_RESULT([needs *]) -+ ],[ -+ AC_DEFINE(XMKNOD_FRTH_ARG,) -+ AC_MSG_RESULT([no extra *]) - - ]) - -@@ -210,13 +210,13 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) - int __xmknodat ( int ver, - int dirfd, - const char *pathname , -- mode_t mode , dev_t dev); -+ mode_t mode , dev_t *dev); - ]])],[ -- AC_DEFINE(XMKNODAT_FIFTH_ARG,) -- AC_MSG_RESULT([no extra *]) -- ],[ - AC_DEFINE(XMKNODAT_FIFTH_ARG,[*]) - AC_MSG_RESULT([needs *]) -+ ],[ -+ AC_DEFINE(XMKNODAT_FIFTH_ARG,) -+ AC_MSG_RESULT([no extra *]) - - ]) - --- -2.30.1 - diff --git a/package/fakeroot/0005-fix-build-regression-on-macOS.patch b/package/fakeroot/0005-fix-build-regression-on-macOS.patch deleted file mode 100644 index d5589a79f5..0000000000 --- a/package/fakeroot/0005-fix-build-regression-on-macOS.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 3590b817df703a256f2c1de9a5f5469eaa1c86e9 Mon Sep 17 00:00:00 2001 -From: Ilya Lipnitskiy -Date: Mon, 15 Feb 2021 11:07:56 -0800 -Subject: [PATCH] fix build regression on macOS - -Signed-off-by: Felix Fietkau -Signed-off-by: Ilya Lipnitskiy -[Ryan: backported from 8090dffdad8fda86dccd47ce7a7db8840bdf7d7b] -Signed-off-by: Ryan Barnett ---- - configure.ac | 6 ++++++ - libfakeroot.c | 4 +++- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d85566f..d635df1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -181,6 +181,9 @@ AC_MSG_CHECKING([for type of arg of __xmknod]) - #include - #include - ]], [[ -+#ifndef __GLIBC__ -+#error no extra * -+#endif - int __xmknod ( int ver, - const char *pathname , - mode_t mode , dev_t *dev); -@@ -207,6 +210,9 @@ AC_MSG_CHECKING([for type of arg of __xmknodat]) - #include - #include - ]], [[ -+#ifndef __GLIBC__ -+#error no extra * -+#endif - int __xmknodat ( int ver, - int dirfd, - const char *pathname , -diff --git a/libfakeroot.c b/libfakeroot.c -index d75c51f..ec4e577 100644 ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -1352,7 +1352,8 @@ int renameat(int olddir_fd, const char *oldpath, - #endif /* HAVE_FSTATAT */ - - --#if defined(__GLIBC__) && __GLIBC_PREREQ(2,33) -+#if defined(__GLIBC__) -+#if __GLIBC_PREREQ(2,33) - /* Glibc 2.33 exports symbols for these functions in the shared lib */ - int lstat(const char *file_name, struct stat *statbuf) { - return WRAP_LSTAT LSTAT_ARG(_STAT_VER, file_name, statbuf); -@@ -1397,6 +1398,7 @@ int renameat(int olddir_fd, const char *oldpath, - return WRAP_MKNODAT MKNODAT_ARG(_STAT_VER, dir_fd, pathname, mode, &dev); - } - #endif -+#endif /* __GLIBC__ */ - #endif /* GLIBC_PREREQ */ - - --- -2.25.1 - diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash index 1a23d9e8d8..3d53eeb097 100644 --- a/package/fakeroot/fakeroot.hash +++ b/package/fakeroot/fakeroot.hash @@ -1,4 +1,4 @@ -# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.25.3-1.dsc -sha256 8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c fakeroot_1.25.3.orig.tar.gz +# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.26-1.dsc +sha256 480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 fakeroot_1.26.orig.tar.gz # License files, locally calculated sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index c3312b777b..3fadf1c0f0 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -4,9 +4,9 @@ # ################################################################################ -FAKEROOT_VERSION = 1.25.3 +FAKEROOT_VERSION = 1.26 FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz -FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20201008T205817Z/pool/main/f/fakeroot +FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/fakeroot HOST_FAKEROOT_DEPENDENCIES = host-acl # Force capabilities detection off @@ -15,8 +15,6 @@ HOST_FAKEROOT_DEPENDENCIES = host-acl HOST_FAKEROOT_CONF_ENV = \ ac_cv_header_sys_capability_h=no \ ac_cv_func_capset=no -# patching configure.ac in patch 0003 -HOST_FAKEROOT_AUTORECONF = YES FAKEROOT_LICENSE = GPL-3.0+ FAKEROOT_LICENSE_FILES = COPYING