Unset locale environment vars (#185193).

Package-Manager: portage-2.1.2.12

5 files changed, 78 insertions, 18 deletions

diff --git a/net-dialup/hsfmodem/ChangeLog b/net-dialup/hsfmodem/ChangeLog
index e100840e876f..34395a8bf82c 100644
--- a/net-dialup/hsfmodem/ChangeLog
+++ b/net-dialup/hsfmodem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/hsfmodem
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.39 2007/07/14 08:42:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/ChangeLog,v 1.40 2007/08/28 18:46:33 mrness Exp $
+
+*hsfmodem-7.60.00.09-r1 (28 Aug 2007)
+
+  28 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/hsfmodem-7.60.00.09-unset-locale.patch,
+  -hsfmodem-7.60.00.09.ebuild, +hsfmodem-7.60.00.09-r1.ebuild:
+  Unset locale environment vars (#185193).
 
 *hsfmodem-7.60.00.09 (14 Jul 2007)
 
diff --git a/net-dialup/hsfmodem/Manifest b/net-dialup/hsfmodem/Manifest
index ac001a80e8b1..ec86010bb5fe 100644
--- a/net-dialup/hsfmodem/Manifest
+++ b/net-dialup/hsfmodem/Manifest
@@ -9,6 +9,10 @@ AUX hsfmodem-7.60.00.09-udev-group.patch 878 RMD160 a0b2fc9b469ca29841201c9affa9
 MD5 60f266f9978dac63915c6ce430dcab1b files/hsfmodem-7.60.00.09-udev-group.patch 878
 RMD160 a0b2fc9b469ca29841201c9affa96dc9b627e607 files/hsfmodem-7.60.00.09-udev-group.patch 878
 SHA256 5866c7310d82a7f48a2b1282baeba556e9762fc6f16ddbf3951d9c001fe708ec files/hsfmodem-7.60.00.09-udev-group.patch 878
+AUX hsfmodem-7.60.00.09-unset-locale.patch 2323 RMD160 ed2e39ee3fb67351b61d8c527d06202b6745f75a SHA1 f77ffff17d40d7b6300ee7708e5ebd0c4cd72796 SHA256 fc0ca9ee198ccb50433100a73dd32ce8eaee0c9166fd17d25c3e5f7e82378228
+MD5 c82530e3021ba593384489155bfb76d9 files/hsfmodem-7.60.00.09-unset-locale.patch 2323
+RMD160 ed2e39ee3fb67351b61d8c527d06202b6745f75a files/hsfmodem-7.60.00.09-unset-locale.patch 2323
+SHA256 fc0ca9ee198ccb50433100a73dd32ce8eaee0c9166fd17d25c3e5f7e82378228 files/hsfmodem-7.60.00.09-unset-locale.patch 2323
 DIST 100498D_RM_HxF_Released.pdf 718949 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a SHA1 519c9b064e734873d67cf9c17d8eb1389a6f4eef SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1
 DIST hsfmodem-7.60.00.02full.tar.gz 1377050 RMD160 31e5f87892f4cac91fa9c1ca4b97c29a76d659a3 SHA1 4c3f67e2e5124268c55f97be1418e35b6d04cfc0 SHA256 2f0334e0ae181f9936687b6d65816627accbeb24e970ae030cfcde969785f1e1
 DIST hsfmodem-7.60.00.02x86_64full.tar.gz 1494128 RMD160 5dd69af4f07e38fdf2969e9a32e4d80c913724da SHA1 de4e786f9299ad2fdb89d4c5b0e48f735ba9b4f1 SHA256 81d36b8691a317f12114ecddb868bb81f9ce1621a9e8519050a639c2561dea68
@@ -18,14 +22,14 @@ EBUILD hsfmodem-7.60.00.02.ebuild 1951 RMD160 c40bf83685aaa0e1057c104085a8a43c39
 MD5 0c9cbba3f8b272a81cfc1d00f9133ecf hsfmodem-7.60.00.02.ebuild 1951
 RMD160 c40bf83685aaa0e1057c104085a8a43c39a1edee hsfmodem-7.60.00.02.ebuild 1951
 SHA256 76decf2f125f7267dcea25cc690d175349b2c080e8dd269f0ec9b8dd8ffabc2a hsfmodem-7.60.00.02.ebuild 1951
-EBUILD hsfmodem-7.60.00.09.ebuild 1952 RMD160 f9009f3281cb6d84e59af23bf782ef0c7e9be7ab SHA1 aa00b7c6fa951e99a0568e8ecb46f9738d4b1672 SHA256 96ed5104adaf320f461c7205194bb6f2432b9e28e6b653a842d4fa0deb1b4eaa
-MD5 ec2da4adf1ab8911d674121888f4511b hsfmodem-7.60.00.09.ebuild 1952
-RMD160 f9009f3281cb6d84e59af23bf782ef0c7e9be7ab hsfmodem-7.60.00.09.ebuild 1952
-SHA256 96ed5104adaf320f461c7205194bb6f2432b9e28e6b653a842d4fa0deb1b4eaa hsfmodem-7.60.00.09.ebuild 1952
-MISC ChangeLog 9890 RMD160 f3f7b83670bcb5ee4f98771fbfa1d4fc4885784c SHA1 c32b6b8413c58a6b864cea7daabdc7ce2ff00833 SHA256 50c81c2a3ce05d4d6724f0b7a0cc661f4a119a06ad448dc03687adf35b0542c9
-MD5 fa1332f889bdc5891bfc44a3f4a89911 ChangeLog 9890
-RMD160 f3f7b83670bcb5ee4f98771fbfa1d4fc4885784c ChangeLog 9890
-SHA256 50c81c2a3ce05d4d6724f0b7a0cc661f4a119a06ad448dc03687adf35b0542c9 ChangeLog 9890
+EBUILD hsfmodem-7.60.00.09-r1.ebuild 2001 RMD160 51989d3b66b0785e357ff75204e33a357fd6b5a5 SHA1 99c30facb2c7471eeb133b73c980fb7424289491 SHA256 5f0c8b125369117277bcddf3dbf0c4ba3a4a79d882eb8a6d64cc4a77fd8573a4
+MD5 c523b59b12be4486076bf507c115402a hsfmodem-7.60.00.09-r1.ebuild 2001
+RMD160 51989d3b66b0785e357ff75204e33a357fd6b5a5 hsfmodem-7.60.00.09-r1.ebuild 2001
+SHA256 5f0c8b125369117277bcddf3dbf0c4ba3a4a79d882eb8a6d64cc4a77fd8573a4 hsfmodem-7.60.00.09-r1.ebuild 2001
+MISC ChangeLog 10133 RMD160 6469e6f2a767fd23487a627672a98befc06c867a SHA1 7fdba077cad153ca41a611ea2d7ecde22cf5bb60 SHA256 a9886f745911e665026acd89d314344f9c6beb9e0ce130dabc4321e648a652c2
+MD5 392d2b324a14ba9a20c2cac080748333 ChangeLog 10133
+RMD160 6469e6f2a767fd23487a627672a98befc06c867a ChangeLog 10133
+SHA256 a9886f745911e665026acd89d314344f9c6beb9e0ce130dabc4321e648a652c2 ChangeLog 10133
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -33,13 +37,13 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 ec909f123ea2f1feb1944ac7e71a76a9 files/digest-hsfmodem-7.60.00.02 828
 RMD160 7363334028121e66ddd8d50a57a0777d46e2c2b3 files/digest-hsfmodem-7.60.00.02 828
 SHA256 8eb74aac549ee6c73135ff70355e7ee2247752d8ba203edf57f261a278478700 files/digest-hsfmodem-7.60.00.02 828
-MD5 977c8d8ee9f9c325f698a6bd12da5323 files/digest-hsfmodem-7.60.00.09 828
-RMD160 d9b78267bc7c2eb2c2891fab9e0fc9f35c85f46a files/digest-hsfmodem-7.60.00.09 828
-SHA256 6052e6fc84965c33c508c55280fd513f2862fb8547f0880d238e503b6d8ab5e4 files/digest-hsfmodem-7.60.00.09 828
+MD5 b392f857aa07249d6e05f00a5d6965a3 files/digest-hsfmodem-7.60.00.09-r1 752
+RMD160 05493568743d4b36cabfd26b7edf36cab4493ccd files/digest-hsfmodem-7.60.00.09-r1 752
+SHA256 136f7320fb12fcde054b6cfca166d861364cb670abcf21edf23069a8d503e699 files/digest-hsfmodem-7.60.00.09-r1 752
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFGmIx0VSA5X31g7/gRAvOzAJ41hrC6EHlWBlswBMuvjmFZSPzeLwCdEWrY
-R4plQ1Heqb9v7Kxm6Zf56mY=
-=OO0Y
+iD8DBQFG1G2UVSA5X31g7/gRArEvAJ0R01aCsvGmFQcc+3JQR3ccfDHq5ACeN+s1
++JusVhVpORSkeMDiFRrX758=
+=RLfO
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/hsfmodem/files/digest-hsfmodem-7.60.00.09 b/net-dialup/hsfmodem/files/digest-hsfmodem-7.60.00.09-r1
index 109ba91eaf91..214acfa48b30 100644
--- a/net-dialup/hsfmodem/files/digest-hsfmodem-7.60.00.09
+++ b/net-dialup/hsfmodem/files/digest-hsfmodem-7.60.00.09-r1
@@ -1,7 +1,6 @@
 MD5 e6d8fea8f5f641d7bb4dfb33c6f478e7 100498D_RM_HxF_Released.pdf 718949
 RMD160 be9df1ae492bcce46775c0325cd438b91213bf7a 100498D_RM_HxF_Released.pdf 718949
 SHA256 e05385b094ac97f13aabc9432ba7478c0acf12862b3c4da097272435d43f6ac1 100498D_RM_HxF_Released.pdf 718949
-MD5 91e42c01c8d69ad79e0793770e2059d4 hsfmodem-7.60.00.09full.tar.gz 1391509
 RMD160 aeb3eec97a5f8ba43bda7a9a058186181d7f8576 hsfmodem-7.60.00.09full.tar.gz 1391509
 SHA256 7cf3dea2a66798846be376b2ab6499ab5ff40f68844baadcd52046a1f4fb3cfb hsfmodem-7.60.00.09full.tar.gz 1391509
 MD5 83db35aa4c882de4810a36eefc2a05ff hsfmodem-7.60.00.09x86_64full.tar.gz 1509106
diff --git a/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-unset-locale.patch b/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-unset-locale.patch
new file mode 100644
index 000000000000..097e0ba4e12c
--- /dev/null
+++ b/net-dialup/hsfmodem/files/hsfmodem-7.60.00.09-unset-locale.patch
@@ -0,0 +1,49 @@
+diff -Nru hsfmodem-7.60.00.09x86_64full.orig/makefile hsfmodem-7.60.00.09x86_64full/makefile
+--- hsfmodem-7.60.00.09x86_64full.orig/makefile	2007-05-09 04:32:30.000000000 +0300
++++ hsfmodem-7.60.00.09x86_64full/makefile	2007-08-28 21:40:32.000000000 +0300
+@@ -219,7 +219,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) -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 hsfmodem-7.60.00.09x86_64full.orig/modules/kernelcompiler.sh hsfmodem-7.60.00.09x86_64full/modules/kernelcompiler.sh
+--- hsfmodem-7.60.00.09x86_64full.orig/modules/kernelcompiler.sh	2007-04-14 20:57:51.000000000 +0300
++++ hsfmodem-7.60.00.09x86_64full/modules/kernelcompiler.sh	2007-08-28 21:41:15.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 hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in
+--- hsfmodem-7.60.00.09x86_64full.orig/scripts/cnxtconfig.in	2007-08-28 21:39:12.000000000 +0300
++++ hsfmodem-7.60.00.09x86_64full/scripts/cnxtconfig.in	2007-08-28 21:41:31.000000000 +0300
+@@ -2635,7 +2635,7 @@
+ 	exit $?
+ fi
+ 
+-unset LANG
++unset LANG LOCALE LC_ALL
+ 
+ umask 022
+ 
+diff -Nru hsfmodem-7.60.00.09x86_64full.orig/scripts/patcher.in hsfmodem-7.60.00.09x86_64full/scripts/patcher.in
+--- hsfmodem-7.60.00.09x86_64full.orig/scripts/patcher.in	2005-12-08 05:33:22.000000000 +0200
++++ hsfmodem-7.60.00.09x86_64full/scripts/patcher.in	2007-08-28 21:41:46.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/hsfmodem/hsfmodem-7.60.00.09.ebuild b/net-dialup/hsfmodem/hsfmodem-7.60.00.09-r1.ebuild
index 69caceea8298..53a7b1430a91 100644
--- a/net-dialup/hsfmodem/hsfmodem-7.60.00.09.ebuild
+++ b/net-dialup/hsfmodem/hsfmodem-7.60.00.09-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/hsfmodem/hsfmodem-7.60.00.09.ebuild,v 1.1 2007/07/14 08:42:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/hsfmodem/hsfmodem-7.60.00.09-r1.ebuild,v 1.1 2007/08/28 18:46:33 mrness Exp $
 
 inherit eutils linux-info
 
@@ -42,6 +42,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${MY_ARCH_S}"
 	epatch "${FILESDIR}/${P}-udev-group.patch"
+	epatch "${FILESDIR}/${P}-unset-locale.patch"
 }
 
 src_compile() {