Fix separator usage in UTF8 output #139409 by Samuli Suominen.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 107 insertions, 16 deletions

diff --git a/sys-apps/smartmontools/ChangeLog b/sys-apps/smartmontools/ChangeLog
index 32f88b77edd0..77d15351948f 100644
--- a/sys-apps/smartmontools/ChangeLog
+++ b/sys-apps/smartmontools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/smartmontools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.54 2006/07/15 05:03:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/ChangeLog,v 1.55 2006/07/17 06:12:50 vapier Exp $
+
+*smartmontools-5.36-r1 (17 Jul 2006)
+
+  17 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/smartmontools-5.36-utf8.patch, +smartmontools-5.36-r1.ebuild:
+  Fix separator usage in UTF8 output #139409 by Samuli Suominen.
 
   15 Jul 2006; Mike Frysinger <vapier@gentoo.org> smartmontools-5.36.ebuild:
   Add mailx to RDEPEND #140192 by Jacek Sieka.
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index fd6b15108999..70c4fbc50e30 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -9,34 +9,37 @@ AUX smartd.rc 911 RMD160 9b37b36efb0a810275939693dc3543aa758e4d77 SHA1 d11eb791b
 MD5 30df6006f480460030dd002e115f7091 files/smartd.rc 911
 RMD160 9b37b36efb0a810275939693dc3543aa758e4d77 files/smartd.rc 911
 SHA256 88e14e797d765e6b082460c494d11dd6e362666448ddd2524f8ac4d4033ec635 files/smartd.rc 911
-DIST smartmontools-5.33.tar.gz 509826 RMD160 c6aa5a6dd903a55d0c583db2c8bd7d20852c9bf4 SHA1 dd1478402843278ba3778ccb1b6ab629a23e3abe SHA256 2fdde1b4e610cd6e004db8f98ac1100fcbea03b8f11e236de536ce22bc6c620d
+AUX smartmontools-5.36-utf8.patch 1276 RMD160 4a44e931474c484420dd6cd61861006d3708c633 SHA1 e2f6080cf1efafae990dbd22d8b18473d472e9e8 SHA256 1a06805ac7a651858056b691f0852400b9657fb8ae03c3c90a75c5176797175d
+MD5 7c78da42209de415fd282cde171fcafe files/smartmontools-5.36-utf8.patch 1276
+RMD160 4a44e931474c484420dd6cd61861006d3708c633 files/smartmontools-5.36-utf8.patch 1276
+SHA256 1a06805ac7a651858056b691f0852400b9657fb8ae03c3c90a75c5176797175d files/smartmontools-5.36-utf8.patch 1276
 DIST smartmontools-5.36.tar.gz 540786 RMD160 38efdc3b8dd78ded3f09890683c84973ccc036e7 SHA1 aafc42287c694e4206d80b7886401acdb0eff230 SHA256 f2032adf22f8d17aad7f3dbed0a9361c25e273d3ca6abb996c84159afd624bf4
