NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/fakeroot: bump to version 1.30.1

Browse Source 
remove upstream patch

remove mkdir build-aux (no longer needed, like AUTORECONF)

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
[yann.morin.1998@free.fr: keep using snapshot.debian.org]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Francois Perrad 2022-11-18 20:00:14 +01:00 committed by Yann E. MORIN
parent 5f94d91ed8
commit dda1c73bf3
3 changed files with 4 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
package/fakeroot/0001-fix-prototype-generation.patch
View File

@ -1,61 +0,0 @@
Subject: Fix prototype generation for openat
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Date: 2021-12-30
Bug-Debian: https://bugs.debian.org/995393
Forwarded: Yes (implicitely)
As jrtc27 pointed out in IRC, ppc64el is more strict than other
architectures when it comes to va_arg handling:
it's that ppc64le uses the elfv2 abi, and for variadic calls you
must reserve space for a parameter save area
So enhance wrapawk to create a proper prototype and argument
handling although it's specific to the openat call. Also add the
missing documentation for the sixth column to wrapfunc.inp.
Signed-off-by: Joel Stanley <joel@jms.id.au>
--- a/wrapawk
+++ b/wrapawk
@@ -37,7 +37,25 @@
argtype=$3;
argname=$4;
MACRO=$5;
- if(MACRO){
+ openat_extra=$6;
+ if(openat_extra){
+ print " {(void(*))&next_" name ", \"" name "\"}," > structfile;
+ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile;
+ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile;
+
+ print ret " tmp_" name, openat_extra "{" > tmpffile;
+ print " mode_t mode = 0;" > tmpffile;
+ print " if (flags & O_CREAT) {" > tmpffile;
+ print " va_list args;" > tmpffile;
+ print " va_start(args, flags);" > tmpffile;
+ print " mode = va_arg(args, int);" > tmpffile;
+ print " va_end(args);" > tmpffile;
+ print " }" > tmpffile;
+ print " load_library_symbols();" > tmpffile;
+ print " return next_" name, argname ";" > tmpffile;
+ print "}" > tmpffile;
+ print "" > tmpffile;
+ } else if(MACRO){
print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile;
print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile;
print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile;
--- a/wrapfunc.inp
+++ b/wrapfunc.inp
@@ -9,8 +9,10 @@
/**/ */
/* each line of this file lists 4 fields, seperated by a ";". */
/* The first field is the name of the wrapped function, then it's return */
-/* value. After that come the function arguments with types, and the last */
+/* value. After that come the function arguments with types, and the fifth */
/* field contains the function arguments without types. */
+/* A sixth field is a special needed when wrapping the openat syscall. */
+/* Otherwise it's like the third (function arguments with types). */
/**/
/* __*xstat are used on glibc systems instead of just *xstat. */

4
package/fakeroot/fakeroot.hash
View File

@ -1,4 +1,4 @@
# From http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.26-1.dsc
sha256 480a578ffdc5592e73df4c086950d321b4adc78dbdaec56c82e4fe1fb68de8e9 fakeroot_1.26.orig.tar.gz
# From https://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.30.1-1.dsc
sha256 32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75 fakeroot_1.30.1.orig.tar.gz
# License files, locally calculated
sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING

9
package/fakeroot/fakeroot.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
FAKEROOT_VERSION = 1.26
FAKEROOT_VERSION = 1.30.1
FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.gz
FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20210907T092512Z/pool/main/f/fakeroot
FAKEROOT_SITE = https://snapshot.debian.org/archive/debian/20221120T030258Z/pool/main/f/fakeroot
HOST_FAKEROOT_DEPENDENCIES = host-acl
# Force capabilities detection off
@ -18,9 +18,4 @@ HOST_FAKEROOT_CONF_ENV = \
FAKEROOT_LICENSE = GPL-3.0+
FAKEROOT_LICENSE_FILES = COPYING
define HOST_FAKEROOT_BUILD_AUX
mkdir -p $(@D)/build-aux
endef
HOST_FAKEROOT_POST_PATCH_HOOKS += HOST_FAKEROOT_BUILD_AUX
$(eval $(host-autotools-package))