[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2024-04-30 Thread Ben Kohler 
commit: 337ecfbda56f66bccafb29594aae8ec97962e8b2
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Apr 30 17:19:53 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Apr 30 17:20:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337ecfbd

sys-kernel/genkernel: drop versions

Signed-off-by: Ben Kohler  gentoo.org>

 sys-kernel/genkernel/Manifest  |  23 --
 .../files/genkernel-4.3.2-no-color-on-qlist.patch  |  38 ---
 ...genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch |  24 --
 sys-kernel/genkernel/genkernel-4.3.2-r1.ebuild | 321 
 sys-kernel/genkernel/genkernel-4.3.3.ebuild| 320 
 sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild | 321 
 sys-kernel/genkernel/genkernel-4.3.5.ebuild| 320 
 sys-kernel/genkernel/genkernel-4.3.6.ebuild| 322 -
 sys-kernel/genkernel/genkernel-4.3.7.ebuild| 322 -
 sys-kernel/genkernel/genkernel-4.3.8.ebuild| 322 -
 10 files changed, 2333 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 2c369d851035..8cc05f51983a 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -3,74 +3,51 @@ DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 
79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43
 DIST bcache-tools-1.0.8_p20141204.tar.gz 22158 BLAKE2B 
dd36102c5668cab3072ea635a5a30128df6cd75b75e7f8bba17ad0a830746ff2f75a46b56d4211aeb4657453d3bbeb98b8b794c53ff724b3fbf0874068d70dc9
 SHA512 
53d6e764d6d42c4367b0bd98199cae3c18054d5707a7880af3a422f9db332b44941015eaed7e1cd170b3546307ed54a2f99558a68d98c76b7bb6234d29206b54
 DIST bcache-tools-1.1_p20230217.tar.gz 44025 BLAKE2B 
c6e1c3e64d1f53f581cd6ea80b919bd7db93e0ec048de70e65cfa1b28ae59e921c7cdcf4c3d0f25823ab323f76ef29671bc2e3db616bad34e8c193aaa3a38c89
 SHA512 
aac047cb773ebc9e9c139f0a3da5721511a24265a497ce26fd607a26195d402ef78fa5f3c76d609195ee48267395527bd7083abe996e9fa3009b43ac85f94652
 DIST boost_1_79_0.tar.bz2 113456811 BLAKE2B 
61f47ca022e60745868e6bdd3b5c75603dd68d878e126dcbb73de5b40fc03c0eec8eede3ec304ece58050435ef2fc1ed7eb763773c20673f85e32bbf4d5f978a
 SHA512 
70909e0561c213d10a1fdd692f9ae7b293d3cdc63e925bdc207da9e9bba6e86474341100e7ee5de6d94f9561196b1a3a1597055a7b7382babf8931131170a312
-DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 
45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941
 SHA512 
5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90
 DIST btrfs-progs-v6.3.2.tar.xz 3160148 BLAKE2B 
e6815eeb90c1dbf9a6c4a5aa72262c18b2031a9305efc9024b1fe7b770a256e1d4cb3b01646a0a523f0e26af2d499382bf42420385c56593ace515a6c225f54d
 SHA512 
d8580250994b3e399babec4478515686f1e3cc2e4fc01ccbc7b00a51b6131452d209cb7f43dbbac5375286546d182fcdf7884bbc1a8ad6889c3f15d85ba8f8d5
 DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 
4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0
 SHA512 
8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc
-DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 
1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033
 SHA512 
fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B 
e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e
 SHA512 
8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
-DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 
0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515
 SHA512 
1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.3.tar.xz 5808696 BLAKE2B 
11502cd2dbeef150d0d4cece2546bf6b835941b94456c258f6058338f0477f22e68e88934d075b08fe51ee4d1c0c50cb23d8084ac06a457d6e8975f01643b1cd
 SHA512 
242271f212a6860bdc6c8d7e5c4f85ce66c1b48ef781aca9daa56e0fe7c2b7809ef72b4392120219fe5b687637c83ce89ceef8bb35f6274f43f8f968a6901694
 DIST coreutils-9.4.tar.xz 5979200 BLAKE2B 
83d41c48804c1d470c0e5eed38e692bb6875436dda3f6e2c29784ad6ef563d86e8e066a050e222621b400f78ea4630b1e127d20fc9b76f12096528c42677e35d
 SHA512 
7c55ee23b685a0462bbbd118b04d25278c902604a0dcf3bf4f8bf81faa0500dee5a7813cba6f586d676c98e520cafd420f16479619305e94ea6798d8437561f5
-DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2023-07-25 Thread Sam James 
commit: d8f4284590c80f6a331e15a7f535184342920dcb
Author: orbea  riseup  net>
AuthorDate: Tue Jul 25 03:09:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul 26 03:33:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8f42845

sys-kernel/genkernel: update cryptsetup to 2.6.1

This version has the LFS64 changes required for >= musl-1.2.4.

Upstream-Commit: 
https://github.com/gentoo/genkernel/commit/231fdfd9f1c1819d19440627ebe0ea58576a9965
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/32029
Signed-off-by: Sam James  gentoo.org>

 sys-kernel/genkernel/Manifest  |  1 +
 ...genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch | 24 ++
 ...ernel-.ebuild => genkernel-4.3.5-r1.ebuild} |  3 ++-
 sys-kernel/genkernel/genkernel-.ebuild |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index b99d346d94ec..ea0925c7e25c 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -5,6 +5,7 @@ DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 