-EBUILD smartmontools-5.33-r1.ebuild 1041 RMD160 c0672d94c3ff6066a6495b97219554cc7a600244 SHA1 caa7a39ac13fdfcf0cd9de2490637e45c958d1dc SHA256 b770a6eccd85e0621d7f41c631035047b13ccaadfbf04c498fd74d203a3283cf
-MD5 9a25ae27e011e33b98209ef140d87268 smartmontools-5.33-r1.ebuild 1041
-RMD160 c0672d94c3ff6066a6495b97219554cc7a600244 smartmontools-5.33-r1.ebuild 1041
-SHA256 b770a6eccd85e0621d7f41c631035047b13ccaadfbf04c498fd74d203a3283cf smartmontools-5.33-r1.ebuild 1041
+EBUILD smartmontools-5.36-r1.ebuild 1204 RMD160 90b2a20e1f7779ac55902e3aedbe262d04aa7bf7 SHA1 e3433b69a985d3c1613f7906c2e5bfc53b70a1a3 SHA256 6f3318df2e3e0206b70ca1ecb2225958904b2be2dad296a3b81ca347b2e948b9
+MD5 9ab4e32ab7b64f71d7a9f6064424afc1 smartmontools-5.36-r1.ebuild 1204
+RMD160 90b2a20e1f7779ac55902e3aedbe262d04aa7bf7 smartmontools-5.36-r1.ebuild 1204
+SHA256 6f3318df2e3e0206b70ca1ecb2225958904b2be2dad296a3b81ca347b2e948b9 smartmontools-5.36-r1.ebuild 1204
 EBUILD smartmontools-5.36.ebuild 1108 RMD160 1dc3def6622ae1a60e3731d9b44cc33210d1df87 SHA1 2432b04f048a39f572bd1e49a6452a80851adbc1 SHA256 c64a4a3bbe96944cf7e26cdcd90e7607f990d2d0ad21b4760a61e47440032ee4
 MD5 7564e1126411abbcab1d3f563a8ac50a smartmontools-5.36.ebuild 1108
 RMD160 1dc3def6622ae1a60e3731d9b44cc33210d1df87 smartmontools-5.36.ebuild 1108
 SHA256 c64a4a3bbe96944cf7e26cdcd90e7607f990d2d0ad21b4760a61e47440032ee4 smartmontools-5.36.ebuild 1108
-MISC ChangeLog 6702 RMD160 2d70119c34a666fd64ce447e03c850d9546f988a SHA1 9e3959f50c6e82ddd60d87a81842a9a150396e1f SHA256 db1a0346fa7f30bfc9bf80919e2655affc8e6caec9069ebd8502e9f6194adda6
-MD5 305fc934802b3ea9f2e28e31f9a8fd1d ChangeLog 6702
-RMD160 2d70119c34a666fd64ce447e03c850d9546f988a ChangeLog 6702
-SHA256 db1a0346fa7f30bfc9bf80919e2655affc8e6caec9069ebd8502e9f6194adda6 ChangeLog 6702
+MISC ChangeLog 6927 RMD160 fa4dc4d13583d6bf69c041395d761848b290e71a SHA1 6a30d6c5c89f2f449b11c3b9994b2854a43d6304 SHA256 81f313debca2fdced182b922fa3bf4e71d0e0a1b431faf8ed5d6bd11aff84a6f
+MD5 3d2c4fb833456eebae54f786c034f501 ChangeLog 6927
+RMD160 fa4dc4d13583d6bf69c041395d761848b290e71a ChangeLog 6927
+SHA256 81f313debca2fdced182b922fa3bf4e71d0e0a1b431faf8ed5d6bd11aff84a6f ChangeLog 6927
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 b7f9a690b96947809b29767e8e889dc8 files/digest-smartmontools-5.33-r1 256
-RMD160 7fd93eadbf4fae0726e448bd043b01e9624bff9e files/digest-smartmontools-5.33-r1 256
-SHA256 1028d133d7de58622df3e2408259e6bd2ed7e6a5f3c12086a907a33616303f98 files/digest-smartmontools-5.33-r1 256
 MD5 b4b284939cfe35f5a078fb3376807f56 files/digest-smartmontools-5.36 256
 RMD160 c919f122f62c24047114e77286b874a744e231fd files/digest-smartmontools-5.36 256
 SHA256 696816feb2b063890a0a1eede253206dd30bbc42cffd977d54894f76e8700aa8 files/digest-smartmontools-5.36 256
