Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 18729 | Differences between
and this patch

Collapse All | Expand All

(-)findutils-4.1.7-r4.ebuild (-4 / +16 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /home/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.8 2003/04/16 16:06:00 joker Exp $
3
# $Header: /home/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.7-r4.ebuild,v 1.8 2003/04/16 16:06:00 joker Exp $
4
4
5
IUSE="nls build afs selinux"
5
IUSE="nls build afs selinux slang"
6
6
7
inherit eutils
7
inherit eutils
8
8
Lines 23-29 Link Here
23
	>=sys-apps/sed-4
23
	>=sys-apps/sed-4
24
	nls? ( sys-devel/gettext )
24
	nls? ( sys-devel/gettext )
25
	afs? ( net-fs/openafs )
25
	afs? ( net-fs/openafs )
26
	selinux? ( sys-apps/selinux-small )"
26
	selinux? ( sys-apps/selinux-small )
27
	slang? ( sys-apps/slocate )"
27
RDEPEND="virtual/glibc"
28
RDEPEND="virtual/glibc"
28
29
29
src_unpack() {
30
src_unpack() {
Lines 32-38 Link Here
32
33
33
	# Don't build or install locate because it conflicts with slocate,
34
	# Don't build or install locate because it conflicts with slocate,
34
	# which is a secure version of locate.  See bug 18729
35
	# which is a secure version of locate.  See bug 18729
35
	sed -i '/^SUBDIRS/s/locate//' Makefile.in
36
	use slang && sed -i '/^SUBDIRS/s/locate//' Makefile.in
36
37
37
	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
38
	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
38
}
39
}
Lines 51-76 Link Here
51
	./configure \
52
	./configure \
52
		--host=${CHOST} \
53
		--host=${CHOST} \
53
		--prefix=/usr \
54
		--prefix=/usr \
55
		--localstatedir=/var/spool/locate \
54
		${myconf} || die
56
		${myconf} || die
55
57
56
	emake libexecdir=/usr/lib/find || die
58
	emake libexecdir=/usr/lib/find || die
57
}
59
}
58
60
59
src_install() {
61
src_install() {
60
	einstall libexecdir=${D}/usr/lib/find || die
62
	#do not change 'localstatedir=/var/spool/locate' to
63
	#'localstatedir=${D}/var/spool/locate', as it will then be hardcoded
64
	#into locate and updatedb
65
	einstall \
66
		localstatedir=${D}/var/spool/locate \
67
		libexecdir=${D}/usr/lib/find \
68
		|| die
61
		
69
		
62
	prepallman
70
	prepallman
63
71
72
	dosed "s:TMPDIR=/usr/tmp:TMPDIR=/tmp:" usr/bin/updatedb
64
	rm -rf ${D}/usr/var
73
	rm -rf ${D}/usr/var
65
	if ! use build; then
74
	if ! use build; then
66
		dodoc COPYING NEWS README TODO ChangeLog
75
		dodoc COPYING NEWS README TODO ChangeLog
67
	else
76
	else
68
		rm -rf ${D}/usr/share
77
		rm -rf ${D}/usr/share
69
	fi
78
	fi
79
	keepdir /var/spool/locate
70
}
80
}
71
81
72
pkg_postinst() {
82
pkg_postinst() {
83
	if use slang; then
73
	ewarn "Please note that the locate and updatedb binaries"
84
	ewarn "Please note that the locate and updatedb binaries"
74
	ewarn "are not longer provided by findutils."
85
	ewarn "are not longer provided by findutils."
75
	ewarn "Please emerge slocate"
86
	ewarn "Please emerge slocate"
87
	fi
76
}
88
}

Return to bug 18729