45fa1e20d14bdd92b1a7761771c7b6c279
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 
1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033
 SHA512 
fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 
0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515
 SHA512 
1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST cryptsetup-2.4.1.tar.xz 11171180 BLAKE2B 
6b999a19df54276d295eb2f1729be2eefb5fb09cd29aae5f7c0b93c539b4b552f92327f2474e0f4793a3c7f8a264a4ef927178dabfc9ba56012bdf9949ef9ada
 SHA512 
17fc73c180e41acbd4ebeddebaf54f8baeef09fce7f154aa9c55936a58bda7adcc7b1bb257336c22295d7b5af426fc8dfd0e4e644e4a52098bcb8a2adb562ca7
+DIST cryptsetup-2.6.1.tar.xz 11402380 BLAKE2B 
efd7a64d89d863876de68ff3e89d8c94ad5eca6a8d2236c52c234fbe51e9d9ee303a0c7fe7dac7df10e0062003b9c0aeddc8dc342582106c157ab2d1e742155e
 SHA512 
0cbddbf33cbac2b834ed7e2dd47a9fc787131031a1c729f373f5c974600a838097e9cc0555f13719fc79c384a2a34b404f94ba4cc2f35f0bb1d70aef2233fd18
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 
290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512
 SHA512 
7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
 DIST dropbear-2020.81.tar.bz2 2289644 BLAKE2B 
eb80ff88d75ae97365570f8793aee855cc615f6a46c49c4efa026d14ba8507c41b87093ca5b86dd1fcd3602f5e24b7b9c4f83c7cf4f6dc7945ff628b09c98794
 SHA512 
2fa9d4d7dcb1c81281f5e47c8a99b7300eb46b3bb605daaec956404eae9124879a8bbbef521dea6da8b3643f3dc6f7f5005e265bfcaba97e89812f5642c294da
 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch 
b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch
new file mode 100644
index ..26caca5de43a
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.5-no-asciidoc-on-cryptsetup.patch
@@ -0,0 +1,24 @@
+https://github.com/gentoo/genkernel/commit/231fdfd9f1c1819d19440627ebe0ea58576a9965
+
+From 231fdfd9f1c1819d19440627ebe0ea58576a9965 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Wed, 5 Jul 2023 21:41:39 +0100
+Subject: [PATCH] gkbuilds: cryptsetup: disable asciidoc
+
+Signed-off-by: Sam James 
+---
+ gkbuilds/cryptsetup.gkbuild | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
+index 816df609..c084286c 100644
+--- a/gkbuilds/cryptsetup.gkbuild
 b/gkbuilds/cryptsetup.gkbuild
