[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: d8ad860a1ed9aa92adaa7dcf1c3fc78d0e2f80ce
Author: Viorel Munteanu gentoo org>
AuthorDate: Fri Mar 29 15:45:20 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Fri Mar 29 15:47:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ad860a
sys-apps/busybox: fix building with kernel headers 6.8
Apply a patch from the mailing list.
Closes: https://bugs.gentoo.org/926872
Signed-off-by: Viorel Munteanu gentoo.org>
sys-apps/busybox/busybox-1.36.1-r2.ebuild | 377 +
.../busybox/files/busybox-1.36.1-kernel-6.8.patch | 53 +++
2 files changed, 430 insertions(+)
diff --git a/sys-apps/busybox/busybox-1.36.1-r2.ebuild
b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
new file mode 100644
index ..74082ac77ae5
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.36.1-r2.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=8
+
+inherit flag-o-matic readme.gentoo-r1 savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/;
+if [[ ${PV} == "" ]] ; then
+ MY_P="${P}"
+ EGIT_REPO_URI="https://git.busybox.net/busybox;
+ inherit git-r3
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug livecd make-symlinks math mdev pam selinux sep-usr static syslog
systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
+RDEPEND="
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
+ pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}
+ static? (
+ virtual/libcrypt[static-libs]
+ selinux? ( sys-libs/libselinux[static-libs(+)] )
+ )
+ sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS='
+If you want a smaller executable, add `-Oz` to your busybox `CFLAGS`.'
+
+busybox_config_option() {
+ local flag=$1 ; shift
+ if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+ busybox_config_option $(usex ${flag} y n) "$@"
+ return
+ fi
+ local expr
+ while [[ $# -gt 0 ]] ; do
+ case ${flag} in
+ y) expr="s:.*\.*set:CONFIG_$1=y:g" ;;
+ n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+ *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;;
+ esac
+ sed -i -e "${expr}" .config || die
+ einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find
CONFIG_$1 ...")"
+ shift
+ done
+}
+
+busybox_config_enabled() {
+ local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+ case ${val} in
+ "") return 1 ;;
+ y) return 0 ;;
+ *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+ esac
+}
+
+# patches go here!
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.26.2-bb.patch
+ "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
+
+ "${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
+ "${FILESDIR}"/${PN}-1.36.1-kernel-6.8.patch
+
+ # "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+ default
+ unset KBUILD_OUTPUT #88088
+ append-flags -fno-strict-aliasing #310413
+ use ppc64 && append-flags -mminimal-toc #130943
+
+ cp "${FILESDIR}"/ginit.c init/ || die
+
+ # flag cleanup
+ sed -i -r \
+ -e
's:[[:space:]]?-(Werror|Os|Oz|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
\
+ Makefile.flags || die
+ sed -i \
+ -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+ -e "/^AR\>/s:=.*:= $(tc-getAR):" \
+ -e "/^CC\>/s:=.*:= $(tc-getCC):" \
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+ -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+ Makefile || die
+ sed -i \
+ -e 's:-static-libgcc::' \
+ Makefile.flags || die
+
+ # Print all link lines too
+ sed -i -e 's:debug=false:debug=true:' scripts/trylink || die
+}
+
+src_configure() {
+ # check for a busybox config before making one of our own.
+ # if one exist lets return and use it.
+
+ restore_config .config
+ if [ -f .config ]; then
+ yes "" | emake -j1 -s oldconfig >/dev/null
+ return 0
+ else
+ ewarn "Could not locate user configfile, so we will save a
default one"
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: c5dc76e527ab17ffda6ca8118cde4efbcffcb09a
Author: Viorel Munteanu gentoo org>
AuthorDate: Thu Aug 17 13:00:48 2023 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Thu Aug 17 13:00:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dc76e5
sys-apps/busybox: drop 1.35.0-r2
Signed-off-by: Viorel Munteanu gentoo.org>
sys-apps/busybox/Manifest | 1 -
sys-apps/busybox/busybox-1.35.0-r2.ebuild | 373 -
.../busybox-1.36.0-ed-memcpy-overlapping.patch | 38 ---
3 files changed, 412 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 1166ee4747e4..903c83e38250 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,2 +1 @@
-DIST busybox-1.35.0.tar.bz2 2480624 BLAKE2B
c08656bc863cd3fa8f7269032e808a30832215c36414c12f8233ab00503636ed1979541b7df42df654f1dfdfdd46fc00c8fe790bf0bed629a915b4c806c643b9
SHA512
62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a
DIST busybox-1.36.1.tar.bz2 2525473 BLAKE2B
e515825cb3ab1c520e16b9c2512e9fc72947366a72a0466bff59b507fdffbc78fc9d16b44a26116175fc7a429d849ad944b1bc379d36c6d3a0eb20969997336e
SHA512
8c0c754c9ae04b5e6b23596283a7d3a4ef96225fe179f92d6f6a99c69c0caa95b1aa56c267f52d7c807f6cc69e1f0b7dd29a8ac624098f601738f8c0c57980d4
diff --git a/sys-apps/busybox/busybox-1.35.0-r2.ebuild
b/sys-apps/busybox/busybox-1.35.0-r2.ebuild
deleted file mode 100644
index b120932ad31f..
--- a/sys-apps/busybox/busybox-1.35.0-r2.ebuild
+++ /dev/null
@@ -1,373 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=7
-
-inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/;
-if [[ ${PV} == "" ]] ; then
- MY_P="${P}"
- EGIT_REPO_URI="https://git.busybox.net/busybox;
- inherit git-r3
-else
- MY_P="${PN}-${PV/_/-}"
- SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2;
- # unstable release - no keywords
- # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static
syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-# TODO: Could make pkgconfig conditional on selinux? bug #782829
-RDEPEND="
- !static? (
- virtual/libc
- virtual/libcrypt:=
- selinux? ( sys-libs/libselinux )
- )
- pam? ( sys-libs/pam )
-"
-DEPEND="${RDEPEND}
- static? (
- virtual/libcrypt[static-libs]
- selinux? ( sys-libs/libselinux[static-libs(+)] )
- )
- sys-kernel/linux-headers"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-busybox_config_option() {
- local flag=$1 ; shift
- if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
- busybox_config_option $(usex ${flag} y n) "$@"
- return
- fi
- local expr
- while [[ $# -gt 0 ]] ; do
- case ${flag} in
- y) expr="s:.*\.*set:CONFIG_$1=y:g" ;;
- n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
- *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;;
- esac
- sed -i -e "${expr}" .config || die
- einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find
CONFIG_$1 ...")"
- shift
- done
-}
-
-busybox_config_enabled() {
- local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
- case ${val} in
- "") return 1 ;;
- y) return 0 ;;
- *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
- esac
-}
-
-# patches go here!
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26.2-bb.patch
- "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
-
- "${FILESDIR}"/${PN}-1.36.0-ed-memcpy-overlapping.patch
- "${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
-
- # "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
- default
- unset KBUILD_OUTPUT #88088
- append-flags -fno-strict-aliasing #310413
- use ppc64 && append-flags -mminimal-toc #130943
-
- cp "${FILESDIR}"/ginit.c init/ || die
-
- # flag cleanup
- sed -i -r \
- -e
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
\
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: 0d7891fb673467a8f74f7aec5a5bc166b078e2ae
Author: Sam James gentoo org>
AuthorDate: Wed Apr 12 07:33:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 12 07:35:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d7891fb
sys-apps/busybox: backport FORTIFY_SOURCE=3 (build) fix; ed UB fix
Closes: https://bugs.gentoo.org/893776
Thanks-to: Arsen Arsenović gentoo.org>
Signed-off-by: Sam James gentoo.org>
sys-apps/busybox/busybox-1.34.1-r2.ebuild | 367
sys-apps/busybox/busybox-1.35.0-r2.ebuild | 368 +
.../busybox-1.36.0-ed-memcpy-overlapping.patch | 38 +++
.../busybox-1.36.0-fortify-source-3-fixdep.patch | 32 ++
4 files changed, 805 insertions(+)
diff --git a/sys-apps/busybox/busybox-1.34.1-r2.ebuild
b/sys-apps/busybox/busybox-1.34.1-r2.ebuild
new file mode 100644
index ..d9a0625448df
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.34.1-r2.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=7
+
+inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/;
+if [[ ${PV} == "" ]] ; then
+ MY_P="${P}"
+ EGIT_REPO_URI="https://git.busybox.net/busybox;
+ inherit git-r3
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static
syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+# TODO: Could make pkgconfig conditional on selinux? bug #782829
+RDEPEND="
+ !static? (
+ virtual/libc
+ virtual/libcrypt:=
+ selinux? ( sys-libs/libselinux )
+ )
+ pam? ( sys-libs/pam )
+"
+DEPEND="${RDEPEND}
+ static? (
+ virtual/libcrypt[static-libs]
+ selinux? ( sys-libs/libselinux[static-libs(+)] )
+ )
+ sys-kernel/linux-headers"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+busybox_config_option() {
+ local flag=$1 ; shift
+ if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+ busybox_config_option $(usex ${flag} y n) "$@"
+ return
+ fi
+ local expr
+ while [[ $# -gt 0 ]] ; do
+ case ${flag} in
+ y) expr="s:.*\.*set:CONFIG_$1=y:g" ;;
+ n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+ *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;;
+ esac
+ sed -i -e "${expr}" .config || die
+ einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find
CONFIG_$1 ...")"
+ shift
+ done
+}
+
+busybox_config_enabled() {
+ local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+ case ${val} in
+ "") return 1 ;;
+ y) return 0 ;;
+ *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+ esac
+}
+
+# patches go here!
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.26.2-bb.patch
+ "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
+
+ "${FILESDIR}"/${PN}-1.36.0-ed-memcpy-overlapping.patch
+ "${FILESDIR}"/${PN}-1.36.0-fortify-source-3-fixdep.patch
+
+ # "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+ default
+ unset KBUILD_OUTPUT #88088
+ append-flags -fno-strict-aliasing #310413
+ use ppc64 && append-flags -mminimal-toc #130943
+
+ cp "${FILESDIR}"/ginit.c init/ || die
+
+ # flag cleanup
+ sed -i -r \
+ -e
's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g'
\
+ Makefile.flags || die
+ #sed -i '/bbsh/s:^//::' include/applets.h
+ sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+ use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+ sed -i \
+ -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+ -e "/^AR\>/s:=.*:= $(tc-getAR):" \
+ -e "/^CC\>/s:=.*:= $(tc-getCC):" \
+ -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+ -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+ Makefile || die
+ sed -i \
+ -e 's:-static-libgcc::' \
+ Makefile.flags || die
+}
+
+src_configure() {
+ # check for a busybox config before making one of our own.
+ # if one exist lets return and use it.
+
+ restore_config .config
+ if [ -f .config ]; then
+ yes "" | emake -j1 -s oldconfig >/dev/null
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: f51fe5149921cfd97d4eb15ba9560fd3d9a24226
Author: Viorel Munteanu gmail com>
AuthorDate: Fri Jul 1 11:03:50 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 3 23:52:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f51fe514
sys-apps/busybox: sync fixes to newer versions
Sync fixes from 1.34.0-r1 to 1.35.0-r1 and to
Fix new QA issue in live version
Signed-off-by: Viorel Munteanu gmail.com>
Signed-off-by: Sam James gentoo.org>
...usybox-.ebuild => busybox-1.35.0-r1.ebuild} | 36 +--
sys-apps/busybox/busybox-.ebuild | 34 --
.../files/busybox-1.36.0-fix-wx-sections.patch | 74 ++
3 files changed, 133 insertions(+), 11 deletions(-)
diff --git a/sys-apps/busybox/busybox-.ebuild
b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
similarity index 85%
copy from sys-apps/busybox/busybox-.ebuild
copy to sys-apps/busybox/busybox-1.35.0-r1.ebuild
index 490896632feb..76d06dcb9b29 100644
--- a/sys-apps/busybox/busybox-.ebuild
+++ b/sys-apps/busybox/busybox-1.35.0-r1.ebuild
@@ -5,7 +5,7 @@
EAPI=7
-inherit flag-o-matic savedconfig toolchain-funcs
+inherit eapi8-dosym flag-o-matic savedconfig toolchain-funcs
DESCRIPTION="Utilities for rescue and embedded systems"
HOMEPAGE="https://www.busybox.net/;
@@ -16,7 +16,8 @@ if [[ ${PV} == "" ]] ; then
else
MY_P="${PN}-${PV/_/-}"
SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ # unstable release - no keywords
+ # KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips
~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
fi
LICENSE="GPL-2" # GPL-2 only
@@ -72,6 +73,7 @@ busybox_config_enabled() {
# patches go here!
PATCHES=(
"${FILESDIR}"/${PN}-1.26.2-bb.patch
+ "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
# "${FILESDIR}"/${P}-*.patch
)
@@ -114,12 +116,14 @@ src_configure() {
ewarn "Could not locate user configfile, so we will save a
default one"
fi
+ # setting SKIP_SELINUX skips searching for selinux at this stage. We
don't
+ # need to search now in case we end up not needing it after all.
# setup the config file
- emake -j1 -s allyesconfig >/dev/null
+ emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null
#620918
# nommu forces a bunch of things off which we want on #387555
busybox_config_option n NOMMU
sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
+ yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y)
>/dev/null #620918
# now turn off stuff we really don't want
busybox_config_option n DMALLOC
@@ -131,6 +135,10 @@ src_configure() {
busybox_config_option n MONOTONIC_SYSCALL
busybox_config_option n USE_PORTABLE_CODE
busybox_config_option n WERROR
+ # CONFIG_MODPROBE_SMALL=y disables depmod.c and uses a smaller one that
+ # does not support -b. Setting this to no creates slightly larger and
+ # slightly more useful modutils
+ busybox_config_option n MODPROBE_SMALL #472464
# triming the BSS size may be dangerous
busybox_config_option n FEATURE_USE_BSS_TAIL
@@ -245,7 +253,10 @@ src_install() {
if use mdev ; then
dodir /$(get_libdir)/mdev/
use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+ cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf || die
+ if [[ ! "$(get_libdir)" == "lib" ]]; then
+ sed -i -e "s:/lib/:/$(get_libdir)/:g"
"${ED}"/etc/mdev.conf || die #831251 - replace lib with lib64 where appropriate
+ fi
exeinto /$(get_libdir)/mdev/
doexe "${FILESDIR}"/mdev/*
@@ -274,6 +285,7 @@ src_install() {
newinitd "${FILESDIR}"/watchdog.initd busybox-watchdog
fi
if busybox_config_enabled UDHCPC; then
+ sed -i 's:$((metric++)):$metric; metric=$((metric + 1)):'
examples/udhcp/simple.script || die #801535
local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
exeinto "${path%/*}"
newexe examples/udhcp/simple.script "${path##*/}"
@@ -282,13 +294,22 @@ src_install() {
insinto /etc
doins examples/udhcp/udhcpd.conf
fi
+ if busybox_config_enabled ASH && ! use make-symlinks; then
+ dosym8 -r /bin/busybox /bin/ash
+ fi
+ if busybox_config_enabled CROND; then
+ newconfd "${FILESDIR}"/crond.confd busybox-crond
+ newinitd "${FILESDIR}"/crond.initd busybox-crond
+ fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: 1996eeb8f05fc7ebc0994952aff9d8ee3ccb8292
Author: Viorel Munteanu gmail com>
AuthorDate: Sat Apr 23 09:38:06 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 30 21:40:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1996eeb8
sys-apps/busybox: Fix warning with USE -selinux
Closes: https://bugs.gentoo.org/620918
Signed-off-by: Viorel Munteanu gmail.com>
Signed-off-by: Sam James gentoo.org>
sys-apps/busybox/busybox-1.34.1-r1.ebuild | 7 +--
.../files/busybox-1.34.1-skip-selinux-search.patch | 21 +
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 80086ac713ca..3e57307d25b6 100644
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -72,6 +72,7 @@ busybox_config_enabled() {
# patches go here!
PATCHES=(
"${FILESDIR}"/${PN}-1.26.2-bb.patch
+ "${FILESDIR}"/${PN}-1.34.1-skip-selinux-search.patch
# "${FILESDIR}"/${P}-*.patch
)
@@ -114,12 +115,14 @@ src_configure() {
ewarn "Could not locate user configfile, so we will save a
default one"
fi
+ # setting SKIP_SELINUX skips searching for selinux at this stage. We
don't
+ # need to search now in case we end up not needing it after all.
# setup the config file
- emake -j1 -s allyesconfig >/dev/null
+ emake -j1 -s allyesconfig SKIP_SELINUX=$(usex selinux n y) >/dev/null
#620918
# nommu forces a bunch of things off which we want on #387555
busybox_config_option n NOMMU
sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
+ yes "" | emake -j1 -s oldconfig SKIP_SELINUX=$(usex selinux n y)
>/dev/null #620918
# now turn off stuff we really don't want
busybox_config_option n DMALLOC
diff --git a/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch
b/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch
new file mode 100644
index ..6fe043bf39e4
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.34.1-skip-selinux-search.patch
@@ -0,0 +1,21 @@
+Setting SKIP_SELINUX skips searching for selinux. The current ebuild calls
+make 3 times. The first 2 times we don't need to search for selinux packages
+because we might end up not needing them and we get useless warnings.
+
+--- a/Makefile.flags
b/Makefile.flags
+@@ -176,12 +176,14 @@
+ LDLIBS += pam pam_misc
+ endif
+
++ifneq ($(SKIP_SELINUX),y)
+ ifeq ($(CONFIG_SELINUX),y)
+ SELINUX_PC_MODULES = libselinux libsepol
+ $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
+ CPPFLAGS += $(SELINUX_CFLAGS)
+ LDLIBS += $(if
$(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
+ endif
++endif
+
+ ifeq ($(CONFIG_FEATURE_NSLOOKUP_BIG),y)
+ ifneq (,$(findstring linux,$(shell $(CC) $(CFLAGS) -dumpmachine)))
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: ee9dcea0ca6023d17537c1f40a251af9f2e8f839
Author: Viorel Munteanu gmail com>
AuthorDate: Wed Apr 20 05:13:32 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 30 21:40:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee9dcea0
sys-apps/busybox: Add openrc files for crond
Closes: https://bugs.gentoo.org/751988
Signed-off-by: Viorel Munteanu gmail.com>
Signed-off-by: Sam James gentoo.org>
sys-apps/busybox/busybox-1.34.1-r1.ebuild | 4
sys-apps/busybox/files/crond.confd| 2 ++
sys-apps/busybox/files/crond.initd| 12
3 files changed, 18 insertions(+)
diff --git a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
index 654edbe4c4b7..80086ac713ca 100644
--- a/sys-apps/busybox/busybox-1.34.1-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.34.1-r1.ebuild
@@ -293,6 +293,10 @@ src_install() {
if busybox_config_enabled ASH && ! use make-symlinks; then
dosym -r /bin/busybox /bin/ash
fi
+ if busybox_config_enabled CROND; then
+ newconfd "${FILESDIR}"/crond.confd busybox-crond
+ newinitd "${FILESDIR}"/crond.initd busybox-crond
+ fi
# bundle up the symlink files for use later
emake DESTDIR="${ED}" install
diff --git a/sys-apps/busybox/files/crond.confd
b/sys-apps/busybox/files/crond.confd
new file mode 100644
index ..707366252913
--- /dev/null
+++ b/sys-apps/busybox/files/crond.confd
@@ -0,0 +1,2 @@
+# Config file for /etc/init.d/busybox-crond
+CRONDARGS=
diff --git a/sys-apps/busybox/files/crond.initd
b/sys-apps/busybox/files/crond.initd
new file mode 100644
index ..e098b14714a4
--- /dev/null
+++ b/sys-apps/busybox/files/crond.initd
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/bin/busybox crond"
+command_args="${CRONDARGS}"
+pidfile="/run/crond.pid"
+
+depend() {
+ need clock logger
+ provide cron
+}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: d7d0d98ea093bb29a81c1f9c0d27d823c61e8640
Author: Patrick McLean sony com>
AuthorDate: Thu Feb 6 23:06:22 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Feb 6 23:06:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d0d98e
sys-apps/busybox-1.31.1-r1: Revbump, virtual/libxcrypt, fix bug #708350
Closes: https://bugs.gentoo.org/708350
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Patrick McLean gentoo.org>
...ybox-1.31.1.ebuild => busybox-1.31.1-r1.ebuild} | 15 +++--
.../busybox/files/busybox-1.31.1-glibc-2.31.patch | 65 ++
2 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/sys-apps/busybox/busybox-1.31.1.ebuild
b/sys-apps/busybox/busybox-1.31.1-r1.ebuild
similarity index 97%
rename from sys-apps/busybox/busybox-1.31.1.ebuild
rename to sys-apps/busybox/busybox-1.31.1-r1.ebuild
index c15fa90610c..0ee063abe46 100644
--- a/sys-apps/busybox/busybox-1.31.1.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-EAPI=6
+EAPI=7
inherit flag-o-matic savedconfig toolchain-funcs
@@ -26,14 +26,18 @@ REQUIRED_USE="pam? ( !static )"
RESTRICT="test"
COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
+ pam? ( sys-libs/pam )
+ virtual/libcrypt"
DEPEND="${COMMON_DEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
+ static? (
+ virtual/libcrypt[static-libs]
+ selinux? ( sys-libs/libselinux[static-libs(+)] )
+ )
>=sys-kernel/linux-headers-2.6.39"
RDEPEND="${COMMON_DEPEND}
mdev? ( !
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: 39459a6f1c69544844fe75855f4a8293be0ef651
Author: Anthony G. Basile gentoo org>
AuthorDate: Sat Jan 28 22:14:27 2017 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sat Jan 28 22:14:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39459a6f
sys-apps/busybox: version bump 1.26.2
Package-Manager: portage-2.3.3
sys-apps/busybox/Manifest | 1 +
.../{busybox-.ebuild => busybox-1.26.2.ebuild} | 4 +--
sys-apps/busybox/busybox-.ebuild | 4 +--
sys-apps/busybox/files/busybox-1.26.2-bb.patch | 42 ++
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3518adf..f15dd27 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,2 +1,3 @@
DIST busybox-1.25.1.tar.bz2 2103070 SHA256
27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512
9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb
WHIRLPOOL
4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1
DIST busybox-1.26.0.tar.bz2 2143958 SHA256
3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c SHA512
9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
WHIRLPOOL
c8a7419bd711d3e0249807ef9f9ff6123ff8d0767479ea3b3e54ef48f6132514942bc37b79334ca2afd6009d32c5e242712bd6b3995f49904c33040c66df9dcc
+DIST busybox-1.26.2.tar.bz2 2120931 SHA256
da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16 SHA512
9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719
WHIRLPOOL
64fdbd3ede8e382d0237b1576000555f563c4ca93d58cfbb72f71374b662e3201863110a069f0e4a27dab7c0a6102d98ccfd4d57f1dfe44c9b12a17c6a30128a
diff --git a/sys-apps/busybox/busybox-.ebuild
b/sys-apps/busybox/busybox-1.26.2.ebuild
similarity index 99%
copy from sys-apps/busybox/busybox-.ebuild
copy to sys-apps/busybox/busybox-1.26.2.ebuild
index b91df29..accdd8d 100644
--- a/sys-apps/busybox/busybox-.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -67,7 +67,7 @@ src_prepare() {
use ppc64 && append-flags -mminimal-toc #130943
# patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
# epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
diff --git a/sys-apps/busybox/busybox-.ebuild
b/sys-apps/busybox/busybox-.ebuild
index b91df29..accdd8d 100644
--- a/sys-apps/busybox/busybox-.ebuild
+++ b/sys-apps/busybox/busybox-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -67,7 +67,7 @@ src_prepare() {
use ppc64 && append-flags -mminimal-toc #130943
# patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
# epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
diff --git a/sys-apps/busybox/files/busybox-1.26.2-bb.patch
b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
new file mode 100644
index ..f120340
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
@@ -0,0 +1,42 @@
+diff -Naur busybox-1.26.2.orig/shell/ash.c busybox-1.26.2/shell/ash.c
+--- busybox-1.26.2.orig/shell/ash.c2017-01-10 10:55:51.0 -0500
busybox-1.26.2/shell/ash.c 2017-01-28 17:02:08.961584737 -0500
+@@ -144,6 +144,8 @@
+ //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
+ //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
+ //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP,
ash))
++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
+
+ //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
+ //kbuild:lib-$(CONFIG_SH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o
+@@ -7572,6 +7574,8 @@
+ }
+ /* re-exec ourselves with the new arguments */
+ execve(bb_busybox_exec_path, argv, envp);
++ execve("/bin/busybox.static", argv, envp);
++ execve("/bin/busybox", argv, envp);
+ /* If they called chroot or otherwise made the binary no longer
+* executable, fall through */
+ }
+diff -Naur busybox-1.26.2.orig/shell/hush.c
[gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/, sys-apps/busybox/files/
commit: e1d1987957530d04e794f52bed887917970c50fa
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Nov 13 05:21:18 2015 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Nov 13 05:21:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d19879
sys-apps/busybox: version bump #564246
sys-apps/busybox/Manifest | 1 +
.../{busybox-.ebuild => busybox-1.24.1.ebuild} | 5 +-
sys-apps/busybox/busybox-.ebuild | 3 +-
sys-apps/busybox/files/busybox-1.24.1-unzip.patch | 112 +
4 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index c7e1fc3..b8590e5 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,3 +1,4 @@
DIST busybox-1.21.0.tar.bz2 2200841 SHA256
eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512
ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31
WHIRLPOOL
d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3
DIST busybox-1.23.1.tar.bz2 2252635 SHA256
300f1db0a7ca4ecee8f8d8027aba250b903372e8339b7d9123d37c1e900473bf SHA512
60849c220dde596c4197f16dd844573b24dd46c8544345a2d5a2b1976fa0ac340d22fbc97f5a1437b7de1c04f4e16aa07b3d62bc77eb83b2467582a50ed4b362
WHIRLPOOL
7cd25e42e74663849b094df699a72deaf02b1088064a511341f76aaa419c936557bbafd54523c6818082dfd4e17605f06ee51abed238ef57a56a9be12c910f99
DIST busybox-1.23.2.tar.bz2 2252786 SHA256
05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a SHA512
209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9
WHIRLPOOL
a0396f7f49ae702f1617e72d5d4646aceec4eba67219c7125bd8d0926d1acb1ef41ea15a7406c3cf5e5e0d8925cc75910ed5128e5fbdd257b80e2cb4f7a048a2
+DIST busybox-1.24.1.tar.bz2 2068803 SHA256
37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d SHA512
3afc757ebaae61ae13c2c69097ee734717434f9e658eb77093a8b7b49af3326cbca2d723483ff84a1da99544b822fd2b47d9a97c68f09962e11754e5daf124ca
WHIRLPOOL
5e827d08d737caac832e7e5923da624094ff27ee2edbb46dadc339e95edba65378a8fa3db412682724476a2092eee41a804f8f36c2eec0b9f883f5ba855f3ad0
diff --git a/sys-apps/busybox/busybox-.ebuild
b/sys-apps/busybox/busybox-1.24.1.ebuild
similarity index 98%
copy from sys-apps/busybox/busybox-.ebuild
copy to sys-apps/busybox/busybox-1.24.1.ebuild
index c517091..9f87f6e 100644
--- a/sys-apps/busybox/busybox-.ebuild
+++ b/sys-apps/busybox/busybox-1.24.1.ebuild
@@ -30,7 +30,7 @@ DEPEND="${COMMON_DEPEND}
static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
>=sys-kernel/linux-headers-2.6.39"
RDEPEND="${COMMON_DEPEND}
-mdev? ( !https://bugs.gentoo.org/564246
+
+From 1de25a6e87e0e627aa34298105a3d17c60a1f44e Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko
+Date: Mon, 26 Oct 2015 19:33:05 +0100
+Subject: [PATCH] unzip: test for bad archive SEGVing
+
+function old new delta
+huft_build 12961300 +4
+
+Signed-off-by: Denys Vlasenko
+---
+ archival/libarchive/decompress_gunzip.c | 11 +++
+ testsuite/unzip.tests | 23 ++-
+ 2 files changed, 29 insertions(+), 5 deletions(-)
+
+diff --git a/archival/libarchive/decompress_gunzip.c
b/archival/libarchive/decompress_gunzip.c
+index 7b6f459..30bf451 100644
+--- a/archival/libarchive/decompress_gunzip.c
b/archival/libarchive/decompress_gunzip.c
+@@ -305,11 +305,12 @@ static int huft_build(const unsigned *b, const unsigned
n,
+ unsigned i; /* counter, current code */
+ unsigned j; /* counter */
+ int k; /* number of bits in current code */
+- unsigned *p;/* pointer into c[], b[], or v[] */
++ const unsigned *p; /* pointer into c[], b[], or v[] */
+ huft_t *q; /* points to current table */
+ huft_t r; /* table entry for structure assignment */
+ huft_t *u[BMAX];/* table stack */
+ unsigned v[N_MAX]; /* values in order of bit length */
++ unsigned v_end;
+ int ws[BMAX + 1]; /* bits decoded stack */
+ int w; /* bits decoded */
+ unsigned x[BMAX + 1]; /* bit offsets, then code stack */
+@@ -324,7 +325,7 @@ static int huft_build(const unsigned *b, const unsigned n,
+
+ /* Generate counts for each bit length */
+ memset(c, 0, sizeof(c));
+- p = (unsigned *) b; /* cast allows us to reuse p for pointing to b */
++ p = b;
+ i = n;
+ do {
+ c[*p]++; /* assume all entries <= BMAX */
+@@ -365,12 +366,14 @@ static int
