diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-22 14:08:05 +0000 |
commit | 93a93e9a3b53c1a73142a305ea1f8136846942ee (patch) | |
tree | b9791a06ab3284e27b568412c59316c66240c682 /sys-kernel/genkernel | |
parent | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (diff) |
gentoo resync : 22.12.2021
Diffstat (limited to 'sys-kernel/genkernel')
-rw-r--r-- | sys-kernel/genkernel/Manifest | 9 | ||||
-rw-r--r-- | sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch | 77 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-4.0.10.ebuild | 2 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-4.2.5.ebuild | 2 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild (renamed from sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild) | 7 | ||||
-rw-r--r-- | sys-kernel/genkernel/genkernel-9999.ebuild | 2 |
6 files changed, 90 insertions, 9 deletions
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest index 369573b3f2a4..b6913ef5f781 100644 --- a/sys-kernel/genkernel/Manifest +++ b/sys-kernel/genkernel/Manifest @@ -1,4 +1,5 @@ AUX genkernel-4.2.6-fix-btrfs-progs-deps.patch 1167 BLAKE2B e2f77467921adeb2d6e00a1f3415a7ed351b2f300164572bab5f649d917e671f51ea1d43df9d692d15d520940341b2f71261a3c4f9cee841a2408a39d8b109c3 SHA512 85ba228df6970c0f0aded2b33fdde22f15568d2258be4089ff46077b78541ba9469d509ae1779c3726685a2d9eba953d46f4e07808d4e4fdf98f22949648b400 +AUX genkernel-4.2.6-fuse-glibc-2.34.patch 2344 BLAKE2B a3406c0dedfc4742134abec909c29e517637ad89097ed5d3ff10b439186bbd41afc77571b8f74baf8357b18e96fc02ac00e2b53589de7cd3a8b537a172e7413f SHA512 bcd927a12a9f035e3eaa8496bcdc29a003dea3f7aa687b1fa9cc48fd68baca77426651f325a1db5788e25c583c13e4649e5cb293302f286908fa54ec212c4528 AUX genkernel-4.bash 2479 BLAKE2B e5504698ab49bb62623fcdfdd4a54b19ee6d88f96a682f08dc282e46ec26bd22d9c54bcdc9b2bdcc6a96295de1ab96351d35b304eb176f5d177c221cd8d82180 SHA512 6a5709a410c5c07b7a343ecc141aa72de73d3b4acd0a69c05c61c801835a59dd17d9a528f6b68f12ac00ff4b6e5954b03237472501383aa390eb1365dd69c281 AUX initramfs.mounts 816 BLAKE2B 4f36e51fef78435369d43647db853c7bfde217cc93002fc010900692f67171512366e6599f08c5f2093490713aa7715e903b7e06528e3f2c6d8468f506938ed5 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91 @@ -63,8 +64,8 @@ DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d933 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33 -EBUILD genkernel-4.0.10.ebuild 9572 BLAKE2B aaa3dda80524b29233e333e13e9076148d1c1fdbc36c9a700c1974c3f924a6d5f006265a44029ab75888966cb634d2a642ee984e1a91a4a6cc4fd61b7d3d7a7b SHA512 1cf0391bfc65f9445030fcb5aaa22c65bb8b72bdd376b37e915f9080bde240cf0118cd337feb18aee7fc0d4b0603540f5d55f2856e3f04cca4a120c5915db5b4 -EBUILD genkernel-4.2.5.ebuild 11455 BLAKE2B dc4e3b2d08c0673844457bde4d72cef8189836f4723445e424629efcb2a1f223f193ed50eda633fd742c66b1efa805d4deff6286b11a545f726a9fb34cff87f0 SHA512 2187379b6171c175930cb361705862e57d975945b90eadf7468a1dfa4611d868dc868ae18857a5c77f142ed1ff88e0cbb3cc49bb6ddceaffdd0c220a63df8bd4 -EBUILD genkernel-4.2.6-r1.ebuild 11563 BLAKE2B 2aa44fe7a47f2702e1c4e4e73f66c77df89e167d18ceb62c90d8782db273f3ce31e79774602714030a199a38fdc00c8d246d1c56f5aeb0e633248fb0b49cd61d SHA512 d1f1b1dc7bdb2fbe2b789f342a6f4595ce16fa61b30f36b8f699899f34583527ffb338a350dd3975e906fee1cd826fd00e77e96ec7687fbede9ed330add77d0a -EBUILD genkernel-9999.ebuild 11512 BLAKE2B 90e954dcd21df272771583ca09b01655c14f9b1204bee32b7bb980fb3847e5412afab6e3b91e9cb51a5570ac46d96a5b93c04de864c90d65a789363dd1b38409 SHA512 599aad34ef128cb2c74b89cfb9a8454cf14e36f6c05469b06ca7bd5ecfcb5a0ae1b81810e54b04fbf1370515c32a097bc0e2d611b200875dd5d3261165caae4c +EBUILD genkernel-4.0.10.ebuild 9583 BLAKE2B eb8f46374b3dd8a2f51db002e666ce64b32acc63f8c02a3ffe4ea85c3129bb19c904624382758e97662979b0eddddf0b0ebfdd8d3df66420cef569ccc92fd946 SHA512 1f24bee85516973b5652fe9ac354445504fdd82edf75683dfdc38559cd68048c87c9635af7047286575ff9cb95f69b4f7bc02fc49d9fe29e6a7199c76086a3c7 +EBUILD genkernel-4.2.5.ebuild 11466 BLAKE2B f5251747786a86133c11eab55438b1aa6b38442347609746e454bc406e0068a48e4b7c608effc94864eff56520358aab56f2ac491099edfdb8512d41303df5a4 SHA512 a78777620ffdf7ddd464029af67e97eb12e9957808af8d576983e60c2dd33594d8fd7d805d36f2206418f005432b12f47fbca4d999b8910e54fa63c95917f612 +EBUILD genkernel-4.2.6-r2.ebuild 11617 BLAKE2B 9923f104862a11320a025109279dabf661732e0502bf5bdfdceefb62d762a78350b23e810cd1ac3f2be1c7f99d730fd647f53ed444e7d47d88b559940a4019c0 SHA512 893b6ac6f01770445eb64daa574b46bcb42392898a2b88b8054a70517af9e895728e3191ad915d09c53be9b60971adc6a4e0ebeff0d191a06099f3d5d21895ed +EBUILD genkernel-9999.ebuild 11523 BLAKE2B ea96dea21e9271bcfc71da5d8ec41e4ff0e1a3a9d4c309eed3bf7b0cc50c2ad487a76d051297c7b0f83c9e1362708efbd27fcc5d6203ff0c2f448da8cea583a9 SHA512 34597bdd504a13378e7c6052ac8a2ec7df933b61f9c4abb48dfc053039c075c8a35dd9e9a894e9193c728b206e0959eca934ed56e15201aa22288ed9a00166da MISC metadata.xml 530 BLAKE2B 9c3b648bd9ae40e3750631e8087a82f6f11e1d316084782db2aad40b73a8578b104b652c7041dab2599731c585f6b98b5ce2f3964079f4b9d50183a1764e2317 SHA512 b28f46ae3d38048a0254a08fd4dd05eec342118beff64b2906764d6bbd3f8c096a624294f576b0c4971d488bb4fbe9b6991db1c9c8d64bb33edaae2aeba862a3 diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch new file mode 100644 index 000000000000..731f127a6712 --- /dev/null +++ b/sys-kernel/genkernel/files/genkernel-4.2.6-fuse-glibc-2.34.patch @@ -0,0 +1,77 @@ +commit 1b1da7527b0307cb70118caf5dfe2da778671588 +Author: Thomas Deutschmann <whissi@gentoo.org> +AuthorDate: Fri Dec 10 01:56:20 2021 +0100 +Commit: Thomas Deutschmann <whissi@gentoo.org> +CommitDate: Fri Dec 10 01:56:20 2021 +0100 + + fuse: Add patch to allow building against glibc-2.34 + + Bug: https://bugs.gentoo.org/828445 + Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> + +diff --git a/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch b/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch +new file mode 100644 +index 0000000..eb7737c +--- /dev/null ++++ b/patches/fuse/2.9.9/fuse-2.9.9-glibc-2.34.patch +@@ -0,0 +1,60 @@ ++From 5a43d0f724c56f8836f3f92411e0de1b5f82db32 Mon Sep 17 00:00:00 2001 ++From: Sam James <sam@gentoo.org> ++Date: Sat, 24 Jul 2021 22:02:45 +0100 ++Subject: [PATCH] util/ulockmgr_server.c: conditionally define closefrom (fix ++ glibc-2.34+) ++ ++closefrom(3) has joined us in glibc-land from *BSD and Solaris. Since ++it's available in glibc 2.34+, we want to detect it and only define our ++fallback if the libc doesn't provide it. ++ ++Bug: https://bugs.gentoo.org/803923 ++Signed-off-by: Sam James <sam@gentoo.org> ++--- ++ configure.ac | 1 + ++ util/ulockmgr_server.c | 6 ++++++ ++ 2 files changed, 7 insertions(+) ++ ++diff --git a/configure.ac b/configure.ac ++index 9946a0efa..a2d481aa9 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -55,6 +55,7 @@ fi ++ ++ AC_CHECK_FUNCS([fork setxattr fdatasync splice vmsplice utimensat]) ++ AC_CHECK_FUNCS([posix_fallocate]) +++AC_CHECK_FUNCS([closefrom]) ++ AC_CHECK_MEMBERS([struct stat.st_atim]) ++ AC_CHECK_MEMBERS([struct stat.st_atimespec]) ++ ++diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c ++index 273c7d923..a04dac5c6 100644 ++--- a/util/ulockmgr_server.c +++++ b/util/ulockmgr_server.c ++@@ -22,6 +22,10 @@ ++ #include <sys/socket.h> ++ #include <sys/wait.h> ++ +++#ifdef HAVE_CONFIG_H +++ #include "config.h" +++#endif +++ ++ struct message { ++ unsigned intr : 1; ++ unsigned nofd : 1; ++@@ -124,6 +128,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp, ++ return res; ++ } ++ +++#if !defined(HAVE_CLOSEFROM) ++ static int closefrom(int minfd) ++ { ++ DIR *dir = opendir("/proc/self/fd"); ++@@ -141,6 +146,7 @@ static int closefrom(int minfd) ++ } ++ return 0; ++ } +++#endif ++ ++ static void send_reply(int cfd, struct message *msg) ++ { diff --git a/sys-kernel/genkernel/genkernel-4.0.10.ebuild b/sys-kernel/genkernel/genkernel-4.0.10.ebuild index 982c379f4ad4..b26333b38c37 100644 --- a/sys-kernel/genkernel/genkernel-4.0.10.ebuild +++ b/sys-kernel/genkernel/genkernel-4.0.10.ebuild @@ -40,7 +40,7 @@ VERSION_ZLIB="1.2.11" VERSION_ZSTD="1.4.5" COMMON_URI=" - https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 + https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz diff --git a/sys-kernel/genkernel/genkernel-4.2.5.ebuild b/sys-kernel/genkernel/genkernel-4.2.5.ebuild index e3e0988c222f..0aa34f0f69da 100644 --- a/sys-kernel/genkernel/genkernel-4.2.5.ebuild +++ b/sys-kernel/genkernel/genkernel-4.2.5.ebuild @@ -48,7 +48,7 @@ VERSION_ZSTD="1.5.0" COMMON_URI=" https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz - https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 + https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz diff --git a/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild index e62b8cbdfac6..8095046ac8a1 100644 --- a/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild +++ b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild @@ -48,7 +48,7 @@ VERSION_ZSTD="1.5.0" COMMON_URI=" https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz - https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 + https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz @@ -126,7 +126,10 @@ if [[ ${PV} == 9999* ]]; then DEPEND="${DEPEND} app-text/asciidoc" fi -PATCHES=( "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch + "${FILESDIR}"/${P}-fuse-glibc-2.34.patch +) src_unpack() { if [[ ${PV} == 9999* ]]; then diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index e5a3606bbf76..acee15e17415 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -48,7 +48,7 @@ VERSION_ZSTD="1.5.0" COMMON_URI=" https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz - https://dl.bintray.com/boostorg/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 + https://boostorg.jfrog.io/artifactory/main/release/${VERSION_BOOST}/source/boost_${VERSION_BOOST//./_}.tar.bz2 https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2 mirror://gnu/coreutils/coreutils-${VERSION_COREUTILS}.tar.xz |