+@@ -11,6 +11,7 @@ src_configure() {
+   local myconf=(
+   --enable-internal-argon2
+   --sbindir=/sbin
++  --disable-asciidoc
+   --disable-nls
+   --disable-selinux
+   --disable-ssh-token

diff --git a/sys-kernel/genkernel/genkernel-.ebuild 
b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
similarity index 99%
copy from sys-kernel/genkernel/genkernel-.ebuild
copy to sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
index 0a90921d0699..9a46e6c7644d 100644
--- a/sys-kernel/genkernel/genkernel-.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.3.5-r1.ebuild
@@ -17,7 +17,7 @@ VERSION_BOOST="1.79.0"

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2022-07-24 Thread Sam James 
commit: c5764a9d99e1f84eef38ee09cb80491cb24ac905
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul 24 23:19:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 24 23:19:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5764a9d

sys-kernel/genkernel: backport chroot/busybox fix, s390x config

Needed to fix sparc livecds at least.

Bug: https://bugs.gentoo.org/842027
Signed-off-by: Sam James  gentoo.org>

 sys-kernel/genkernel/Manifest  |   1 +
 .../files/genkernel-4.2.6-chroot-path.patch|  49 
 sys-kernel/genkernel/genkernel-4.2.6-r5.ebuild | 323 +
 3 files changed, 373 insertions(+)

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 788ef1989104..30abe767bb55 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -26,6 +26,7 @@ DIST expat-2.4.1.tar.xz 445024 BLAKE2B 
2ae66d284a03176ef7290093f59bb7ad98011dfbf
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 
9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847
 SHA512 
3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-4.0.10.tar.xz 460816 BLAKE2B 
d5922eede1192bb95ca235106a70118826c2c4c078f741e25954485f142d858bf612f35b94553fc409e4f6641b256a2940f83131c5b4bc7d6dbae85019bee7ff
 SHA512 
29dc29b346b132cc6e7ea5298e49c93d01ba28531928cb7a6125864c7d03b74f70bc74043b220dfbbb6651ad67fcbc3d8ed8a2d0f40d271b83e9a8ab0325a2dd
 DIST genkernel-4.2.5.tar.xz 488188 BLAKE2B 
e960a46eb6053476bcf46ed0156d3b0c2712d69e339b644033272eb4d1d1f7325e03d4a1921e79282e29aa08134ee17060439983069718f0411a57e98c14ef2e
 SHA512 
3d417507dc06a91e4d356d1a5476faab8d9ad3c18f72bc6d6244a14f46673cf4e349d9eaca377e79c72f713ff7818d8676b0b59553c748abf3cd8454a532f271
+DIST genkernel-4.2.6-s390x.patch 39633 BLAKE2B 
a48aae069b41e2520fce9ac60a79f567225bcb798bfa02ccc5c279427381d3f0e59bb0d8231b7e9760c22a1bccf17ae826d0f01973e32f9a4f0ab60165c8fbdd
 SHA512 
d1db9f2c36cf9c0d7f042ec682c2b61817eda0d21c35515dc313ad8901c7c4239a28937c4b411f796ab38278caaa1fa3a7c7e7d6dd9c8ba3f4f37fbba5988105
 DIST genkernel-4.2.6.tar.xz 488892 BLAKE2B 
4dc54c878e25165799ac40e45f28843c057348006a9e1a8dc2dec499e0ef78705104ae6893e15f76fc88cc054137d781cae1c4ec395fba669f6c93ec6fa8d6d9
 SHA512 
5981be08aac31c1cac22efd66e9cb39e6362cc7cac90dc26dd2089f95f287908dcbfb58a7da0bde6205bf42c57c606b96ed2e190b6d0fed1cfade9bae76b11fb
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B 
ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e
 SHA512 
78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 DIST hwids-20210613.tar.gz 3867741 BLAKE2B 
64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d
 SHA512 
4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch 
b/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch
new file mode 100644
index ..150506c454c8
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-chroot-path.patch
@@ -0,0 +1,49 @@
+https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33394fef9f712ca0854eca248fe85863771ca04a
+
+From: "Andreas K. Hüttel" 
+Date: Mon, 16 May 2022 21:31:34 +0200
+Subject: linuxrc: do not rely on chroot evaluating PATH
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When trying to install a new kernel on catbus.sparc.dev.gentoo.org, the
+newly built initrd consistently claimed that it could not find init, and
+dropped to the rescue shell.
+
+However, init was there just fine in /newroot (as before).
+
+I dug out the command that is actually run inside linuxrc,
+
+elif ! chroot "${CHROOT}" test -x /${init#/} 1>/dev/null 2>&1
+
+and tried to run that manually, which led to a rather strange error message
+
+rescueshell / # chroot /newroot test -x /lib/systemd/systemd
+chroot: can't execute 'test': File name too long
+
+Some more research led me to the busybox manpage (where here chroot comes
+from):
+https://busybox.net/downloads/BusyBox.html#chroot
+
+chroot
+chroot NEWROOT [PROG [ARGS]]
+Run PROG with root directory set to NEWROOT
+
+Note, the third argument is *not* a command (as with usual chroot, see the
+manpage from coreutils chroot) but a program!
+
+Bug: https://bugs.gentoo.org/842027
+Signed-off-by: Andreas K. Hüttel 
+--- a/defaults/linuxrc
 b/defaults/linuxrc
+@@ -1376,7 +1376,7 @@ do
+   if  ! mountpoint "${CHROOT}" 1>/dev/null 2>&1
+   then
+   bad_msg "${CHROOT} is not a mountpoint; Was root device

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2021-12-09 Thread Thomas Deutschmann 
commit: 1b9bf0269cd8276bb65546b738cd672323a4483a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec 10 00:59:22 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec 10 01:00:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9bf026

sys-kernel/genkernel: allow building fuse against glibc-2.34

Closes: https://bugs.gentoo.org/828445
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/genkernel-4.2.6-fuse-glibc-2.34.patch| 77 ++
 ...l-4.2.6-r1.ebuild => genkernel-4.2.6-r2.ebuild} |  5 +-
 2 files changed, 81 insertions(+), 1 deletion(-)

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 ..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 
+AuthorDate: Fri Dec 10 01:56:20 2021 +0100
+Commit: Thomas Deutschmann 
+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 
+
+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 000..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 
++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 
++---
++ 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 
++ #include 
++ 
+++#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.2.6-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
index ef162ae9c38b..8095046ac8a1 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
@@ -126,7 +126,10 @@ if [[ ${PV} == * ]]; 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} == * ]]; then

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2021-11-16 Thread Thomas Deutschmann 
commit: 5d7061a540ee6868e6e4b70868f838ddf5e6e07a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 16 17:36:19 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 16 17:38:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7061a5

