From patchwork Fri Jan 1 21:28:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Syrone Wong X-Patchwork-Id: 1421713 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=zyep8vaC; 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=B8lS2cav; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4D6yt75csxz9sRR for ; Sat, 2 Jan 2021 08:32:45 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=yA68fSakh20eYBKefAOG4JnVSXmGDalXos2E64WmN9o=; b=zyep8vaCl81x4TdrL463+Vf+4c OdlDUE1YUjclfUN8NHZbPc7kliKyxPEGlvOgEgkt/ltIijWQuO7+xjkbNJMCMmy0Ld6BXDHiEtFHK gVtcHWNdeePMZIjwSW+KDAm9AgM3lm/190B2bqJRhwRRAmSRBohoCKwNMXLW1qdT34RwhtUWjhVd7 Bp4uzfuDtpVV+MvecK8OqZZPQOziMZMQPa6ig5tLo5dL47mPht3gzYfc/WJj3166dJB1RNYMA2Xhn TDFcFKspusyE01GSYY3UVU2lbiK8zO2YOCn6Gi/1UbqUB56ulBCRbIK46rm1gyuU+hlN8cuDJ+JKK NbFKcF3w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kvRzE-00076a-Ll; Fri, 01 Jan 2021 21:29:28 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kvRz7-00075w-GR for openwrt-devel@lists.openwrt.org; Fri, 01 Jan 2021 21:29:25 +0000 Received: by mail-pj1-x1032.google.com with SMTP id f14so6513588pju.4 for ; Fri, 01 Jan 2021 13:29:17 -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=e9Vllqfe4mBfS5h3d6qNf3A+Q0yymZm3zY5cfp3sh2c=; b=B8lS2cav4au6MWLb4+QL/mz6+C+t760Ri99tzlPxJWw/jeJdyFJdBuEhmOrk3Kmb+2 LMUN8cZiVtORcOA9qhXe7BKrUj+L33gO2EVVB5EWHSNbUz3phuM4gGd8Y2hfNV9Mg1ud a6O3MVRbiYZfmhQyCtLfOJQKyQcfUkuKkkXEWnFD/KoStp+4pgzqzffZ+v+2lMGlgWcg M2O5jqs6tfTUQg3v55IlDFMF5iEJ+gkFd/KTaEYsUE+s4pNiXm3V5Ka2Bh8gflW7AqU4 okblcL+MNHjfDcsqc6nDxgEp6O87RIvAq7eckaWZYxy4hdoj19FYlMdfASe0QE9Px+dz XtHA== 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=e9Vllqfe4mBfS5h3d6qNf3A+Q0yymZm3zY5cfp3sh2c=; b=tLgQFBmEhPAaDZBe9UAT0sMGZhgzKI1PuAyIBDWqHZW1wJbUWLEg50vQqgohsVltVh VEtwNpDHBsSmrAiZXzBu6I7zu3nEKFFj2WP0cUsM9LHGpgzz63Em8gaXbFK+3klP+i8j c1AmsvM9AUmg8qzDq9xHjyeY2xhu6cZx9KDqGZTb0NZ6vgr4owzZdcWh9AlE7QKH4H1g LO7eX+MitaZRkVAnk8Pv2X7n0Ldg9HuN3iNY2FIrXYvE5LsC/8MLTvjuYigI8rzdnBA3 6xXHEd8V2cN5ZW+Dg2Z2bONyscpSIwLtkKM5g6i8KD8quZ3Txer/RSe5/05Vi5NLKo55 g1rQ== X-Gm-Message-State: AOAM531LvTlr9qW8VpH+SIhvh+AY7hHOjImuEabARsg2p15ixNCHOsvz s/c7PmxKkzr+Ka6ClG8HH+IJB4AfdDw= X-Google-Smtp-Source: ABdhPJy6F+I+vHgEHKPtKU/Bj61w3dOXA8qXXaIcdxss6nuy/JAAiJX5+gN4ZDeWXRrnTi5B6op6lQ== X-Received: by 2002:a17:902:42:b029:da:e72b:fe9e with SMTP id 60-20020a1709020042b02900dae72bfe9emr63756443pla.31.1609536555224; Fri, 01 Jan 2021 13:29:15 -0800 (PST) Received: from localhost.localdomain (us2.wongsyrone.xyz. [89.208.243.167]) by smtp.gmail.com with ESMTPSA id v15sm45363075pfn.217.2021.01.01.13.29.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 13:29:14 -0800 (PST) From: Syrone Wong To: openwrt-devel@lists.openwrt.org Subject: [PATCH] tools/fakeroot: update to 1.25.3 Date: Sat, 2 Jan 2021 05:28:45 +0800 Message-Id: <20210101212845.1065-1-wong.syrone@gmail.com> X-Mailer: git-send-email 2.29.0.windows.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210101_162921_566748_6799ADFF X-CRM114-Status: GOOD ( 18.54 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:1032 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [wong.syrone[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Wegener , Syrone Wong , Jo-Philipp Wich , Thomas Petazzoni Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org use PKG_FIXUP:=autoreconf to generate configure 200-hide-dlsym-error.patch deleted due to fixed upstream in another way other patches refreshed to reflect latest changes Signed-off-by: Syrone Wong --- tools/fakeroot/Makefile | 7 ++-- tools/fakeroot/patches/000-relocatable.patch | 6 ++-- tools/fakeroot/patches/100-portability.patch | 28 ++++++---------- tools/fakeroot/patches/200-disable-doc.patch | 10 ++++++ .../patches/200-hide-dlsym-error.patch | 32 ------------------- 5 files changed, 26 insertions(+), 57 deletions(-) create mode 100644 tools/fakeroot/patches/200-disable-doc.patch delete mode 100644 tools/fakeroot/patches/200-hide-dlsym-error.patch diff --git a/tools/fakeroot/Makefile b/tools/fakeroot/Makefile index 8c30ee71c3f6..e9daa4b6ad7b 100644 --- a/tools/fakeroot/Makefile +++ b/tools/fakeroot/Makefile @@ -5,14 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fakeroot -PKG_VERSION:=1.24 -PKG_RELEASE:=2 +PKG_VERSION:=1.25.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://deb.debian.org/debian/pool/main/f/fakeroot -PKG_HASH:=2e045b3160370b8ab4d44d1f8d267e5d1d555f1bb522d650e7167b09477266ed +PKG_HASH:=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=COPYING +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/fakeroot/patches/000-relocatable.patch b/tools/fakeroot/patches/000-relocatable.patch index 0408acfa2500..44897c5ab8c7 100644 --- a/tools/fakeroot/patches/000-relocatable.patch +++ b/tools/fakeroot/patches/000-relocatable.patch @@ -8,7 +8,7 @@ -FAKEROOT_BINDIR=@bindir@ +if [ -n "$STAGING_DIR_HOST" ]; then + USEABSLIBPATH=1 -+ LIB=${STAGING_DIR_HOST}/lib/lib@fakeroot_transformed@@DLSUFFIX@ ++ FAKEROOT_LIB=${STAGING_DIR_HOST}/lib/lib@fakeroot_transformed@@DLSUFFIX@ + FAKED=${STAGING_DIR_HOST}/bin/faked + PATHS= +else @@ -16,11 +16,11 @@ + FAKEROOT_BINDIR=@bindir@ -USEABSLIBPATH=@LDPRELOADABS@ --LIB=lib@fakeroot_transformed@@DLSUFFIX@ +-FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@ -PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot -FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ + USEABSLIBPATH=@LDPRELOADABS@ -+ LIB=lib@fakeroot_transformed@@DLSUFFIX@ ++ FAKEROOT_LIB=lib@fakeroot_transformed@@DLSUFFIX@ + PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot + FAKED=${FAKEROOT_BINDIR}/@faked_transformed@ +fi diff --git a/tools/fakeroot/patches/100-portability.patch b/tools/fakeroot/patches/100-portability.patch index 5713c9e3fe86..315a9e16bfce 100644 --- a/tools/fakeroot/patches/100-portability.patch +++ b/tools/fakeroot/patches/100-portability.patch @@ -1,9 +1,9 @@ --- a/libfakeroot.c +++ b/libfakeroot.c -@@ -110,8 +110,16 @@ - #define INT_NEXT_FSTATAT(a,b,c,d) NEXT_FSTATAT(_STAT_VER,a,b,c,d) +@@ -112,8 +112,16 @@ #define INT_SEND_STAT(a,b) SEND_STAT(a,b,_STAT_VER) #define INT_SEND_GET_XATTR(a,b) SEND_GET_XATTR(a,b,_STAT_VER) + #define INT_SEND_GET_STAT(a,b) SEND_GET_STAT(a,b) + +/* 10.10 uses id_t in getpriority/setpriority calls, so pretend + id_t is used everywhere, just happens to be int on some OSes */ @@ -17,7 +17,7 @@ #include #include #include -@@ -123,7 +131,6 @@ +@@ -125,7 +133,6 @@ #include #include #include @@ -25,7 +25,7 @@ #ifdef HAVE_SYS_ACL_H #include #endif /* HAVE_SYS_ACL_H */ -@@ -1894,7 +1901,7 @@ ssize_t fremovexattr(int fd, const char +@@ -1911,7 +1918,7 @@ ssize_t fremovexattr(int fd, const char } #endif /* HAVE_FREMOVEXATTR */ @@ -34,7 +34,7 @@ if (fakeroot_disabled) return next_setpriority(which, who, prio); next_setpriority(which, who, prio); -@@ -2426,3 +2433,19 @@ int sysinfo(int command, char *buf, long +@@ -2520,3 +2527,19 @@ int sysinfo(int command, char *buf, long } } #endif @@ -56,16 +56,16 @@ +#endif --- a/wrapfunc.inp +++ b/wrapfunc.inp -@@ -145,7 +145,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) - #endif /* HAVE_SETFSGID */ +@@ -146,7 +146,7 @@ setfsgid;gid_t;(gid_t fsgid);(fsgid) initgroups;int;(const char *user, INITGROUPS_SECOND_ARG group);(user, group) + getgroups;int;(int size, gid_t list[]);(size, list) setgroups;int;(SETGROUPS_SIZE_TYPE size, const gid_t *list);(size, list) -setpriority;int;(int which, int who, int prio);(which, who, prio) +setpriority;int;(int which, id_t who, int prio);(which, who, prio) #ifdef HAVE_CAPSET capset;int;(cap_user_header_t hdrp, const cap_user_data_t datap);(hdrp, datap) #endif /* HAVE_CAPSET */ -@@ -197,7 +197,7 @@ fchownat;int;(int dir_fd, const char *pa +@@ -198,7 +198,7 @@ fchownat;int;(int dir_fd, const char *pa mkdirat;int;(int dir_fd, const char *pathname, mode_t mode);(dir_fd, pathname, mode) #endif /* HAVE_MKDIRAT */ #ifdef HAVE_OPENAT @@ -112,17 +112,7 @@ print "static __inline__ " ret " next_" name, argtype " {" > tmpffile; --- a/configure.ac +++ b/configure.ac -@@ -110,6 +110,7 @@ for first in size_t int; do - #include - #endif - #include -+#include - #ifdef HAVE_GRP_H - #include - #endif ---- a/configure -+++ b/configure -@@ -12847,6 +12847,7 @@ for first in size_t int; do +@@ -146,6 +146,7 @@ for first in size_t int; do #include #endif #include diff --git a/tools/fakeroot/patches/200-disable-doc.patch b/tools/fakeroot/patches/200-disable-doc.patch new file mode 100644 index 000000000000..29a3e39b2d21 --- /dev/null +++ b/tools/fakeroot/patches/200-disable-doc.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS=foreign + ACLOCAL_AMFLAGS = -I build-aux +-SUBDIRS=doc scripts test ++SUBDIRS=scripts test + + noinst_LTLIBRARIES = libcommunicate.la libmacosx.la + libcommunicate_la_SOURCES = communicate.c diff --git a/tools/fakeroot/patches/200-hide-dlsym-error.patch b/tools/fakeroot/patches/200-hide-dlsym-error.patch deleted file mode 100644 index 3fd34c8778fa..000000000000 --- a/tools/fakeroot/patches/200-hide-dlsym-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Hide error from dlsym() - dlsym(), starting in glibc 2.24 actually reports errors. In our case, - we try to get ACL functions which are not in the glibc. This causes - failures in test suites, so hide those messages for non-debugging - purposes for now. It also makes the build logs annoying to read. -Author: Julian Andres Klode -Origin: vendor -Bug-Debian: https://bugs.debian.org/830912 -Forwarded: no -Last-Update: 2016-08-12 - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -256,10 +256,16 @@ void load_library_symbols(void){ - /* clear dlerror() just in case dlsym() legitimately returns NULL */ - msg = dlerror(); - *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); -+ - if ( (msg = dlerror()) != NULL){ -- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); --/* abort ();*/ -+#ifdef LIBFAKEROOT_DEBUGGING -+ if (fakeroot_debug) { -+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); -+/* abort ();*/ -+ } -+#endif - } -+ - } - } -