diff options
| -rw-r--r-- | sys-devel/distcc/ChangeLog | 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 |
5 files changed, 34 insertions, 198 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/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 |