diff options
| -rw-r--r-- | sys-devel/distcc/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-devel/distcc/Manifest | 9 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-2.18.3-r13.ebuild | 190 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-3.0-r4.ebuild | 6 | ||||
| -rw-r--r-- | sys-devel/distcc/distcc-3.1-r2.ebuild (renamed from sys-devel/distcc/distcc-3.1.ebuild) | 16 | ||||
| -rw-r--r-- | sys-devel/distcc/files/distcc-3.0-fix-fortify.patch | 11 |
6 files changed, 38 insertions, 203 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index 81efc0dd9e66..307d7953e07c 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/distcc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.194 2009/02/01 16:16:51 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.195 2009/02/10 00:09:35 matsuu Exp $ + +*distcc-3.1-r2 (10 Feb 2009) + + 10 Feb 2009; MATSUU Takuto <matsuu@gentoo.org> + +files/distcc-3.0-fix-fortify.patch, -distcc-2.18.3-r13.ebuild, + distcc-3.0-r4.ebuild, -distcc-3.1.ebuild, +distcc-3.1-r2.ebuild: + Fixed -D_FORTIFY_SOURCE=2 issue, bug 253786. *distcc-3.1-r1 (01 Feb 2009) diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 49b3543fecaa..e460391c2efe 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -5,6 +5,7 @@ AUX 2.18/init 733 RMD160 935e52d2ddfc6363f26a916666bbbc28b6fdb79b SHA1 737e969b1 AUX 3.0/conf 1286 RMD160 52f0fb469fc83b2f28f032c81515773d09add0d5 SHA1 4860a6e2eea10d918058b0cdcb76ac196a2d7992 SHA256 28fa9a9ce30c9f979eac3d5be3fc64f199ecffa9d7e38e02f11957019152dc46 AUX 3.0/distcc-config 3402 RMD160 ef72502f3b69d86884fcc038d84105be46b952f2 SHA1 bbef02b51241439f64a679c72b69428035a8c2a8 SHA256 b37627554a6b55671770dd005c85a68a3db83a0b9a5669517c11064b76086e71 AUX 3.0/init 846 RMD160 313ba4a8b611254bd333364f54bd7dc73d988283 SHA1 4e4a271486ea78d4d126df5d3ee2a6d38af13b0e SHA256 ca81ef66534013ec10a10e3e58610170938b54fb75ced23e3507ebd166be99cc +AUX distcc-3.0-fix-fortify.patch 313 RMD160 e5edc96a4bc4fe06a58878011cbb466184946b3e SHA1 386ee72a9d0b620dfc3aa75324060f764ed44e6d SHA256 7b57ae28dcef0c1ecd273a8a10dd1a16fa6a7af618d5438e1fe4398863fa8901 AUX distcc-3.0-gentoo.patch 1225 RMD160 5c305052c9ee62c7d60377b26e53f69a67438b39 SHA1 7114da1f2ddda38498d19a685782da48a8b37f30 SHA256 ba1895fa906ba18490b722f9eda07a96459949d879412c2aba0218f8854ca7cc AUX distcc-3.0-svn617.patch 533 RMD160 64c8712a9290b1fef776ca5517074748a0ec9255 SHA1 7b9b661b21aea2e1a338b3ed890c6bd7dc8064e3 SHA256 902d6715f443fceb7c799bcf4f82d637569db2da900be5e36bb40b57a3e9fa84 AUX distcc-3.0-uninitialized.patch 448 RMD160 706d9923d257f7616775d55b287e02fb133dbdd9 SHA1 7275a1d4c314abc0ddac572cb85b49efaedee97b SHA256 2d4b0aefbe1e0245881d35c572605ee8f3c52e43316482041fadadc31e5fa9a6 @@ -19,14 +20,12 @@ AUX distcc-gentoo-multilib-r1.patch 4245 RMD160 175cb4c2ce0e8ecb2262165b3fd9a0d8 AUX distcc-gentoo-multilib.patch 3784 RMD160 f48a3f2f8c82379c30c9da0e49aa66ba34681882 SHA1 5a3ba956caaab2d5c6ef44ee3ded10a33ac870dc SHA256 d3af7a7592d0a11a35d294022b36feca2fb625e4799513bf56a79e0656278403 AUX distcc-hardened.patch 1084 RMD160 0f11c9c8e8b56e91399b054fb57566e290a0baa5 SHA1 746f1905a9bc45ea7b71d71f4b1feba7d96d0f7f SHA256 dcf63f201cb7f4bf13eeb1485a5056c64370b9239d28e4acc77a47046dcda6cf AUX distcc-march-native.patch 934 RMD160 29908d5b5c4622285a78f221b2633e3ee495a648 SHA1 e1ac6912d55c9b3dda9b6f1a03c973ad1a85f359 SHA256 bc95daad65a3c3a7429b94b432b5d2aa470cb50d6e67c65303865df1e28831e7 -DIST distcc-2.18-avahi.patch.bz2 9447 RMD160 eaf358bc417566bb8cf7ea005ce853df880f4e49 SHA1 af76073bdde6668f3013f4e84f693155b3b887ad SHA256 1c6fb40b57385870b267d3ce4285ba3fa32e57a335cfcd3b96f4f9a36645a97f DIST distcc-2.18.3.tar.bz2 341601 RMD160 c7ac6f3e161dccf39b841b57a3328b4208d28c2d SHA1 88e4c15826bdbc5a3de0f7c1bcb429e558c6976d SHA256 6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434 DIST distcc-3.0.tar.bz2 582700 RMD160 1e187fe09129dcc6e561bfb0cd0db9a43619acca SHA1 90cea1d7500e95d3c698e6ab9b9536a946f62824 SHA256 bb6f5674b619ef1438da67739d982e8a6b11e01f748708e0fcbe371c02f020fe DIST distcc-3.1.tar.bz2 588820 RMD160 82229c230e6917b0df7db275460579b02dbf6b60 SHA1 30663e8ff94f13c0553fbfb928adba91814e1b3a SHA256 f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 EBUILD distcc-2.18.3-r10.ebuild 5142 RMD160 64d8b7d135334e023aa4450be62da861ea591298 SHA1 8de697fc7beddfab8192be91ca27faeb4074dd25 SHA256 2dfc6ea7957cb4baf1632bac8d417be835cb6b893f83fbefece100b782ae55fe -EBUILD distcc-2.18.3-r13.ebuild 5824 RMD160 cb18aecf919f616180067dc4344d4f12b0fe67b0 SHA1 5530214de055458bd47937d8a73ecdc2bf54372e SHA256 0940b65fb98630c5f3146abd6400094fd05599aea10a06972ea00eaf7221f08a -EBUILD distcc-3.0-r4.ebuild 4525 RMD160 259f430490c79b9aeaac88528cb087725e77999d SHA1 4c488d8b34abe96b1a4abe2662adf4550fa1a260 SHA256 b5d8b274396228447f62a0dabfe36f5c934d53bccf61c01acebd4cc29c560d0d +EBUILD distcc-3.0-r4.ebuild 4590 RMD160 35fb1eaabb3adbd7b555ca13f184372d5b464bd7 SHA1 05be8e0ba7042bfa9517a33dc685d6d1d97a5d79 SHA256 788ad6511307170018639491238a0ca4ead49044b46fcf37dfcef266561fb755 EBUILD distcc-3.1-r1.ebuild 4391 RMD160 e58cfc94624224e6b3a72e3e7433a4c7398cbac6 SHA1 7830303ba9dd41ced95ad7c4f43a0f4429c38fd7 SHA256 629c5165ac1e6870d575903d503606c2a25dddd45aae2c1621e6a959be18cc96 -EBUILD distcc-3.1.ebuild 4248 RMD160 86b69496fe98c0e17dbf00f6d212d758d1c75f58 SHA1 5091496f41a530b702b81fe51299dc4508740a18 SHA256 b5f66f505470866364865d88a2ad26473ef84fde972188af39148127be31dea4 -MISC ChangeLog 35736 RMD160 9d08d53b11f9ff43e546e7eadaa55c6a40fe42e8 SHA1 48733691d81c8993b0d12776b0f9c69e2caac5ca SHA256 5f8f4d9516efa96448b99fc98438776d7765993aeaf767e86e621ef8e56f0e77 +EBUILD distcc-3.1-r2.ebuild 4456 RMD160 c1b25958804f44c3fcc0100bea4209da9553f4da SHA1 9ce6edceec3b372a570064cc8fd6cd617f2afd70 SHA256 39155c82bed968fdd4786ba8adcaba176ba688c0e5e2964d693ee4b5b50b4f6c +MISC ChangeLog 35996 RMD160 3b625b0666c6f3b90845433adcfa25a559b63b77 SHA1 5b2242e62f8b2a80e6d22dc53c53dadb48dd0916 SHA256 ba3eb38134bed096524f8dbe2131a0c1241ab0612cd999fc8a0aa191f84b37cd MISC metadata.xml 375 RMD160 71766089deafcc906533d0dc537a46646f36b50a SHA1 c188ca1cdd4d1bc82f372608e8ad7fc473cb47e5 SHA256 adb92971f6939e55ce103e1c42d3ce3dfe82823d038db0e9cf9b08d9be888e1a diff --git a/sys-devel/distcc/distcc-2.18.3-r13.ebuild b/sys-devel/distcc/distcc-2.18.3-r13.ebuild deleted file mode 100644 index 160e941c3729..000000000000 --- a/sys-devel/distcc/distcc-2.18.3-r13.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r13.ebuild,v 1.3 2008/11/02 22:24:23 gengor Exp $ - -# If you change this in any way please email lisa@gentoo.org and make an -# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye - -inherit autotools eutils flag-o-matic toolchain-funcs fdo-mime - -PATCHLEVEL="2.18-r1" - -DESCRIPTION="a program to distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.samba.org/" -SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 - mirror://gentoo/${PN}-2.18-avahi.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="avahi gnome gtk hardened selinux ipv6" - -COMMON_DEP="dev-libs/popt - avahi? ( >=net-dns/avahi-0.6.5 )" -DEPEND=">=sys-devel/gcc-config-1.3.1 - userland_GNU? ( sys-apps/shadow ) - dev-util/pkgconfig - || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) - >=sys-devel/autoconf-2.60 - ${COMMON_DEP}" -RDEPEND=" - gnome? ( - >=x11-libs/gtk+-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0.0 - >=gnome-base/libglade-2.0.0 - x11-libs/pango - >=gnome-base/gconf-2.0.0 - ) - gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) - selinux? ( sec-policy/selinux-distcc ) - ${COMMON_DEP}" - -pkg_setup() { - if use avahi && ! built_with_use net-dns/avahi dbus; then - eerror "${CATEGORY}/${PN} needs net-dns/avahi built with the dbus use" - eerror "flag for avahi support." - die "net-dns/avahi not built with dbus support" - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # -Wl,--as-needed to close bug #128605 - epatch "${FILESDIR}/distcc-as-needed.patch" - - # See bug #75420 for more multilib stuff - epatch "${FILESDIR}/distcc-gentoo-multilib-r1.patch" - einfo "Please report to bug #75420 success or failure of this patch." - - epatch "${FILESDIR}/distcc-freedesktop.patch" - epatch "${FILESDIR}/distcc-create-dir.patch" - epatch "${FILESDIR}/${PN}-march-native.patch" - - rm -v popt/*.c || die - if use avahi; then - epatch "${DISTDIR}/${PN}-2.18-avahi.patch.bz2" - epatch "${FILESDIR}/${PN}-avahi-configure.patch" - fi - - # Bugs #120001, #167844 and probably more. See patch for description. - use hardened && epatch "${FILESDIR}/distcc-hardened.patch" - - eautoreconf -} - -src_compile() { - local myconf="--without-included-popt --docdir=/usr/share/doc/${PF}" - - #More legacy stuff? - [ `gcc-major-version` -eq 2 ] && filter-lfs-flags - - if use ipv6; then - ewarn "To use IPV6 you must have IPV6 compiled into your kernel" - ewarn "either via a module or compiled code" - ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" - myconf=" ${myconf} --enable-rfc2553 " - epause 5 - fi - econf ${myconf} $(use_enable avahi) $(use_with gnome) $(use_with gtk) || die "econf ${myconf} failed" - emake || die "emake failed" -} - -handle_avahi() { - local avahi="-UAVAHI" - use avahi && avahi="-DAVAHI" - unifdef ${avahi} "${1}" > "${2}" -} - -src_install() { - make DESTDIR="${D%/}" install - - dodoc "${S}/survey.txt" - - exeinto /usr/bin - doexe "${FILESDIR}/distcc-config" - - handle_avahi "${FILESDIR}/${PATCHLEVEL}/init" "${T}/init" - newinitd "${T}/init" distccd || die - - handle_avahi "${FILESDIR}/${PATCHLEVEL}/conf" "${T}/conf" - newconfd "${T}/conf" distccd || die - - # create and keep the symlink dir - dodir /usr/lib/distcc/bin - keepdir /usr/lib/distcc/bin - - # create the distccd pid directory - dodir /var/run/distccd - keepdir /var/run/distccd - - if use gnome || use gtk; then - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" - einfo "This is to have a little sensability in naming schemes between distccmon programs" - mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die - dosym /usr/bin/distccmon-gui /usr/bin/distccmon-gnome - fi - -} - -pkg_preinst() { - # non-/ installs don't require us to do anything here - [ "${ROOT}" != "/" ] && return 0 - - # stop daemon since script is being updated - [ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \ - /etc/init.d/distccd stop -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - #are we doing bootstrap with has no useradd? - if [[ ${CHOST} != *-*-gnu && ${CHOST} != *-linux* ]] || [ -x /usr/sbin/useradd ]; then - enewuser distcc 240 - else - ewarn "You do not have useradd (bootstrap) from shadow so I didn't" - ewarn "install the distcc user. Note that attempting to start the daemon" - ewarn "will fail. Please install shadow and re-emerge distcc." - ebeep 2 - fi - - # By now everyone should be using the right envfile - - if [ "${ROOT}" = "/" ]; then - einfo "Installing links to native compilers..." - /usr/bin/distcc-config --install - else - # distcc-config can *almost* handle ROOT installs itself - # but for now, but user must finsh things off - ewarn "*** Installation is not complete ***" - ewarn "You must run the following as root:" - ewarn " /usr/bin/distcc-config --install" - ewarn "after booting or chrooting into ${ROOT}" - fi - einfo "Setting permissions on ${ROOT}var/run/distccd" - chown -R distcc:daemon "${ROOT}var/run/distccd" - echo "" - - einfo "Tips on using distcc with Gentoo can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - - ewarn "***SECURITY NOTICE***" - ewarn "If you are upgrading distcc please make sure to run etc-update to" - ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - ewarn "added security precautions (the --listen and --allow directives)" - ebeep 5 -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sys-devel/distcc/distcc-3.0-r4.ebuild b/sys-devel/distcc/distcc-3.0-r4.ebuild index b0f4c691e778..a820df85d764 100644 --- a/sys-devel/distcc/distcc-3.0-r4.ebuild +++ b/sys-devel/distcc/distcc-3.0-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.10 2008/12/19 00:51:49 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.0-r4.ebuild,v 1.11 2009/02/10 00:09:35 matsuu Exp $ inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs @@ -50,6 +50,8 @@ src_unpack() { epatch "${FILESDIR}/${P}-svn617.patch" epatch "${FILESDIR}/${P}-xinetd.patch" epatch "${FILESDIR}/${P}-uninitialized.patch" + # bug #253786 + epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die # Bugs #120001, #167844 and probably more. See patch for description. diff --git a/sys-devel/distcc/distcc-3.1.ebuild b/sys-devel/distcc/distcc-3.1-r2.ebuild index 3ad18cb9cc6b..a0e5948e6aac 100644 --- a/sys-devel/distcc/distcc-3.1.ebuild +++ b/sys-devel/distcc/distcc-3.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1.ebuild,v 1.1 2008/12/03 09:19:07 matsuu Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r2.ebuild,v 1.1 2009/02/10 00:09:35 matsuu Exp $ inherit eutils fdo-mime flag-o-matic multilib toolchain-funcs @@ -47,6 +47,10 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" + # bug #253786 + epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" + # bug #255188 + epatch "${FILESDIR}/${P}-freedesktop.patch" sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die # Bugs #120001, #167844 and probably more. See patch for description. @@ -54,16 +58,18 @@ src_unpack() { } src_compile() { + local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" # More legacy stuff? [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags + # --disable-rfc2553 b0rked, bug #254176 + use ipv6 && myconf="${myconf} --enable-rfc2553" + econf \ $(use_with avahi) \ $(use_with gtk) \ $(use_with gnome) \ - $(use_enable ipv6 rfc2553) \ - --disable-Werror \ - --with-docdir="/usr/share/doc/${PF}" || die "econf failed" + ${myconf} || die "econf failed" emake || die "emake failed" } diff --git a/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch new file mode 100644 index 000000000000..8edc330e324b --- /dev/null +++ b/sys-devel/distcc/files/distcc-3.0-fix-fortify.patch @@ -0,0 +1,11 @@ +diff -ru a/src/snprintf.h b/src/snprintf.h +--- a/src/snprintf.h 2008-08-06 15:52:06.000000000 -0500 ++++ b/src/snprintf.h 2009-01-04 15:19:22.000000000 -0600 +@@ -7,6 +7,7 @@ + */ + + #include <stdarg.h> ++#include "config.h" + + #ifdef __GNUC__ + /** Use gcc attribute to check printf fns. a1 is the 1-based index of |