[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxls/files/, dev-libs/libxls/

2017-01-28 Thread Sergei Trofimovich 
commit: 4bbc0bd925e32087de9c61bf2bee81d00ec1ad7f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 28 20:28:00 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 28 20:31:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbc0bd9

dev-libs/libxls: fix infinite loop on excel files with 65535 rows

Reported-by: globus
Bug: https://bugs.gentoo.org/607094

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libxls/files/libxls-1.4.0-infinite.patch| 16 
 .../{libxls-1.4.0.ebuild => libxls-1.4.0-r1.ebuild}  |  1 +
 2 files changed, 17 insertions(+)

diff --git a/dev-libs/libxls/files/libxls-1.4.0-infinite.patch 
b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
new file mode 100644
index ..6f6e9fc
--- /dev/null
+++ b/dev-libs/libxls/files/libxls-1.4.0-infinite.patch
@@ -0,0 +1,16 @@
+cellRow and cellCol need to be of a type larger than WORD.
+Otherwise for for documents with 65535 columns condition
+loops forever in the following line:
+for (cellRow = 0; cellRow <= pWS->rows.lastrow; cellRow++) {
+In this case <= 65535 is always true.
+
+https://bugs.gentoo.org/607094 has an example doc of this kind.
+diff --git a/libxls/src/xls2csv.c b/libxls/src/xls2csv.c
+index b804267..1f0d4b3 100644
+--- a/src/xls2csv.c
 b/src/xls2csv.c
+@@ -104,3 +104,3 @@ int main(int argc, char *argv[]) {
+   struct st_row_data* row;
+-  WORD cellRow, cellCol;
++  DWORD cellRow, cellCol;
+ 

diff --git a/dev-libs/libxls/libxls-1.4.0.ebuild 
b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
similarity index 94%
rename from dev-libs/libxls/libxls-1.4.0.ebuild
rename to dev-libs/libxls/libxls-1.4.0-r1.ebuild
index 431c400..bb23a6c 100644
--- a/dev-libs/libxls/libxls-1.4.0.ebuild
+++ b/dev-libs/libxls/libxls-1.4.0-r1.ebuild
@@ -25,6 +25,7 @@ S="${WORKDIR}/${PN}"
 
 PATCHES=(
"${FILESDIR}"/${P}-asprintf.patch
+   "${FILESDIR}"/${P}-infinite.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxls/files/, dev-libs/libxls/

2017-01-28 Thread Sergei Trofimovich 
commit: 62ae86ae23409ba8729e545e7e5034962cd9ca1c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 28 18:00:52 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 28 18:01:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62ae86ae

dev-libs/libxls: bump up to 1.4.0, bug #607094

Adopt an orphan.

Bug: https://bugs.gentoo.org/607094

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/libxls/Manifest  |  1 +
 dev-libs/libxls/files/libxls-1.4.0-asprintf.patch |  8 +
 dev-libs/libxls/libxls-1.4.0.ebuild   | 39 +++
 dev-libs/libxls/metadata.xml  |  5 ++-
 4 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libxls/Manifest b/dev-libs/libxls/Manifest
index 2c8e150..a22204f 100644
--- a/dev-libs/libxls/Manifest
+++ b/dev-libs/libxls/Manifest
@@ -1 +1,2 @@
 DIST libxls-0.3.0_pre107.tar.bz2 294219 SHA256 
134f3c92c26e233fa16f8a6a4eeb7efd148d4594b3772eaca6d8faa96c2cf5f0 SHA512 
a9008a01a4a64ff5f968b0413f9cbc618d4e877420c6d125198fdcddf648ac4b52afeb5a21422e67d28175497e8fbddea21b03fe47c1b9452f1d9f24f5e0fc76
 WHIRLPOOL 
614da39ca6cfcf9b875f236c93d1ed476036d758d366821f0b9353fbac09c411759bf4dab58fe041a09f4bfcff8b8610cfc01afc8837458a7a261def149d9c7a
+DIST libxls-1.4.0.zip 428782 SHA256 
d3baea458a511d9b587a367528fa2a7fef410113ac9f6359834469b8f8d10dbd SHA512 
e55c0faa25b17a42d53ca939c80e1d3fd0c0e91de7f73d3d10d1fb6658e58e8f38f4e6288a3e3ecb9ae53ea681629ee66ec173229325eea69e01cbd038e68c95
 WHIRLPOOL 
03188b444cb6e2c1e80e45d1f9947c6a1221985d80a26795bef75f40c24a7b526ea4bb920e74d94e6520ead092b3604d786c2197032e986464db4fafe2b915e1

diff --git a/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch 
b/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch
new file mode 100644
index ..71a6c82
--- /dev/null
+++ b/dev-libs/libxls/files/libxls-1.4.0-asprintf.patch
@@ -0,0 +1,8 @@
+diff --git a/src/xlstool.c b/src/xlstool.c
+index 54eab0e..ef1c7e9 100644
+--- a/src/xlstool.c
 b/src/xlstool.c
+@@ -32,2 +32,3 @@
+ 
++#define _GNU_SOURCE /* asprintf */
+ #include "config.h"

diff --git a/dev-libs/libxls/libxls-1.4.0.ebuild 
b/dev-libs/libxls/libxls-1.4.0.ebuild
new file mode 100644
index ..431c400
--- /dev/null
+++ b/dev-libs/libxls/libxls-1.4.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="A library which can read Excel (xls) files"
+HOMEPAGE="http://libxls.sourceforge.net/;
+SRC_URI="mirror://sourceforge/project/libxls/${P}.zip"
+
+LICENSE="GPL-2 LGPL-3"
+SLOT="0/1" # libxlsreader.so.1
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+RESTRICT=test # test driver is missing
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-asprintf.patch
+)
+
+src_configure() {
+   econf \
+   --disable-static
+}
+
+src_install() {
+   default
+
+   prune_libtool_files
+}

diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
index 77ce2e3..8a47f96 100644
--- a/dev-libs/libxls/metadata.xml
+++ b/dev-libs/libxls/metadata.xml
@@ -1,7 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
+  
+sly...@gentoo.org
+Sergei Trofimovich
+  
   
 libxls