Unset locale environment vars (#185193).

(Portage version: 2.1.2.12)

4 files changed, 64 insertions, 2 deletions

diff --git a/net-dialup/hcfusbmodem/ChangeLog b/net-dialup/hcfusbmodem/ChangeLog
index 16681afab0b5..b9c1b9115049 100644
--- a/net-dialup/hcfusbmodem/ChangeLog
+++ b/net-dialup/hcfusbmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfusbmodem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.22 2007/05/02 08:07:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/ChangeLog,v 1.23 2007/08/28 19:00:02 mrness Exp $
+
+*hcfusbmodem-1.11-r1 (28 Aug 2007)
+
+  28 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/hcfusbmodem-1.11-unset-locale.patch, -hcfusbmodem-1.11.ebuild,
+  +hcfusbmodem-1.11-r1.ebuild:
+  Unset locale environment vars (#185193).
 
   02 May 2007; Marius Mauch <genone@gentoo.org> hcfusbmodem-1.11.ebuild:
   Replacing einfo with elog
diff --git a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.11 b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.11-r1
index 071a7765efc5..071a7765efc5 100644
--- a/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.11
+++ b/net-dialup/hcfusbmodem/files/digest-hcfusbmodem-1.11-r1
diff --git a/net-dialup/hcfusbmodem/files/hcfusbmodem-1.11-unset-locale.patch b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.11-unset-locale.patch
new file mode 100644
index 000000000000..b5ffd94bacc0
--- /dev/null
+++ b/net-dialup/hcfusbmodem/files/hcfusbmodem-1.11-unset-locale.patch
@@ -0,0 +1,49 @@
+diff -Nru hcfusbmodem-1.11powerpcfull.orig/makefile hcfusbmodem-1.11powerpcfull/makefile
+--- hcfusbmodem-1.11powerpcfull.orig/makefile	2007-01-31 19:03:44.000000000 +0200
++++ hcfusbmodem-1.11powerpcfull/makefile	2007-08-28 21:54:34.000000000 +0300
+@@ -211,7 +211,7 @@
+ 		mv debian/changelog.tmp debian/changelog; \
+ 		( echo "TARGET_DISTRO=$$d" ; echo "TARGET_KERNEL=$$k" ; echo "DISTROKERNHDRSDIR=$(DISTROKERNHDRSDIR)" ; echo "PACKAGE_NAME=$(@F)" ; echo "PACKAGE_ARCH=$(*D)" ) > debian/target.mak; \
+ 	fi
+-	unset LANG; unset LOCALE; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH) -us -uc || true
++	unset LANG; unset LOCALE; unset LC_ALL; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH) -us -uc || true
+ 	rm -f debian/target.mak
+ 	mv ../$(CNXTTARGET)modem_*.deb packages/DEBS/$(*D)/$(@F)
+ 	rm -f ../$(CNXTTARGET)modem_* ../$(CNXTTARGET)modem-doc_*
+diff -Nru hcfusbmodem-1.11powerpcfull.orig/modules/kernelcompiler.sh hcfusbmodem-1.11powerpcfull/modules/kernelcompiler.sh
+--- hcfusbmodem-1.11powerpcfull.orig/modules/kernelcompiler.sh	2005-10-21 19:15:04.000000000 +0300
++++ hcfusbmodem-1.11powerpcfull/modules/kernelcompiler.sh	2007-08-28 21:55:54.000000000 +0300
+@@ -8,7 +8,7 @@
+ KERNELVER="$1"
+ KERNELSRC="$2"
+ 
+-unset LANG
++unset LANG LOCALE LC_ALL
+ 
+ if [ -n "${RPM_BUILD_ROOT}${DEB_HOST_GNU_SYSTEM}" ]; then
+ 	if [ -f "${KERNELSRC}/kernelcompiler" ]; then
+diff -Nru hcfusbmodem-1.11powerpcfull.orig/scripts/cnxtconfig.in hcfusbmodem-1.11powerpcfull/scripts/cnxtconfig.in
+--- hcfusbmodem-1.11powerpcfull.orig/scripts/cnxtconfig.in	2007-01-31 18:59:11.000000000 +0200
++++ hcfusbmodem-1.11powerpcfull/scripts/cnxtconfig.in	2007-08-28 21:55:54.000000000 +0300
+@@ -2563,7 +2563,7 @@
+ 	exit $?
+ fi
+ 
+-unset LANG
++unset LANG LOCALE LC_ALL
+ 
+ umask 022
+ 
+diff -Nru hcfusbmodem-1.11powerpcfull.orig/scripts/patcher.in hcfusbmodem-1.11powerpcfull/scripts/patcher.in
+--- hcfusbmodem-1.11powerpcfull.orig/scripts/patcher.in	2005-12-08 05:33:35.000000000 +0200
++++ hcfusbmodem-1.11powerpcfull/scripts/patcher.in	2007-08-28 21:55:54.000000000 +0300
+@@ -285,8 +285,7 @@
+ # Safe environment...
+ PATH=/usr/sbin:/sbin:/usr/bin:/bin:/usr/local/sbin:/usr/local/bin
+ export PATH
+-unset LANG
+-unset LOCALE
++unset LANG LOCALE LC_ALL
+ umask 022
+ 
+ if check_tools gawk; then
diff --git a/net-dialup/hcfusbmodem/hcfusbmodem-1.11.ebuild b/net-dialup/hcfusbmodem/hcfusbmodem-1.11-r1.ebuild
index 8ea1f39ab4ce..eb7e17a88423 100644
--- a/net-dialup/hcfusbmodem/hcfusbmodem-1.11.ebuild
+++ b/net-dialup/hcfusbmodem/hcfusbmodem-1.11-r1.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/net-dialup/hcfusbmodem/hcfusbmodem-1.11.ebuild,v 1.2 2007/05/02 08:07:45 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfusbmodem/hcfusbmodem-1.11-r1.ebuild,v 1.1 2007/08/28 19:00:02 mrness Exp $
 
 inherit linux-info eutils
 
@@ -20,6 +20,12 @@ S="${WORKDIR}/${P}powerpcfull"
 
 QA_EXECSTACK="usr/lib/hcfusbmodem/modules/imported/hcfblam-powerpc.O usr/lib/hcfusbmodem/modules/imported/hcfengine-powerpc.O"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-unset-locale.patch
+}
+
 src_compile() {
 	emake all || die "make failed"
 }