Version bump and fix for building with glibc-2.16 #424954 by Stevan Bajić.

Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64

4 files changed, 440 insertions, 5 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index e915ea73a792..9fe770d5996e 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.317 2012/06/20 20:12:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.318 2012/07/06 03:37:44 vapier Exp $
+
+*busybox-1.20.2 (06 Jul 2012)
+
+  06 Jul 2012; Mike Frysinger <vapier@gentoo.org> +busybox-1.20.2.ebuild,
+  +files/busybox-1.20.2-glibc-sys-resource.patch:
+  Version bump and fix for building with glibc-2.16 #424954 by Stevan Bajić.
 
   20 Jun 2012; Markus Meier <maekke@gentoo.org> busybox-1.20.1.ebuild:
   arm stable, bug #419689
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2e36124c16af..ef9b02d2a9bd 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -10,6 +10,7 @@ AUX busybox-1.20.0-getty.patch 477 RMD160 3dfeb9b57acb342092ab1457e0aedc6d2bd26d
 AUX busybox-1.20.0-lineedit.patch 768 RMD160 50f398265d1496df68d6afa89936b32b7fe065ba SHA1 77c2266ad808cfe6ba09f571dbf14875b9f3783a SHA256 f52874c75c2bf1ec5a101a1da111ec31fceee6e94ad895deadcbf9a4780503b2
 AUX busybox-1.20.0-sed.patch 710 RMD160 c11de196a3cf33d0c8d66c1eff7674507562d25f SHA1 878f9800ea823a232273d57fe9da1ea1399857e1 SHA256 4d0a7670848967afee436d0692d4395c61677cbef67c2c0d1f44f1878d2ebadd
 AUX busybox-1.20.0-udhcpc6-ipv6.patch 998 RMD160 a0e37f9c3fb68b5cc52f9dfe31efb44817d0a6b0 SHA1 ccc1d669e37ad429b586fbe088cd2b88cdf1d95f SHA256 58ac58c6d4e5d9d1d838d2e30f631b4b63a6187fd685d454294bee3646721d54
+AUX busybox-1.20.2-glibc-sys-resource.patch 3054 RMD160 548cdb951c3c7e2712b8d0283ff49e1d5f69fe32 SHA1 ebe167d63d98932e09d2a0c4e8b7b04dd895712a SHA256 03d64c3b864fc5caa9ec56e3d2bf3bcd43801ee82e27332dbfe412138c9502d7
 AUX ginit.c 3091 RMD160 3d6901a028e178cd7f00c5d4a45e1454f25e4f5a SHA1 7109040bde2a37e079be36758d228965f7df4631 SHA256 c5a4d5dedf402742611fea7607f0d870a918da06ed5ee98796371e158956ca80
 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7
 AUX mdev.rc 282 RMD160 6a11e23fbed92acd24088a7885bdc52b9c845fac SHA1 46f1a0494e009332e83b62599842f8213b60ba60 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5
@@ -21,16 +22,28 @@ AUX mdev/usbdisk_link 984 RMD160 9b86d85f5f27f03f894a062c9f00d3583c4db3ae SHA1 6
 DIST busybox-1.19.3.tar.bz2 2167188 RMD160 f8df020b47a363b1b308e852d2034758e42d16a9 SHA1 692754db46b129c70921ffb84eaef679061c0952 SHA256 a1a9a35732c719ef384f02b6e357c324d8be25bc154af91a48c4264b1e6038f0
 DIST busybox-1.20.0.tar.bz2 2190652 RMD160 b7d4d411b9903e709e71d0438d1aa2825d6a028e SHA1 b8f5721557d437d2539dd3f7db91683ec50bdade SHA256 3c56508d984db1178664241ad548d118fb0aa71cdd2f8a9a93038e50b3b2bf16
 DIST busybox-1.20.1.tar.bz2 2190170 RMD160 41a63b8a3d2927086886b43d61a739744fce72c3 SHA1 8877502e3399dd6cb8ab333cdf6c43264f1da313 SHA256 3e515d8abefd8583ebabffdcfccecb3b8deacf2cef7c69ab1d8755a012ec68c9
