Unset locale environment vars (#185193).

(Portage version: 2.1.2.12)

4 files changed, 59 insertions, 2 deletions

diff --git a/net-dialup/hcfpcimodem/ChangeLog b/net-dialup/hcfpcimodem/ChangeLog
index 93f18c3a90d9..806bb0531ac7 100644
--- a/net-dialup/hcfpcimodem/ChangeLog
+++ b/net-dialup/hcfpcimodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hcfpcimodem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.31 2007/07/14 07:41:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/ChangeLog,v 1.32 2007/08/28 18:53:06 mrness Exp $
+
+*hcfpcimodem-1.13-r1 (28 Aug 2007)
+
+  28 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/hcfpcimodem-1.13-unset-locale.patch, -hcfpcimodem-1.13.ebuild,
+  +hcfpcimodem-1.13-r1.ebuild:
+  Unset locale environment vars (#185193).
 
 *hcfpcimodem-1.13 (14 Jul 2007)
 
diff --git a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13 b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13-r1
index 0cf652461e2b..0cf652461e2b 100644
--- a/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13
+++ b/net-dialup/hcfpcimodem/files/digest-hcfpcimodem-1.13-r1
diff --git a/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch
new file mode 100644
index 000000000000..ae7872a1e207
--- /dev/null
+++ b/net-dialup/hcfpcimodem/files/hcfpcimodem-1.13-unset-locale.patch
@@ -0,0 +1,49 @@
+diff -Nru hcfpcimodem-1.13full.orig/makefile hcfpcimodem-1.13full/makefile
+--- hcfpcimodem-1.13full.orig/makefile	2007-05-10 21:06:08.000000000 +0300
++++ hcfpcimodem-1.13full/makefile	2007-08-28 21:49:33.000000000 +0300
+@@ -229,7 +229,7 @@
+ 		mv debian/changelog.tmp debian/changelog; \
+ 		( echo CNXTDRIVER=$(CNXTDRIVER); 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_DEBIAN) -us -uc || true
++	unset LANG; unset LOCALE; unset LC_ALL; unset LC_TIME; dpkg-buildpackage -a$(IMPORTED_ARCH_DEBIAN) -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 hcfpcimodem-1.13full.orig/modules/kernelcompiler.sh hcfpcimodem-1.13full/modules/kernelcompiler.sh
+--- hcfpcimodem-1.13full.orig/modules/kernelcompiler.sh	2007-04-20 17:30:51.000000000 +0300
++++ hcfpcimodem-1.13full/modules/kernelcompiler.sh	2007-08-28 21:48:52.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 hcfpcimodem-1.13full.orig/scripts/cnxtconfig.in hcfpcimodem-1.13full/scripts/cnxtconfig.in
+--- hcfpcimodem-1.13full.orig/scripts/cnxtconfig.in	2007-05-10 21:06:08.000000000 +0300
++++ hcfpcimodem-1.13full/scripts/cnxtconfig.in	2007-08-28 21:48:52.000000000 +0300
+@@ -2635,7 +2635,7 @@
+ 	exit $?
+ fi
+ 
+-unset LANG
++unset LANG LOCALE LC_ALL
+ 
+ umask 022
+ 
+diff -Nru hcfpcimodem-1.13full.orig/scripts/patcher.in hcfpcimodem-1.13full/scripts/patcher.in
+--- hcfpcimodem-1.13full.orig/scripts/patcher.in	2005-12-08 05:33:35.000000000 +0200
++++ hcfpcimodem-1.13full/scripts/patcher.in	2007-08-28 21:48:52.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/hcfpcimodem/hcfpcimodem-1.13.ebuild b/net-dialup/hcfpcimodem/hcfpcimodem-1.13-r1.ebuild
index 55f6c87fa750..7d69aa44f5b6 100644
--- a/net-dialup/hcfpcimodem/hcfpcimodem-1.13.ebuild
+++ b/net-dialup/hcfpcimodem/hcfpcimodem-1.13-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/hcfpcimodem/hcfpcimodem-1.13.ebuild,v 1.2 2007/07/15 04:52:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hcfpcimodem/hcfpcimodem-1.13-r1.ebuild,v 1.1 2007/08/28 18:53:06 mrness Exp $
 
 inherit eutils linux-info
 
@@ -52,6 +52,7 @@ src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}/${P}-implicit-declarations.patch"
+	epatch "${FILESDIR}/${P}-unset-locale.patch"
 }
 
 src_compile() {