diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-03-25 16:29:47 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-03-25 16:29:47 +0000 |
| commit | 3fb7f4bea3b4acc09babc61fdee85e380bc5db22 (patch) | |
| tree | 6bc5fdf5c2e6c4d7eb178bf373b3a0d95031d391 /sys-apps/busybox | |
| parent | Initial import, thanks to Rafal Boniecki, bug #164398 (diff) | |
| download | gentoo-2-3fb7f4bea3b4acc09babc61fdee85e380bc5db22.tar.gz gentoo-2-3fb7f4bea3b4acc09babc61fdee85e380bc5db22.tar.bz2 gentoo-2-3fb7f4bea3b4acc09babc61fdee85e380bc5db22.zip | |
Fix linking with selinux libs #160879.
(Portage version: 2.1.2.2)
Diffstat (limited to 'sys-apps/busybox')
| -rw-r--r-- | sys-apps/busybox/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.4.1-r2.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/busybox/busybox-1.4.2.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/busybox/files/1.4.0/selinux-link.patch | 11 |
4 files changed, 21 insertions, 3 deletions
diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog index db86a7066e1a..edde54bb9058 100644 --- a/sys-apps/busybox/ChangeLog +++ b/sys-apps/busybox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/busybox # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.134 2007/03/25 15:00:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.135 2007/03/25 16:29:47 vapier Exp $ + + 25 Mar 2007; Mike Frysinger <vapier@gentoo.org> + +files/1.4.0/selinux-link.patch, busybox-1.4.1-r2.ebuild, + busybox-1.4.2.ebuild: + Fix linking with selinux libs #160879. *busybox-1.5.0 (25 Mar 2007) diff --git a/sys-apps/busybox/busybox-1.4.1-r2.ebuild b/sys-apps/busybox/busybox-1.4.1-r2.ebuild index cae36eae3780..4760438af9d4 100644 --- a/sys-apps/busybox/busybox-1.4.1-r2.ebuild +++ b/sys-apps/busybox/busybox-1.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.7 2007/03/25 14:42:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.1-r2.ebuild,v 1.8 2007/03/25 16:29:47 vapier Exp $ inherit eutils flag-o-matic @@ -104,6 +104,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.4.0/bb.patch + epatch "${FILESDIR}"/1.4.0/selinux-link.patch epatch "${FILESDIR}"/1.4.0/bin2hex.patch epatch "${FILESDIR}"/1.4.0/data_extract_all.patch diff --git a/sys-apps/busybox/busybox-1.4.2.ebuild b/sys-apps/busybox/busybox-1.4.2.ebuild index 9802968f7d35..6d59ad6c9d2f 100644 --- a/sys-apps/busybox/busybox-1.4.2.ebuild +++ b/sys-apps/busybox/busybox-1.4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.1 2007/03/25 14:51:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.4.2.ebuild,v 1.2 2007/03/25 16:29:47 vapier Exp $ inherit eutils flag-o-matic @@ -104,6 +104,7 @@ src_unpack() { # patches go here! epatch "${FILESDIR}"/1.4.0/bb.patch + epatch "${FILESDIR}"/1.4.0/selinux-link.patch # work around broken ass powerpc compilers use ppc64 && append-flags -mminimal-toc diff --git a/sys-apps/busybox/files/1.4.0/selinux-link.patch b/sys-apps/busybox/files/1.4.0/selinux-link.patch new file mode 100644 index 000000000000..b2e69e4ac025 --- /dev/null +++ b/sys-apps/busybox/files/1.4.0/selinux-link.patch @@ -0,0 +1,11 @@ +--- busybox-1.4.2/Makefile.flags ++++ busybox-1.4.2/Makefile.flags +@@ -28,4 +28,8 @@ + ifeq ($(CONFIG_STATIC),y) + LDFLAGS += -static + endif ++ ++ifeq ($(CONFIG_SELINUX),y) ++LDFLAGS += -lselinux -lsepol ++endif + #LDFLAGS += -nostdlib |