[gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     2e9e0f08513a0ac0d1c12abb0b9e9196ac0551e1
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 20:14:43 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 20:14:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=2e9e0f08

Added sandbox patch from bug #308477

---
 sys-libs/uclibc/ChangeLog                          |    3 +++
 .../uclibc/files/uclibc-0.9.32-BJA-sandbox.patch   |    9 +++++++++
 sys-libs/uclibc/metadata.xml                       |    2 --
 sys-libs/uclibc/uclibc-0.9.32.ebuild               |    2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index dfc0de8..362aeef 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,5 +1,8 @@
 
 
   20 Dec 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
+  Added patch from bug #308477
+
+  20 Dec 2011; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Initial commit
 

diff --git a/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch b/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch
new file mode 100644
index 0000000..167d711
--- /dev/null
+++ b/sys-libs/uclibc/files/uclibc-0.9.32-BJA-sandbox.patch
@@ -0,0 +1,9 @@
+--- ./libubacktrace/Makefile.in.ori	2011-07-25 19:14:19.427297221 +0200
++++ ./libubacktrace/Makefile.in	2011-07-25 19:14:34.380349907 +0200
+@@ -71,5 +71,4 @@
+ 	$(do_ar)
+ 
+ CLEAN_libubacktrace:
+-	$(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a) \
+-	 $(addprefix $(libubacktrace_ARCH_OUT)/*., o os oS a)
++	$(do_rm) $(addprefix $(libubacktrace_OUT)/*., o os oS a)

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index 97db3b0..bcb329d 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -4,10 +4,8 @@
 	<herd>hardened</herd>
 	<use>
 		<flag name='ssp'>Force the use of ssp to be built into a hardened uclibc setup</flag>
-		<flag name='pregen'>Use pregenerated locales</flag>
 		<flag name='savedconfig'>Adds support for user defined configs</flag>
 		<flag name='uclibc-compat'>Build uclibc with backwards compatible options</flag>
-		<flag name='userlocales'>Build only the locales specified in /etc/locales.build</flag>
 		<flag name='wordexp'>Add support for word expansion (wordexp.h)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-libs/uclibc/uclibc-0.9.32.ebuild b/sys-libs/uclibc/uclibc-0.9.32.ebuild
index ac248d7..105174c 100644
--- a/sys-libs/uclibc/uclibc-0.9.32.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.32.ebuild
@@ -170,7 +170,7 @@ src_unpack() {
 		epatch "${WORKDIR}"/patch
 	fi
 
-	epatch "${FILESDIR}"/${P}-BJA-sandbox.diff
+	epatch "${FILESDIR}"/${P}-BJA-sandbox.patch
 
 	########## CPU SELECTION ##########