+MD5 b4b284939cfe35f5a078fb3376807f56 files/digest-smartmontools-5.36-r1 256
+RMD160 c919f122f62c24047114e77286b874a744e231fd files/digest-smartmontools-5.36-r1 256
+SHA256 696816feb2b063890a0a1eede253206dd30bbc42cffd977d54894f76e8700aa8 files/digest-smartmontools-5.36-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuym5amhnQswr0vIRAsfEAJ42XTgBqYzvoz2oGl0T7cXSPObkTwCglaZc
-VtnIRbfVRQsnPJot5N3dsf4=
-=b187
+iD8DBQFEuyqtamhnQswr0vIRAlkgAJ9udPpTyBqpvdN9MV+UJUKFgxafGQCguflK
+55p19OyS5+efVTsUawQV5ms=
+=SEaT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/smartmontools/files/digest-smartmontools-5.36-r1 b/sys-apps/smartmontools/files/digest-smartmontools-5.36-r1
new file mode 100644
index 000000000000..f7a69c6327af
--- /dev/null
+++ b/sys-apps/smartmontools/files/digest-smartmontools-5.36-r1
@@ -0,0 +1,3 @@
+MD5 2e424f2d35efa38a29ebca419c1dbe3c smartmontools-5.36.tar.gz 540786
+RMD160 38efdc3b8dd78ded3f09890683c84973ccc036e7 smartmontools-5.36.tar.gz 540786
+SHA256 f2032adf22f8d17aad7f3dbed0a9361c25e273d3ca6abb996c84159afd624bf4 smartmontools-5.36.tar.gz 540786
diff --git a/sys-apps/smartmontools/files/smartmontools-5.36-utf8.patch b/sys-apps/smartmontools/files/smartmontools-5.36-utf8.patch
new file mode 100644
index 000000000000..a6bf3617c8c6
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartmontools-5.36-utf8.patch
@@ -0,0 +1,34 @@
+Fix separator usage in UTF8 output
+
+http://bugs.gentoo.org/139409
+http://sourceforge.net/mailarchive/forum.php?thread_id=14805424&forum_id=12495
+
+--- smartmontools-5.36/ataprint.c
++++ smartmontools-5.36/ataprint.c
+@@ -445,7 +445,7 @@
+   unsigned short lba_64         = drive->words088_255[103-88];
+   uint64_t capacity_short=0, capacity=0, threedigits, power_of_ten;
+   int started=0,k=1000000000;
+-  char separator=',';
++  char *separator=",";
+ 
+   // get correct character to use as thousands separator
+ #ifdef HAVE_LOCALE_H
+@@ -453,7 +453,7 @@
+   setlocale (LC_ALL, "");
+   currentlocale=localeconv();
+   if (*(currentlocale->thousands_sep))
+-    separator=*(currentlocale->thousands_sep);
++    separator=currentlocale->thousands_sep;
+ #endif // #ifdef HAVE_LOCALE_H
+ 
+   // if drive supports LBA addressing, determine 32-bit LBA capacity
+@@ -485,7 +485,7 @@
+     capacity   -= threedigits*power_of_ten;
+     if (started)
+       // we have already printed some digits
+-      pstring += sprintf(pstring, "%c%03"PRIu64, separator, threedigits);
++      pstring += sprintf(pstring, "%s%03"PRIu64, separator, threedigits);
+     else if (threedigits || k==6) {
+       // these are the first digits that we are printing
+       pstring += sprintf(pstring, "%"PRIu64, threedigits);
diff --git a/sys-apps/smartmontools/smartmontools-5.36-r1.ebuild b/sys-apps/smartmontools/smartmontools-5.36-r1.ebuild
new file mode 100644
index 000000000000..8643b233be8e
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-5.36-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/smartmontools/smartmontools-5.36-r1.ebuild,v 1.1 2006/07/17 06:12:50 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="control and monitor storage systems using the Self-Monitoring, Analysis and Reporting Technology System (S.M.A.R.T.)"
+HOMEPAGE="http://smartmontools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86"
+IUSE="static"
+
+RDEPEND="virtual/mailx"
+DEPEND=">=sys-apps/portage-2.0.51"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-utf8.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	emake || die
+}
+
+src_install() {
+	dosbin smart{ctl,d} || die "dosbin"
+	doman *.[58]
+	dodoc AUTHORS CHANGELOG NEWS README TODO WARNINGS
+	newdoc smartd.conf smartd.conf.example
+	docinto examplescripts
+	dodoc examplescripts/*
+	rm -f "${D}"/usr/share/doc/${PF}/examplescripts/Makefile*
+
+	insinto /etc
+	doins smartd.conf
+
+	newinitd "${FILESDIR}"/smartd.rc smartd
+	newconfd "${FILESDIR}"/smartd.confd smartd
+}