sys-kernel/genkernel: fix building of btrfs-progs

Bug: https://bugs.gentoo.org/823716
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../genkernel-4.2.6-fix-btrfs-progs-deps.patch | 24 ++
 ...rnel-4.2.6.ebuild => genkernel-4.2.6-r1.ebuild} |  2 ++
 2 files changed, 26 insertions(+)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch 
b/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
new file mode 100644
index ..f9306d851d33
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
@@ -0,0 +1,24 @@
+commit 779376e0a1e3c55a8bdc40c5e55ce9bb50ee8eae
+Author: Thomas Deutschmann 
+AuthorDate: Tue Nov 16 18:33:12 2021 +0100
+Commit: Thomas Deutschmann 
+CommitDate: Tue Nov 16 18:33:12 2021 +0100
+
+btrfs-progs-5.15+ needs libudev
+
+Fixes: d3ee3d06 ("Bump btrfs-progs to v5.15")
+Signed-off-by: Thomas Deutschmann 
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 9f64ab0..ec2bacb 100644
+--- a/defaults/software.sh
 b/defaults/software.sh
+@@ -32,7 +32,7 @@ 
GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GK
+ 
+ GKPKG_BTRFS_PROGS_PN="btrfs-progs"
+ GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
+-GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo"
++GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
+ 
GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
+ 
GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
+ 
GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"

