diff options
23 files changed, 0 insertions, 1360 deletions
diff --git a/metadata/md5-cache/sys-apps/busybox-1.1.0 b/metadata/md5-cache/sys-apps/busybox-1.1.0 deleted file mode 100644 index fa9aa48a..00000000 --- a/metadata/md5-cache/sys-apps/busybox-1.1.0 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile install postinst unpack -DESCRIPTION=Utilities for rescue and embedded systems -EAPI=0 -HOMEPAGE=http://www.busybox.net/ -IUSE=debug static netboot floppyboot make-symlinks savedconfig -KEYWORDS=alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 -LICENSE=GPL-2 -RESTRICT=test -SLOT=0 -SRC_URI=http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 -_eclasses_=eutils 351a78113be5b393c09a2c948701ad36 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 portability 3a50b3ec310b86914f98babecc8f89c6 savedconfig 7de7daa586f6bf361639e77d6f2299db toolchain-funcs 4b8d3388c0a6e798504e20ba30b49361 -_md5_=6fdec32efc61ca8644d30a2ec13056c7 diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 77c72599..58a4c73d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -78,8 +78,6 @@ net-wireless/hostapd:crda - Add CRDA support net-wireless/hostapd:logwatch - Install support files for sys-app/logwatch net-wireless/hostapd:madwifi - Add support for madwifi (Atheros chipset) net-wireless/hostapd:wps - Add support for Wi-Fi Protected Setup -sys-apps/busybox:floppyboot - Support floppydisk -sys-apps/busybox:make-symlinks - Create all the appropriate symlinks in /bin and /sbin. virtual/linux-sources:firmware - Install linux kernel firmware www-apps/phabricator:highlight - Enable source code highlighting via dev-python/pygments www-apps/phabricator:mail - Update Differential and Maniphest by replying to messages and create Maniphest tasks via email diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog deleted file mode 100644 index 412830d3..00000000 --- a/sys-apps/busybox/ChangeLog +++ /dev/null @@ -1,39 +0,0 @@ -# ChangeLog for sys-apps/busybox -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> busybox-1.1.0.ebuild: - Remove malformed Id headers - - 10 Jun 2013; Bertrand Jacquin <bertrand@jacquin.bzh> metadata.xml: - Fix manifest - - 28 May 2013; Bertrand Jacquin <bertrand@jacquin.bzh> +metadata.xml: - Add missing metadata.xml - - 28 May 2013; Bertrand Jacquin <bertrand@jacquin.bzh> busybox-1.1.0.ebuild: - Add missing RDEPEND - - 27 May 2013; Bertrand Jacquin <bertrand@jacquin.bzh> busybox-1.1.0.ebuild, - +files/1.1.0/busybox-1.1.0-BJA-open-mode.diff, - +files/1.1.0/busybox-1.1.0-BJA-utime.h.diff: - 1.1.0: Handle savedconfig eclass, also fix some - open()ness, replace utime with utimes, adapt headers - -*busybox-1.1.0 (22 Jul 2011) - - 22 Jul 2011; Bertrand Jacquin <bertrand@jacquin.bzh> +busybox-1.1.0.ebuild, - +files/1.1.0/bb.patch, +files/1.1.0/busybox-1.1.0-BJA-asm-page.diff, - +files/1.1.0/flx-01_redirect-dev-null-1.diff, - +files/1.1.0/flx-02_klog-block-read-1.diff, - +files/1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff, - +files/1.1.0/flx-04-disable-unix-listening.diff, - +files/1.1.0/flx-05-syslogd-ipc-set-key.diff, - +files/1.1.0/flx-06-logread-ipc-set-key.diff, - +files/1.1.0/flx-07-syslogd-pidfile.diff, - +files/1.1.0/flx-makefile-typo.diff, - +files/1.1.0/flx-syslogd-collect-kmsg.diff, - +files/1.1.0/flx-syslogd-listen-udp.diff, - +files/1.1.0/flx-syslogd-reliability.diff, +files/1.1.0/glibc.patch, - +files/1.1.0/ppc64-insmod.patch: - busybox dfc diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest deleted file mode 100644 index 5a79d188..00000000 --- a/sys-apps/busybox/Manifest +++ /dev/null @@ -1,21 +0,0 @@ -AUX 1.1.0/bb.patch 156 SHA256 094d7a95f64198666ea65bdd59f2ea93b7f489b9019bb045aa1c1d25e9f0ee53 WHIRLPOOL cc90faadda784d7e1b6ca4600a7df5ea84443d120357cf843e60a25fe6708f407707ed55863619cb1dfd5db3925b73aeb0035614cfa3c0666e5491f0a239fd3b -AUX 1.1.0/busybox-1.1.0-BJA-asm-page.diff 606 SHA256 6a41891cef175a9e0f39a2a724501a15e73ef90126b9fbbfd6c9cb3785eea0b7 WHIRLPOOL 10dc23d4cd2dc7246175f172df1c6a46ba9abc9860ee8eb06894cac5aa03b1651fdf5ef336662943d21610185eac2b3d6e3bce7380ca0e8a255f1bf0a3281176 -AUX 1.1.0/busybox-1.1.0-BJA-open-mode.diff 1056 SHA256 2536738daa833e2c1edfb740ad26338da38cb37c3506118d6e8a588470f9947e WHIRLPOOL 1191297a80fe8f976a9b9adffebb68a7c92e9cf17df285cba8870417a67eff549d8fb6b9fd8fd92673c68dd2e76f3e9dcb6d4713abab89ea9941bef4f61b5815 -AUX 1.1.0/busybox-1.1.0-BJA-utime.h.diff 3493 SHA256 9d68f7ff94cb263f3386e1684947e884ceb928dfb12bf0e31b96ad57211643e6 WHIRLPOOL 9936c40dabb9f256b911025be582a8e83241ef2736bc2e19d63cb97e05dede8f9c2e5e8d056834764168b47215811762e8bed4a4632ddf7a366ab131ae5ce90d -AUX 1.1.0/flx-01_redirect-dev-null-1.diff 420 SHA256 e3002a8fb2ba9a10c7d06705cb6cdf51b0a732a78b339258597f5c44c33eae0a WHIRLPOOL ab09b82d5dd3698e5b67e9be0e38c6b9736980f16e4710231dfff973f756c7e32453909e1007770dcf2cc175b1242200a1a4f5607fa3908c9e4567fff0246c5b -AUX 1.1.0/flx-02_klog-block-read-1.diff 2524 SHA256 64db8082652960a2ee097e97dcf44274dfbd6bb08285d1c20c0181d267cccf3b WHIRLPOOL 75f857990ae037158b1a87669ad7df593abf3860a2293256fbfb54499e6b77b656a5cc76eb56f0de2a56aa5fc6488454780732eb2e3ab7ace35b62e612c85283 -AUX 1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff 1943 SHA256 ffbcd9cb065aa01a3e13691886a198ad542f3ba49815c55a98a36babab347aa8 WHIRLPOOL d058d6f17e19ad20d61905bc8307f69a4fc7f841cdc568c21ec5bfa90af62e65798711bdb9cbf2e34c980736f737f0575fe44aa97f62d1c35021dfc9cc6cccff -AUX 1.1.0/flx-04-disable-unix-listening.diff 2248 SHA256 a649f25557f7af06bb3dc1b46cbfee9d9ed3f6f87c473d2bded27abe3e887bf5 WHIRLPOOL 912436bd37433d1cf93f4cef41b36121ea9dd18fef01c555cc15d9fe4f9e5c45a38763565c213844b1894cfa92091362b05f5ae14a79d5028bf907b5891b3cf5 -AUX 1.1.0/flx-05-syslogd-ipc-set-key.diff 1475 SHA256 3db593eff84d0658588b18b3340dcd3c14a2b643a17ba262e5a4443116f19c5c WHIRLPOOL dfb7de2fe7a7645b90ed437c5649722e19bbc49dde8035c79cd06c564d932347c6ef0fb37a17ad4c75c022fa43d64db8817093b76b06227c84931a762d663d30 -AUX 1.1.0/flx-06-logread-ipc-set-key.diff 1290 SHA256 6b3eb2502b1a6c9be7b73db520e0ce5c547ef6dc4118f566e648116292c87b39 WHIRLPOOL e30a1821305e3cc933a7cb9426513a15e0787e4e9a973fec5c3e1ab4c26dadb1ef8cbc50cf180e92773d1ec24c40299cc37ebedee1fe93ac59ef96c205d2bf14 -AUX 1.1.0/flx-07-syslogd-pidfile.diff 2128 SHA256 990ad133a8d9eebe864adb1a4bb536fea1d275b5de53c822e3f1a7975f771dfb WHIRLPOOL fb1918cfa2eff9a07abc328250bbd02bc9735092dc0bba241f4120c9bf9d6d984e7839dc5801ad02d1958ae2c469543ba3ff9036d0c7481041a2d3b371ffabe2 -AUX 1.1.0/flx-makefile-typo.diff 385 SHA256 6a195f2b6732fcd5f95c9d1ec2d2b64ae080e76ea5b35d90ad7cd799cbf82dd0 WHIRLPOOL 6f37330ba83091c5669c6a75977cd9b8a7f4f3c87c6836240ed3b8dfdce036590089089cce74b2c993b97bba4585e338214bed459d7e54c42bcbcc4696d813d5 -AUX 1.1.0/flx-syslogd-collect-kmsg.diff 4020 SHA256 ef0899278a94a0179d4e55592c8242828af9c85a468ed305b6106b8da19dc2f1 WHIRLPOOL 4d3ff7b4a728d59dc92ec902ce3f0cd71db12cceaefc68970a39b9a146499849d9eae28f017571d5f33ce8f02b56aa38f1d790c00b1fbb6fec4b9bdfe14b2d72 -AUX 1.1.0/flx-syslogd-listen-udp.diff 5219 SHA256 f166a06dfd655aa0c79b59c75ba381365ef8fb3ef64f21cae1545e32a636f1f1 WHIRLPOOL 71e91f3a27f80c669c48c61da4f687bceb13e9ed6b6ec345b4c29eef49fe362494dfc3ea8e5d9d513bb26e1276fae41b570d3335fbec60116bacf22edc9bfd09 -AUX 1.1.0/flx-syslogd-reliability.diff 2396 SHA256 0da9280566dd98ad9e2f6a30aea37c46884fdc612eb56675470ebb3aa5bf6740 WHIRLPOOL b588509b3aa5e5ff14b3b39aa13802c79cd516090fe692ddf59fb01c4b1074da174258681e29911f24930c686647bcc0141029ae1583f64b5468655d3507c176 -AUX 1.1.0/glibc.patch 605 SHA256 0a252b3a7da5265cf439300d9a98e2c39bf418acc29b4f113a53e2552098415f WHIRLPOOL 04f1e9a5bfebe4e1fdd408d491f1ba2d6a3cb9c8bb504661b51ab6e31d82b94980425521999b80374b8cf5de2bb74173752f6431393aae04cbac1b8453bf3549 -AUX 1.1.0/ppc64-insmod.patch 359 SHA256 822f72925dbff554a1f4e8c34a979bf7fc192b5683b62a40f6d78316b80d8a8c WHIRLPOOL 8728f62b7f1c1d3ffdcd4b9e1f2a5d2ea7e07ff4bbf509daff48a2b642c41b94dd2d978ad2a174f29557f755834851f62802c319b56bacf39499df357c10eb10 -DIST busybox-1.1.0.tar.bz2 1408642 SHA256 3377d271dcfcbf8f49368c63c4819d4f8306bc529766bb0d8f4a12888fb20596 WHIRLPOOL 888113b5f95a7533c6a05b2d603e69aac292647fca4e4cfed3bbcd2880770c8789963319e7059fb0b2e5dd99ccfc8bb610dd8cbcf3c2f3271bcf93e13600b6c2 -EBUILD busybox-1.1.0.ebuild 6816 SHA256 88a91917245a95f8d661b0c2cf32bae83ea5811cb57dbf147a56e1b038ebaefc WHIRLPOOL ac66838e77e23b9a38fed9f9eb6a1377ecf3084ceaa7cef8f47dd36cc6fc62b87b8b22413e07ffe449039cb380b75cd4ca075b7b667d48468ab6b87fd24bfdbc -MISC ChangeLog 1558 SHA256 cfd5f8f72af6edbf6b20960f2d9d3f69e24abe7dcd79cbf4c8240ade25aca8ef WHIRLPOOL 8d270211cc5f6fdfa0e397bc1fb8f4bbc82567b0f688474c20c77ac921947b5f027ce877eeae0c602607fd1dca936fb6cd1fb829ab7a7936fcf390b74eb82861 -MISC metadata.xml 341 SHA256 008ef8ec91db2dbf422d2b325bc2830da97fe958782d0e4370fb71040890ecf1 WHIRLPOOL de68a9507879e99011996bf70f3be4fbd49be2bed9f63c712dd0949979748e46c1000c554a07622e5891cefde7794a1e13002f4f88502c47928918efafc4a018 diff --git a/sys-apps/busybox/busybox-1.1.0.ebuild b/sys-apps/busybox/busybox-1.1.0.ebuild deleted file mode 100644 index a9b7d0bb..00000000 --- a/sys-apps/busybox/busybox-1.1.0.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils savedconfig - -#SNAPSHOT=20040726 -SNAPSHOT="" - -DESCRIPTION="Utilities for rescue and embedded systems" -HOMEPAGE="http://www.busybox.net/" -if [[ -n ${SNAPSHOT} ]] ; then - MY_P=${PN} - SRC_URI="http://www.busybox.net/downloads/snapshots/${PN}-${SNAPSHOT}.tar.bz2" -else - MY_P=${PN}-${PV/_/-} - SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" -fi - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="debug static netboot floppyboot make-symlinks" -RESTRICT="test" - -DEPEND="" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -# <pebenito> then eventually turning on selinux would mean -# adding a dep: selinux? ( sys-libs/libselinux ) - -busybox_set_env() { - type -p ${CHOST}-ar > /dev/null && export CROSS=${CHOST}- - # Don't let KBUILD_OUTPUT mess us up #88088 - unset KBUILD_OUTPUT -} - -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;; - Y) echo "CONFIG_$2=y" >> .config;; - N) echo "CONFIG_$2=n" >> .config;; - *) use $1 \ - && busybox_config_option y $2 \ - || busybox_config_option n $2 - return 0 - ;; - esac - einfo $(grep "CONFIG_$2[= ]" .config) -} - -src_unpack() { - busybox_set_env - unpack ${A} - cd "${S}" - - # patches go here! - epatch "${FILESDIR}"/1.1.0/bb.patch - epatch "${FILESDIR}"/1.1.0/ppc64-insmod.patch - epatch "${FILESDIR}"/1.1.0/glibc.patch - - epatch "${FILESDIR}"/1.1.0/flx-syslogd-listen-udp.diff - epatch "${FILESDIR}"/1.1.0/flx-syslogd-reliability.diff - epatch "${FILESDIR}"/1.1.0/flx-makefile-typo.diff - epatch "${FILESDIR}"/1.1.0/flx-syslogd-collect-kmsg.diff - epatch "${FILESDIR}"/1.1.0/flx-01_redirect-dev-null-1.diff - epatch "${FILESDIR}"/1.1.0/flx-02_klog-block-read-1.diff - epatch "${FILESDIR}"/1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff - epatch "${FILESDIR}"/1.1.0/flx-04-disable-unix-listening.diff - epatch "${FILESDIR}"/1.1.0/flx-05-syslogd-ipc-set-key.diff - epatch "${FILESDIR}"/1.1.0/flx-06-logread-ipc-set-key.diff - epatch "${FILESDIR}"/1.1.0/flx-07-syslogd-pidfile.diff - - epatch "${FILESDIR}"/1.1.0/${P}-BJA-asm-page.diff - epatch "${FILESDIR}"/1.1.0/${P}-BJA-open-mode.diff - epatch "${FILESDIR}"/1.1.0/${P}-BJA-utime.h.diff - - # we'll let portage do the stripping - # respect env CFLAGS - sed -i \ - -e '/STRIPCMD:=/s:=.*:=true:' \ - -e '/^CFLAGS=/s:=:+=:' \ - Rules.mak - - # check for a busybox config before making one of our own. - # if one exist lets return and use it. - # fine grained config control for user defined busybox configs. - # [package]-[version]-[revision].config - # [package]-[version].config - # [package].config - - if use netboot ; then - cp "${FILESDIR}"/config-netboot .config - sed -i \ - -e '/DEFAULT_SCRIPT/s:/share/udhcpc/default.script:/lib/udhcpc.script:' \ - networking/udhcp/libbb_udhcp.h \ - || die "fixing netboot/udhcpc" - elif use floppyboot ; then - cp "${FILESDIR}"/config-floppyboot .config - fi - - # setup the config file - make allyesconfig > /dev/null - busybox_config_option n DMALLOC - busybox_config_option n FEATURE_SUID_CONFIG - - # If these are not set and we are using a uclibc/busybox setup - # all calls to system() will fail. - busybox_config_option y FEATURE_SH_IS_ASH - busybox_config_option n FEATURE_SH_IS_NONE - - busybox_config_option static STATIC - busybox_config_option debug DEBUG - use debug \ - && busybox_config_option Y NO_DEBUG_LIB \ - && busybox_config_option N DMALLOC \ - && busybox_config_option N EFENCE - - # 1.00-pre5 uses the old selinux api which is no longer maintained - #busybox_config_option selinux SELINUX - busybox_config_option n SELINUX - - # default a bunch of uncommon options to off - for opt in LOCALE_SUPPORT TFTP FTP{GET,PUT} IPCALC TFTP HUSH \ - LASH MSH INETD DPKG RPM2CPIO RPM FOLD LOGNAME OD CRONTAB \ - UUDECODE UUENCODE SULOGIN DC - do - busybox_config_option n ${opt} - done - - restore_config .config - make oldconfig > /dev/null -} - -src_compile() { - busybox_set_env - use ppc64 && CFLAGS="${CFLAGS} -mminimal-toc" - emake -j1 CROSS="${CROSS}" depend || die "depend failed" - emake CROSS="${CROSS}" busybox || die "build failed" - if use static ; then - mv busybox{,.bak} - local failed=0 - emake -j1 \ - LDFLAGS="${LDFLAGS} -static" \ - CROSS="${CROSS}" \ - busybox || failed=1 - if [[ ${failed} == 1 ]] ; then - if has_version '<sys-libs/glibc-2.3.5' ; then - eerror "Your glibc has broken static support, ignorning static build failure." - eerror "See http://bugs.gentoo.org/show_bug.cgi?id=94879" - cp busybox.bak bb - else - die "static build failed" - fi - else - mv busybox bb - fi - mv busybox{.bak,} - fi -} - -src_install() { - busybox_set_env - - into / - dobin busybox - use static \ - && dosym busybox /bin/bb \ - || dobin bb - - if use make-symlinks ; then - if [[ ! ${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 realy what you want." - die "silly options will destroy your system" - fi - make CROSS="${CROSS}" install || die - cp -pPR _install/${x}/* "${D}"/ || die "copying links for ${x} failed" -# cd "${D}" -# # XXX: should really move this to pkg_preinst() ... -# local symlink -# for symlink in {,usr/}{bin,sbin}/* linuxrc ; do -# [[ -L ${symlink} ]] || continue -# [[ -e ${ROOT}/${symlink} ]] \ -# && eerror "Deleting symlink ${symlink} because it exists in ${ROOT}" \ -# && rm ${symlink} -# done - cd "${S}" - fi - - dodoc AUTHORS Changelog README TODO - - cd docs || die - docinto txt - dodoc *.txt - docinto pod - dodoc *.pod - dohtml *.html *.sgml - - # no man files? - # cd ../man && doman *.1 - - cd ../examples || die - docinto examples - dodoc inittab depmod.pl - - cd bootfloppy || die - docinto bootfloppy - dodoc bootfloppy.txt display.txt mkdevs.sh etc/* etc/init.d/* 2>/dev/null - - cd ../../ || die - if has buildpkg ${FEATURES} && has keepwork ${FEATURES} ; then - cd "${S}" - # this should install to the ./_install/ dir by default. - # we make a micro pkg of busybox that can be used for - # embedded systems -solar - if ! use make-symlinks ; then - make CROSS="${CROSS}" install || die - fi - cd ./_install/ \ - && tar --no-same-owner -jcvf "${WORKDIR}/${MY_P}-${ARCH}.bz2" . \ - && cd .. - fi - - save_config .config -} - -pkg_postinst() { - echo - einfo "This ebuild has support for user defined configs" - einfo "Please read this ebuild for more details and re-emerge as needed" - einfo "if you want to add or remove functionality for ${PN}" - echo -} diff --git a/sys-apps/busybox/files/1.1.0/bb.patch b/sys-apps/busybox/files/1.1.0/bb.patch deleted file mode 100644 index fc90b00c..00000000 --- a/sys-apps/busybox/files/1.1.0/bb.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- include/applets.h -+++ include/applets.h -@@ -78,2 +78,3 @@ - #endif -+ APPLET_NOUSAGE("bb", ash_main, _BB_DIR_BIN, _BB_SUID_NEVER) - #ifdef CONFIG_BBCONFIG diff --git a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-asm-page.diff b/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-asm-page.diff deleted file mode 100644 index 09888e3b..00000000 --- a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-asm-page.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- util-linux/mkswap.c.ori 2009-05-08 22:56:53.000000000 +0200 -+++ util-linux/mkswap.c 2009-05-08 22:57:04.000000000 +0200 -@@ -42,7 +42,6 @@ - #include <stdlib.h> - #include <sys/ioctl.h> /* for _IO */ - #include <sys/utsname.h> --#include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ - /* we also get PAGE_SIZE via getpagesize() */ - #include "busybox.h" - ---- libbb/procps.c.ori 2009-05-02 01:15:13.000000000 +0200 -+++ libbb/procps.c 2009-05-02 01:15:20.000000000 +0200 -@@ -12,7 +12,6 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> --#include <asm/page.h> - - #include "libbb.h" - diff --git a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-open-mode.diff b/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-open-mode.diff deleted file mode 100644 index e73ceeb3..00000000 --- a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-open-mode.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- archival/gzip.c.ori 2011-08-02 20:00:03.864359196 +0200 -+++ archival/gzip.c 2011-08-02 20:03:53.277427909 +0200 -@@ -1268,9 +1268,9 @@ - /* Open output file */ - #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) && defined O_NOFOLLOW - outFileNum = -- open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW); -+ open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW, S_IRUSR | S_IWUSR | S_IRGRP); - #else -- outFileNum = open(path, O_RDWR | O_CREAT | O_EXCL); -+ outFileNum = open(path, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | S_IRGRP); - #endif - if (outFileNum < 0) { - bb_perror_msg("%s", path); ---- e2fsprogs/ext2fs/ismounted.c.ori 2011-08-02 20:06:38.241196299 +0200 -+++ e2fsprogs/ext2fs/ismounted.c 2011-08-02 20:07:04.065316581 +0200 -@@ -147,7 +147,7 @@ - is_root: - #define TEST_FILE "/.ismount-test-file" - *mount_flags |= EXT2_MF_ISROOT; -- fd = open(TEST_FILE, O_RDWR|O_CREAT); -+ fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) { - if (errno == EROFS) - *mount_flags |= EXT2_MF_READONLY; diff --git a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-utime.h.diff b/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-utime.h.diff deleted file mode 100644 index d5267977..00000000 --- a/sys-apps/busybox/files/1.1.0/busybox-1.1.0-BJA-utime.h.diff +++ /dev/null @@ -1,128 +0,0 @@ ---- ./loginutils/passwd.c.ori 2012-02-12 00:09:25.808644957 +0100 -+++ ./loginutils/passwd.c 2012-02-12 00:33:13.831198604 +0100 -@@ -6,7 +6,8 @@ - #include <sys/stat.h> - #include <sys/types.h> - #include <unistd.h> --#include <utime.h> -+#include <linux/utime.h> -+#include <sys/time.h> - #include <syslog.h> - #include <time.h> - #include <sys/resource.h> -@@ -282,7 +283,7 @@ - - ub.actime = sb.st_atime; - ub.modtime = sb.st_mtime; -- utime(backup, &ub); -+ utimes(backup, &ub); - return 0; - } - ---- ./libbb/copy_file.c.ori 2012-02-12 00:09:36.011699753 +0100 -+++ ./libbb/copy_file.c 2012-02-12 00:33:23.575249555 +0100 -@@ -12,7 +12,8 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> --#include <utime.h> -+#include <linux/utime.h> -+#include <sys/time.h> - #include <errno.h> - #include <dirent.h> - #include <stdlib.h> -@@ -244,7 +245,7 @@ - - times.actime = source_stat.st_atime; - times.modtime = source_stat.st_mtime; -- if (utime(dest, ×) < 0) -+ if (utimes(dest, ×) < 0) - bb_perror_msg(msg, "times", dest); - if (chown(dest, source_stat.st_uid, source_stat.st_gid) < 0) { - source_stat.st_mode &= ~(S_ISUID | S_ISGID); ---- ./libbb/remove_file.c.ori 2012-02-12 00:09:30.619670796 +0100 -+++ ./libbb/remove_file.c 2012-02-12 00:31:22.261615364 +0100 -@@ -21,7 +21,7 @@ - - #include <stdio.h> - #include <time.h> --#include <utime.h> -+#include <sys/time.h> - #include <dirent.h> - #include <errno.h> - #include <unistd.h> ---- ./coreutils/cp.c.ori 2012-02-12 00:09:50.667778461 +0100 -+++ ./coreutils/cp.c 2012-02-12 00:31:22.262615369 +0100 -@@ -20,7 +20,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> --#include <utime.h> -+#include <sys/time.h> - #include <errno.h> - #include <dirent.h> - #include <stdlib.h> ---- ./coreutils/touch.c.ori 2012-02-12 00:09:43.867741942 +0100 -+++ ./coreutils/touch.c 2012-02-12 00:33:32.422295817 +0100 -@@ -33,7 +33,8 @@ - #include <stdio.h> - #include <sys/types.h> - #include <fcntl.h> --#include <utime.h> -+#include <linux/utime.h> -+#include <sys/time.h> - #include <errno.h> - #include <unistd.h> - #include <stdlib.h> -@@ -54,7 +55,7 @@ - } - - do { -- if (utime(*argv, NULL)) { -+ if (utimes(*argv, NULL)) { - if (errno == ENOENT) { /* no such file*/ - if (flags & 1) { /* Creation is disabled, so ignore. */ - continue; ---- ./archival/ar.c.ori 2012-02-12 00:10:00.492831226 +0100 -+++ ./archival/ar.c 2012-02-12 00:31:22.265615387 +0100 -@@ -31,7 +31,7 @@ - #include <stdlib.h> - #include <string.h> - #include <time.h> --#include <utime.h> -+#include <sys/time.h> - #include <unistd.h> - - #include "unarchive.h" ---- ./archival/gzip.c.ori 2012-02-12 00:09:55.867806389 +0100 -+++ ./archival/gzip.c 2012-02-12 00:33:40.823339748 +0100 -@@ -42,7 +42,8 @@ - #include <errno.h> - #include <sys/types.h> - #include <signal.h> --#include <utime.h> -+#include <linux/utime.h> -+#include <sys/time.h> - #include <ctype.h> - #include <sys/types.h> - #include <unistd.h> ---- ./archival/libunarchive/data_extract_all.c.ori 2012-02-12 00:10:08.380873590 +0100 -+++ ./archival/libunarchive/data_extract_all.c 2012-02-12 00:32:51.895083909 +0100 -@@ -20,7 +20,8 @@ - #include <fcntl.h> - #include <stdlib.h> - #include <string.h> --#include <utime.h> -+#include <linux/utime.h> -+#include <sys/time.h> - #include <unistd.h> - #include <stdlib.h> - -@@ -123,6 +124,6 @@ - if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) { - struct utimbuf t; - t.actime = t.modtime = file_header->mtime; -- utime(file_header->name, &t); -+ utimes(file_header->name, &t); - } - } diff --git a/sys-apps/busybox/files/1.1.0/flx-01_redirect-dev-null-1.diff b/sys-apps/busybox/files/1.1.0/flx-01_redirect-dev-null-1.diff deleted file mode 100644 index d924f228..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-01_redirect-dev-null-1.diff +++ /dev/null @@ -1,13 +0,0 @@ -This patch ensures that even if an error is printed, it will never be sent -to a socket or other embarrassing fd. - ---- ./sysklogd/syslogd.c~ 2006-03-13 22:35:44.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-13 22:32:55.000000000 +0100 -@@ -824,6 +824,7 @@ - bb_perror_msg_and_die("daemon"); - #endif /* __uClinux__ */ - close(0); close(1); close(2); -+ open("/dev/null", O_RDWR); dup(0); dup(0); - } - doSyslogd(); - diff --git a/sys-apps/busybox/files/1.1.0/flx-02_klog-block-read-1.diff b/sys-apps/busybox/files/1.1.0/flx-02_klog-block-read-1.diff deleted file mode 100644 index 17cd603d..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-02_klog-block-read-1.diff +++ /dev/null @@ -1,82 +0,0 @@ -This patch correctly reads the kernel logs at startup time. The kernel then -returns large blocks of data which must be cut in lines. Also, we need to -ensure that we will never block on the kernel FD upon next reads. - ---- ./sysklogd/syslogd.c~ 2006-03-13 14:59:45.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-13 22:35:44.000000000 +0100 -@@ -707,16 +707,68 @@ - #endif /* SYSLOG_LISTEN_UDP */ - #ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG - if (doKernelLog && FD_ISSET(klog_fd, &fds)) { -- int i; -+ int i, j, msgptr, msgend; -+ int save, remain; - -- if ((i = read(klog_fd, tmpbuf + 8, TMP_BUF_SZ)) > 0) { -- memcpy(tmpbuf, "kernel: ", 8); -- i += 8; -- tmpbuf[i] = '\0'; -- serveConnection(tmpbuf, i); -- } else if (i < 0 && errno != EINTR && errno != EAGAIN) { -+ save = strlen("kernel: "); -+ remain = 0; -+ -+ -+ i = read(klog_fd, tmpbuf + save, TMP_BUF_SZ - save - 1); -+ if (i < 0 && errno != EINTR && errno != EAGAIN) { - bb_perror_msg_and_die("/proc/kmsg read error"); - } -+ -+ while (i > 0) { -+ fd_set rfd; -+ struct timeval tv; -+ -+ /* look for a line feed after remaining data */ -+ msgptr = save; -+ j = msgptr + remain; -+ msgend = j + i; -+ while (j < msgend) { -+ if (tmpbuf[j] != '\n') { -+ j++; -+ continue; -+ } -+ /* we have one complete message between msgptr and j */ -+ tmpbuf[j] = 0; -+ memcpy(tmpbuf + msgptr - save, -+ "kernel: ", save); -+ serveConnection(tmpbuf + msgptr - save, -+ j - msgptr + save); -+ msgptr = ++j; -+ } -+ remain = msgend - msgptr; -+ -+ if (!remain) -+ break; -+ -+ /* now we know there are some data left, so we'll try -+ * to read the next block. but we *MUST* check with -+ * select() that data is available before trying to -+ * read again, otherwise we willy block. -+ */ -+ -+ memmove(tmpbuf + save, tmpbuf + msgptr, remain); -+ -+ FD_ZERO(&rfd); FD_SET(klog_fd, &rfd); -+ tv.tv_sec = tv.tv_usec = 0; -+ i = 0; -+ if (select(klog_fd + 1, &rfd, NULL, NULL, &tv) <= 0 || -+ (i = read(klog_fd, tmpbuf + save + remain, -+ TMP_BUF_SZ - save - remain - 1)) <= 0) { -+ if (i < 0 && errno != EINTR && errno != EAGAIN) { -+ bb_perror_msg_and_die("/proc/kmsg read error"); -+ } -+ /* end of read : send last data and return */ -+ tmpbuf[save + remain] = 0; -+ memcpy(tmpbuf, "kernel: ", save); -+ serveConnection(tmpbuf, save + remain); -+ break; -+ } -+ } /* end of while(1) */ - } - #endif - } /* for main loop */ diff --git a/sys-apps/busybox/files/1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff b/sys-apps/busybox/files/1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff deleted file mode 100644 index 54778ff7..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-03_remove-backspaces-from-kmsg-1.diff +++ /dev/null @@ -1,61 +0,0 @@ -This patch automatically removes backspaces from logs sent by the kernel. The -kernel uses backspaces to show its progress during the ramdisk decompression. - ---- ./sysklogd/syslogd.c~ 2006-03-13 22:32:55.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-13 22:30:35.000000000 +0100 -@@ -522,7 +522,7 @@ - - /* This must be a #define, since when CONFIG_DEBUG and BUFFERS_GO_IN_BSS are - * enabled, we otherwise get a "storage size isn't constant error. */ --static int serveConnection(char *tmpbuf, int n_read) -+static int serveConnection(char *tmpbuf, int n_read, int remove_bs) - { - char *p = tmpbuf; - -@@ -547,6 +547,9 @@ - } - } else if (c == '\n') { - *q++ = ' '; -+ } else if (c == '\b') { -+ if (q > line) -+ *--q = '\0'; - } else if (iscntrl(c) && (c < 0177)) { - *q++ = '^'; - *q++ = c ^ 0100; -@@ -687,7 +690,7 @@ - - if ((i = recv(sock_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { - tmpbuf[i] = '\0'; -- serveConnection(tmpbuf, i); -+ serveConnection(tmpbuf, i, 0); - } else if (i < 0 && errno != EINTR && errno != EAGAIN) { - bb_perror_msg_and_die("UNIX socket error"); - } -@@ -699,7 +702,7 @@ - - if ((i = recv(listen_udp_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { - tmpbuf[i] = '\0'; -- serveConnection(tmpbuf, i); -+ serveConnection(tmpbuf, i, 0); - } else if (i < 0 && errno != EINTR && errno != EAGAIN) { - bb_perror_msg_and_die("UDP socket error"); - } -@@ -737,7 +740,7 @@ - memcpy(tmpbuf + msgptr - save, - "kernel: ", save); - serveConnection(tmpbuf + msgptr - save, -- j - msgptr + save); -+ j - msgptr + save, 1); - msgptr = ++j; - } - remain = msgend - msgptr; -@@ -765,7 +768,7 @@ - /* end of read : send last data and return */ - tmpbuf[save + remain] = 0; - memcpy(tmpbuf, "kernel: ", save); -- serveConnection(tmpbuf, save + remain); -+ serveConnection(tmpbuf, save + remain, 1); - break; - } - } /* end of while(1) */ - diff --git a/sys-apps/busybox/files/1.1.0/flx-04-disable-unix-listening.diff b/sys-apps/busybox/files/1.1.0/flx-04-disable-unix-listening.diff deleted file mode 100644 index 504d69cb..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-04-disable-unix-listening.diff +++ /dev/null @@ -1,82 +0,0 @@ ---- ./sysklogd/syslogd.c~ 2006-03-30 18:16:06.000000000 +0200 -+++ ./sysklogd/syslogd.c 2006-03-30 21:42:34.000000000 +0200 -@@ -110,6 +110,8 @@ - static int doKernelLog = FALSE; - #endif - -+static int doListenUnix = TRUE; /* we can disable unix socket listening */ -+ - /* Make loging output smaller. */ - static bool small = false; - -@@ -587,6 +589,8 @@ - signal(SIGALRM, domark); - alarm(MarkInterval); - -+ if (doListenUnix) -+ { - /* Create the syslog file so realpath() can work. */ - if (realpath(_PATH_LOG, lfile) != NULL) { - unlink(lfile); -@@ -612,6 +616,7 @@ - if (chmod(lfile, 0666) < 0) { - bb_perror_msg_and_die("Could not set permission on " _PATH_LOG); - } -+ } - - #ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP - if (doListenUDP) { -@@ -654,8 +659,12 @@ - for (;;) { - int nbfd; - FD_ZERO(&fds); -- FD_SET(sock_fd, &fds); -- nbfd = sock_fd + 1; -+ if (doListenUnix) { -+ FD_SET(sock_fd, &fds); -+ nbfd = sock_fd + 1; -+ } else -+ nbfd = 0; -+ - #ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP - if (doListenUDP) { - FD_SET(listen_udp_fd, &fds); -@@ -685,7 +694,7 @@ - #endif - #define tmpbuf bb_common_bufsiz1 - -- if (FD_ISSET(sock_fd, &fds)) { -+ if (doListenUnix && FD_ISSET(sock_fd, &fds)) { - int i; - - if ((i = recv(sock_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { -@@ -786,7 +795,7 @@ - char *p; - - /* do normal option parsing */ -- while ((opt = getopt(argc, argv, "m:nO:s:Sb:R:Ll:k:C::")) > 0) { -+ while ((opt = getopt(argc, argv, "m:nO:s:uSb:R:Ll:k:C::")) > 0) { - switch (opt) { - case 'm': - MarkInterval = atoi(optarg) * 60; -@@ -847,7 +856,10 @@ - } - circular_logging = TRUE; - break; - #endif -+ case 'u': -+ doListenUnix = FALSE; -+ break; - case 'S': - small = true; - break; ---- ./include/usage.h.orig 2006-03-30 21:51:39.000000000 +0200 -+++ ./include/usage.h 2006-03-30 21:52:47.000000000 +0200 -@@ -2907,6 +2907,7 @@ - "\t-n\t\tRun as a foreground process\n" \ - "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" \ - "\t-S\t\tMake logging output smaller." \ -+ "\n\t-u\t\tDo not bind to UNIX socket /dev/log." \ - USAGE_ROTATE_LOGFILE( \ - "\n\t-s SIZE\t\tMax size (KB) before rotate (default=200KB, 0=off)\n" \ - "\t-b NUM\t\tNumber of rotated logs to keep (default=1, max=99, 0=purge)") \ diff --git a/sys-apps/busybox/files/1.1.0/flx-05-syslogd-ipc-set-key.diff b/sys-apps/busybox/files/1.1.0/flx-05-syslogd-ipc-set-key.diff deleted file mode 100644 index 3061e66a..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-05-syslogd-ipc-set-key.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- ./sysklogd/syslogd.c~ 2006-03-30 21:44:51.000000000 +0200 -+++ ./sysklogd/syslogd.c 2006-03-30 21:42:34.000000000 +0200 -@@ -132,7 +132,7 @@ - #include <sys/shm.h> - - /* our shared key */ --static const long KEY_ID = 0x414e4547; /*"GENA" */ -+static long KEY_ID = 0x414e4500; /*"\0ENA" */ - - // Semaphore operation structures - static struct shbuf_ds { -@@ -795,7 +795,7 @@ - char *p; - - /* do normal option parsing */ -- while ((opt = getopt(argc, argv, "m:nO:s:uSb:R:Ll:k:C::")) > 0) { -+ while ((opt = getopt(argc, argv, "m:nO:s:uSb:R:Ll:k:K:C::")) > 0) { - switch (opt) { - case 'm': - MarkInterval = atoi(optarg) * 60; -@@ -856,6 +856,10 @@ - } - circular_logging = TRUE; - break; -+ case 'K': -+ KEY_ID = (KEY_ID & ~0xFF) | (atoi(optarg) & 0xFF); -+ circular_logging = TRUE; -+ break; - #endif - case 'u': - doListenUnix = FALSE; ---- ./include/usage.h.orig 2006-03-30 21:53:08.000000000 +0200 -+++ ./include/usage.h 2006-03-30 21:55:58.000000000 +0200 -@@ -2919,7 +2919,8 @@ - USAGE_SYSLOG_INCLUDE_KLOG( \ - "\n\t-k LEVEL\tCollect kernel logs and set console to display logs below LEVEL (1-8)\n") \ - USAGE_IPC_LOG( \ -- "\n\t-C [size(KiB)]\tLog to a circular buffer (read the buffer using logread)") -+ "\n\t-C [size(KiB)]\tLog to a circular buffer (read the buffer using logread)\n" \ -+ "\t-K KEYID\tUse this ID for the circular buffer (0..255, default=0)") - #define syslogd_example_usage \ - "$ syslogd -R masterlog:514\n" \ - "$ syslogd -R 192.168.1.1:601\n" diff --git a/sys-apps/busybox/files/1.1.0/flx-06-logread-ipc-set-key.diff b/sys-apps/busybox/files/1.1.0/flx-06-logread-ipc-set-key.diff deleted file mode 100644 index 202733dc..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-06-logread-ipc-set-key.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- ./sysklogd/logread.c.orig 2006-03-30 22:03:21.000000000 +0200 -+++ ./sysklogd/logread.c 2006-03-30 22:03:23.000000000 +0200 -@@ -36,7 +36,7 @@ - #include <unistd.h> - #include "busybox.h" - --static const long KEY_ID = 0x414e4547; /*"GENA"*/ -+static long KEY_ID = 0x414e4500; /*"\0ENA"*/ - - static struct shbuf_ds { - int size; // size of data written -@@ -80,12 +80,17 @@ - int i; - int follow=0; - -- if (argc == 2 && strcmp(argv[1],"-f")==0) { -- follow = 1; -- } else { -- /* no options, no getopt */ -- if (argc > 1) -- bb_show_usage(); -+ argc--; argv++; -+ while (argc > 0) { -+ if (!strcmp(argv[0], "-f")) -+ follow = 1; -+ else if (argc > 1 && !strcmp(argv[0], "-K")) { -+ KEY_ID = (KEY_ID & ~0xFF) | (atoi(argv[1]) & 0xFF); -+ argc--; argv++; -+ } -+ else -+ bb_show_usage(); -+ argc--; argv++; - } - - // handle intrrupt signal ---- ./include/usage.h.orig 2006-03-30 22:04:04.000000000 +0200 -+++ ./include/usage.h 2006-03-30 22:06:15.000000000 +0200 -@@ -1655,6 +1655,7 @@ - "Shows the messages from syslogd (using circular buffer).\n\n" \ - "Options:\n" \ -- "\t-f\t\toutput data as the log grows" -+ "\t-f\t\toutput data as the log grows\n" \ -+ "\t-K KEYID\taccess logs with key KEYID (0..255, default=0)" - - #define losetup_trivial_usage \ - "[-od] LOOPDEVICE [FILE]" diff --git a/sys-apps/busybox/files/1.1.0/flx-07-syslogd-pidfile.diff b/sys-apps/busybox/files/1.1.0/flx-07-syslogd-pidfile.diff deleted file mode 100644 index 1b479655..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-07-syslogd-pidfile.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ./sysklogd/syslogd.c.flx4-nopid 2006-03-30 22:32:43.000000000 +0200 -+++ ./sysklogd/syslogd.c 2006-03-30 22:49:32.000000000 +0200 -@@ -60,6 +60,8 @@ - - static const char *logFilePath = __LOG_FILE; - -+static const char *pidFilePath = NULL; -+ - #ifdef CONFIG_FEATURE_ROTATE_LOGFILE - /* max size of message file before being rotated */ - static int logFileSize = 200 * 1024; -@@ -507,6 +509,8 @@ - { - logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting."); - unlink(lfile); -+ if (pidFilePath) -+ unlink(pidFilePath); - #ifdef CONFIG_FEATURE_IPC_SYSLOG - ipcsyslog_cleanup(); - #endif -@@ -795,7 +799,7 @@ - char *p; - - /* do normal option parsing */ -- while ((opt = getopt(argc, argv, "m:nO:s:uSb:R:Ll:k:K:C::")) > 0) { -+ while ((opt = getopt(argc, argv, "m:nO:p:s:uSb:R:Ll:k:K:C::")) > 0) { - switch (opt) { - case 'm': - MarkInterval = atoi(optarg) * 60; -@@ -806,6 +810,9 @@ - case 'O': - logFilePath = optarg; - break; -+ case 'p': -+ pidFilePath = optarg; -+ break; - #ifdef CONFIG_FEATURE_ROTATE_LOGFILE - case 's': - logFileSize = atoi(optarg) * 1024; -@@ -885,8 +892,6 @@ - *p = '\0'; - } - -- umask(0); -- - if (doFork == TRUE) { - #if defined(__uClinux__) - vfork_daemon_rexec(0, 1, argc, argv, "-n"); -@@ -896,7 +901,18 @@ - #endif /* __uClinux__ */ - close(0); close(1); close(2); - open("/dev/null", O_RDWR); dup(0); dup(0); -+ if (pidFilePath != NULL) { -+ FILE *f; -+ -+ f = fopen(pidFilePath, "w+"); -+ if (f != NULL) { -+ fprintf(f, "%d\n", getpid()); -+ fclose(f); -+ } -+ } - } -+ umask(0); -+ - doSyslogd(); - - return EXIT_SUCCESS; ---- ./include/usage.h.orig 2006-03-30 23:08:03.000000000 +0200 -+++ ./include/usage.h 2006-03-30 23:09:03.000000000 +0200 -@@ -2909,6 +2909,7 @@ - "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" \ - "\t-S\t\tMake logging output smaller." \ - "\n\t-u\t\tDo not bind to UNIX socket /dev/log." \ -+ "\n\t-p PIDFILE\tWrite background process ID to this file." \ - USAGE_ROTATE_LOGFILE( \ - "\n\t-s SIZE\t\tMax size (KB) before rotate (default=200KB, 0=off)\n" \ - "\t-b NUM\t\tNumber of rotated logs to keep (default=1, max=99, 0=purge)") \ diff --git a/sys-apps/busybox/files/1.1.0/flx-makefile-typo.diff b/sys-apps/busybox/files/1.1.0/flx-makefile-typo.diff deleted file mode 100644 index aa787284..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-makefile-typo.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig 2006-03-07 22:13:20.000000000 +0100 -+++ ./Makefile 2006-03-07 22:13:29.000000000 +0100 -@@ -129,7 +129,7 @@ - @echo ' oldconfig - resolve any unresolved symbols in .config' - @echo - @echo 'Installation:' -- @echo ' install - install busybox into $prefix' -+ @echo ' install - install busybox into $(PREFIX)' - @echo ' uninstall' - @echo - @echo 'Development:' diff --git a/sys-apps/busybox/files/1.1.0/flx-syslogd-collect-kmsg.diff b/sys-apps/busybox/files/1.1.0/flx-syslogd-collect-kmsg.diff deleted file mode 100644 index 4d502e38..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-syslogd-collect-kmsg.diff +++ /dev/null @@ -1,137 +0,0 @@ ---- ./sysklogd/syslogd.c~ 2006-03-07 22:45:12.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-09 21:03:57.000000000 +0100 -@@ -104,6 +104,11 @@ - static int doListenUDP = FALSE; - #endif - -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+static int console_level; -+static int klog_fd; -+static int doKernelLog = FALSE; -+#endif - - /* Make loging output smaller. */ - static bool small = false; -@@ -616,6 +621,19 @@ - } - #endif - -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+ if (doKernelLog) { -+ klogctl(8, NULL, console_level); -+ klog_fd = open("/proc/kmsg", O_RDONLY); -+ if (klog_fd < 0) { -+ bb_perror_msg_and_die("Cannot open /proc/kmsg"); -+ } -+ if (fcntl(klog_fd, F_SETFL, O_NONBLOCK) < 0) { -+ bb_perror_msg_and_die("Couldn't make /proc/kmsg non-blocking"); -+ } -+ } -+#endif -+ - #ifdef CONFIG_FEATURE_IPC_SYSLOG - if (circular_logging == TRUE) { - ipcsyslog_init(); -@@ -642,6 +660,13 @@ - nbfd = listen_udp_fd + 1; - } - #endif -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+ if (doKernelLog) { -+ FD_SET(klog_fd, &fds); -+ if (klog_fd >= nbfd) -+ nbfd = klog_fd + 1; -+ } -+#endif - if (select(nbfd, &fds, NULL, NULL, NULL) < 0) { - if (errno == EINTR) { - /* alarm may have happened. */ -@@ -680,6 +705,20 @@ - } - } /* FD_ISSET() */ - #endif /* SYSLOG_LISTEN_UDP */ -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+ if (doKernelLog && FD_ISSET(klog_fd, &fds)) { -+ int i; -+ -+ if ((i = read(klog_fd, tmpbuf + 8, TMP_BUF_SZ)) > 0) { -+ memcpy(tmpbuf, "kernel: ", 8); -+ i += 8; -+ tmpbuf[i] = '\0'; -+ serveConnection(tmpbuf, i); -+ } else if (i < 0 && errno != EINTR && errno != EAGAIN) { -+ bb_perror_msg_and_die("/proc/kmsg read error"); -+ } -+ } -+#endif - } /* for main loop */ - } - -@@ -692,7 +731,7 @@ - char *p; - - /* do normal option parsing */ -- while ((opt = getopt(argc, argv, "m:nO:s:Sb:R:Ll:C::")) > 0) { -+ while ((opt = getopt(argc, argv, "m:nO:s:Sb:R:Ll:k:C::")) > 0) { - switch (opt) { - case 'm': - MarkInterval = atoi(optarg) * 60; -@@ -735,6 +774,14 @@ - doListenUDP = TRUE; - break; - #endif -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+ case 'k': -+ console_level = atoi(optarg); -+ if (console_level < 0) -+ console_level = 0; -+ doKernelLog = TRUE; -+ break; -+#endif - #ifdef CONFIG_FEATURE_IPC_SYSLOG - case 'C': - if (optarg) { ---- ./sysklogd/Config.in~ 2006-03-07 22:45:12.000000000 +0100 -+++ ./sysklogd/Config.in 2006-03-09 20:39:53.000000000 +0100 -@@ -53,6 +53,18 @@ - The real goal is not to provide a big local syslog server, - but to use it as a centralized repeater. - -+config CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+ bool " Make syslogd collect kernel messages" -+ default n -+ depends on CONFIG_SYSLOGD -+ help -+ When you enable this feature, the syslogd utility will -+ be able to directly read kernel messages from /proc/kmsg -+ without the need for an external klogd daemon. Unless you -+ know that you really need this option, you'd better use -+ the more flexible klogd featured as a standalone daemon -+ which is provided in another option below. -+ - config CONFIG_FEATURE_IPC_SYSLOG - bool " Circular Buffer support" - default n ---- ./include/usage.h~ 2006-03-07 22:45:12.000000000 +0100 -+++ ./include/usage.h 2006-03-09 21:08:32.000000000 +0100 -@@ -2869,6 +2869,11 @@ - #else - # define USAGE_SYSLOG_LISTEN_UDP(a) - #endif -+#ifdef CONFIG_FEATURE_SYSLOG_INCLUDE_KLOG -+# define USAGE_SYSLOG_INCLUDE_KLOG(a) a -+#else -+# define USAGE_SYSLOG_INCLUDE_KLOG(a) -+#endif - #ifdef CONFIG_FEATURE_IPC_SYSLOG - # define USAGE_IPC_LOG(a) a - #else -@@ -2910,6 +2915,8 @@ - "\t-L\t\tLog locally and via network logging (default is network only)") \ - USAGE_SYSLOG_LISTEN_UDP( \ - "\n\t-l HOST[:PORT]\tAccept UDP packets on this local IP or hostname on PORT (default PORT=514/UDP)\n") \ -+ USAGE_SYSLOG_INCLUDE_KLOG( \ -+ "\n\t-k LEVEL\tCollect kernel logs and set console to display logs below LEVEL (1-8)\n") \ - USAGE_IPC_LOG( \ - "\n\t-C [size(KiB)]\tLog to a circular buffer (read the buffer using logread)") - #define syslogd_example_usage \ diff --git a/sys-apps/busybox/files/1.1.0/flx-syslogd-listen-udp.diff b/sys-apps/busybox/files/1.1.0/flx-syslogd-listen-udp.diff deleted file mode 100644 index e846f925..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-syslogd-listen-udp.diff +++ /dev/null @@ -1,193 +0,0 @@ ---- ./sysklogd/syslogd.c.orig 2006-03-07 20:19:12.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-07 21:55:28.000000000 +0100 -@@ -91,6 +91,20 @@ - static int local_logging = FALSE; - #endif - -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+/* udp socket for receiving local UDP messages */ -+static int listen_udp_fd = -1; -+static struct sockaddr_in listen_udp_addr; -+ -+/* where are we listening to? */ -+static char *ListenHost; -+ -+/* what port are we listening to? */ -+static int ListenPort = 514; -+static int doListenUDP = FALSE; -+#endif -+ -+ - /* Make loging output smaller. */ - static bool small = false; - -@@ -394,6 +408,22 @@ - } - #endif - -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+static void init_LocalLog(void) -+{ -+ memset(&listen_udp_addr, 0, sizeof(listen_udp_addr)); -+ listen_udp_fd = socket(AF_INET, SOCK_DGRAM, 0); -+ -+ if (listen_udp_fd < 0) { -+ bb_error_msg("cannot create socket"); -+ } -+ -+ listen_udp_addr.sin_family = AF_INET; -+ listen_udp_addr.sin_addr = *(struct in_addr *) *(xgethostbyname(ListenHost))->h_addr_list; -+ listen_udp_addr.sin_port = htons(ListenPort); -+} -+#endif -+ - static void logMessage(int pri, char *msg) - { - time_t now; -@@ -569,6 +599,18 @@ - if (chmod(lfile, 0666) < 0) { - bb_perror_msg_and_die("Could not set permission on " _PATH_LOG); - } -+ -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+ if (doListenUDP) { -+ init_LocalLog(); -+ -+ if (bind(listen_udp_fd, (struct sockaddr *) &listen_udp_addr, -+ sizeof(listen_udp_addr)) < 0) { -+ bb_perror_msg_and_die("Could not bind to local UDP socket"); -+ } -+ } -+#endif -+ - #ifdef CONFIG_FEATURE_IPC_SYSLOG - if (circular_logging == TRUE) { - ipcsyslog_init(); -@@ -584,11 +626,18 @@ - logMessage(LOG_SYSLOG | LOG_INFO, "syslogd started: " BB_BANNER); - - for (;;) { -- -+ int nbfd; - FD_ZERO(&fds); - FD_SET(sock_fd, &fds); -- -- if (select(sock_fd + 1, &fds, NULL, NULL, NULL) < 0) { -+ nbfd = sock_fd + 1; -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+ if (doListenUDP) { -+ FD_SET(listen_udp_fd, &fds); -+ if (listen_udp_fd >= nbfd) -+ nbfd = listen_udp_fd + 1; -+ } -+#endif -+ if (select(nbfd, &fds, NULL, NULL, NULL) < 0) { - if (errno == EINTR) { - /* alarm may have happened. */ - continue; -@@ -596,8 +645,6 @@ - bb_perror_msg_and_die("select error"); - } - -- if (FD_ISSET(sock_fd, &fds)) { -- int i; - #if MAXLINE > BUFSIZ - # define TMP_BUF_SZ BUFSIZ - #else -@@ -605,6 +652,9 @@ - #endif - #define tmpbuf bb_common_bufsiz1 - -+ if (FD_ISSET(sock_fd, &fds)) { -+ int i; -+ - if ((i = recv(sock_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { - tmpbuf[i] = '\0'; - serveConnection(tmpbuf, i); -@@ -612,6 +662,17 @@ - bb_perror_msg_and_die("UNIX socket error"); - } - } /* FD_ISSET() */ -+ -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+ if (doListenUDP && FD_ISSET(listen_udp_fd, &fds)) { -+ int i; -+ -+ if ((i = recv(listen_udp_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { -+ tmpbuf[i] = '\0'; -+ serveConnection(tmpbuf, i); -+ } -+ } /* FD_ISSET() */ -+#endif /* SYSLOG_LISTEN_UDP */ - } /* for main loop */ - } - -@@ -624,7 +685,7 @@ - char *p; - - /* do normal option parsing */ -- while ((opt = getopt(argc, argv, "m:nO:s:Sb:R:LC::")) > 0) { -+ while ((opt = getopt(argc, argv, "m:nO:s:Sb:R:Ll:C::")) > 0) { - switch (opt) { - case 'm': - MarkInterval = atoi(optarg) * 60; -@@ -657,6 +718,16 @@ - local_logging = TRUE; - break; - #endif -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+ case 'l': -+ ListenHost = bb_xstrdup(optarg); -+ if ((p = strchr(ListenHost, ':'))) { -+ ListenPort = atoi(p + 1); -+ *p = '\0'; -+ } -+ doListenUDP = TRUE; -+ break; -+#endif - #ifdef CONFIG_FEATURE_IPC_SYSLOG - case 'C': - if (optarg) { ---- ./sysklogd/Config.in.orig 2006-03-07 20:37:28.000000000 +0100 -+++ ./sysklogd/Config.in 2006-03-07 20:40:32.000000000 +0100 -@@ -42,6 +42,17 @@ - measure to prevent system logs from being tampered with - by an intruder. - -+config CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+ bool " Listen to UDP socket" -+ default n -+ depends on CONFIG_SYSLOGD -+ help -+ When you enable this feature, the syslogd utility will -+ be able to listen to a local UDP socket, which will -+ make it reachable by tools which can only log to network. -+ The real goal is not to provide a big local syslog server, -+ but to use it as a centralized repeater. -+ - config CONFIG_FEATURE_IPC_SYSLOG - bool " Circular Buffer support" - default n ---- ./include/usage.h.orig 2006-03-07 20:53:55.000000000 +0100 -+++ ./include/usage.h 2006-03-07 20:56:22.000000000 +0100 -@@ -2864,6 +2864,11 @@ - #else - # define USAGE_REMOTE_LOG(a) - #endif -+#ifdef CONFIG_FEATURE_SYSLOG_LISTEN_UDP -+# define USAGE_SYSLOG_LISTEN_UDP(a) a -+#else -+# define USAGE_SYSLOG_LISTEN_UDP(a) -+#endif - #ifdef CONFIG_FEATURE_IPC_SYSLOG - # define USAGE_IPC_LOG(a) a - #else -@@ -2903,6 +2908,8 @@ - USAGE_REMOTE_LOG( \ - "\n\t-R HOST[:PORT]\tLog to IP or hostname on PORT (default PORT=514/UDP)\n" \ - "\t-L\t\tLog locally and via network logging (default is network only)") \ -+ USAGE_SYSLOG_LISTEN_UDP( \ -+ "\n\t-l HOST[:PORT]\tAccept UDP packets on this local IP or hostname on PORT (default PORT=514/UDP)\n") \ - USAGE_IPC_LOG( \ - "\n\t-C [size(KiB)]\tLog to a circular buffer (read the buffer using logread)") - #define syslogd_example_usage \ diff --git a/sys-apps/busybox/files/1.1.0/flx-syslogd-reliability.diff b/sys-apps/busybox/files/1.1.0/flx-syslogd-reliability.diff deleted file mode 100644 index be05703a..00000000 --- a/sys-apps/busybox/files/1.1.0/flx-syslogd-reliability.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- ./sysklogd/syslogd.c.udplog 2006-03-07 21:55:28.000000000 +0100 -+++ ./sysklogd/syslogd.c 2006-03-07 21:56:27.000000000 +0100 -@@ -414,6 +414,10 @@ - memset(&listen_udp_addr, 0, sizeof(listen_udp_addr)); - listen_udp_fd = socket(AF_INET, SOCK_DGRAM, 0); - -+ if (fcntl(listen_udp_fd, F_SETFL, O_NONBLOCK) < 0) { -+ bb_perror_msg_and_die("Couldn't make UDP socket non-blocking"); -+ } -+ - if (listen_udp_fd < 0) { - bb_error_msg("cannot create socket"); - } -@@ -468,19 +472,16 @@ - - /* if we have a valid socket, send the message */ - if (-1 != remotefd) { -- now = 1; -+ now = 5; /* used as a retry counter */ - snprintf(line, sizeof(line), "<%d>%s", pri, msg); - -- retry: - /* send message to remote logger */ -- if(( -1 == sendto(remotefd, line, strlen(line), 0, -- (struct sockaddr *) &remoteaddr, -- sizeof(remoteaddr))) && (errno == EINTR)) { -- /* sleep now seconds and retry (with now * 2) */ -- sleep(now); -- now *= 2; -- goto retry; -- } -+ while ((now-- > 0) && -+ ( -1 == sendto(remotefd, line, strlen(line), -+ MSG_NOSIGNAL, -+ (struct sockaddr *) &remoteaddr, -+ sizeof(remoteaddr))) && -+ (errno == EINTR)); - } - } - -@@ -591,6 +592,10 @@ - _PATH_LOG); - } - -+ if (fcntl(sock_fd, F_SETFL, O_NONBLOCK) < 0) { -+ bb_perror_msg_and_die("Couldn't mark UNIX socket " _PATH_LOG " non-blocking"); -+ } -+ - addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path); - if (bind(sock_fd, (struct sockaddr *) &sunx, addrLength) < 0) { - bb_perror_msg_and_die("Could not connect to socket " _PATH_LOG); -@@ -658,7 +663,7 @@ - if ((i = recv(sock_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { - tmpbuf[i] = '\0'; - serveConnection(tmpbuf, i); -- } else { -+ } else if (i < 0 && errno != EINTR && errno != EAGAIN) { - bb_perror_msg_and_die("UNIX socket error"); - } - } /* FD_ISSET() */ -@@ -670,6 +675,8 @@ - if ((i = recv(listen_udp_fd, tmpbuf, TMP_BUF_SZ, 0)) > 0) { - tmpbuf[i] = '\0'; - serveConnection(tmpbuf, i); -+ } else if (i < 0 && errno != EINTR && errno != EAGAIN) { -+ bb_perror_msg_and_die("UDP socket error"); - } - } /* FD_ISSET() */ - #endif /* SYSLOG_LISTEN_UDP */ -@@ -769,6 +776,7 @@ - if(daemon(0, 1) < 0) - bb_perror_msg_and_die("daemon"); - #endif /* __uClinux__ */ -+ close(0); close(1); close(2); - } - doSyslogd(); - diff --git a/sys-apps/busybox/files/1.1.0/glibc.patch b/sys-apps/busybox/files/1.1.0/glibc.patch deleted file mode 100644 index 9025265a..00000000 --- a/sys-apps/busybox/files/1.1.0/glibc.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: networking/ping6.c -=================================================================== ---- networking/ping6.c (revision 14514) -+++ networking/ping6.c (working copy) -@@ -236,6 +236,16 @@ - } - } - -+/* libc defines have changed around on us, whee ! */ -+#ifndef ICMP6_MEMBERSHIP_QUERY -+# define ICMP6_MEMBERSHIP_QUERY MLD_LISTENER_QUERY -+#endif -+#ifndef ICMP6_MEMBERSHIP_REPORT -+# define ICMP6_MEMBERSHIP_REPORT MLD_LISTENER_REPORT -+#endif -+#ifndef ICMP6_MEMBERSHIP_REDUCTION -+# define ICMP6_MEMBERSHIP_REDUCTION MLD_LISTENER_REDUCTION -+#endif - static char *icmp6_type_name (int id) - { - switch (id) { diff --git a/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch b/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch deleted file mode 100644 index cda3ac61..00000000 --- a/sys-apps/busybox/files/1.1.0/ppc64-insmod.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/122992 - -Index: modutils/insmod.c -=================================================================== ---- modutils/insmod.c (revision 14108) -+++ modutils/insmod.c (revision 14109) -@@ -1297,6 +1297,9 @@ - } - break; - -+#elif defined(__powerpc64__) -+ /* do this someday ... */ -+ - #elif defined(__powerpc__) - - case R_PPC_ADDR16_HA: diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml deleted file mode 100644 index 7c12989f..00000000 --- a/sys-apps/busybox/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>embedded</herd> - <use> - <flag name='floppyboot'>Support floppydisk</flag> - <flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag> - </use> -</pkgmetadata> |