+DIST busybox-1.20.2.tar.bz2 2186738 RMD160 9c10d5285eb56f738225b90ea891b6393b1251ff SHA1 dd2e3684b13c0071d480e97b569041e69538e798 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882
 EBUILD busybox-1.19.3-r1.ebuild 8449 RMD160 4323b21683bd1b2069f40213ebf126620f8e7276 SHA1 c12f0fc2e3ea3af78219b850f45704a493378e9f SHA256 89497a117be3235619155c56984ada796850517d2e2583e4aefeebd02780822b
 EBUILD busybox-1.20.0.ebuild 8811 RMD160 986d0703af3f195006e5707e3ba90b4e84dbfc36 SHA1 215ea5bf808e15d34282605e3d75d659027034de SHA256 19c606393839c21452f4352d6290495a27edddfc7b1d7fabff373da2d06a3dee
 EBUILD busybox-1.20.1.ebuild 8806 RMD160 34be7693d1d43d08ba62809fad47e565d233d969 SHA1 bf75d4a42d2661f311cc93632b1f2b0e60f51924 SHA256 35cf058eb30f3bb5e0fdf1a1aaa739b5a79fcc7508a37bada8e378b1a11cddd9
+EBUILD busybox-1.20.2.ebuild 8811 RMD160 819f922b0b34ee3cde16008984f9a2bab14f4e32 SHA1 b10072c8ff3e3e1ee4effd403e5c3494db695821 SHA256 0670ef2e38c8a18615987517d510ed4d3cbef97bc340b2b55fa51f3dc3b566c9
 EBUILD busybox-9999.ebuild 8809 RMD160 7b4175a43f052a7eff0ce4193c4143034ddf5da3 SHA1 d0cbb0913c3f236a65f6bcd79bd053968d34542f SHA256 e2e1f552555d23b33d4aa6c498a6dc63ba6d2c3eeedbff2f9c278e36adce00c9
-MISC ChangeLog 48791 RMD160 e8c30522df16b0d301eed999a281bf9a2635f817 SHA1 a0f78b4d22f856c4663965c443301c390cddc3a9 SHA256 35a9ce90d6a52d109ab79ae0dc45755c9f8dc9c087e95d46cd76f8f0e195e029
+MISC ChangeLog 49025 RMD160 5a5fd488f25230eda30be39a85178b0fe89398d9 SHA1 f67814e8029813fb35e3e1a2b55019b05e7bc25c SHA256 2a1e22301fb2efc71abc35d69e4884864970f581854af2d134d020343658178e
 MISC metadata.xml 546 RMD160 8045e4216379ed46276e3fe02705d1c7d9b82219 SHA1 9e3b8954d69264e70741840f4eb2533da2e402a3 SHA256 8464a2acbbf52780d1c71a1f6b06cc1dc00b6d027b6b04ca91ab25a7d7ce5e0b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/iL1kACgkQkKaRLQcq0GIhyQCeII/Bc63zsDcMwgpK+/HXkDso