diff --git a/sys-kernel/genkernel/genkernel-4.2.6.ebuild 
b/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.6.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
index e5a3606bbf76..1088ddbbe1c2 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
@@ -126,6 +126,8 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch )
+
 src_unpack() {
if [[ ${PV} == * ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2021-09-30 Thread Thomas Deutschmann 
commit: e31cc3aa827f1d83fd9e7d23a4bc32149d8e6ae2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Sep 30 22:26:15 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Sep 30 22:27:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31cc3aa

sys-kernel/genkernel: adopt changes from >=sys-apps/baselayout-2.8

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/genkernel-4.2.4-modprobe-d-fix.patch | 46 ++
 ...l-4.2.4-r1.ebuild => genkernel-4.2.4-r2.ebuild} |  5 ++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch 
b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
new file mode 100644
index 000..09ac6422e16
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.4-modprobe-d-fix.patch
@@ -0,0 +1,46 @@
+From c869ac450ae286908cfed582b0c51fe327555833 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Thu, 30 Sep 2021 23:12:52 +0200
+Subject: gen_initramfs.sh: append_modprobed(): Adopt changes from
+ sys-apps/baselayout-2.8
+
+In >=sys-apps/baselayout-2.8, /etc/modprobe.d was moved to /lib/modprobe.d.
+
+This commit will try to copy /etc/modprobe.d and /lib/modprobe.d but will
+no longer fail if one directory is missing.
+
+Signed-off-by: Thomas Deutschmann 
+---
+ gen_initramfs.sh | 15 ---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 8f11127..56d6a03 100755
+--- a/gen_initramfs.sh
 b/gen_initramfs.sh
+@@ -1832,10 +1832,19 @@ append_modprobed() {
+   mkdir "${TDIR}" || gen_die "Failed to create '${TDIR}'!"
+   cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+ 
+-  mkdir -p "${TDIR}"/etc || gen_die "Failed to create '${TDIR}/etc'!"
++  local modprobe_dir
++  for modprobe_dir in /etc/modprobe.d /lib/modprobe.d
++  do
++  if [[ ! -e "${modprobe_dir}" ]]; then
++  print_info 5 "'${modprobe_dir}' does not exist; 
Skipping ..."
++  continue
++  fi
++
++  mkdir -p "${TDIR}${modprobe_dir}" || gen_die "Failed to create 
'${TDIR}${modprobe_dir}'!"
+ 
+-  cp -rL "/etc/modprobe.d" "${TDIR}"/etc/ 2>/dev/null \
+-  || gen_die "Failed to copy '/etc/modprobe.d'!"
++  cp -aL "${modprobe_dir}"/. "${TDIR}${modprobe_dir}" 2>/dev/null 
\
++  || gen_die "Failed to copy '${modprobe_dir}'!"
++  done
+ 
+   cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+   log_future_cpio_content
+-- 
+cgit v1.2.3-18-g5258
+

diff --git a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
index f8f6847a650..dfef98dec33 100644
--- a/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.4-r2.ebuild
@@ -125,7 +125,10 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-PATCHES=( "${FILESDIR}"/${P}-fix-dropbear-depend.patch )
+PATCHES=(
+   "${FILESDIR}"/${P}-fix-dropbear-depend.patch
+   "${FILESDIR}"/${P}-modprobe-d-fix.patch
+)
 
 src_unpack() {
if [[ ${PV} == * ]]; then

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2021-09-29 Thread Thomas Deutschmann 
commit: e0515e9e35f1a9c0ec7e5fb6daf6124a9b2054ef
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep 29 20:40:05 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep 29 20:44:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0515e9e

sys-kernel/genkernel: fix building dropbear

dropbear needs libxcrypt.

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../genkernel-4.2.4-fix-dropbear-depend.patch  | 26 ++
 ...rnel-4.2.4.ebuild => genkernel-4.2.4-r1.ebuild} |  2 ++
 2 files changed, 28 insertions(+)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch 
b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
new file mode 100644
index 000..ab74620e0fa
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.4-fix-dropbear-depend.patch
@@ -0,0 +1,26 @@
+From e43878aa62e563fcefa7c1da5c44017816ac65b4 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann 
+Date: Wed, 29 Sep 2021 20:15:56 +0200
+Subject: defaults/software.sh: dropbear needs libxcrypt
+
+Signed-off-by: Thomas Deutschmann 
+---
+ defaults/software.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 54836ad..9f64ab0 100644
+--- a/defaults/software.sh
 b/defaults/software.sh
+@@ -67,7 +67,7 @@ 
GKPKG_DMRAID_BINPKG="${GKPKG_DMRAID_BINPKG:-%%CACHE%%/dmraid-${GKPKG_DMRAID_PV}-
+ 
+ GKPKG_DROPBEAR_PN="dropbear"
+ GKPKG_DROPBEAR_PV="${GKPKG_DROPBEAR_PV:-VERSION_DROPBEAR}"
+-GKPKG_DROPBEAR_DEPS="zlib"
++GKPKG_DROPBEAR_DEPS="zlib libxcrypt"
+ 
GKPKG_DROPBEAR_SRCTAR="${GKPKG_DROPBEAR_SRCTAR:-${DISTDIR}/dropbear-${GKPKG_DROPBEAR_PV}.tar.bz2}"
+ 
GKPKG_DROPBEAR_SRCDIR="${GKPKG_DROPBEAR_SRCDIR:-dropbear-${GKPKG_DROPBEAR_PV}}"
+ 
GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPBEAR_PV}-%%ARCH%%.tar.xz}"
+-- 
+cgit v1.2.3-18-g5258
+

diff --git a/sys-kernel/genkernel/genkernel-4.2.4.ebuild 
b/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.2.4.ebuild
rename to sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
index a7c583a33ed..f8f6847a650 100644
--- a/sys-kernel/genkernel/genkernel-4.2.4.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.4-r1.ebuild
@@ -125,6 +125,8 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-fix-dropbear-depend.patch )
+
 src_unpack() {
if [[ ${PV} == * ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2020-09-02 Thread Thomas Deutschmann 
commit: 329acc304d62d6d3a1954ca23b509f5c68779690
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Sep  2 19:59:14 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Sep  2 19:59:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=329acc30

sys-kernel/genkernel: unbreak remote unlock using POST action

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch| 3 +--
 .../genkernel/{genkernel-4.1.2-r1.ebuild => genkernel-4.1.2-r2.ebuild} | 0
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch 
b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
index 1faa26d8b3e..ec72ab09866 100644
--- a/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
+++ b/sys-kernel/genkernel/files/genkernel-4.1.2-post-release-fixes.patch
@@ -108,7 +108,7 @@
 -  eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"' 
OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
 +  local LUKS_NAME="${NAME}"
 +  eval local LUKS_DEVICE='"${CRYPT_'${TYPE}'}"'
-+  eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEY}"'
++  eval local LUKS_KEY='"${CRYPT_'${TYPE}'_KEYFILE}"'
 +  eval local LUKS_TRIM='"${CRYPT_'${TYPE}'_TRIM}"'
 +  eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"'
  
@@ -187,4 +187,3 @@
  # "best" selects the best available compression method
  # "fastest" selects the fastest available compression method
  #COMPRESS_INITRD_TYPE="best"
- 

diff --git a/sys-kernel/genkernel/genkernel-4.1.2-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.1.2-r2.ebuild
similarity index 100%
rename from sys-kernel/genkernel/genkernel-4.1.2-r1.ebuild
rename to sys-kernel/genkernel/genkernel-4.1.2-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2020-08-18 Thread Thomas Deutschmann 
commit: 739d9c4c3635ed4536ef385dc4475a3f15d9f6ab
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 19 01:17:23 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 19 01:18:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739d9c4c

sys-kernel/genkernel: fix --bcache option

Closes: https://bugs.gentoo.org/737894
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...itramfs.patch => genkernel-4.1.0-post-release-fixes.patch} | 11 +++
 .../{genkernel-4.1.0-r1.ebuild => genkernel-4.1.0-r2.ebuild}  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch 
b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch
similarity index 80%
rename from 
sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch
rename to sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch
index afe3e99dbc5..ef121d9ccc6 100644
--- a/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch
+++ b/sys-kernel/genkernel/files/genkernel-4.1.0-post-release-fixes.patch
@@ -26,3 +26,14 @@
|| gen_die "Failed to set '${optname}=${optval}' in 
'${kconfig}'"
  
[ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch 
"${KCONFIG_MODIFIED_MARKER}"
+--- a/gkbuilds/bcache-tools.gkbuild
 b/gkbuilds/bcache-tools.gkbuild
+@@ -6,7 +6,7 @@ src_configure() {
+ }
+ 
+ src_compile() {
+-  PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \
++  PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
+   gkmake V=1
+ }
+ 

diff --git a/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild
rename to sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild
index 0b57d466b50..56ac783bac6 100644
--- a/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.1.0-r2.ebuild
@@ -118,7 +118,7 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-PATCHES=( "${FILESDIR}"/${P}-fix-integrated-initramfs.patch )
+PATCHES=( "${FILESDIR}"/${P}-post-release-fixes.patch )
 
 src_unpack() {
if [[ ${PV} == * ]]; then

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2020-08-17 Thread Thomas Deutschmann 
commit: c024aafd9e3d27ec79bcc96dc17f2a152c2bc333
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Aug 17 23:25:11 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Aug 17 23:25:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c024aafd

sys-kernel/genkernel: fix --integrated-initramfs option

Closes: https://bugs.gentoo.org/737598
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../genkernel-4.1.0-fix-integrated-initramfs.patch | 28 ++
 ...rnel-4.1.0.ebuild => genkernel-4.1.0-r1.ebuild} |  2 ++
 2 files changed, 30 insertions(+)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch 
b/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch
new file mode 100644
index 000..afe3e99dbc5
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.1.0-fix-integrated-initramfs.patch
@@ -0,0 +1,28 @@
+--- a/gen_determineargs.sh
 b/gen_determineargs.sh
+@@ -1170,6 +1170,14 @@ determine_real_args() {
+   fi
+   fi
+ 
++  if isTrue "${INTEGRATED_INITRAMFS}"
++  then
++  if  ! isTrue "${BUILD_KERNEL}" || ! isTrue "${BUILD_RAMDISK}"
++  then
++  gen_die "Invalid action specified: 
--integrated-initramfs option requires action \"all\", i.e. building of kernel 
and initramfs at the same time!"
++  fi
++  fi
++
+   if ! isTrue "${CMD_INSTALL}"
+   then
+   if [ -n "${KERNEL_MODULES_PREFIX}" ]
+--- a/gen_funcs.sh
 b/gen_funcs.sh
+@@ -2033,7 +2033,7 @@ kconfig_set_opt() {
+   else
+   print_info 3 "$(get_indent ${indentlevel}) - Setting option 
'${optname}' to '${optval}' in '${kconfig}'..."
+   sed -i "${kconfig}" \
+-  -e "s/^#\? \?${optname}[ =].*/${optname}=${optval}/g" \
++  -e "s|^#\? \?${optname}[ =].*|${optname}=${optval}|g" \
+   || gen_die "Failed to set '${optname}=${optval}' in 
'${kconfig}'"
+ 
+   [ ! -f "${KCONFIG_MODIFIED_MARKER}" ] && touch 
"${KCONFIG_MODIFIED_MARKER}"

diff --git a/sys-kernel/genkernel/genkernel-4.1.0.ebuild 
b/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.1.0.ebuild
rename to sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild
index f4f851fba1a..0b57d466b50 100644
--- a/sys-kernel/genkernel/genkernel-4.1.0.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.1.0-r1.ebuild
@@ -118,6 +118,8 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-fix-integrated-initramfs.patch )
+
 src_unpack() {
if [[ ${PV} == * ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2020-04-11 Thread Thomas Deutschmann 
commit: e4f482966bd30c729cc3ea2fe44cd75170f1780a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Apr 11 23:18:14 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Apr 11 23:25:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f48296

sys-kernel/genkernel: rev bump

Cherry-pick commit 2948a542da6964a4f61a71fd5253c97f803eac34.

Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...ernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch | 26 ++
 ...rnel-4.0.7.ebuild => genkernel-4.0.7-r1.ebuild} |  2 ++
 2 files changed, 28 insertions(+)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch
 
b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch
new file mode 100644
index 000..be7bcf169ce
--- /dev/null
+++ 
b/sys-kernel/genkernel/files/genkernel-4.0.7-fix-unquoted-SANDBOX_ON-check.patch
@@ -0,0 +1,26 @@
+commit 2948a542da6964a4f61a71fd5253c97f803eac34
+Author: Thomas Deutschmann 
+AuthorDate: Sun Apr 12 01:12:38 2020 +0200
+Commit: Thomas Deutschmann 
+CommitDate: Sun Apr 12 01:12:38 2020 +0200
+
+gen_determineargs.sh: determine_real_args(): Quote $SANDBOX_ON
+
+$SANDBOX_ON can be unset causing 'unary operator expected' error.
+
+Fixes c0e013c ("gen_determineargs.sh: determine_real_args(): Error out 
early when already running within a sandbox")
+Signed-off-by: Thomas Deutschmann 
+
+diff --git a/gen_determineargs.sh b/gen_determineargs.sh
+index 95ec4021..b1c038d3 100755
+--- a/gen_determineargs.sh
 b/gen_determineargs.sh
+@@ -1012,7 +1012,7 @@ determine_real_args() {
+   SANDBOX_COMMAND=
+   if isTrue "${SANDBOX}"
+   then
+-  if [ ${SANDBOX_ON} -eq 1 ]
++  if [[ "${SANDBOX_ON}" == "1" ]]
+   then
+   gen_die "SANDBOX_ON=1 detected -- You cannot 
use --sandbox when already running within a sandbox!"
+   fi

diff --git a/sys-kernel/genkernel/genkernel-4.0.7.ebuild 
b/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.0.7.ebuild
rename to sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild
index 1014ca6dd11..8847cf2242f 100644
--- a/sys-kernel/genkernel/genkernel-4.0.7.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.7-r1.ebuild
@@ -111,6 +111,8 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-fix-unquoted-SANDBOX_ON-check.patch )
+
 src_unpack() {
if [[ ${PV} == * ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2019-12-06 Thread Thomas Deutschmann 
commit: ec9a316d0b693f53aeb6b64b2d3e25815c5f7f5e
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  6 15:35:43 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Dec  6 15:35:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9a316d

sys-kernel/genkernel: Improve SELinux compatibility

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...ernel-4.0.0-improve-selinux-compatibility.patch | 54 ++
 ...rnel-4.0.0.ebuild => genkernel-4.0.0-r1.ebuild} |  2 +
 2 files changed, 56 insertions(+)

diff --git 
a/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch
 
b/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch
new file mode 100644
index 000..a61ba8a0eef
--- /dev/null
+++ 
b/sys-kernel/genkernel/files/genkernel-4.0.0-improve-selinux-compatibility.patch
@@ -0,0 +1,54 @@
+From a611a39cabab9836b51d1fc4326c3747cbdcd29a Mon Sep 17 00:00:00 2001
+From: Mark Wright 
+Date: Fri, 6 Dec 2019 16:23:51 +0100
+Subject: Improve SELinux compatibility
+
+Closes: https://bugs.gentoo.org/697074
+Signed-off-by: Thomas Deutschmann 
+---
+ gen_funcs.sh | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gen_funcs.sh b/gen_funcs.sh
+index 107f02b..f5dd0cd 100755
+--- a/gen_funcs.sh
 b/gen_funcs.sh
+@@ -728,7 +728,7 @@ dropbear_create_key() {
+ 
+   if isTrue "${SANDBOX}"
+   then
+-  envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
++  envvars+=( 
"SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
+   fi
+ 
+   # set up worker signal handler
+@@ -805,7 +805,7 @@ dropbear_generate_key_info_file() {
+ 
+   if isTrue "${SANDBOX}"
+   then
+-  envvars+=( SANDBOX_WRITE="${LOGFILE}:${TEMP}" )
++  envvars+=( 
"SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
+   fi
+ 
+   # set up worker signal handler
+@@ -1397,7 +1397,7 @@ gkbuild() {
+ 
+   if isTrue "${SANDBOX}"
+   then
+-  envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
++  envvars+=( 
"SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
+   fi
+ 
+   # set up gkbuild signal handler
+@@ -1452,7 +1452,7 @@ unpack() {
+ 
+   if isTrue "${SANDBOX}"
+   then
+-  envvars+=( "SANDBOX_WRITE='${LOGFILE}:${TEMP}'" )
++  envvars+=( 
"SANDBOX_WRITE='${LOGFILE}:${TEMP}:/proc/thread-self/attr/fscreate'" )
+   fi
+ 
+   # set up unpack signal handler
+-- 
+cgit v1.2.1
+

diff --git a/sys-kernel/genkernel/genkernel-4.0.0.ebuild 
b/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
similarity index 99%
rename from sys-kernel/genkernel/genkernel-4.0.0.ebuild
rename to sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
index 6f69a282d07..c84640e954f 100644
--- a/sys-kernel/genkernel/genkernel-4.0.0.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
@@ -109,6 +109,8 @@ if [[ ${PV} == * ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
+PATCHES=( "${FILESDIR}"/${P}-improve-selinux-compatibility.patch )
+
 src_unpack() {
if [[ ${PV} == * ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2018-05-07 Thread Thomas Deutschmann 
commit: 8df441a2c49752ec72d4057703ead491d449fd9b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue May  8 00:45:14 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue May  8 00:45:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df441a2

sys-kernel/genkernel: add crc32c to modules_load

Closes: https://bugs.gentoo.org/655110
Package-Manager: Portage-2.3.34, Repoman-2.3.9
RepoMan-Options: --force

 .../files/genkernel-3.4.52.4-crc32c.patch  | 130 +
 sys-kernel/genkernel/genkernel-3.4.52.4-r3.ebuild  | 157 +
 2 files changed, 287 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch 
b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch
new file mode 100644
index 000..48dada2f980
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-crc32c.patch
@@ -0,0 +1,130 @@
+modules_load: add crc32c
+
+commit 7308d72c3280da22cd94337b0eb248cdc53cb842 upstream.
+
+Bug: https://bugs.gentoo.org/655110
+
+--- a/arch/alpha/modules_load
 b/arch/alpha/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/arm/modules_load
 b/arch/arm/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/ia64/modules_load
 b/arch/ia64/modules_load
+@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ 
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
++
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/mips/modules_load
 b/arch/mips/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/parisc/modules_load
 b/arch/parisc/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/parisc64/modules_load
 b/arch/parisc64/modules_load
+@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ 
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
++
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/ppc/modules_load
 b/arch/ppc/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/ppc64/modules_load
 b/arch/ppc64/modules_load
+@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ 
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
++
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/s390/modules_load
 b/arch/s390/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/sparc/modules_load
 b/arch/sparc/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/sparc64/modules_load
 b/arch/sparc64/modules_load
+@@ -26,3 +26,6 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ 
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
++
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/um/modules_load
 b/arch/um/modules_load
+@@ -27,3 +27,5 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage 
uhci-hcd ohci-hcd x
+ # Filesystems
+ MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
+ 
++# Crypto
++MODULES_CRYPTO="sha256_generic cbc crc32c aes_generic xts"
+--- a/arch/x86/modules_load
 b/arch/x86/modules_load
+@@ -29,4 +29,4 @@

[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/files/, sys-kernel/genkernel/

2016-08-15 Thread Robin H. Johnson 
commit: 0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sat Aug 13 23:35:55 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Mon Aug 15 07:02:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b64552c

sys-kernel/genkernel: backport grub-mkconfig change from master, per bug #591200

Package-Manager: portage-2.2.28

 .../files/genkernel-3.4.52.4-grub-mkconfig.patch   |  17 +++
 sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild  | 163 +
 2 files changed, 180 insertions(+)

diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch 
b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
new file mode 100644
index 000..9e55301
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/gen_bootloader.sh b/gen_bootloader.sh
+index 4bbd303..fdca749 100755
+--- a/gen_bootloader.sh
 b/gen_bootloader.sh
+@@ -49,8 +49,10 @@ set_bootloader_grub2() {
+   fi
+ 
+   print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
+-  print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
+-  grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die 
"grub2-mkconfig failed"
++  print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
++  grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++  grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++  gen_die "grub-mkconfig failed"
+   [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/' 
"${GRUB_CONF}"
+ }
+ 

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild 
b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
new file mode 100644
index 000..0319c77
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# genkernel--> latest Git branch "master"
+# genkernel-VERSION -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sourceware.org/pub;
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src;
+BB_HOME="https://busybox.net/downloads;
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+   ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+   
mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+   ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+   ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+   ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+   
http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+   mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+   
http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+   mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == * ]]
+then
+   EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
+   https://anongit.gentoo.org/git/proj/${PN}.git;
+   inherit git-2 bash-completion-r1 eutils
+   S="${WORKDIR}/${PN}"
+   SRC_URI="${COMMON_URI}"
+else
+   inherit bash-completion-r1 eutils
+   SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
+   ${COMMON_URI}"
+   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org;
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+   selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+   cryptsetup? ( sys-fs/cryptsetup )
+   app-arch/cpio
+   >=app-misc/pax-utils-0.2.1
+   !/dev/null || die
+   git log > "${S}"/ChangeLog || die
+   popd >/dev/null || die
+   fi
+   if use selinux ; then
+   sed -i 's/###//g' "${S}"/gen_compile.sh || die
+   fi
+
+   # Update software.sh
+   sed -i \
+   -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+   -e "s:VERSION_MDADM:$VERSION_MDADM:" \
+   -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+   -e "s:VERSION_FUSE:$VERSION_FUSE:" \
+   -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+   -e "s:VERSION_LVM:$VERSION_LVM:" \
+   -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+   -e "s:VERSION_GPG:$VERSION_GPG:" \
+   "${S}"/defaults/software.sh \
+   || die "Could not adjust versions"
+
+   epatch