diff options
Diffstat (limited to 'sys-apps')
79 files changed, 1358 insertions, 1788 deletions
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest index 5087017c55fb..85a41f719ce2 100644 --- a/sys-apps/baobab/Manifest +++ b/sys-apps/baobab/Manifest @@ -1,2 +1,2 @@ -DIST baobab-3.14.1.tar.xz 884316 SHA256 76966521858f3c46fedbf38deb8f9847737ef0bc3c5f330c51d1feb68a711d17 SHA512 1738a8d536cb9cc9031dda2179b8997ecb03b5eee3cd462194b894eac36ab27a7deb268a7bc9c554909a4e473bda3ebe2ff35a06b70939b5f79152c73d794ab1 WHIRLPOOL 8fd948f75c57d937a79fa0d1e7a2e8d38a8555207205b341c1e13a79aeeef2e377ec828c300571daadb50e0ec056403bb23a4af15c6aad15431dc33ffcdb768b DIST baobab-3.16.1.tar.xz 880192 SHA256 1fe40433df3adda0bcc4d0a6edc2bc2501888798d7e8336ad51d443c9a1fcef2 SHA512 3b68348d4686900dbc24eb904d0709fb5495ebbce5bfe44f5f956242d18492ce6b1ca8a072c1c3e7f384ea2d5b668d35d3867cf50434aeaf84878c5f5b5dc288 WHIRLPOOL 74a75cad585ae0d9c14e65712baa9a6b52c48d0eb1f7cc508c42a997695b3c154b34eb708e7247c683769e52dd1650847b55534a46bd89854888706b0ed4cc6b +DIST baobab-3.18.1.tar.xz 882924 SHA256 c2ac90426390e77147446a290c1480c49936c0a224f740b555ddaec2675b44b5 SHA512 0421aed577b0cf588fee2fb9de86956e5866527f5d6bccd61cfd32baaeaf5b1100188217f94cc35e384c493318e194756cc7cac906399d012e91bb8ecc94f1dd WHIRLPOOL 18b3c3d59c51d55c2bedb77e7ddab2aee8adcdd2c22a39b63b3cda0f52acc4c246e7e3c520beb7d8a3b6a46ecae2efa311cc96c93c575753b694db8f068e922b diff --git a/sys-apps/baobab/baobab-3.14.1.ebuild b/sys-apps/baobab/baobab-3.18.1.ebuild index 333785d2e04c..b94ae698f3a9 100644 --- a/sys-apps/baobab/baobab-3.14.1.ebuild +++ b/sys-apps/baobab/baobab-3.18.1.ebuild @@ -13,10 +13,10 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab" LICENSE="GPL-2+ FDL-1.1+" SLOT="0" IUSE="" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" COMMON_DEPEND=" - >=dev-libs/glib-2.40:2 + >=dev-libs/glib-2.40:2[dbus] >=x11-libs/gtk+-3.13.2:3 " RDEPEND="${COMMON_DEPEND} @@ -26,15 +26,15 @@ RDEPEND="${COMMON_DEPEND} " # ${PN} was part of gnome-utils before 3.4 DEPEND="${COMMON_DEPEND} + dev-libs/libxml2 >=dev-util/intltool-0.40 + dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig " src_configure() { gnome2_src_configure \ - ITSTOOL=$(type -P true) \ - XMLLINT=$(type -P true) \ VALAC=$(type -P true) \ VAPIGEN=$(type -P true) } diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest index 70008b2c9a26..b8590e591450 100644 --- a/sys-apps/busybox/Manifest +++ b/sys-apps/busybox/Manifest @@ -1,8 +1,4 @@ -DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420 DIST busybox-1.21.0.tar.bz2 2200841 SHA256 eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed SHA512 ddafded24881f03db550d9793585bb5442c70f2a60a5d9770126f50981dadfe95fc0b280f83d5b8a8ce21c86bb7ce64e9f1a606cea140fb2f2599a21de55ba31 WHIRLPOOL d50378bb823dd59e8a607ed6a72d4890f4e5ad3304f1ddba9f7f3d49b5ab820acc9daa2b3c4619f8b147dec085c53c3c6f4b4ebe4c60b431299031d2af00a4d3 -DIST busybox-1.21.1.tar.bz2 2201917 SHA256 cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 SHA512 b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1 WHIRLPOOL 8ec0d9c23d8e2eb28e7f8e88f076908cf6a3f7b64aabd0a7a1af2200064a5337c82fdac9450726236e0632faa202ea08396ca5c35e5334c2128a307adbdd736c -DIST busybox-1.22.0.tar.bz2 2218120 SHA256 92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53 SHA512 75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66 WHIRLPOOL 055aba8e8d116f664f61458f32c31c08bfdb0db97934eb00af02098981e25665aff16e9a371234a6859e4954d1568603a99ca7d6925cd42a27e7dae30523514f -DIST busybox-1.22.1.tar.bz2 2218650 SHA256 ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b SHA512 3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80 WHIRLPOOL 8f022480960b81d673772bdda857b5b3860edd893a833a64f5184ec6816b6b0f328079ca67ec1ba1d288a7c4b805b39c6038f0d385884762a396a86ccea7b0c8 -DIST busybox-1.23.0.tar.bz2 2253001 SHA256 483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4 SHA512 02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72 WHIRLPOOL 01d68487d4d3cff4fb807970446f42db1dec3309fdd3fb0402f138eee28dc0885dba324b5b12b417effd4fad87581a32da09a0e9f7c050377025a52ecce2308b 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-1.20.2.ebuild b/sys-apps/busybox/busybox-1.20.2.ebuild deleted file mode 100644 index 465f436de71c..000000000000 --- a/sys-apps/busybox/busybox-1.20.2.ebuild +++ /dev/null @@ -1,291 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=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}"/${PN}-1.20.0-udhcpc6-ipv6.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):" \ - -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 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 FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - 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 - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option systemd FEATURE_SYSTEMD - 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 -} - -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 busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - 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/busybox-1.21.1.ebuild b/sys-apps/busybox/busybox-1.21.1.ebuild deleted file mode 100644 index 7db94ece64a5..000000000000 --- a/sys-apps/busybox/busybox-1.21.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -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 ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - 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 -} - -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):" \ - -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 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 FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - 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 - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - 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 -} - -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 busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - 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 - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - 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/busybox-1.22.0.ebuild b/sys-apps/busybox/busybox-1.22.0.ebuild deleted file mode 100644 index 82f62c91a3b1..000000000000 --- a/sys-apps/busybox/busybox-1.22.0.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -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 ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - 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 -} - -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):" \ - -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 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 FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - 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 - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - 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 -} - -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 busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - 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 - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - 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/busybox-1.22.1-r1.ebuild b/sys-apps/busybox/busybox-1.22.1-r1.ebuild deleted file mode 100644 index d6d5bfa41449..000000000000 --- a/sys-apps/busybox/busybox-1.22.1-r1.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - 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 -} - -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):" \ - -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 - return 0 - else - ewarn "Could not locate user configfile, so we will save a default one" - fi - - # setup the config file - emake -j1 -s defconfig >/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 -s 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 FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - 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 - busybox_config_option n UDHCPC6 - fi - - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - 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 $(usex debug y n) TFTP_DEBUG - - 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 -} - -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 busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - 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 - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - 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/busybox-1.22.1.ebuild b/sys-apps/busybox/busybox-1.22.1.ebuild deleted file mode 100644 index 9d6a3e71acc5..000000000000 --- a/sys-apps/busybox/busybox-1.22.1.ebuild +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# See `man savedconfig.eclass` for info on how to use USE=savedconfig. - -EAPI="4" -inherit eutils flag-o-matic savedconfig toolchain-funcs multilib - -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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" - -IUSE="ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" -RESTRICT="test" - -RDEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) - pam? ( sys-libs/pam )" -DEPEND="${RDEPEND} - static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then - busybox_config_option $(usex ${flag} y n) "$@" - return - fi - while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - 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 -} - -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):" \ - -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 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 FEATURE_CLEAN_UP - busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n USE_PORTABLE_CODE - 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 - busybox_config_option $(usex static n pam) PAM - busybox_config_option static STATIC - busybox_config_option syslog {K,SYS}LOGD LOGGER - busybox_config_option systemd FEATURE_SYSTEMD - 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 -} - -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 busybox_unstripped ginit - dosym /ginit /bin/bb - dosym bb /bin/busybox - else - newbin busybox_unstripped busybox - dosym busybox /bin/bb - 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 - - # add busybox daemon's, bug #444718 - if busybox_config_enabled FEATURE_NTPD_SERVER; then - newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd" - newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd" - fi - if busybox_config_enabled SYSLOGD; then - newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd" - newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd" - fi - if busybox_config_enabled KLOGD; then - newconfd "${FILESDIR}/klogd.confd" "busybox-klogd" - newinitd "${FILESDIR}/klogd.initd" "busybox-klogd" - fi - if busybox_config_enabled WATCHDOG; then - newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog" - newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog" - fi - if busybox_config_enabled UDHCPC; then - local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT) - exeinto "${path%/*}" - newexe examples/udhcp/simple.script "${path##*/}" - fi - if busybox_config_enabled UDHCPD; then - insinto /etc - doins examples/udhcp/udhcpd.conf - fi - - # bundle up the symlink files for use later - emake DESTDIR="${ED}" install - rm _install/bin/busybox - # for compatibility, provide /usr/bin/env - mkdir -p _install/usr/bin - ln -s /bin/env _install/usr/bin/env - 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/busybox-1.23.0-r1.ebuild b/sys-apps/busybox/busybox-1.24.1.ebuild index e413eeeaceac..f015a1025467 100644 --- a/sys-apps/busybox/busybox-1.23.0-r1.ebuild +++ b/sys-apps/busybox/busybox-1.24.1.ebuild @@ -16,12 +16,12 @@ if [[ ${PV} == "9999" ]] ; then else MY_P=${PN}-${PV/_/-} SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" fi -LICENSE="GPL-2" +LICENSE="GPL-2" # GPL-2 only SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" RESTRICT="test" COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) @@ -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? ( !<sys-apps/openrc-0.13 )" + mdev? ( !<sys-apps/openrc-0.13 )" S=${WORKDIR}/${MY_P} @@ -67,7 +67,7 @@ src_prepare() { # patches go here! epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch -# epatch "${FILESDIR}"/${P}-*.patch + epatch "${FILESDIR}"/${P}-*.patch cp "${FILESDIR}"/ginit.c init/ || die # flag cleanup diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index c51709160450..7847b243071f 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -19,9 +19,10 @@ else KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" fi -LICENSE="GPL-2" +LICENSE="GPL-2" # GPL-2 only SLOT="0" -IUSE="debug ipv6 livecd make-symlinks math mdev -pam selinux sep-usr +static syslog systemd" +IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd" +REQUIRED_USE="pam? ( !static )" RESTRICT="test" COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) @@ -30,7 +31,7 @@ DEPEND="${COMMON_DEPEND} static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39" RDEPEND="${COMMON_DEPEND} -mdev? ( !<sys-apps/openrc-0.13 )" + mdev? ( !<sys-apps/openrc-0.13 )" S=${WORKDIR}/${MY_P} @@ -115,7 +116,6 @@ src_configure() { busybox_config_option n BUILD_LIBBUSYBOX busybox_config_option n FEATURE_CLEAN_UP busybox_config_option n MONOTONIC_SYSCALL - busybox_config_option n START_STOP_DAEMON busybox_config_option n USE_PORTABLE_CODE busybox_config_option n WERROR @@ -132,9 +132,6 @@ src_configure() { busybox_config_option n UDHCPC6 fi - if use static && use pam ; then - ewarn "You cannot have USE='static pam'. Assuming static is more important." - fi busybox_config_option $(usex static n pam) PAM busybox_config_option static STATIC busybox_config_option syslog {K,SYS}LOGD LOGGER diff --git a/sys-apps/busybox/files/busybox-1.24.1-unzip.patch b/sys-apps/busybox/files/busybox-1.24.1-unzip.patch new file mode 100644 index 000000000000..722b5fb83a7a --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.24.1-unzip.patch @@ -0,0 +1,112 @@ +https://bugs.gentoo.org/564246 + +From 1de25a6e87e0e627aa34298105a3d17c60a1f44e Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko <vda.linux@googlemail.com> +Date: Mon, 26 Oct 2015 19:33:05 +0100 +Subject: [PATCH] unzip: test for bad archive SEGVing + +function old new delta +huft_build 1296 1300 +4 + +Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com> +--- + 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 huft_build(const unsigned *b, const unsigned n, + } + + /* Make a table of values in order of bit lengths */ +- p = (unsigned *) b; ++ p = b; + i = 0; ++ v_end = 0; + do { + j = *p++; + if (j != 0) { + v[x[j]++] = i; ++ v_end = x[j]; + } + } while (++i < n); + +@@ -432,7 +435,7 @@ static int huft_build(const unsigned *b, const unsigned n, + + /* set up table entry in r */ + r.b = (unsigned char) (k - w); +- if (p >= v + n) { ++ if (p >= v + v_end) { // Was "if (p >= v + n)" but v[] can be shorter! + r.e = 99; /* out of values--invalid code */ + } else if (*p < s) { + r.e = (unsigned char) (*p < 256 ? 16 : 15); /* 256 is EOB code */ +diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests +index 8677a03..ca0a458 100755 +--- a/testsuite/unzip.tests ++++ b/testsuite/unzip.tests +@@ -7,7 +7,7 @@ + + . ./testing.sh + +-# testing "test name" "options" "expected result" "file input" "stdin" ++# testing "test name" "commands" "expected result" "file input" "stdin" + # file input will be file called "input" + # test can create a file "actual" instead of writing to stdout + +@@ -30,6 +30,27 @@ testing "unzip (subdir only)" "unzip -q foo.zip foo/ && test -d foo && test ! -f + rmdir foo + rm foo.zip + ++# File containing some damaged encrypted stream ++testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \ ++"Archive: bad.zip ++ inflating: ]3j½r«IK-%Ix ++unzip: inflate error ++1 ++" \ ++"" "\ ++begin-base64 644 bad.zip ++UEsDBBQAAgkIAAAAIQA5AAAANwAAADwAAAAQAAcAXTNqwr1ywqtJGxJLLSVJ ++eCkBD0AdKBk8JzQsIj01JC0/ORJQSwMEFAECCAAAAAAhADoAAAAPAAAANgAA ++AAwAAQASw73Ct1DCokohPXQiNjoUNTUiHRwgLT4WHlBLAQIQABQAAggIAAAA ++oQA5AAAANwAAADwAAAAQQAcADAAAACwAMgCAAAAAAABdM2rCvXLCq0kbEkst ++JUl4KQEPQB0oGSY4Cz4QNgEnJSYIPVBLAQIAABQAAggAAAAAIQAqAAAADwAA ++BDYAAAAMAAEADQAAADIADQAAAEEAAAASw73Ct1DKokohPXQiNzA+FAI1HCcW ++NzITNFBLBQUKAC4JAA04Cw0EOhZQSwUGAQAABAIAAgCZAAAAeQAAAAIALhM= ++==== ++" ++ ++rm * ++ + # Clean up scratch directory. + + cd .. +-- +2.6.2 + diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild index eab19c234adc..06715fadc3c1 100644 --- a/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild +++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.11.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Shows status of logical drives attached to HP SmartArray controller HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils" LICENSE="GPL-2" SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz" -KEYWORDS="amd64 ~ia64 ~x86" +KEYWORDS="amd64 ~ia64 x86" SLOT="0" RDEPEND="" DEPEND="" diff --git a/sys-apps/coreutils/coreutils-8.20.ebuild b/sys-apps/coreutils/coreutils-8.20.ebuild index 48946b218753..96434764771c 100644 --- a/sys-apps/coreutils/coreutils-8.20.ebuild +++ b/sys-apps/coreutils/coreutils-8.20.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.21.ebuild b/sys-apps/coreutils/coreutils-8.21.ebuild index 92fccdf5c8ae..fdaa4c2de1cb 100644 --- a/sys-apps/coreutils/coreutils-8.21.ebuild +++ b/sys-apps/coreutils/coreutils-8.21.ebuild @@ -36,7 +36,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.22-r1.ebuild b/sys-apps/coreutils/coreutils-8.22-r1.ebuild index 940d49ea1f3a..78fcad4daacc 100644 --- a/sys-apps/coreutils/coreutils-8.22-r1.ebuild +++ b/sys-apps/coreutils/coreutils-8.22-r1.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.22.ebuild b/sys-apps/coreutils/coreutils-8.22.ebuild index 5f3370ca2ed1..d570dee30b43 100644 --- a/sys-apps/coreutils/coreutils-8.22.ebuild +++ b/sys-apps/coreutils/coreutils-8.22.ebuild @@ -34,7 +34,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.23.ebuild b/sys-apps/coreutils/coreutils-8.23.ebuild index 9d7ebab1a069..bfb0c9bc167c 100644 --- a/sys-apps/coreutils/coreutils-8.23.ebuild +++ b/sys-apps/coreutils/coreutils-8.23.ebuild @@ -40,7 +40,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/coreutils/coreutils-8.24.ebuild b/sys-apps/coreutils/coreutils-8.24.ebuild index f5f6bd0d946e..5b88e1c96f5f 100644 --- a/sys-apps/coreutils/coreutils-8.24.ebuild +++ b/sys-apps/coreutils/coreutils-8.24.ebuild @@ -40,7 +40,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4 - !<sci-chemistry/ccp4-6.1.1" +" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) app-arch/xz-utils" diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest index 23c5295a39b0..33784bca9dd7 100644 --- a/sys-apps/cpuid/Manifest +++ b/sys-apps/cpuid/Manifest @@ -1,3 +1,4 @@ DIST cpuid-20130610.src.tar.gz 65801 SHA256 f87e835a83e69013eee09eded0e9c5ac0ea5819d569d3b79680cab2b5ea770f4 SHA512 cb31126a7ba7244d44c3b0d86ad93f3ff0956a59af488a27ed482e549a8f628fedf142ac8f238c32e48946b5c76ceba2f5a0b95a9b4df8bf7354ed4dcdbeb0a7 WHIRLPOOL e82d27e1450e85e53074fa37f42ad5e03a0daf3dd153c5d6a8674c72b2e04f266f59b80f2eb90f3f25e8a8b0f473e8aa1ce4991b9eb8d50e76d6e1ae70665ab2 DIST cpuid-20140123.src.tar.gz 67882 SHA256 b85aba5696d382f0dba8dc246bd42d09767089d6181a9cd0633d626f079d79ff SHA512 8b205cc539959dcd63326d5de700e090213f5b7cdbd5e25925b8db774001cbd95df7ccb696fda124226380fef69ea7fe0c0885869b0ec7e07b0c340dc0cd8a5b WHIRLPOOL dfcc1b6ea125fb0b6c13b7edd7f6c37592a2acfbc178f4c65cd7ec1577010ec9cc69919af512681e4af048ab028cb8992d1a282435e5b4aace179c40ff607ac4 DIST cpuid-20150606.src.tar.gz 71882 SHA256 b7607e81e62e4901180d9e2f48fe407033211c3fb300d758a210f746ef518c4e SHA512 6f99266b9720b48ec10f220f8a321d3ed052300960151feb6c45d39b586216745f070241db20afd4d16ac0b3389b634eb31f90c93ea9d12f521012cfe5ab9257 WHIRLPOOL 0c7140b636e7cca8ac0d150cb015170964471a3e00d48f3b7290976c768415773d5741f53937b2773b751a8e830d21e156c3f199de081dd42c50ffd76688e640 +DIST cpuid-20151017.src.tar.gz 72787 SHA256 34d35ddd7dab7c9f8b071b7b318d4f99fe112caaa28b6c8571e2ecdaa855db78 SHA512 83e6d49bd043e3f21610e50e5ca98705ee78bb1527f90e184f8aa380bfce82dc4168f5ef7b85e1e337e059668f4c83b20b96578f303bf73383b0241a50cd5296 WHIRLPOOL a28f12a7b403611d0ea0e6d8e08d27be424b2194a7818a5281a37a19d6b412938fb57b4d067461fc754fe469d536b0f009282e14ce619228326aefd6d6f8b892 diff --git a/sys-apps/cpuid/cpuid-20151017.ebuild b/sys-apps/cpuid/cpuid-20151017.ebuild new file mode 100644 index 000000000000..77863be1a235 --- /dev/null +++ b/sys-apps/cpuid/cpuid-20151017.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="Utility to get detailed information about the CPU(s) using the +CPUID instruction" +HOMEPAGE="http://www.etallen.com/cpuid.html" +SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-20150606-Makefile.patch + epatch "${FILESDIR}"/${PN}-20110305-fPIC.patch #376245 +} + +src_compile() { + tc-export CC + emake +} + +src_install() { + emake BUILDROOT="${D}" install +} diff --git a/sys-apps/dbus/dbus-1.8.16.ebuild b/sys-apps/dbus/dbus-1.8.16.ebuild index 1bba9db1416d..c9b188da442b 100644 --- a/sys-apps/dbus/dbus-1.8.16.ebuild +++ b/sys-apps/dbus/dbus-1.8.16.ebuild @@ -223,7 +223,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist" diff --git a/sys-apps/dbus/dbus-1.8.18.ebuild b/sys-apps/dbus/dbus-1.8.18.ebuild index 824ceb85a73f..ed5e8b23aeda 100644 --- a/sys-apps/dbus/dbus-1.8.18.ebuild +++ b/sys-apps/dbus/dbus-1.8.18.ebuild @@ -227,7 +227,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist" diff --git a/sys-apps/dbus/dbus-1.8.20.ebuild b/sys-apps/dbus/dbus-1.8.20.ebuild index 824ceb85a73f..ed5e8b23aeda 100644 --- a/sys-apps/dbus/dbus-1.8.20.ebuild +++ b/sys-apps/dbus/dbus-1.8.20.ebuild @@ -227,7 +227,7 @@ pkg_postinst() { # for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse # dependencies with hardcoded paths (although the known ones got fixed already) dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id - ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id + ln -sf "${EPREFIX}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id if [[ ${CHOST} == *-darwin* ]]; then local plist="org.freedesktop.dbus-session.plist" diff --git a/sys-apps/dog/dog-1.7-r5.ebuild b/sys-apps/dog/dog-1.7-r5.ebuild new file mode 100644 index 000000000000..a05d7c75fe95 --- /dev/null +++ b/sys-apps/dog/dog-1.7-r5.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="Dog is better than cat" +# the best HOMEPAGE we have. +HOMEPAGE="https://packages.gentoo.org/package/sys-apps/dog" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-check-ctime.diff + "${FILESDIR}"/${PV}-manpage-touchup.patch + "${FILESDIR}"/${P}-64bit-goodness.patch + "${FILESDIR}"/${P}-strfry.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" + + if [[ "${CHOST}" == *-solaris* ]]; then + sed -i '/gcc.*-o dog/s/$/ -lsocket -lnsl/' \ + Makefile || die "sed Makefile failed" + fi + + sed -i \ + -e 's,^CFLAGS,#CFLAGS,' \ + -e "s,gcc,$(tc-getCC)," \ + -e 's:-o dog:$(LDFLAGS) -o dog:g' \ + Makefile || die "sed Makefile failed" +} + +src_install() { + dobin "${PN}" || die + doman "${PN}".1 || die + dodoc README AUTHORS || die +} diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest index 66009d68e445..8c996664b90a 100644 --- a/sys-apps/elfix/Manifest +++ b/sys-apps/elfix/Manifest @@ -1,3 +1,3 @@ DIST elfix-0.8.4.tar.gz 374742 SHA256 374be66da3dddef485bbb5e95bfcab6fd0c2db478255bddd10079730ada5260b SHA512 10aacc3fff33c934e2d4487d174a2b0cec10ffb7a35fc72b160c786f82f0355f3a2dea716bc7fb929d2919cc32a26844f37f9d73064b755098bdaa72e8075bda WHIRLPOOL b04e099f188c0b76d8c07abd76559c1313854aa83a03ad69afb72674d93cde6ce538ae10d0fea3be5495937e72a4b98fdd36efbb2e3aa8ff23c1d9f7f943c1ae DIST elfix-0.9.0.tar.gz 372014 SHA256 8b547d987edb2f7dc23ddf30f959d7d051a9ed49810f983b8fe6c489fe731cf0 SHA512 fd9bab90d745f77429c902acd2a14f615132731b3c38929dce764f1e5f7ee8f6478a6fef7ce0cb38e7ebd9181ba57965ff0c97da5e01d0fbf2cfb940ed691ebf WHIRLPOOL c09fa2193b990a506cae17f370ec10fa6302e17d2a165e42eceb88644f8a92e297c839ad788204e213d8205695b65557a7dcef5f6417177c434c8d0a34bd5eb7 -DIST elfix-0.9.1.tar.gz 398588 SHA256 0368d07bfdad4a14f039929a30d85a612dcd9d22ac87211f8e59d452bac23625 SHA512 28fdde7841263cee766434b5eda1a4151999526aa3a1acaacd2e6355502df4b56db9faf64ce81bdc89606d366d0a6dd28c5c135290fe7f0285cee480f6002527 WHIRLPOOL cd7dc6e191d97836f4b8859b73777e3b4b6fce5d290087400327f87a621e9879f5c233eef51bef981398d0d00ecc753f222655108994d25a4e0503799569ec82 +DIST elfix-0.9.2.tar.gz 398758 SHA256 1a50ec57d6f5d1b25dcaaaf15f82849774e9e4e7e263cee3aa4936c5e3d6f071 SHA512 a7be30722abe7249ec42024d33b2bda00524cfb85da66b4511c5056efbdbfae1d3c2b42048bcf4d5cb7c0ae675f763b74a834d93a25b541ebac42fddcd2c6cf9 WHIRLPOOL aead1a63612ea187dc00aa52ee2c18431036176aae2e0e08d3138ced751f28947ee8045dd63dae67f89946d5b64e705a6b6d45b884d3d9da1d7e6e03b37ed700 diff --git a/sys-apps/elfix/elfix-0.9.1.ebuild b/sys-apps/elfix/elfix-0.9.2.ebuild index f303c412cd30..2f395b6f734a 100644 --- a/sys-apps/elfix/elfix-0.9.1.ebuild +++ b/sys-apps/elfix/elfix-0.9.2.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 else SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86" fi DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo" diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest index e1e84ccd6448..77c5599d9e12 100644 --- a/sys-apps/gnome-disk-utility/Manifest +++ b/sys-apps/gnome-disk-utility/Manifest @@ -1,2 +1,2 @@ -DIST gnome-disk-utility-3.14.0.tar.xz 1426948 SHA256 85ee6453e56c97a5c33b7346849016f31df53f9acbe325a046d269242797d32b SHA512 ce4be64fbd4c72ad2a853a6ee06165b18f5d5e91d69654f2db813aec0d8e8294fc8e0ce84f20638a169468341cce4ca4bb2580d542a5228040df06733a1f2e4f WHIRLPOOL e4d57810527bdcec7f3dba200d6a2c60b15178ce38e6560c4447cfcc3286471cfecabd96fb8f508a3e5a9c3113275051afd478d0b4d7b3a81af3d5d4f3064e59 DIST gnome-disk-utility-3.16.2.tar.xz 1432332 SHA256 4a495563a0142d2a64d9f573e5333a82d6c3c94ab5c8cd9b1878bfa36ae15353 SHA512 228187c1f3354c3a11dda3d4b85abed3e54bb7e5f105971f5d39f72fa52bcc9b44344c27148c604b2a87ed83942724187af90527e48acb9e9bc888922c34a53b WHIRLPOOL ef0b1b6f2cbeac1533798854796905909b866f45f9377bbd05060df1f615d81e0cb58a2e9d8bfbf3b9bef3d22d24cba45ec8d64ddbe63887bbbce75967ca1969 +DIST gnome-disk-utility-3.18.2.tar.xz 1465016 SHA256 2fbe46349256829641f8b1ecdf299f9c32ebe35a7055448e36a61da31f0bcebf SHA512 2260185522659a0f0010cf9295b29362402101057c5f1afddf48ba10a0ab82e0798a2f478eb2e82887c73f7ce5c3f67a297c9a6af266cf137eb119b929f1f33d WHIRLPOOL 6dd8dd2b3a033bbff36315c1323ad5ca13e09ea0ca253fdc34312e09d07b27cf00fc8f856ac27b98c6b49fe9635670229a54a29c802d3d1b2b4bfa56eb273301 diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.14.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild index d88a0a0729dc..606a2f1f4211 100644 --- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.14.0.ebuild +++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild @@ -6,24 +6,24 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 +inherit gnome2 DESCRIPTION="Disk Utility for GNOME using udisks" HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility" LICENSE="GPL-2+" SLOT="0" -IUSE="fat +gnome systemd" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86" +IUSE="fat gnome systemd" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" COMMON_DEPEND=" - >=dev-libs/glib-2.31:2 + >=dev-libs/glib-2.31:2[dbus] >=sys-fs/udisks-2.1.1:2 - >=x11-libs/gtk+-3.12:3 + >=x11-libs/gtk+-3.16.0:3 >=app-arch/xz-utils-5.0.5 >=app-crypt/libsecret-0.7 dev-libs/libpwquality - systemd? ( >=sys-apps/systemd-44:0= ) + systemd? ( >=sys-apps/systemd-209:0= ) " RDEPEND="${COMMON_DEPEND} >=media-libs/libdvdread-4.2.0 @@ -34,23 +34,14 @@ RDEPEND="${COMMON_DEPEND} gnome? ( >=gnome-base/gnome-settings-daemon-3.8 ) " DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.50 + >=dev-util/intltool-0.50.2 + dev-libs/appstream-glib dev-libs/libxslt - gnome-base/gnome-common virtual/pkgconfig " -src_prepare() { - # Fix USE=-gnome, bug #478820 - epatch "${FILESDIR}"/${PN}-3.10.0-kill-gsd-automagic.patch - epatch "${FILESDIR}"/${PN}-3.10.0-raise-gsd-dependency.patch - - eautoreconf - gnome2_src_prepare -} - src_configure() { gnome2_src_configure \ $(use_enable gnome gsd-plugin) \ - $(use_enable systemd libsystemd-login) + $(use_enable systemd libsystemd) } diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index f6f139879dad..5e5c0013bd21 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -1,2 +1,3 @@ DIST gptfdisk-0.8.10.tar.gz 190666 SHA256 73e64151203ae0c347c488358e71ca582bb7fb7f0d66df86b71c42050390eb9b SHA512 3187bc231c3390a86f5b7b32270d5f0d1e6c7bccd9d1cbf100c29f4822afa73362aa1fbdd3b29f20c42d67ec51bd777b7b58b5791e31182b3860915bc695948f WHIRLPOOL f90b95f9f0cfba1b57b7dcfd2e39e475f322fa9ea2a85891ea70877e518bbed96dec8d4f61a8eeae3dbd2d36d276ce4bd2c2781eaa5135058cf544629f4cddbc DIST gptfdisk-1.0.0.tar.gz 193521 SHA256 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c SHA512 d60660563268c20737415e1cfd4239fba0cc2ceb4c6ae86cc34e9550d969f9b88ac3d8c862d1790f6d644266b423eeb5d78540eec01a447b722793fba54f6afc WHIRLPOOL d7fbec9fd92eb0a871510f2c25d0057577f73668b68336148af86d549522845dda79423e8ddf306d2128153436467f618decb9b65a19a6bf6e89ce5187c67676 +DIST gptfdisk-1.0.1.tar.gz 195378 SHA256 864c8aee2efdda50346804d7e6230407d5f42a8ae754df70404dd8b2fdfaeac7 SHA512 6aa2ed6213183ea38ce7dd6e7f4f23b88cc56bed5a4d078f563b9e0a3c276eacf869e28a27ccb4e473753f7bced7ecb5de4535626f9ed22b7a59a39906d0419c WHIRLPOOL b520ec11cf62d0d2a1b66af1d4acfbd24c2df4dad2c00562900d4f90fb67ee76b6fa2aefc5d730b6ce30551baafddd9d3e2631ad2022b067bed3cdc943fadb5c diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild new file mode 100644 index 000000000000..249a9d2bf213 --- /dev/null +++ b/sys-apps/gptfdisk/gptfdisk-1.0.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="GPT partition table manipulator for Linux" +HOMEPAGE="http://www.rodsbooks.com/gdisk/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="kernel_linux ncurses static" + +LIB_DEPEND=" + dev-libs/popt[static-libs(+)] + ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] )" # libuuid +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} ) + virtual/pkgconfig" + +src_prepare() { + tc-export CXX PKG_CONFIG + + if ! use ncurses; then + sed -i \ + -e '/^all:/s:cgdisk::' \ + Makefile || die + fi + + sed \ + -e '/g++/s:=:?=:g' \ + -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ + -i Makefile || die + + use static && append-ldflags -static +} + +src_install() { + dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts + doman *.8 + dodoc NEWS README +} diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 9bd956abcea4..416d1e37ea7f 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,2 +1,3 @@ DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82 WHIRLPOOL 5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601 DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd WHIRLPOOL 2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0 +DIST grep-2.22.tar.xz 1297864 SHA256 ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb SHA512 c0756e4aa360cc29b3123384eef654743df108cc606372142c79893a09a0c8053b03d048768e972221e0ed96f378b8564f848f9acc180fca499f0494fbe9113c WHIRLPOOL 612c72fd61605a4f4e6052980db72ff2e6dfa6d0a975186ebd8f9101ab4b62caf31c5a634318156df6407e44456edf74ea1070d489da0625fee1dc029b978404 diff --git a/sys-apps/grep/grep-2.22.ebuild b/sys-apps/grep/grep-2.22.ebuild new file mode 100644 index 000000000000..c1392f6ec08b --- /dev/null +++ b/sys-apps/grep/grep-2.22.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + static? ( ${LIB_DEPEND} )" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + src/egrep.sh || die #523898 +} + +src_configure() { + use static && append-ldflags -static + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + econf \ + --bindir="${EPREFIX}"/bin \ + $(use_enable nls) \ + $(use_enable pcre perl-regexp) +} diff --git a/sys-apps/grepcidr/Manifest b/sys-apps/grepcidr/Manifest new file mode 100644 index 000000000000..35625c60b21f --- /dev/null +++ b/sys-apps/grepcidr/Manifest @@ -0,0 +1 @@ +DIST grepcidr-2.0.tar.gz 16557 SHA256 61886a377dabf98797145c31f6ba95e6837b6786e70c932324b7d6176d50f7fb SHA512 c592c7a96e5e711cb5ee10ea1f63907411f69c0014c0bdc845f4b026766b6466db624063af1411b994b53aa7e694fe99ecb1120c11543c5ea1b11afc9558f7aa WHIRLPOOL b35386ec975a682a55b8d258a102680512018da449a123fa6f73f77337ce9946b4dd95ef2491fb36eaf92532350ee35bea346e8542fc9fd8197e2dd28648efc8 diff --git a/sys-apps/grepcidr/grepcidr-2.0.ebuild b/sys-apps/grepcidr/grepcidr-2.0.ebuild new file mode 100644 index 000000000000..0119a384b2bc --- /dev/null +++ b/sys-apps/grepcidr/grepcidr-2.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit toolchain-funcs + +DESCRIPTION="Filter IPv4 and IPv6 addresses matching CIDR patterns" +HOMEPAGE="http://www.pc-tools.net/unix/grepcidr/" +SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EROOT}/usr" install + + dodoc README ChangeLog +} diff --git a/sys-apps/turbotail/metadata.xml b/sys-apps/grepcidr/metadata.xml index 659da0ca93c2..b71a8a2e034d 100644 --- a/sys-apps/turbotail/metadata.xml +++ b/sys-apps/grepcidr/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>base-system</herd> + <maintainer> + <email>idl0r@gentoo.org</email> + <name>Christian Ruppert</name> + </maintainer> </pkgmetadata> diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest index 7bccce58bef0..d9052303736f 100644 --- a/sys-apps/haveged/Manifest +++ b/sys-apps/haveged/Manifest @@ -1,3 +1 @@ -DIST haveged-1.5.tar.gz 243348 SHA256 f7d5a7e995befd4723811b331854fa53fe558546ba0c1dcb4675698e8db3702f SHA512 57952a79d4535267de15c42511991e2b06021db3b1ea90a45b30c5bd5ac65f6b9b6d66373d981280a3e7c0aff24dd6feae5640394e77f08a893dba5f31d86c91 WHIRLPOOL ef4c5acf8c787e18a436fe34ef2479658f325852e5717ad1a06bf19ecbe485e646a2bb132617417de26982d1d388b90293d3c8c31c0e7a0b0db570be80c5e5a4 -DIST haveged-1.7a.tar.gz 458671 SHA256 8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051 SHA512 e98740315b5c9920ec471587362ffd468d0b0f7183bc002982fbe25dfde2252a89f489e4d7604d7d6d2c14d67f3f0d1044de70ccdeaf587d8bdaacfd55669875 WHIRLPOOL f9f808a17767e33ec4285242ccb2fd41889fbe1ee693bd001d4a08e89bf47131d3f84040b566276522940b2a164aab2062b4c6fca18d0b737406814fc56524a3 DIST haveged-1.9.1.tar.gz 474845 SHA256 9c2363ed9542a6784ff08e247182137e71f2ddb79e8e6c1ac4ad50d21ced3715 SHA512 267d62cfeb886ea00fa412de1a91a34821460d0f4ad789dcfb3547018300e1cbf480917571b19652f2d449369293031d9534f9533bbf6a59560f4f10608c9cd2 WHIRLPOOL a930d0a007c91dbc3b7c83a1ccfb659f53aa3f151b8b3984dc7208697ddb1f73ce7012c7c968dd5295b2e90e62db03e1c582267c1b8b5230745735f462a1f757 diff --git a/sys-apps/haveged/haveged-1.5.ebuild b/sys-apps/haveged/haveged-1.5.ebuild deleted file mode 100644 index b28b5484f045..000000000000 --- a/sys-apps/haveged/haveged-1.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" -SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="sys-devel/gcc" -RDEPEND="sys-apps/openrc" - -src_configure() { - econf --bindir=/usr/sbin --enable-nistest -} - -src_test() { - emake check -} - -src_install() { - default - # This is a RedHat init script - rm -rf "${D}"/etc/init.d/haveged - # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d.2 haveged - newconfd "${FILESDIR}"/haveged-conf.d haveged -} diff --git a/sys-apps/haveged/haveged-1.7a-r1.ebuild b/sys-apps/haveged/haveged-1.7a-r1.ebuild deleted file mode 100644 index 8e112f310357..000000000000 --- a/sys-apps/haveged/haveged-1.7a-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools-utils systemd - -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" -SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="" -RDEPEND="!<sys-apps/openrc-0.11.8" - -src_configure() { - local myeconfargs=( - --bindir=/usr/sbin - --enable-nistest - --disable-static - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d.3 haveged - newconfd "${FILESDIR}"/haveged-conf.d haveged - - systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service - insinto /etc - doins "${FILESDIR}"/haveged.conf -} diff --git a/sys-apps/haveged/haveged-1.7a.ebuild b/sys-apps/haveged/haveged-1.7a.ebuild deleted file mode 100644 index 8d24c73e36fd..000000000000 --- a/sys-apps/haveged/haveged-1.7a.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools-utils - -DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm" -HOMEPAGE="http://www.issihosts.com/haveged/" -SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="!<sys-apps/openrc-0.11.8" - -src_configure() { - local myeconfargs=( - --bindir=/usr/sbin - --enable-nistest - --disable-static - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install - - rm -rf "${D}"/usr/lib*/*.la - - # Install gentoo ones instead - newinitd "${FILESDIR}"/haveged-init.d.3 haveged - newconfd "${FILESDIR}"/haveged-conf.d haveged -} diff --git a/sys-apps/haveged/haveged-1.9.1.ebuild b/sys-apps/haveged/haveged-1.9.1.ebuild index 2f058ab9b34f..796f876c88ba 100644 --- a/sys-apps/haveged/haveged-1.9.1.ebuild +++ b/sys-apps/haveged/haveged-1.9.1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 arm x86" IUSE="" DEPEND="" diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild index 5186798a0a9e..3cb70823f8ea 100644 --- a/sys-apps/install-xattr/install-xattr-0.5.ebuild +++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild @@ -10,11 +10,10 @@ inherit toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" - KEYWORDS="alpha arm hppa ia64 sparc" inherit git-2 else SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" S=${WORKDIR}/${PN} fi diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild index 471cd8db5b80..4273b3e3d189 100644 --- a/sys-apps/install-xattr/install-xattr-9999.ebuild +++ b/sys-apps/install-xattr/install-xattr-9999.ebuild @@ -10,7 +10,6 @@ inherit toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git" - KEYWORDS="" inherit git-2 else SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2" diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest index 8aa32d2742ba..f5f177d2af62 100644 --- a/sys-apps/iproute2/Manifest +++ b/sys-apps/iproute2/Manifest @@ -6,3 +6,4 @@ DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a9 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6 DIST iproute2-4.2.0.tar.xz 506120 SHA256 a4101e743e0da36b55f63353ff489699ddcd634ceca854a9a272346588f30f30 SHA512 a2580cab92ee4c3e78e52bd8b742e9a1f2097815022a392241136b5589dd1de2ff1def9f608e4b5464c57d8f3d50c4361897271db2058683dfdc6984172784c5 WHIRLPOOL f6ae4537cafc2dd70640f602195f509e58613787f82b26dd909d7c36f09e6b256abee5fc6772e6129cfd023d95248ce66b2c6bd223186861203ebcbe2965e43c +DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0.ebuild new file mode 100644 index 000000000000..b62de4daac0f --- /dev/null +++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs flag-o-matic multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" + inherit git-2 +else + SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +fi + +DESCRIPTION="kernel routing and traffic control utilities" +HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" + +LICENSE="GPL-2" +SLOT="0" +IUSE="atm berkdb +iptables ipv6 minimal selinux" + +# We could make libmnl optional, but it's tiny, so eh +RDEPEND="!net-misc/arpd + !minimal? ( net-libs/libmnl ) + iptables? ( >=net-firewall/iptables-1.4.20:= ) + berkdb? ( sys-libs/db:= ) + atm? ( net-dialup/linux-atm ) + selinux? ( sys-libs/libselinux )" +# We require newer linux-headers for ipset support #549948 and some defines #553876 +DEPEND="${RDEPEND} + app-arch/xz-utils + iptables? ( virtual/pkgconfig ) + sys-devel/bison + sys-devel/flex + >=sys-kernel/linux-headers-3.16 + elibc_glibc? ( >=sys-libs/glibc-2.7 )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907 + use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849 + + sed -i \ + -e '/^CC =/d' \ + -e "/^LIBDIR/s:=.*:=/$(get_libdir):" \ + -e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \ + -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \ + -e "/^WFLAGS/s:-Werror::" \ + -e "/^DBM_INCLUDE/s:=.*:=${T}:" \ + Makefile || die + + # Use /run instead of /var/run. + sed -i \ + -e 's:/var/run:/run:g' \ + include/namespace.h \ + man/man8/ip-netns.8 || die + + # build against system headers + rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc + sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die + + use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile +} + +src_configure() { + tc-export AR CC PKG_CONFIG + + # This sure is ugly. Should probably move into toolchain-funcs at some point. + local setns + pushd "${T}" >/dev/null + echo 'main(){return setns();};' > test.c + ${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n + echo 'main(){};' > test.c + ${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile + popd >/dev/null + + cat <<-EOF > Config + TC_CONFIG_ATM := $(usex atm y n) + TC_CONFIG_XT := $(usex iptables y n) + # We've locked in recent enough kernel headers #549948 + TC_CONFIG_IPSET := y + HAVE_BERKELEY_DB := $(usex berkdb y n) + HAVE_MNL := $(usex minimal n y) + HAVE_SELINUX := $(usex selinux y n) + IP_CONFIG_SETNS := ${setns} + # Use correct iptables dir, #144265 #293709 + IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir) + EOF +} + +src_install() { + if use minimal ; then + into / + dosbin tc/tc + dobin ip/ip + return 0 + fi + + emake \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ + install + + rm "${ED}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988 + + dodir /bin + mv "${ED}"/{s,}bin/ip || die #330115 + + dolib.a lib/libnetlink.a + insinto /usr/include + doins include/libnetlink.h + # This local header pulls in a lot of linux headers it + # doesn't directly need. Delete this header that requires + # linux-headers-3.8 until that goes stable. #467716 + sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die + + if use berkdb ; then + dodir /var/lib/arpd + # bug 47482, arpd doesn't need to be in /sbin + dodir /usr/bin + mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die + fi +} diff --git a/sys-apps/kmod/kmod-20.ebuild b/sys-apps/kmod/kmod-20.ebuild index 4e4fbd9b2912..0c0b951251cf 100644 --- a/sys-apps/kmod/kmod-20.ebuild +++ b/sys-apps/kmod/kmod-20.ebuild @@ -98,7 +98,7 @@ src_configure() { kmod_configure --disable-python if use python; then - python_parallel_foreach_impl kmod_configure --enable-python + python_foreach_impl kmod_configure --enable-python fi } diff --git a/sys-apps/kmod/kmod-21.ebuild b/sys-apps/kmod/kmod-21.ebuild index b377fcb2f390..c67cf5a2966b 100644 --- a/sys-apps/kmod/kmod-21.ebuild +++ b/sys-apps/kmod/kmod-21.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then inherit autotools git-2 else SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" inherit libtool fi @@ -98,7 +98,7 @@ src_configure() { kmod_configure --disable-python if use python; then - python_parallel_foreach_impl kmod_configure --enable-python + python_foreach_impl kmod_configure --enable-python fi } diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild index b377fcb2f390..ee2b045a4bfd 100644 --- a/sys-apps/kmod/kmod-9999.ebuild +++ b/sys-apps/kmod/kmod-9999.ebuild @@ -98,7 +98,7 @@ src_configure() { kmod_configure --disable-python if use python; then - python_parallel_foreach_impl kmod_configure --enable-python + python_foreach_impl kmod_configure --enable-python fi } diff --git a/sys-apps/less/less-481.ebuild b/sys-apps/less/less-481.ebuild index 4b2ab243caf0..24b27b6618a3 100644 --- a/sys-apps/less/less-481.ebuild +++ b/sys-apps/less/less-481.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz LICENSE="|| ( GPL-3 BSD-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="pcre unicode" DEPEND=">=app-misc/editor-wrapper-3 diff --git a/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch new file mode 100644 index 000000000000..2652f246111d --- /dev/null +++ b/sys-apps/likwid/files/likwid-4.0.1-access-daemon.patch @@ -0,0 +1,11 @@ +--- src/configuration.c.orig 2015-11-14 09:10:58.283075033 +0100 ++++ src/configuration.c 2015-11-14 09:11:14.898074670 +0100 +@@ -68,7 +68,7 @@ + use_hardcoded: + ret = sprintf(filename,"%s", TOSTRING(ACCESSDAEMON)); + filename[ret] = '\0'; +- if (!access(filename, R_OK)) ++ if (!access(filename, X_OK)) + { + config.daemonPath = (char*)malloc((strlen(filename)+1) * sizeof(char)); + strcpy(config.daemonPath, filename); diff --git a/sys-apps/likwid/likwid-4.0.1.ebuild b/sys-apps/likwid/likwid-4.0.1-r1.ebuild index 0c25cb3f99c9..11e04c2b90a2 100644 --- a/sys-apps/likwid/likwid-4.0.1.ebuild +++ b/sys-apps/likwid/likwid-4.0.1-r1.ebuild @@ -41,11 +41,15 @@ src_prepare() { epatch "${FILESDIR}"/${P}-Makefile.patch \ "${FILESDIR}"/${P}-fix-gnustack.patch \ "${FILESDIR}"/${P}-lua-makefile.patch \ - "${FILESDIR}"/${P}-config.mk.patch + "${FILESDIR}"/${P}-config.mk.patch \ + "${FILESDIR}"/${P}-access-daemon.patch # Set PREFIX path to include sandbox path sed -e 's:^PREFIX = .*:PREFIX = '${D}'/usr:' -i config.mk || die + # Set the path to library directory. + sed -e 's:$(get_libdir):'$(get_libdir)':' -i config.mk || die "Cannot set library path!" + # Set correct LDFLAGS sed -e '/LIBS/aSHARED_LFLAGS += -Wl,-soname,$@' \ -i make/include_GCC.mk || die @@ -86,3 +90,11 @@ src_install () { doman doc/*.1 } + +pkg_postinst() { + fcaps_pkg_postinst + ewarn "To enable users to access performance counters it is necessary to" + ewarn "change the access permissions to /dev/cpu/msr[0]* devices." + ewarn "It can be accomplished by adding the following line to file" + ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\"" +} diff --git a/sys-apps/lomoco/metadata.xml b/sys-apps/lomoco/metadata.xml index a11c7e26e88e..56244816bc20 100644 --- a/sys-apps/lomoco/metadata.xml +++ b/sys-apps/lomoco/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>proxy-maintainers</herd> <maintainer> - <email>anton.bugs@gmail.com</email> + <email>blshkv@pentoo.ch</email> <name>Anton Bolshakov</name> <description>Proxy maintainer. Assign bugs to him</description> </maintainer> diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest index 5e251ec4763b..e321b24f0a9b 100644 --- a/sys-apps/man-db/Manifest +++ b/sys-apps/man-db/Manifest @@ -1,5 +1,5 @@ DIST man-db-2.6.6.tar.xz 1448576 SHA256 7da90f8d8df91e0e682769d50f4bdb905f525b5d0f01e7e5b8cc3c6da45f66c3 SHA512 7abb8609e1113dd1852076c4c71557c3b376fefa7e42fa39198f7b882f4b3fe733983045742c4b3903be2c953c09c724f735619b4396283a4ed2ad7816aaf4ec WHIRLPOOL e5c7b41afd7374bb1df3024134f9bd8a1af42b5ad63d4e516e946b0e8ccc88bafc055fdba707b0c764030e92748b225a72672bfe07e2bc3e8d78526d17f5ff72 DIST man-db-2.6.7.1.tar.xz 1452280 SHA256 8d65559838fccca774e3ef7c15c073180c786e728785c735e136297facca41fc SHA512 91e1036701174c5623a4cf4208a93130822dc9c61ffd9c6bf0dddaf7c4c5b2401e6238f60578dfa81a11d67d360cbc4d45af920542fb4a0624c7169b17a618f8 WHIRLPOOL 30c510289d1444b3231704c22ddf2c17b58d4aa8b9e8a94552537fbc971b23f16b2c43a32fa9f85fb7b8eca2fd71a73d52955fcd0ab24ef49d3903832eafecf7 DIST man-db-2.7.2.tar.xz 1501264 SHA256 22674eaf51dce8bcc83fd86b1c8d11f99de5c6d8962d7fad7b02307c4ad6e492 SHA512 fd0659f002980ba902bcd1186de09f82d840b039cbeea3457377926991ce5aaa602fe228c0969ea643140a4d5e7bdfbdab7c747943ac93b51c17a591677a7b84 WHIRLPOOL 51ad5e4580b5ff9ede9a0c2e17d579ed2a14c5ef1b11a43b92f99e5467db3e1627eed58c76040710e6fb7ae24258a4904142db8951c21e0981318082710dd772 -DIST man-db-2.7.3.tar.xz 1502928 SHA256 9d4744c9956007e7aad59efcc6bb8b6da410ee507df46f9e81311431f80114ea SHA512 0b265b52d8278f80dfbe34cd3ae13382ecea42a8e55046ddd9be3d552b1b404eb7afc6956001ecdb4500ce352a4cded6a4875bba935ca4dbaaed0b51e9b3119e WHIRLPOOL 77c6fd8df3aec6bf40ab8d7cabb0e1aeb53f63db8d2b015f529333972d0792bad49b36b7ec9481dfffefd2b3b079c0701c6164ce4ee616bfa6d2b0f73b5b34e8 DIST man-db-2.7.4.tar.xz 1503972 SHA256 153f4d3c33f5f9b0c8484bb39d9d271f6ae4aa1b3f5d6d515879692dba944f0b SHA512 979f4b8380a57d2e7275095a31903c112c36558aba33f5d3c26d5bbb5d846c3dae11b943a32db8a5cd9af34605558329666c3830e932a81af8647c370f509139 WHIRLPOOL 7ad145e7b6f04707059b31c7a01c931d4b9f3fb0d638f8c17f91f6f249d91b9121a2d22b0a4115dffb41949cf60e4d8c5e940f6fb39257cf7bcfbdf03885e7a7 +DIST man-db-2.7.5.tar.xz 1505428 SHA256 5c4ddd0d67abbbcb408dc5804906f62210f7c863ef791198faca3d75681cca14 SHA512 8e82fb437372261a2b33e1acb45b6322dac1864f13b20968d6a09b27edec795111c25bafcb7f6f3550784d4621eb4871f76d0275d7fa9e01644a5ced60666933 WHIRLPOOL c9322b8a816f9eeab974172827adbc93e1c6ee973c6af9049e370d1cefdb1d6cc4bb29383ed609e8567ac98052fb195887096e511b734688012cd7250d66466e diff --git a/sys-apps/man-db/man-db-2.7.3.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild index bf66d3865377..bf66d3865377 100644 --- a/sys-apps/man-db/man-db-2.7.3.ebuild +++ b/sys-apps/man-db/man-db-2.7.5.ebuild diff --git a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild index 720265d75c48..e4446c46c98c 100644 --- a/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild +++ b/sys-apps/mawk/mawk-1.3.4_p20150503.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND="app-eselect/eselect-awk" DEPEND="${RDEPEND}" diff --git a/sys-apps/microcode-data/Manifest b/sys-apps/microcode-data/Manifest index 2fe33baa9f37..c1074e6a8061 100644 --- a/sys-apps/microcode-data/Manifest +++ b/sys-apps/microcode-data/Manifest @@ -2,3 +2,4 @@ DIST microcode-20140430.tgz 785594 SHA256 2e67767fd561164a2b09831020c2d36600ad33 DIST microcode-20140624.tgz 787237 SHA256 b4662ac780438a7b2d87e6d26a7066feb807f37c6e5b6fa147089f4edb02ea37 SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c WHIRLPOOL 6051d4a7547e6f74c653d332c54a4711838b670d2707408de7dccddb5d1409994417bae26ce5ec2f72d91b613e14a3381ded301027995bca1fb746baf85000c4 DIST microcode-20140913.tgz 830537 SHA256 ea6c0ee21d1fbf261f093176a78089c21411e5fe0e2c35b258cedf2b39987e15 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c WHIRLPOOL de56d52d184dd2f21e0ca41dca0bb5b539758de614f4e0eb8e7c8281e97ea6dfcc33c50a3fec7262112dc11e8a78b458b3d7ef8c8b5579d500d358393911565d DIST microcode-20150121.tgz 850761 SHA256 23353b93bb421971496cea5e9f9d390ce0ed22580a8cc45ae7b3b322dcd8f6b3 SHA512 f62edd1b666cf381605613766d7e123f0c6debee4448c0ff0882d33c144ad2174656d2501a449f24eb3e4708259e7ec0ff42810739b7d1f34a6a1d9950d17bc4 WHIRLPOOL 573368845333aee9ca23a98cc6711cc22da5b5893a3c29df292df281a024ad9b50ab4893cc0a44b65e86f388fc55e2c53cd0f99a619c3315dd4db5e090b91319 +DIST microcode-20151106.tgz 892805 SHA256 096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7 SHA512 606ce97f0fe76f6a34a857923d3432d8e2368e8a5c504ffa0313f9f016d61b0a5dea26e67662ce1283c1f772ace7318e96a34ebeeeff50b25deb3005ccc6978e WHIRLPOOL 0c73429977e31b8f6230b21889480eda79ecc3feb64a8e6e5a1cebc124a98300f887789650e480611a183237461517aba51b3b31a8450bc5a2e01c5955e7b534 diff --git a/sys-apps/microcode-data/microcode-data-20151106.ebuild b/sys-apps/microcode-data/microcode-data-20151106.ebuild new file mode 100644 index 000000000000..f224706c3458 --- /dev/null +++ b/sys-apps/microcode-data/microcode-data-20151106.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit toolchain-funcs + +# Find updates by searching and clicking the first link (hopefully it's the one): +# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File + +NUM="25512" +DESCRIPTION="Intel IA32 microcode update data" +HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}" +SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz" + +LICENSE="intel-ucode" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="initramfs monolithic +split-ucode" +REQUIRED_USE="|| ( initramfs monolithic split-ucode )" + +DEPEND="initramfs? ( sys-apps/iucode_tool )" +RDEPEND="!<sys-apps/microcode-ctl-1.17-r2" #268586 + +S=${WORKDIR} + +src_unpack() { + default + cp "${FILESDIR}"/intel-microcode2ucode.c ./ || die +} + +src_compile() { + if use initramfs ; then + iucode_tool --write-earlyfw=microcode.cpio microcode.dat || die + fi + + if use split-ucode ; then + tc-env_build emake intel-microcode2ucode + ./intel-microcode2ucode microcode.dat || die + fi +} + +src_install() { + insinto /lib/firmware + use initramfs && doins microcode.cpio + use monolithic && doins microcode.dat + use split-ucode && doins -r intel-ucode +} diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest index 691ea0b4421c..c89373344c48 100644 --- a/sys-apps/pcsc-tools/Manifest +++ b/sys-apps/pcsc-tools/Manifest @@ -1,3 +1,4 @@ DIST pcsc-tools-1.4.22.tar.gz 109458 SHA256 615592dd56627bd0ff3650608bb7eefe3e9f43cc18ca2d805ebf0bf74d30f307 SHA512 cb4bea7bd75e98fda5ff44e3fd680a479cddb3edd6c632951346d2a87329386b55203dc3f2f29d484c23ee4c6cb8f741aaa6b94dd16095b86c7f88f057015cf5 WHIRLPOOL 2f4141034f013970bd43050c70d24e9ab7ee076a29d86d939cc0dc250b4431b6515f04a3e21f179e015c6d80312a70e07101732085e84bf48f5645e7de306c08 DIST pcsc-tools-1.4.23.tar.gz 114495 SHA256 69ca7bb6ee23ef99e2696451f2f56072dd74adcc43272d89fd757ac8f7de4fe2 SHA512 b94fd467ded600f6ad47510225d325635a227f2bbbe8dbb191fee31a3ccaff951d0ea4a7184765912f00dbf4725b5fcbc478b769fc0dd4369eab0a8c1d627f93 WHIRLPOOL 7ca4c25af05d4f8bebe5a73a3d4e9409d882c42816a25139d218c85ff2464382637ea2049bf176b73ba65a7d483075f23c2087b4a28bf9b38c0102538ca07467 DIST pcsc-tools-1.4.24.tar.gz 180792 SHA256 176ee6f791cd7437e05d921e5041a1f2265116a5a0d1079a5b8321f2cf541682 SHA512 d333b5e9988d93b1cd889ddfe7271b6cae0713422aa4884d5030f731d1f9de620b53d0857597d4e26508cd8f4db7e94ace07968b34a0c6392c358c38ed1725ae WHIRLPOOL fec763a91efaa95512f9c7b3d038bb288b21ef58e48c67020332e866330d012de24c1beec6e7fdeb383e08252274eada452c66658e9ec76ca3ad88e267a349b8 +DIST pcsc-tools-1.4.25.tar.gz 183540 SHA256 a9c715224e5ea293721e0bc4e1deb4a6ee73ca19f16679896ec3a47591f00c47 SHA512 ad8bf02609a57e338de5cadd0aef09f13c90205888d749410340cf8b36eecc82c6a529e4730b9197c8e8a4f89084dca7068981a7dc5ad47612dfef3a8d4e141d WHIRLPOOL 9355fc87c33585fec44c42a5bc6de8e0a033c623fb158350b7ea22545d3d37c3dfc9c59ccf207b74513982820e99134db3c1df4c165054eed303ccfee0e62f76 diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild new file mode 100644 index 000000000000..5999d202f7f4 --- /dev/null +++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.25.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils fdo-mime multilib toolchain-funcs + +DESCRIPTION="PC/SC Architecture smartcard tools" +HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/" +SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" +IUSE="gtk network-cron" + +RDEPEND=">=sys-apps/pcsc-lite-1.4.14" + +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + dev-perl/pcsc-perl + gtk? ( dev-perl/gtk2-perl )" + +src_prepare() { + sed -i -e 's:-Wall -O2:$(CFLAGS):g' Makefile +} + +src_compile() { + # explicitly only build the pcsc_scan application, or the man + # pages will be gzipped first, and then unpacked. + emake pcsc_scan CC=$(tc-getCC) +} + +src_install() { + # install manually, makes it much easier since the Makefile + # requires fiddling with + dobin ATR_analysis scriptor pcsc_scan + doman pcsc_scan.1 scriptor.1p ATR_analysis.1p + + dodoc README Changelog + + if use gtk; then + domenu gscriptor.desktop + dobin gscriptor + doman gscriptor.1p + fi + + if use network-cron ; then + exeinto /etc/cron.monthly + newexe "${FILESDIR}"/smartcard.cron update-smartcard_list + fi + + insinto /usr/share/pcsc + doins smartcard_list.txt +} + +pkg_postinst() { + use gtk && fdo-mime_desktop_database_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 1f0dbcacb554..28b27eeab934 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,3 +1,4 @@ DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328 DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578 +DIST portage-2.2.24.tar.bz2 972610 SHA256 c2dbd53dd474c6fe455ffa5920514a6afe467abf02959c33ddb7a7e363939550 SHA512 9dc00410de604db66843bdf62cf0ee7e93ff2c4d562390172c4f0c55ab98b2712078b0eb02c9f35d52633b0fff0b024736e25a1c66cf40ad61a6bf99a7cee4a6 WHIRLPOOL 3227c61662acf69abd843344d0fb1b7cc2cfa91c1bae48b08e1da8fdf42cda15834994852d42dfc089f189e318c657e12fd6b1c19885279e0bb5cfd2349235f8 DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2 diff --git a/sys-apps/portage/portage-2.2.20.1.ebuild b/sys-apps/portage/portage-2.2.20.1.ebuild index 5db3fabe9ac4..9b1a31093768 100644 --- a/sys-apps/portage/portage-2.2.20.1.ebuild +++ b/sys-apps/portage/portage-2.2.20.1.ebuild @@ -18,7 +18,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" IUSE="build doc epydoc +ipc linguas_ru selinux xattr" @@ -359,7 +359,7 @@ pkg_postinst() { einfo "This release of portage removed the new squashfs sync module " einfo "introduced in portage-2.2.19." einfo "Look for it to be released as an installable portage module soon." - einfo "This will allow it to develop at it's own pace partially independant" - einfo "of portage" + einfo "This will allow it to develop at its own pace partially independent" + einfo "of portage." einfo "" } diff --git a/sys-apps/portage/portage-2.2.24.ebuild b/sys-apps/portage/portage-2.2.24.ebuild new file mode 100644 index 000000000000..43cb079e8c28 --- /dev/null +++ b/sys-apps/portage/portage-2.2.24.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( + pypy + python3_3 python3_4 python3_5 + python2_7 +) +# Note: substituted below +PYTHON_REQ_USE='bzip2(+)' + +inherit distutils-r1 multilib + +DESCRIPTION="Portage is the package management and distribution system for Gentoo" +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +SLOT="0" +IUSE="build doc epydoc +ipc linguas_ru selinux xattr" + +DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} ) + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + >=sys-apps/sed-4.0.5 sys-devel/patch + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) + epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" +# Require sandbox-2.2 for bug #288863. +# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's +# quite slow, so it's not considered in the dependencies as an alternative to +# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so +# for now, don't pull in xattr deps for other kernels. +# For whirlpool hash, require python[ssl] (bug #425046). +# For compgen, require bash[readline] (bug #445576). +RDEPEND=" + >=app-arch/tar-1.27 + dev-lang/python-exec:2 + !build? ( + >=sys-apps/sed-4.0.5 + app-shells/bash:0[readline] + >=app-admin/eselect-1.2 + ) + elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) + elibc_glibc? ( >=sys-apps/sandbox-2.2 ) + elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) + >=app-misc/pax-utils-0.1.17 + selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] ) + xattr? ( kernel_linux? ( + >=sys-apps/install-xattr-0.3 + $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \ + python2_7 pypy) + ) ) + !<app-admin/logrotate-3.8.0" +PDEPEND=" + !build? ( + >=net-misc/rsync-2.6.4 + userland_GNU? ( >=sys-apps/coreutils-6.4 ) + )" +# coreutils-6.4 rdep is for date format in emerge-webrsync #164532 +# NOTE: FEATURES=installsources requires debugedit and rsync + +REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" + +SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage" + +prefix_src_archives() { + local x y + for x in ${@}; do + for y in ${SRC_ARCHIVES}; do + echo ${y}/${x} + done + done +} + +TARBALL_PV=${PV} +SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2 + $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)" + +python_prepare_all() { + distutils-r1_python_prepare_all + + if ! use ipc ; then + einfo "Disabling ipc..." + sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ + -i pym/_emerge/AbstractEbuildProcess.py || \ + die "failed to patch AbstractEbuildProcess.py" + fi + + if use xattr && use kernel_linux ; then + einfo "Adding FEATURES=xattr to make.globals ..." + echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + if [[ -n ${EPREFIX} ]] ; then + einfo "Setting portage.const.EPREFIX ..." + sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \ + -i pym/portage/const.py || \ + die "Failed to patch portage.const.EPREFIX" + + einfo "Prefixing shebangs ..." + while read -r -d $'\0' ; do + local shebang=$(head -n1 "$REPLY") + if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then + sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \ + die "sed failed" + fi + done < <(find . -type f -print0) + + einfo "Adjusting make.globals ..." + sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \ + -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \ + -i cnf/make.globals || die "sed failed" + + einfo "Adjusting repos.conf ..." + sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \ + -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \ + -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \ + -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \ + -i cnf/repos.conf || die "sed failed" + + einfo "Adding FEATURES=force-prefix to make.globals ..." + echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \ + || die "failed to append to make.globals" + fi + + cd "${S}/cnf" || die + if [ -f "make.conf.example.${ARCH}".diff ]; then + patch make.conf.example "make.conf.example.${ARCH}".diff || \ + die "Failed to patch make.conf.example" + else + eerror "" + eerror "Portage does not have an arch-specific configuration for this arch." + eerror "Please notify the arch maintainer about this issue. Using generic." + eerror "" + fi +} + +python_compile_all() { + local targets=() + use doc && targets+=( docbook ) + use epydoc && targets+=( epydoc ) + + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi +} + +python_test() { + esetup.py test +} + +python_install() { + # Install sbin scripts to bindir for python-exec linking + # they will be relocated in pkg_preinst() + distutils-r1_python_install \ + --system-prefix="${EPREFIX}/usr" \ + --bindir="$(python_get_scriptdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \ + --sbindir="$(python_get_scriptdir)" \ + --sysconfdir="${EPREFIX}/etc" \ + "${@}" +} + +python_install_all() { + distutils-r1_python_install_all + + local targets=() + use doc && targets+=( install_docbook ) + use epydoc && targets+=( install_epydoc ) + + # install docs + if [[ ${targets[@]} ]]; then + esetup.py "${targets[@]}" + fi + + # Due to distutils/python-exec limitations + # these must be installed to /usr/bin. + local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld' + einfo "Moving admin scripts to the correct directory" + dodir /usr/sbin + for target in ${sbin_relocations}; do + einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" + mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + done +} + +pkg_preinst() { + # comment out sanity test until it is fixed to work + # with the new PORTAGE_PYM_PATH + #if [[ $ROOT == / ]] ; then + ## Run some minimal tests as a sanity check. + #local test_runner=$(find "${ED}" -name runTests) + #if [[ -n $test_runner && -x $test_runner ]] ; then + #einfo "Running preinst sanity tests..." + #"$test_runner" || die "preinst sanity tests failed" + #fi + #fi + + # elog dir must exist to avoid logrotate error for bug #415911. + # This code runs in preinst in order to bypass the mapping of + # portage:portage to root:root which happens after src_install. + keepdir /var/log/portage/elog + # This is allowed to fail if the user/group are invalid for prefix users. + if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + fi + + if has_version "<${CATEGORY}/${PN}-2.1.13" || \ + { + has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \ + has_version "<${CATEGORY}/${PN}-2.2.0_alpha189" + } ; then + USERPRIV_UPGRADE=true + USERSYNC_UPGRADE=true + REPOS_CONF_UPGRADE=true + REPOS_CONF_SYNC= + type -P portageq >/dev/null 2>&1 && \ + REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC) + else + USERPRIV_UPGRADE=false + USERSYNC_UPGRADE=false + REPOS_CONF_UPGRADE=false + fi +} + +get_ownership() { + case ${USERLAND} in + BSD) + stat -f '%Su:%Sg' "${1}" + ;; + *) + stat -c '%U:%G' "${1}" + ;; + esac +} + +new_config_protect() { + # Generate a ._cfg file even if the target file + # does not exist, ensuring that the user will + # notice the config change. + local basename=${1##*/} + local dirname=${1%/*} + local i=0 + while true ; do + local filename=$( + echo -n "${dirname}/._cfg" + printf "%04d" ${i} + echo -n "_${basename}" + ) + [[ -e ${filename} ]] || break + (( i++ )) + done + echo "${filename}" +} + +pkg_postinst() { + + if ${REPOS_CONF_UPGRADE} ; then + einfo "Generating repos.conf" + local repo_name= + [[ -f ${PORTDIR}/profiles/repo_name ]] && \ + repo_name=$(< "${PORTDIR}/profiles/repo_name") + if [[ -z ${REPOS_CONF_SYNC} ]] ; then + REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf") + REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* } + fi + local sync_type= + [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git + + if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then + sync_type=cvs + REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://} + fi + + cat <<-EOF > "${T}/repos.conf" + [DEFAULT] + main-repo = ${repo_name:-gentoo} + + [${repo_name:-gentoo}] + location = ${PORTDIR:-${EPREFIX}/usr/portage} + sync-type = ${sync_type:-rsync} + sync-uri = ${REPOS_CONF_SYNC} + EOF + + [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf" + + local dest=${EROOT:-${ROOT}}etc/portage/repos.conf + if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then + dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf + fi + # Don't install the config update if the desired repos.conf directory + # and config file exist, since users may accept it blindly and break + # their config (bug #478726). + [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \ + mv "${T}/repos.conf" "$(new_config_protect "${dest}")" + + if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then + einfo "Generating make.conf PORTDIR setting for backward compatibility" + for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do + [[ -e ${dest} ]] && break + done + [[ -d ${dest} ]] && dest=${dest}/portdir.conf + rm -rf "${T}/make.conf" + [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf" + cat <<-EOF >> "${T}/make.conf" + + # Set PORTDIR for backward compatibility with various tools: + # gentoo-bashcomp - bug #478444 + # euse - bug #474574 + # euses and ufed - bug #478318 + PORTDIR="${EPREFIX}/usr/portage" + EOF + mkdir -p "${dest%/*}" + mv "${T}/make.conf" "$(new_config_protect "${dest}")" + fi + fi + + local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}} + + if ${USERSYNC_UPGRADE} && \ + [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then + local ownership=$(get_ownership "${PORTDIR}") + if [[ -n ${ownership} ]] ; then + einfo "Adjusting PORTDIR permissions for usersync" + find "${PORTDIR}" -path "${distdir%/}" -prune -o \ + ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \ + -exec chown "${ownership}" {} + + fi + fi + + # Do this last, since it could take a long time if there + # are lots of live sources, and the user may be tempted + # to kill emerge while it is running. + if ${USERPRIV_UPGRADE} && \ + [[ -d ${distdir} && -w ${distdir} ]] ; then + local ownership=$(get_ownership "${distdir}") + if [[ ${ownership#*:} == portage ]] ; then + einfo "Adjusting DISTDIR permissions for userpriv" + find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \ + -exec chown -R portage:portage {} + + fi + fi + + einfo "" + einfo "This release of portage contains the new repoman code base" + einfo "This code base is still being developed. So its API's are" + einfo "not to be considered stable and are subject to change." + einfo "The code released has been tested and considered ready for use." + einfo "This however does not guarantee it to be completely bug free." + einfo "Please report any bugs you may encounter." + einfo "" +} diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild index a104f8b5eb28..d241dcc45caa 100644 --- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild +++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" +KEYWORDS="~alpha amd64 arm ia64 ppc x86" IUSE="selinux" DEPEND="dev-libs/libgcrypt:0 diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest index 9e2361caa98a..8e7e03de76d7 100644 --- a/sys-apps/spu-tools/Manifest +++ b/sys-apps/spu-tools/Manifest @@ -1,2 +1 @@ -DIST spu-tools-2.2.80-95.tar.gz 19917 SHA256 bfa467ddf036b1148978d251fdd5a1dd89dece3cf3895c7875f1ae61482fffc2 SHA512 34071e52dd5a4e1a426452ac4a279b4cdaa65f14dc38cfea106ea06410b8771d94eb12e77743dc8464d79ad43998b11f3a0da3efd3bbdbdab81d61cb696be1cc WHIRLPOOL e7deaeab02a1c83b83e9cd40ac2ddec3f0674e54876a9fe48dd3b5c82f17cfb899f13d504d7a907d74cbbed8d4cc7e6f7d2a57ff6e6509ec56bef44b12fdb67f DIST spu-tools-2.3.0.136.tar.gz 21981 SHA256 3b20bb66d42e77757390c62fe13ba6e57397f64c6c8688ae0dcfc901805642c4 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612 WHIRLPOOL 6cd2b674d6c5e4c8ae9f1af75cdb46be2688bf8a5b441c93a3e66e4e0500746799a910eef396bec17fefd9453dd6961d23607f84017c7d25e5113ee13dd486c1 diff --git a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild b/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild deleted file mode 100644 index 940b3308bfb7..000000000000 --- a/sys-apps/spu-tools/spu-tools-2.2.80_p95.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -MY_P=${P/_p/-} - -DESCRIPTION="CELL spu ps and top alike utilities" -HOMEPAGE="https://sourceforge.net/projects/libspe" -SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="ppc ppc64" -IUSE="" - -DEPEND="sys-libs/ncurses - sys-apps/help2man" -RDEPEND="sys-libs/ncurses" - -S="${WORKDIR}/${PN}/src" - -src_compile() { - emake all || die "emake failed" -} - -src_install() { - make DESTDIR="$D" install || die -} diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild index 403c5158753a..95480e1aba9c 100644 --- a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild +++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~ppc ~ppc64" +KEYWORDS="ppc ppc64" IUSE="" RDEPEND="sys-libs/ncurses:0=" diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch new file mode 100644 index 000000000000..769aa04ccf6e --- /dev/null +++ b/sys-apps/systemd/files/228-noclean-tmp.patch @@ -0,0 +1,28 @@ +From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 25 Sep 2015 10:26:18 -0400 +Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp + +Bug: https://bugs.gentoo.org/490676 +--- + tmpfiles.d/tmp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index 6bbd1aa..a361062 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,8 +8,8 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++q /tmp 1777 root root ++q /var/tmp 1777 root root + + # Exclude namespace mountpoints created with PrivateTmp=yes + x /tmp/systemd-private-%b-* +-- +2.4.10 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 72c65e09e428..ceb34355095a 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -48,7 +48,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27:0=[${MULTILIB_USEDEP}] sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) + lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) @@ -145,7 +145,7 @@ src_prepare() { # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - epatch "${FILESDIR}/226-noclean-tmp.patch" + epatch "${FILESDIR}/228-noclean-tmp.patch" epatch_user eautoreconf } diff --git a/sys-apps/turbotail/Manifest b/sys-apps/turbotail/Manifest deleted file mode 100644 index 7cd2b2c46b3f..000000000000 --- a/sys-apps/turbotail/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST turbotail-0.3.tgz 6515 SHA256 d6b1f367de3952359f91da78de4eca01a285b37203530a7ee245b1a2e4a5a179 SHA512 7533da53d5a18594892f17bd6ae1adee95ac5eef05a03c9a2a5f42b30fb638a910471b1a25eb2996ae87c080bc78b1033c5968606e7547773aa70adbfa20611e WHIRLPOOL 0cab5d1b3946b8584894c94ef1bf82c68c4a001a0d4177a5c93f6822d777dfd16fd48d2dce25ef59b8b3342de9d8a09b8f0119a3faeccdf860cc4fbaaa3b5583 diff --git a/sys-apps/turbotail/turbotail-0.3-r1.ebuild b/sys-apps/turbotail/turbotail-0.3-r1.ebuild deleted file mode 100644 index 75175ae42ba2..000000000000 --- a/sys-apps/turbotail/turbotail-0.3-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs - -DESCRIPTION="Drop-in replacement for 'tail' which uses the kernel DNOTIFY-api" -HOMEPAGE="http://www.vanheusden.com/turbotail/" -SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="fam" - -DEPEND="fam? ( virtual/fam )" -RDEPEND="${DEPEND}" - -src_compile() { - local myconf mylibs - if use fam; then - myconf="-DUSE_FAM" - mylibs="-lfam" - else - myconf="-DUSE_DNOTIFY" - fi - - echo "$(tc-getCC) ${CFLAGS} ${myconf} -DVERSION=\"${PV}\" -c ${PN}.c" - $(tc-getCC) ${CFLAGS} ${myconf} -DVERSION=\"${PV}\" -c ${PN}.c || die - echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.o ${mylibs}" - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.o ${mylibs} || die -} - -src_install() { - dobin turbotail - dodoc readme.txt -} diff --git a/sys-apps/turbotail/turbotail-0.3.ebuild b/sys-apps/turbotail/turbotail-0.3.ebuild deleted file mode 100644 index 0e651c23f5d9..000000000000 --- a/sys-apps/turbotail/turbotail-0.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit toolchain-funcs - -DESCRIPTION="drop-in replacement for 'tail' which uses the kernel DNOTIFY-api" -HOMEPAGE="http://www.vanheusden.com/turbotail/" -SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 hppa ~ppc ~sparc ~x86" -IUSE="fam" - -DEPEND="fam? ( virtual/fam )" -RDEPEND="${DEPEND}" - -src_compile() { - local myconf - if use fam; then - myconf="-DUSE_FAM -lfam" - else - myconf="-DUSE_DNOTIFY" - fi - - echo "$(tc-getCC) ${myconf} -DVERSION=\"${PV}\" ${PN}.c -o ${PN}" - $(tc-getCC) ${myconf} -DVERSION=\"${PV}\" ${PN}.c -o ${PN} \ - || die "compile failed" -} - -src_install() { - dobin turbotail || die "install failed" - dodoc readme.txt -} diff --git a/sys-apps/usb_modeswitch/Manifest b/sys-apps/usb_modeswitch/Manifest index 2d98187eef00..d819dc669fea 100644 --- a/sys-apps/usb_modeswitch/Manifest +++ b/sys-apps/usb_modeswitch/Manifest @@ -1,5 +1,7 @@ DIST usb-modeswitch-2.2.0.tar.bz2 261888 SHA256 2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a SHA512 1311365c580035361e961ffefb84acf88771aae17d4b084733f2e0d10ac2ad770cf7d3b64c1c6cc400f19082530b425714f3afb88d10d6023e3798261a982e67 WHIRLPOOL 0e9e2bca6e72c9f34a18c82ba52d02b3281f3a016a5fdab251f7556b4d4aa04936c22a08e97d13985e2cf2d416ee0d51a5cf9494d0e9a449022259025b9d187c DIST usb-modeswitch-2.2.3.tar.bz2 263038 SHA256 d1a0d9a9e7411f07796611881a8f264daa946e2a28418abed34639b3583d7593 SHA512 f6d30e251bd4a1d6459cb7ac3594d204c21e0ca22ab0fa44ea675176751e4a2f08a4f42ce2ec0d2caf0bbca56438800327f7e5e16832e383263a4002941fa869 WHIRLPOOL c8a0c1c7bad335da8a9c2d87202ba5ac897d1d469c95c45c1677c41d04256dd97a4577eafd48104d135c5d15cda7c9bc287ecf38b457d4b2d4cce29471931a6e DIST usb-modeswitch-2.2.5.tar.bz2 263335 SHA256 8b2340303732aabc8c8e1cdd7d4352f61dcb942839f58ce22ba0ecfa122426d5 SHA512 007c14fbf64b17b422be4e54baa0f345f03dd322871886d1200e76d3af623fa78b130f66869be1e8e8f2a16f0350b4be8b9e8d7ea416af0b4c2730ab440d7023 WHIRLPOOL 0a6723f4a08293a366f3a063fe045224ca802b4c2cb8b9f7ae431fa41249a6ba937669a273ab6cd2e989e8a977ffaea386d2c7285289ca140c0619c5d75be0ea +DIST usb-modeswitch-2.2.6.tar.bz2 263395 SHA256 7ee42be2fe26dde20c58f54bf678fb136d2706250e4aa74f06fc97268a46e90f SHA512 f19b4c88e9a32af55a4a552cf89a2d25343b499180e41fccf988d34613f8480d49b7586b9b123edabc7cdbbb23073678797e99b7b679dd758924c9300377e067 WHIRLPOOL 107bcbc886cb8fda0d4b754641f237e4d8aa9f491649ae5bf42ee0d589eefc003fa37fc59bea63fd722a4d408f226e427058a235cd27ec6fa984ca1dcfb0a3f3 DIST usb-modeswitch-data-20140529.tar.bz2 27383 SHA256 53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536 SHA512 e0ac311ae09dcf41b45e9434bf43e7964ec0a32ac68024216ddfb6d6fd9d3b484cbe663ec081841e11a4af80e50fce12f1a06e0249aa229558085886c0f25809 WHIRLPOOL 64c4f5c63a85a55ca21f530c3bd3eb50756c5a596f96f85bbadf152e34becf90cc29a2b368a77f3e65bbfff36241ffdd6c09cf50692f730c62567162ab200102 DIST usb-modeswitch-data-20150627.tar.bz2 29918 SHA256 826096cb35a487c6e924b1318074988457220b5e72812e5393597950dd9eefc2 SHA512 0d1f7a5844d5a8d50e03b842adc2add5c3c4025fd034df6355312b399e714c7df2f5cd01c497e36c6a09744c4376bf4e2af6eef2aebaa1154086fce57a0bce62 WHIRLPOOL cdbd9489a1674645b6d2db2ace43353e813e30d10d30439aac87b232a0496d2424ecafb04faa1ca514be27cbd408880f1b5c323df3ed046e071d87a2091236f8 +DIST usb-modeswitch-data-20151101.tar.bz2 30350 SHA256 584d362bc0060c02016edaac7b05ebd6558d5dcbdf14f1ae6d0ec9630265a982 SHA512 416fcf5ca6834b0a7697df4ecdc3ca61c02da7ecd8aff8836b9b8a83be96f9df7fb85ed05befdb6257267875d96ee39ee30affedea9794250f9ea46c1aadd879 WHIRLPOOL 7f95be9e7237425eba32948a72614d4ee68956fad93f2ea0aacb6bf90a0e50240315b321602a1f60ddd4035a667e7ee5160089458220fd35e0634ead395664bd diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild new file mode 100644 index 000000000000..4fa9298889fb --- /dev/null +++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.2.6.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils linux-info toolchain-funcs udev systemd + +MY_PN=${PN/_/-} +MY_P=${MY_PN}-${PV/_p*} +#DATA_VER=${PV/*_p} +DATA_VER="20151101" + +DESCRIPTION="A tool for controlling 'flip flop' (multiple devices) USB gear like UMTS sticks" +HOMEPAGE="http://www.draisberghof.de/usb_modeswitch/ http://www.draisberghof.de/usb_modeswitch/device_reference.txt" +SRC_URI="http://www.draisberghof.de/${PN}/${MY_P}.tar.bz2 + http://www.draisberghof.de/${PN}/${MY_PN}-data-${DATA_VER}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="jimtcl" + +COMMON_DEPEND=" + virtual/udev + virtual/libusb:1 +" +RDEPEND="${COMMON_DEPEND} + jimtcl? ( dev-lang/jimtcl ) + !jimtcl? ( dev-lang/tcl:0 )" # usb_modeswitch script is tcl +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} + +CONFIG_CHECK="~USB_SERIAL" + +src_prepare() { + sed -i -e '/install.*BIN/s:-s::' Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + SYSDIR="${D}/$(systemd_get_unitdir)" \ + UDEVDIR="${D}/$(get_udevdir)" \ + $(usex jimtcl install-shared install) + + # Even if we set SYSDIR above, the Makefile is causing automagic detection of `systemctl` binary, + # which is why we need to force the .service file to be installed: + systemd_dounit ${PN}@.service + + dodoc ChangeLog README + + pushd ../${MY_PN}-data-${DATA_VER} >/dev/null + emake \ + DESTDIR="${D}" \ + RULESDIR="${D}/$(get_udevdir)/rules.d" \ + files-install db-install + docinto data + dodoc ChangeLog README + popd >/dev/null +} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 435eed7bf2af..888f6a4ac807 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,4 +2,5 @@ DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed +DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639 DIST util-linux-2.27.tar.xz 3968872 SHA256 fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7 SHA512 06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c WHIRLPOOL da19c56dfe424c59bc982096f08c02d864718f030bbad79661968f1da972ea10e0eacaa2477cda45ec9a3c688d220740ca2c8823918dae5139a943f6c9d8e2a4 diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild index 3f58b43ea732..20bd04c90425 100644 --- a/sys-apps/util-linux/util-linux-2.26.2.ebuild +++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-2 autotools EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" fi diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild new file mode 100644 index 000000000000..95c5785af85e --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + python-single-r1 multilib-minimal systemd + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == 9999 ]] ; then + inherit git-2 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" + +RDEPEND="!sys-process/schedutils + !sys-apps/setarch + !<sys-apps/sysvinit-2.88-r7 + !sys-block/eject + !<sys-libs/e2fsprogs-libs-1.41.8 + !<sys-fs/e2fsprogs-1.41.8 + !<app-shells/bash-completion-1.3-r2 + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + fi + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include <fcntl.h> + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + ECONF_SOURCE=${S} \ + econf \ + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ + --docdir='${datarootdir}'/doc/${PF} \ + $(multilib_native_use_enable nls) \ + --enable-agetty \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + --enable-bash-completion \ + $(multilib_native_use_enable caps setpriv) \ + --disable-chfn-chsh \ + $(multilib_native_use_enable cramfs) \ + $(multilib_native_use_enable fdformat) \ + --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ + --disable-kill \ + --disable-login \ + $(multilib_native_use_enable tty-helpers mesg) \ + --disable-nologin \ + --enable-partx \ + $(multilib_native_use_with python) \ + --enable-raw \ + --enable-rename \ + --disable-reset \ + --enable-schedutils \ + --disable-su \ + $(multilib_native_use_enable tty-helpers wall) \ + $(multilib_native_use_enable tty-helpers write) \ + $(multilib_native_use_enable suid makeinstall-chown) \ + $(multilib_native_use_enable suid makeinstall-setuid) \ + $(use_with selinux) \ + $(multilib_native_use_with slang) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with systemd) \ + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \ + $(multilib_native_use_with udev) \ + $(tc-has-tls || echo --disable-tls) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + prune_libtool_files +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index ee2ab6a9764f..95c5785af85e 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -90,13 +90,9 @@ multilib_src_configure() { tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 ECONF_SOURCE=${S} \ econf \ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ --docdir='${datarootdir}'/doc/${PF} \ $(multilib_native_use_enable nls) \ --enable-agetty \ diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch new file mode 100644 index 000000000000..39df3caf1156 --- /dev/null +++ b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/488158 + +taken from Fedora + +Patch by Thomas Swan <thomas.swan@gmail.com> + +--- a/xinetd/builtins.c ++++ b/xinetd/builtins.c +@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) + if( SC_IS_INTERNAL( scp ) ) { + SC_INTERNAL(scp, nserp); + } else { +- exec_server(nserp); ++ child_process(nserp); + } + } + diff --git a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild index cb82dc35bb64..39c51be6fdef 100644 --- a/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.15-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils flag-o-matic systemd toolchain-funcs @@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 IUSE="perl rpc tcpd" DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) - rpc? ( net-libs/libtirpc )" + rpc? ( net-libs/libtirpc:= )" RDEPEND="${DEPEND} perl? ( dev-lang/perl )" DEPEND="${DEPEND} diff --git a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild new file mode 100644 index 000000000000..77feca0809d0 --- /dev/null +++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic systemd toolchain-funcs + +DESCRIPTION="powerful replacement for inetd" +HOMEPAGE="http://www.xinetd.org/" +SRC_URI="http://www.xinetd.org/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +IUSE="perl rpc tcpd" + +DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) + rpc? ( net-libs/libtirpc:= )" +RDEPEND="${DEPEND} + perl? ( dev-lang/perl )" +DEPEND="${DEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch + epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch + epatch "${FILESDIR}"/${PN}-2.3.14-config.patch + epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158 + find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} + +} + +src_configure() { + if ! use rpc ; then + append-cppflags -DNO_RPC + export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no + fi + tc-export AR PKG_CONFIG + LIBS=$(${PKG_CONFIG} --libs libtirpc) \ + econf \ + $(use_with tcpd libwrap) \ + --with-loadavg +} + +src_install() { + emake DESTDIR="${ED}" install install-contrib + use perl || rm -f "${ED}"/usr/sbin/xconv.pl + + newinitd "${FILESDIR}"/xinetd.rc6 xinetd + newconfd "${FILESDIR}"/xinetd.confd xinetd + systemd_dounit "${FILESDIR}/${PN}.service" + + newdoc contrib/xinetd.conf xinetd.conf.dist.sample + dodoc AUDIT INSTALL README TODO CHANGELOG +} |