diff options
Diffstat (limited to 'system')
-rw-r--r-- | system/cmake/APKBUILD | 5 | ||||
-rw-r--r-- | system/fakeroot/APKBUILD | 19 | ||||
-rw-r--r-- | system/fakeroot/fix-format.patch | 25 | ||||
-rw-r--r-- | system/fakeroot/fix-prototype-generation.patch | 59 | ||||
-rw-r--r-- | system/fakeroot/fix-shell-in-fakeroot.patch | 13 | ||||
-rw-r--r-- | system/fakeroot/t-xattr.patch | 14 | ||||
-rw-r--r-- | system/fakeroot/xstatjunk.patch | 10 | ||||
-rw-r--r-- | system/libgpg-error/APKBUILD | 3 | ||||
-rw-r--r-- | system/perl-io-socket-ssl/APKBUILD | 4 |
9 files changed, 76 insertions, 76 deletions
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD index a93fc9057..983dd5335 100644 --- a/system/cmake/APKBUILD +++ b/system/cmake/APKBUILD @@ -54,14 +54,13 @@ check() { ; # skip CTestTestUpload: tries to upload something during check... + # BundleUtilities fails in autobuilder env due to LD_PRELOAD hack # RunCMake.CrosscompilingEmulator and RunCMake.add_test don't support # running with parallel level > 1. CTEST_PARALLEL_LEVEL=${JOBS} \ CTEST_OUTPUT_ON_FAILURE=TRUE \ bin/ctest \ - -E CTestTestUpload \ - -E BundleUtilities \ - -E 'RunCMake\.(CrosscompilingEmulator|add_test)' \ + -E '(CTestTestUpload|BundleUtilities|RunCMake\.(CrosscompilingEmulator|add_test))' \ ; } diff --git a/system/fakeroot/APKBUILD b/system/fakeroot/APKBUILD index 2cb86273f..9c16bffec 100644 --- a/system/fakeroot/APKBUILD +++ b/system/fakeroot/APKBUILD @@ -1,9 +1,10 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=fakeroot -pkgver=1.28 +pkgver=1.37.1.2 pkgrel=0 pkgdesc="Tool for simulating superuser privileges" arch="all" +options="!check" license="GPL-3.0+" url="https://wiki.debian.org/FakeRoot" depends="" @@ -13,12 +14,14 @@ makedepends="$makedepends_build $makedepends_host" checkdepends="bash sharutils" subpackages="$pkgname-doc" # find timestamp here: https://snapshot.debian.org/package/fakeroot/ -source="https://snapshot.debian.org/archive/debian/20220304T204941Z/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz +source="https://snapshot.debian.org/archive/debian/20250513T025019Z/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz fakeroot-no64.patch fakeroot-stdint.patch - xstatjunk.patch - fix-prototype-generation.patch + fix-format.patch + fix-shell-in-fakeroot.patch + t-xattr.patch + xstatjunk.patch " build() { @@ -47,8 +50,10 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cd55007014da5741ff336d005a80633a2f1ed856e075162acb9a4a1edd5c6d17ec74457c8a1e31edb02ae70920904c53e69365d55bd9beb7e8c6211aa8cfca8b fakeroot_1.28.orig.tar.gz +sha512sums="b3cfaef630add81891c77f5cc6f565ef23ee5c17a0e86f596b15a1a3be6cc0eaa9b6ad091e04d2e5d1efd36cb8082757ab13a40a463d7cbf054a6624422a534c fakeroot_1.37.1.2.orig.tar.gz 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209 fakeroot-no64.patch ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac fakeroot-stdint.patch -5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88 xstatjunk.patch -63db66b0d883495151f817c4e57bdaaff992667416f2f5b03c9b66b65f1fba1762f709dd5153717aa4008d7be0fbc58bf1f41eb2b35dc61047b0cc0b762e145b fix-prototype-generation.patch" +3d5858080659e4430eb15353b5adb9cf668e56ea56789832a2498b507f9a6ca13161eb66e806d8ab0edfec36d5c93cc4374ffd2812ee400bbf093b99be723fae fix-format.patch +47593b3d86a66bab832c50a1d967cdc70e42bbd9ef4436f18140067ccefdd6418516e5157102c67e604f3623ed1b9f4fe1423fc5dad4dfe5356fc250c12818a7 fix-shell-in-fakeroot.patch +891a319e5ea1b8ecced1020f660e5f91e7f7746b383beb5d3ae6e10478b810d46d3434f69f51bd4463d2c8a6c913177fe4b7ea0abc4cd89cd48bddcd654849c2 t-xattr.patch +a13c8fd7d8a4c69e1044b2ec54af1df0df997c39a561f394b001bce4e83a1334315ae093d7aa73e47d4f32b0358532d51793d701a174b45d52172260a56c9d10 xstatjunk.patch" diff --git a/system/fakeroot/fix-format.patch b/system/fakeroot/fix-format.patch new file mode 100644 index 000000000..22449691f --- /dev/null +++ b/system/fakeroot/fix-format.patch @@ -0,0 +1,25 @@ +Fakeroot defines custom fake_dev_t/fake_ino_t as uint64_t +but doesn't use the PRIu64 format specifier from inttypes.h +to print them thereby relying on a specific representation +of these types. + +diff -upr fakeroot-1.27.orig/faked.c fakeroot-1.27/faked.c +--- a/faked.c ++++ b/faked.c +@@ -123,6 +123,7 @@ + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#include <inttypes.h> + #ifdef HAVE_STDINT_H + # include <stdint.h> + #endif +@@ -689,7 +690,7 @@ int load_database(const uint32_t remote) + /* */ + /*********************************/ + void debug_stat(const struct fakestat *st){ +- fprintf(stderr,"dev:ino=(%llx:%lli), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%lli\n", ++ fprintf(stderr,"dev:ino=(%"PRIx64":%"PRIu64"), mode=0%lo, own=(%li,%li), nlink=%li, rdev=%"PRIu64"\n", + st->dev, + st->ino, + (long)st->mode, diff --git a/system/fakeroot/fix-prototype-generation.patch b/system/fakeroot/fix-prototype-generation.patch deleted file mode 100644 index 38d32ff3b..000000000 --- a/system/fakeroot/fix-prototype-generation.patch +++ /dev/null @@ -1,59 +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. - ---- 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. */ diff --git a/system/fakeroot/fix-shell-in-fakeroot.patch b/system/fakeroot/fix-shell-in-fakeroot.patch new file mode 100644 index 000000000..ce5d23f0c --- /dev/null +++ b/system/fakeroot/fix-shell-in-fakeroot.patch @@ -0,0 +1,13 @@ +Description: Fix shell in fakeroot.in + Use /bin/sh instead of @SHELL@ in fakeroot.in +Author: Juan Picca <jumapico@gmail.com> +Last-Update: 2016-06-27 +--- +--- a/scripts/fakeroot.in ++++ b/scripts/fakeroot.in +@@ -1,4 +1,4 @@ +-#!@SHELL@ ++#!/bin/sh + + # This script first starts faked (the daemon), and then it will run + # the requested program with fake root privileges. diff --git a/system/fakeroot/t-xattr.patch b/system/fakeroot/t-xattr.patch new file mode 100644 index 000000000..d99f80088 --- /dev/null +++ b/system/fakeroot/t-xattr.patch @@ -0,0 +1,14 @@ +runs when getcap is available, and setting a cap in fakeroot is forbidden so it fails +-- +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -14,8 +14,7 @@ TESTS = \ + t.perlstat \ + t.tar \ + t.touchinstall \ +- t.truereturn \ +- t.xattr ++ t.truereturn + + suffix = + diff --git a/system/fakeroot/xstatjunk.patch b/system/fakeroot/xstatjunk.patch index 12f2759b4..5a315e850 100644 --- a/system/fakeroot/xstatjunk.patch +++ b/system/fakeroot/xstatjunk.patch @@ -1,10 +1,12 @@ ---- fakeroot-1.18.4.orig/configure.ac 2012-06-02 18:23:41.000000000 +0000 -+++ fakeroot-1.18.4configure.ac 2015-09-24 23:15:56.917470073 +0000 -@@ -301,7 +301,7 @@ +diff --git a/configure.ac b/configure.ac +index 9613183..e4a9bbc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -428,7 +428,7 @@ for SEARCH in %stat f%stat l%stat f%stat FUNC=`echo $SEARCH|sed -e 's/.*%//'` PRE=`echo $SEARCH|sed -e 's/%.*//'` FOUND= -- for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do +- for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC} __${PRE}${FUNC}; do + for WRAPPED in ${PRE}${FUNC}; do AC_CHECK_FUNCS($WRAPPED,FOUND=$WRAPPED) dnl diff --git a/system/libgpg-error/APKBUILD b/system/libgpg-error/APKBUILD index 3a75f5e81..a6fc5841f 100644 --- a/system/libgpg-error/APKBUILD +++ b/system/libgpg-error/APKBUILD @@ -19,7 +19,8 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --localstatedir=/var + --localstatedir=/var \ + --enable-install-gpg-error-config make } diff --git a/system/perl-io-socket-ssl/APKBUILD b/system/perl-io-socket-ssl/APKBUILD index e8b9f6556..210fcabc3 100644 --- a/system/perl-io-socket-ssl/APKBUILD +++ b/system/perl-io-socket-ssl/APKBUILD @@ -5,7 +5,7 @@ _pkgreal=IO-Socket-SSL _author=SULLR _au=${_author%%"${_author#??}"} _a=${_author%%"${_author#?}"} -pkgver=2.085 +pkgver=2.095 pkgrel=0 pkgdesc="Perl module implementing SSL/TLS with IO::Socket interface" url="https://metacpan.org/release/IO-Socket-SSL" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="c4e045e88f69579d53a3663ed8f74d342fe3529e24e06d9e7d299debafdb840839c6f5bccb579b4d03f7501615439dba4661ac006312f379a2598a3030634cfd IO-Socket-SSL-2.085.tar.gz" +sha512sums="6025bc0eac4258e81eb0fc6da9297e8c3c648ed02ba0b2b66a6f604f83a7bd5d8b4a945e7c51c733754a7738ed1309316d4d1be6eccf1f7744fc58fd9fb27109 IO-Socket-SSL-2.095.tar.gz" |