-KqsAn0ks1Oa0aEkssX+VyJii6n9bkhcZ
-=oWVl
+iQIcBAEBAgAGBQJP9l2hAAoJELEHsLL7fEFWVDAP/i5Fb0upe9vLZYPsjiSbE9eE
+H5SpnBKPO/9I3IECZiy8lXh1tRoS4NFkQXXdxMcv8vuVKAIQp7LUXCn1RV9ojJzp
+jmSu+Rw7WrKvQiISYM6xbcOsj6B9QfWaGHP4Vcma4HpCtdwIwErhocieLbmmhucY
+uumcfHjzAxG+Iy6TMYrdInW+Ax98xOeBDyiVey25scnF1axltdN8JPEIl7H4VnKG
+jM43bzwoDyPb3PsfG7aLqI3B+HWTylanO+zAEkW6a8NSWDzfdKAGB/iqpvXu5HQF
+INJ7jis2WbOKRpkRp6Se8CYjvdOikY/CuxRlgUL6NOBfTVv5SoMbwEu9ipdBlDnf
+BmdznGu4WkV3CNuRH8/jC1irnlFq5oo6rj5PwRSaQKULEXwSJJSI5ed81b9El9FG
+wDfmBwkWrekxUQdwxfaGcCICEZqjGubny8xc/Hvn2e/gGJ6A7ghRYgiPvMEiarrf
+uEfwgXbDKfzDncFgiVGlVYYw8MQJFBSvSyhrMParyhvdwr0RwgDjTGy7Ow1BNIi+
+qSL8D0pD/3MYfH+3q4I/Jxxxz2cliD0nTKn81BPYaq7UWl0inJCRBDPp+CJNmr35
+HgsEafPMuvWzwj/92b9mEVst3U1idyewApnZEAn9szC5+y7tVfl98jKp6oEHH1D6
+u6bUMCwHR0r0w8kUdZdv
+=DNN2
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild
new file mode 100644
index 000000000000..5ec16a0790b0
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.20.2.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.20.2.ebuild,v 1.1 2012/07/06 03:37:44 vapier Exp $
+
+EAPI="4"
+inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
+
+################################################################################
+# BUSYBOX ALTERNATE CONFIG MINI-HOWTO
+#
+# Busybox can be modified in many different ways. Here's a few ways to do it:
+#
+# (1) Emerge busybox with FEATURES=keepwork so the work directory won't
+#     get erased afterwards. Add a definition like ROOT=/my/root/path to the
+#     start of the line if you're installing to somewhere else than the root
+#     directory. This command will save the default configuration to
+#     ${PORTAGE_CONFIGROOT} (or ${ROOT} if ${PORTAGE_CONFIGROOT} is not
+#     defined), and it will tell you that it has done this. Note the location
+#     where the config file was saved.
+#
+#     FEATURES=keepwork USE=savedconfig emerge busybox
+#
+# (2) Go to the work directory and change the configuration of busybox using its
+#     menuconfig feature.
+#
+#     cd /var/tmp/portage/busybox*/work/busybox-*
+#     make menuconfig
+#
+# (3) Save your configuration to the default location and copy it to the
+#     one of the locations listed in /usr/portage/eclass/savedconfig.eclass
+#
+# (4) Emerge busybox with USE=savedconfig to use the configuration file you
+#     just generated.
+#
+################################################################################
+#
+# (1) Alternatively skip the above steps and simply emerge busybox without
+#     USE=savedconfig.
+#
+# (2) Edit the file it saves by hand. ${ROOT}"/etc/portage/savedconfig/${CATEGORY}/${PF}
+#
+# (3) Remerge busybox as using USE=savedconfig.
+#
+################################################################################
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="http://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${PN}
+	EGIT_REPO_URI="git://busybox.net/busybox.git"
+	inherit git-2
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr static"
+RESTRICT="test"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39"
+
+S=${WORKDIR}/${MY_P}
+
+busybox_config_option() {
+	case $1 in
+		y) sed -i -e "s:.*\<CONFIG_$2\>.*set:CONFIG_$2=y:g" .config;;
+		n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;;
+		*) use $1 \
+		       && busybox_config_option y $2 \
+		       || busybox_config_option n $2
+		   return 0
+		   ;;
+	esac
+	einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...)
+}
+
+src_prepare() {
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	# patches go here!
+	epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+	epatch "${FILESDIR}"/${P}-*.patch
+	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):" \
+		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 oldconfig > /dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 allyesconfig > /dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n WERROR
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option n HUSH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+	fi
+
+	if use static && use pam ; then
+		ewarn "You cannot have USE='static pam'.  Assuming static is more important."
+	fi
+	use static \
+		&& busybox_config_option n PAM \
+		|| busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+	if ! use static ; then
+		cp .config{,.bak}
+		mv busybox_unstripped{,.bak}
+		use pam && busybox_config_option n PAM
+		emake CONFIG_STATIC=y busybox
+		mv busybox_unstripped bb
+		mv busybox_unstripped{.bak,}
+		mv .config{.bak,}
+	else
+		# keeps src_install simpler
+		ln busybox_unstripped bb
+	fi
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe bb ginit
+		dosym /ginit /bin/bb
+		if use static ; then
+			dosym bb /bin/busybox
+		else
+			newbin busybox_unstripped busybox
+		fi
+	else
+		newbin busybox_unstripped busybox
+		if use static ; then
+			dosym busybox /bin/bb
+		else
+			dobin bb
+		fi
+	fi
+	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
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.rc.1 mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	dohtml *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
new file mode 100644
index 000000000000..f682d00f7022
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.20.2-glibc-sys-resource.patch
@@ -0,0 +1,109 @@
+https://bugs.gentoo.org/424954
+
+From c5fe9f7b723f949457263ef8e22ab807d5b549ce Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 5 Jul 2012 23:19:09 -0400
+Subject: [PATCH] include sys/resource.h where needed
+
+We use functions from sys/resource.h in misc applets, but don't include
+the header.  This breaks building with newer glibc versions, so add the
+include where needed.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ loginutils/passwd.c      |    1 +
+ miscutils/time.c         |    1 +
+ networking/inetd.c       |    1 +
+ networking/ntpd.c        |    1 +
+ networking/ntpd_simple.c |    1 +
+ runit/chpst.c            |    1 +
+ shell/shell_common.c     |    1 +
+ 7 files changed, 7 insertions(+)
+
+diff --git a/loginutils/passwd.c b/loginutils/passwd.c
+index b83db00..a7006f0 100644
+--- a/loginutils/passwd.c
++++ b/loginutils/passwd.c
+@@ -15,6 +15,7 @@
+ 
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ 
+ static void nuke_str(char *str)
+ {
+diff --git a/miscutils/time.c b/miscutils/time.c
+index 945f15f..ffed386 100644
+--- a/miscutils/time.c
++++ b/miscutils/time.c
+@@ -16,6 +16,7 @@
+ //usage:     "\n	-v	Verbose"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrusage */
+ 
+ /* Information on the resources used by a child process.  */
+ typedef struct {
+diff --git a/networking/inetd.c b/networking/inetd.c
+index 1308d74..00baf69 100644
+--- a/networking/inetd.c
++++ b/networking/inetd.c
+@@ -165,6 +165,7 @@
+ //usage:     "\n		(default: 0 - disabled)"
+ 
+ #include <syslog.h>
++#include <sys/resource.h> /* setrlimit */
+ #include <sys/un.h>
+ 
+ #include "libbb.h"
+diff --git a/networking/ntpd.c b/networking/ntpd.c
+index 72e9d0b..5b92db6 100644
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -46,6 +46,7 @@
+ #include "libbb.h"
+ #include <math.h>
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #include <sys/timex.h>
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
+index 4ad44e4..1b7c66b 100644
+--- a/networking/ntpd_simple.c
++++ b/networking/ntpd_simple.c
+@@ -7,6 +7,7 @@
+  */
+ #include "libbb.h"
+ #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
++#include <sys/resource.h> /* setpriority */
+ #ifndef IPTOS_LOWDELAY
+ # define IPTOS_LOWDELAY 0x10
+ #endif
+diff --git a/runit/chpst.c b/runit/chpst.c
+index ac296ba..ed72c8b 100644
+--- a/runit/chpst.c
++++ b/runit/chpst.c
+@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //usage:     "\n			a SIGXCPU after N seconds"
+ 
+ #include "libbb.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ /*
+ Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
+diff --git a/shell/shell_common.c b/shell/shell_common.c
+index 51c92d6..780e27e 100644
+--- a/shell/shell_common.c
++++ b/shell/shell_common.c
+@@ -18,6 +18,7 @@
+  */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h> /* getrlimit */
+ 
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+ 
+-- 
+1.7.9.7
+